Merging upstream version 16.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

23 files changed, 1205 insertions, 1107 deletions

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 3afe14c..458dc11 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -482,6 +482,7 @@ replace_guc_value(char **lines, const char *guc_name, const char *guc_value,
 	for (i = 0; lines[i]; i++)
 	{
 		const char *where;
+		const char *namestart;
 
 		/*
 		 * Look for a line assigning to guc_name.  Typically it will be
@@ -492,15 +493,19 @@ replace_guc_value(char **lines, const char *guc_name, const char *guc_value,
 		where = lines[i];
 		while (*where == '#' || isspace((unsigned char) *where))
 			where++;
-		if (strncmp(where, guc_name, namelen) != 0)
+		if (pg_strncasecmp(where, guc_name, namelen) != 0)
 			continue;
+		namestart = where;
 		where += namelen;
 		while (isspace((unsigned char) *where))
 			where++;
 		if (*where != '=')
 			continue;
 
-		/* found it -- append the original comment if any */
+		/* found it -- let's use the canonical casing shown in the file */
+		memcpy(&newline->data[mark_as_comment ? 1 : 0], namestart, namelen);
+
+		/* now append the original comment if any */
 		where = strrchr(where, '#');
 		if (where)
 		{
diff --git a/src/bin/initdb/po/ru.po b/src/bin/initdb/po/ru.po
index d05b42c..e4800fc 100644
--- a/src/bin/initdb/po/ru.po
+++ b/src/bin/initdb/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: initdb (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:10+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2023-09-11 16:13+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -216,87 +216,87 @@ msgstr "не удалось создать связь для каталога \"
 msgid "could not get junction for \"%s\": %s\n"
 msgstr "не удалось получить связь для каталога \"%s\": %s\n"
 
-#: initdb.c:618 initdb.c:1605
+#: initdb.c:623 initdb.c:1610
 #, c-format
 msgid "could not open file \"%s\" for reading: %m"
 msgstr "не удалось открыть файл \"%s\" для чтения: %m"
 
-#: initdb.c:662 initdb.c:966 initdb.c:986
+#: initdb.c:667 initdb.c:971 initdb.c:991
 #, c-format
 msgid "could not open file \"%s\" for writing: %m"
 msgstr "не удалось открыть файл \"%s\" для записи: %m"
 
-#: initdb.c:666 initdb.c:969 initdb.c:988
+#: initdb.c:671 initdb.c:974 initdb.c:993
 #, c-format
 msgid "could not write file \"%s\": %m"
 msgstr "не удалось записать файл \"%s\": %m"
 
-#: initdb.c:670
+#: initdb.c:675
 #, c-format
 msgid "could not close file \"%s\": %m"
 msgstr "не удалось закрыть файл \"%s\": %m"
 
-#: initdb.c:686
+#: initdb.c:691
 #, c-format
 msgid "could not execute command \"%s\": %m"
 msgstr "не удалось выполнить команду \"%s\": %m"
 
-#: initdb.c:704
+#: initdb.c:709
 #, c-format
 msgid "removing data directory \"%s\""
 msgstr "удаление каталога данных \"%s\""
 
-#: initdb.c:706
+#: initdb.c:711
 #, c-format
 msgid "failed to remove data directory"
 msgstr "ошибка при удалении каталога данных"
 
-#: initdb.c:710
+#: initdb.c:715
 #, c-format
 msgid "removing contents of data directory \"%s\""
 msgstr "удаление содержимого каталога данных \"%s\""
 
-#: initdb.c:713
+#: initdb.c:718
 #, c-format
 msgid "failed to remove contents of data directory"
 msgstr "ошибка при удалении содержимого каталога данных"
 
-#: initdb.c:718
+#: initdb.c:723
 #, c-format
 msgid "removing WAL directory \"%s\""
 msgstr "удаление каталога WAL \"%s\""
 
-#: initdb.c:720
+#: initdb.c:725
 #, c-format
 msgid "failed to remove WAL directory"
 msgstr "ошибка при удалении каталога WAL"
 
-#: initdb.c:724
+#: initdb.c:729
 #, c-format
 msgid "removing contents of WAL directory \"%s\""
 msgstr "удаление содержимого каталога WAL \"%s\""
 
-#: initdb.c:726
+#: initdb.c:731
 #, c-format
 msgid "failed to remove contents of WAL directory"
 msgstr "ошибка при удалении содержимого каталога WAL"
 
-#: initdb.c:733
+#: initdb.c:738
 #, c-format
 msgid "data directory \"%s\" not removed at user's request"
 msgstr "каталог данных \"%s\" не был удалён по запросу пользователя"
 
-#: initdb.c:737
+#: initdb.c:742
 #, c-format
 msgid "WAL directory \"%s\" not removed at user's request"
 msgstr "каталог WAL \"%s\" не был удалён по запросу пользователя"
 
-#: initdb.c:755
+#: initdb.c:760
 #, c-format
 msgid "cannot be run as root"
 msgstr "программу не должен запускать root"
 
-#: initdb.c:756
+#: initdb.c:761
 #, c-format
 msgid ""
 "Please log in (using, e.g., \"su\") as the (unprivileged) user that will own "
@@ -305,17 +305,17 @@ msgstr ""
 "Пожалуйста, переключитесь на обычного пользователя (например, используя "
 "\"su\"), которому будет принадлежать серверный процесс."
 
-#: initdb.c:788
+#: initdb.c:793
 #, c-format
 msgid "\"%s\" is not a valid server encoding name"
 msgstr "\"%s\" — некорректное имя серверной кодировки"
 
-#: initdb.c:932
+#: initdb.c:937
 #, c-format
 msgid "file \"%s\" does not exist"
 msgstr "файл \"%s\" не существует"
 
-#: initdb.c:933 initdb.c:938 initdb.c:945
+#: initdb.c:938 initdb.c:943 initdb.c:950
 #, c-format
 msgid ""
 "This might mean you have a corrupted installation or identified the wrong "
@@ -324,129 +324,129 @@ msgstr ""
 "Это означает, что ваша установка PostgreSQL испорчена или в параметре -L "
 "задан неправильный каталог."
 
-#: initdb.c:937
+#: initdb.c:942
 #, c-format
 msgid "could not access file \"%s\": %m"
 msgstr "нет доступа к файлу \"%s\": %m"
 
-#: initdb.c:944
+#: initdb.c:949
 #, c-format
 msgid "file \"%s\" is not a regular file"
 msgstr "\"%s\" — не обычный файл"
 
-#: initdb.c:1077
+#: initdb.c:1082
 #, c-format
 msgid "selecting dynamic shared memory implementation ... "
 msgstr "выбирается реализация динамической разделяемой памяти... "
 
-#: initdb.c:1086
+#: initdb.c:1091
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "выбирается значение max_connections по умолчанию... "
 
-#: initdb.c:1106
+#: initdb.c:1111
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "выбирается значение shared_buffers по умолчанию... "
 
-#: initdb.c:1129
+#: initdb.c:1134
 #, c-format
 msgid "selecting default time zone ... "
 msgstr "выбирается часовой пояс по умолчанию... "
 
-#: initdb.c:1206
+#: initdb.c:1211
 msgid "creating configuration files ... "
 msgstr "создание конфигурационных файлов... "
 
-#: initdb.c:1359 initdb.c:1373 initdb.c:1440 initdb.c:1451
+#: initdb.c:1364 initdb.c:1378 initdb.c:1445 initdb.c:1456
 #, c-format
 msgid "could not change permissions of \"%s\": %m"
 msgstr "не удалось поменять права для \"%s\": %m"
 
-#: initdb.c:1469
+#: initdb.c:1474
 #, c-format
 msgid "running bootstrap script ... "
 msgstr "выполняется подготовительный скрипт... "
 
-#: initdb.c:1481
+#: initdb.c:1486
 #, c-format
 msgid "input file \"%s\" does not belong to PostgreSQL %s"
 msgstr "входной файл \"%s\" не принадлежит PostgreSQL %s"
 
-#: initdb.c:1483
+#: initdb.c:1488
 #, c-format
 msgid "Specify the correct path using the option -L."
 msgstr "Укажите корректный путь в параметре -L."
 
-#: initdb.c:1583
+#: initdb.c:1588
 msgid "Enter new superuser password: "
 msgstr "Введите новый пароль суперпользователя: "
 
-#: initdb.c:1584
+#: initdb.c:1589
 msgid "Enter it again: "
 msgstr "Повторите его: "
 
-#: initdb.c:1587
+#: initdb.c:1592
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "Пароли не совпадают.\n"
 
-#: initdb.c:1611
+#: initdb.c:1616
 #, c-format
 msgid "could not read password from file \"%s\": %m"
 msgstr "не удалось прочитать пароль из файла \"%s\": %m"
 
-#: initdb.c:1614
+#: initdb.c:1619
 #, c-format
 msgid "password file \"%s\" is empty"
 msgstr "файл пароля \"%s\" пуст"
 
-#: initdb.c:2026
+#: initdb.c:2031
 #, c-format
 msgid "caught signal\n"
 msgstr "получен сигнал\n"
 
-#: initdb.c:2032
+#: initdb.c:2037
 #, c-format
 msgid "could not write to child process: %s\n"
 msgstr "не удалось записать в поток дочернего процесса: %s\n"
 
-#: initdb.c:2040
+#: initdb.c:2045
 #, c-format
 msgid "ok\n"
 msgstr "ок\n"
 
-#: initdb.c:2129
+#: initdb.c:2134
 #, c-format
 msgid "setlocale() failed"
 msgstr "ошибка в setlocale()"
 
-#: initdb.c:2147
+#: initdb.c:2152
 #, c-format
 msgid "failed to restore old locale \"%s\""
 msgstr "не удалось восстановить старую локаль \"%s\""
 
-#: initdb.c:2155
+#: initdb.c:2160
 #, c-format
 msgid "invalid locale name \"%s\""
 msgstr "ошибочное имя локали \"%s\""
 
-#: initdb.c:2156
+#: initdb.c:2161
 #, c-format
 msgid "If the locale name is specific to ICU, use --icu-locale."
 msgstr "Если эта локаль свойственна ICU, укажите --icu-locale."
 
-#: initdb.c:2169
+#: initdb.c:2174
 #, c-format
 msgid "invalid locale settings; check LANG and LC_* environment variables"
 msgstr "неверные установки локали; проверьте переменные окружения LANG и LC_*"
 
-#: initdb.c:2195 initdb.c:2219
+#: initdb.c:2200 initdb.c:2224
 #, c-format
 msgid "encoding mismatch"
 msgstr "несоответствие кодировки"
 
-#: initdb.c:2196
+#: initdb.c:2201
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected locale "
@@ -457,7 +457,7 @@ msgstr ""
 "может привести к неправильной работе различных функций обработки текстовых "
 "строк."
 
-#: initdb.c:2201 initdb.c:2222
+#: initdb.c:2206 initdb.c:2227
 #, c-format
 msgid ""
 "Rerun %s and either do not specify an encoding explicitly, or choose a "
@@ -466,42 +466,42 @@ msgstr ""
 "Для исправления перезапустите %s, не указывая кодировку явно, либо выберите "
 "подходящее сочетание параметров локализации."
 
-#: initdb.c:2220
+#: initdb.c:2225
 #, c-format
 msgid "The encoding you selected (%s) is not supported with the ICU provider."
 msgstr "Выбранная вами кодировка (%s) не поддерживается провайдером ICU."
 
-#: initdb.c:2271
+#: initdb.c:2276
 #, c-format
 msgid "could not convert locale name \"%s\" to language tag: %s"
 msgstr "не удалось получить из названия локали \"%s\" метку языка: %s"
 
-#: initdb.c:2277 initdb.c:2329 initdb.c:2408
+#: initdb.c:2282 initdb.c:2334 initdb.c:2413
 #, c-format
 msgid "ICU is not supported in this build"
 msgstr "ICU не поддерживается в данной сборке"
 
-#: initdb.c:2300
+#: initdb.c:2305
 #, c-format
 msgid "could not get language from locale \"%s\": %s"
 msgstr "не удалось определить язык для локали \"%s\": %s"
 
-#: initdb.c:2326
+#: initdb.c:2331
 #, c-format
 msgid "locale \"%s\" has unknown language \"%s\""
 msgstr "для локали \"%s\" получен неизвестный язык \"%s\""
 
-#: initdb.c:2392
+#: initdb.c:2397
 #, c-format
 msgid "ICU locale must be specified"
 msgstr "необходимо задать локаль ICU"
 
-#: initdb.c:2396
+#: initdb.c:2401
 #, c-format
 msgid "Using language tag \"%s\" for ICU locale \"%s\".\n"
 msgstr "Для локали ICU \"%s\" используется метка языка \"%s\".\n"
 
-#: initdb.c:2419
+#: initdb.c:2424
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -510,17 +510,17 @@ msgstr ""
 "%s инициализирует кластер PostgreSQL.\n"
 "\n"
 
-#: initdb.c:2420
+#: initdb.c:2425
 #, c-format
 msgid "Usage:\n"
 msgstr "Использование:\n"
 
-#: initdb.c:2421
+#: initdb.c:2426
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [ПАРАМЕТР]... [КАТАЛОГ]\n"
 
-#: initdb.c:2422
+#: initdb.c:2427
 #, c-format
 msgid ""
 "\n"
@@ -529,7 +529,7 @@ msgstr ""
 "\n"
 "Параметры:\n"
 
-#: initdb.c:2423
+#: initdb.c:2428
 #, c-format
 msgid ""
 "  -A, --auth=METHOD         default authentication method for local "
@@ -538,7 +538,7 @@ msgstr ""
 "  -A, --auth=МЕТОД          метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений\n"
 
-#: initdb.c:2424
+#: initdb.c:2429
 #, c-format
 msgid ""
 "      --auth-host=METHOD    default authentication method for local TCP/IP "
@@ -547,7 +547,7 @@ msgstr ""
 "      --auth-host=МЕТОД     метод проверки подлинности по умолчанию\n"
 "                            для локальных TCP/IP-подключений\n"
 
-#: initdb.c:2425
+#: initdb.c:2430
 #, c-format
 msgid ""
 "      --auth-local=METHOD   default authentication method for local-socket "
@@ -556,17 +556,17 @@ msgstr ""
 "      --auth-local=МЕТОД    метод проверки подлинности по умолчанию\n"
 "                            для локальных подключений через сокет\n"
 
-#: initdb.c:2426
+#: initdb.c:2431
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]КАТАЛОГ     расположение данных этого кластера БД\n"
 
-#: initdb.c:2427
+#: initdb.c:2432
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=КОДИРОВКА  кодировка по умолчанию для новых баз\n"
 
-#: initdb.c:2428
+#: initdb.c:2433
 #, c-format
 msgid ""
 "  -g, --allow-group-access  allow group read/execute on data directory\n"
@@ -575,12 +575,12 @@ msgstr ""
 "для\n"
 "                            группы\n"
 
-#: initdb.c:2429
+#: initdb.c:2434
 #, c-format
 msgid "      --icu-locale=LOCALE   set ICU locale ID for new databases\n"
 msgstr "      --icu-locale=ЛОКАЛЬ   идентификатор локали ICU для новых баз\n"
 
-#: initdb.c:2430
+#: initdb.c:2435
 #, c-format
 msgid ""
 "      --icu-rules=RULES     set additional ICU collation rules for new "
@@ -589,17 +589,17 @@ msgstr ""
 "      --icu-rules=ПРАВИЛА   дополнительные правила сортировки ICU для новых "
 "баз\n"
 
-#: initdb.c:2431
+#: initdb.c:2436
 #, c-format
 msgid "  -k, --data-checksums      use data page checksums\n"
 msgstr "  -k, --data-checksums      включить контроль целостности страниц\n"
 
-#: initdb.c:2432
+#: initdb.c:2437
 #, c-format
 msgid "      --locale=LOCALE       set default locale for new databases\n"
 msgstr "      --locale=ЛОКАЛЬ       локаль по умолчанию для новых баз\n"
 
-#: initdb.c:2433
+#: initdb.c:2438
 #, c-format
 msgid ""
 "      --lc-collate=, --lc-ctype=, --lc-messages=LOCALE\n"
@@ -613,12 +613,12 @@ msgstr ""
 "                            установить соответствующий параметр локали\n"
 "                            для новых баз (вместо значения из окружения)\n"
 
-#: initdb.c:2437
+#: initdb.c:2442
 #, c-format
 msgid "      --no-locale           equivalent to --locale=C\n"
 msgstr "      --no-locale           эквивалентно --locale=C\n"
 
-#: initdb.c:2438
+#: initdb.c:2443
 #, c-format
 msgid ""
 "      --locale-provider={libc|icu}\n"
@@ -627,14 +627,14 @@ msgstr ""
 "      --locale-provider={libc|icu}\n"
 "                            провайдер основной локали для новых баз\n"
 
-#: initdb.c:2440
+#: initdb.c:2445
 #, c-format
 msgid ""
 "      --pwfile=FILE         read password for the new superuser from file\n"
 msgstr ""
 "      --pwfile=ФАЙЛ         прочитать пароль суперпользователя из файла\n"
 
-#: initdb.c:2441
+#: initdb.c:2446
 #, c-format
 msgid ""
 "  -T, --text-search-config=CFG\n"
@@ -643,29 +643,29 @@ msgstr ""
 "  -T, --text-search-config=КОНФИГУРАЦИЯ\n"
 "                            конфигурация текстового поиска по умолчанию\n"
 
-#: initdb.c:2443
+#: initdb.c:2448
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=ИМЯ        имя суперпользователя БД\n"
 
-#: initdb.c:2444
+#: initdb.c:2449
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            запросить пароль суперпользователя\n"
 
-#: initdb.c:2445
+#: initdb.c:2450
 #, c-format
 msgid ""
 "  -X, --waldir=WALDIR       location for the write-ahead log directory\n"
 msgstr "  -X, --waldir=КАТАЛОГ      расположение журнала предзаписи\n"
 
-#: initdb.c:2446
+#: initdb.c:2451
 #, c-format
 msgid "      --wal-segsize=SIZE    size of WAL segments, in megabytes\n"
 msgstr "      --wal-segsize=РАЗМЕР  размер сегментов WAL (в мегабайтах)\n"
 
-#: initdb.c:2447
+#: initdb.c:2452
 #, c-format
 msgid ""
 "\n"
@@ -674,7 +674,7 @@ msgstr ""
 "\n"
 "Редко используемые параметры:\n"
 
-#: initdb.c:2448
+#: initdb.c:2453
 #, c-format
 msgid ""
 "  -c, --set NAME=VALUE      override default setting for server parameter\n"
@@ -682,27 +682,27 @@ msgstr ""
 "  -c, --set ИМЯ=ЗНАЧЕНИЕ    переопределить значение серверного параметра по\n"
 "                            умолчанию\n"
 
-#: initdb.c:2449
+#: initdb.c:2454
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               выдавать много отладочных сообщений\n"
 
-#: initdb.c:2450
+#: initdb.c:2455
 #, c-format
 msgid "      --discard-caches      set debug_discard_caches=1\n"
 msgstr "      --discard-caches      установить debug_discard_caches=1\n"
 
-#: initdb.c:2451
+#: initdb.c:2456
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L КАТАЛОГ                расположение входных файлов\n"
 
-#: initdb.c:2452
+#: initdb.c:2457
 #, c-format
 msgid "  -n, --no-clean            do not clean up after errors\n"
 msgstr "  -n, --no-clean            не очищать после ошибок\n"
 
-#: initdb.c:2453
+#: initdb.c:2458
 #, c-format
 msgid ""
 "  -N, --no-sync             do not wait for changes to be written safely to "
@@ -710,18 +710,18 @@ msgid ""
 msgstr ""
 "  -N, --no-sync             не ждать завершения сохранения данных на диске\n"
 
-#: initdb.c:2454
+#: initdb.c:2459
 #, c-format
 msgid "      --no-instructions     do not print instructions for next steps\n"
 msgstr ""
 "      --no-instructions     не выводить инструкции для дальнейших действий\n"
 
-#: initdb.c:2455
+#: initdb.c:2460
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                показать внутренние установки\n"
 
-#: initdb.c:2456
+#: initdb.c:2461
 #, c-format
 msgid ""
 "  -S, --sync-only           only sync database files to disk, then exit\n"
@@ -729,7 +729,7 @@ msgstr ""
 "  -S, --sync-only           только синхронизировать с ФС файлы базы и "
 "завершиться\n"
 
-#: initdb.c:2457
+#: initdb.c:2462
 #, c-format
 msgid ""
 "\n"
@@ -738,17 +738,17 @@ msgstr ""
 "\n"
 "Другие параметры:\n"
 
-#: initdb.c:2458
+#: initdb.c:2463
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             показать версию и выйти\n"
 
-#: initdb.c:2459
+#: initdb.c:2464
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                показать эту справку и выйти\n"
 
-#: initdb.c:2460
+#: initdb.c:2465
 #, c-format
 msgid ""
 "\n"
@@ -758,7 +758,7 @@ msgstr ""
 "\n"
 "Если каталог данных не указан, используется переменная окружения PGDATA.\n"
 
-#: initdb.c:2462
+#: initdb.c:2467
 #, c-format
 msgid ""
 "\n"
@@ -767,18 +767,18 @@ msgstr ""
 "\n"
 "Об ошибках сообщайте по адресу <%s>.\n"
 
-#: initdb.c:2463
+#: initdb.c:2468
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "Домашняя страница %s: <%s>\n"
 
-#: initdb.c:2491
+#: initdb.c:2496
 #, c-format
 msgid "invalid authentication method \"%s\" for \"%s\" connections"
 msgstr ""
 "нераспознанный метод проверки подлинности \"%s\" для подключений \"%s\""
 
-#: initdb.c:2505
+#: initdb.c:2510
 #, c-format
 msgid ""
 "must specify a password for the superuser to enable password authentication"
@@ -786,12 +786,12 @@ msgstr ""
 "для включения аутентификации по паролю необходимо указать пароль "
 "суперпользователя"
 
-#: initdb.c:2524
+#: initdb.c:2529
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог данных не указан"
 
-#: initdb.c:2525
+#: initdb.c:2530
 #, c-format
 msgid ""
 "You must identify the directory where the data for this database system will "
@@ -801,53 +801,53 @@ msgstr ""
 "Вы должны указать каталог, в котором будут располагаться данные этой СУБД. "
 "Это можно сделать, добавив ключ -D или установив переменную окружения PGDATA."
 
-#: initdb.c:2542
+#: initdb.c:2547
 #, c-format
 msgid "could not set environment"
 msgstr "не удалось задать переменную окружения"
 
-#: initdb.c:2560
+#: initdb.c:2565
 #, 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:2563
+#: initdb.c:2568
 #, c-format
 msgid "program \"%s\" was found by \"%s\" but was not the same version as %s"
 msgstr ""
 "программа \"%s\" найдена программой \"%s\", но её версия отличается от "
 "версии %s"
 
-#: initdb.c:2578
+#: initdb.c:2583
 #, c-format
 msgid "input file location must be an absolute path"
 msgstr "расположение входных файлов должно задаваться абсолютным путём"
 
-#: initdb.c:2595
+#: initdb.c:2600
 #, c-format
 msgid "The database cluster will be initialized with locale \"%s\".\n"
 msgstr "Кластер баз данных будет инициализирован с локалью \"%s\".\n"
 
-#: initdb.c:2598
+#: initdb.c:2603
 #, c-format
 msgid ""
 "The database cluster will be initialized with this locale configuration:\n"
 msgstr ""
 "Кластер баз данных будет инициализирован со следующими параметрами локали:\n"
 
-#: initdb.c:2599
+#: initdb.c:2604
 #, c-format
 msgid "  provider:    %s\n"
 msgstr "  провайдер:   %s\n"
 
-#: initdb.c:2601
+#: initdb.c:2606
 #, c-format
 msgid "  ICU locale:  %s\n"
 msgstr "  локаль ICU:  %s\n"
 
-#: initdb.c:2602
+#: initdb.c:2607
 #, c-format
 msgid ""
 "  LC_COLLATE:  %s\n"
@@ -864,22 +864,22 @@ msgstr ""
 "  LC_NUMERIC:  %s\n"
 "  LC_TIME:     %s\n"
 
-#: initdb.c:2632
+#: initdb.c:2637
 #, c-format
 msgid "could not find suitable encoding for locale \"%s\""
 msgstr "не удалось найти подходящую кодировку для локали \"%s\""
 
-#: initdb.c:2634
+#: initdb.c:2639
 #, c-format
 msgid "Rerun %s with the -E option."
 msgstr "Перезапустите %s с параметром -E."
 
-#: initdb.c:2635 initdb.c:3168 initdb.c:3276 initdb.c:3296
+#: initdb.c:2640 initdb.c:3173 initdb.c:3281 initdb.c:3301
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: initdb.c:2647
+#: initdb.c:2652
 #, c-format
 msgid ""
 "Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
@@ -888,40 +888,40 @@ msgstr ""
 "Кодировка \"%s\", подразумеваемая локалью, не годится для сервера.\n"
 "Вместо неё в качестве кодировки БД по умолчанию будет выбрана \"%s\".\n"
 
-#: initdb.c:2652
+#: initdb.c:2657
 #, c-format
 msgid "locale \"%s\" requires unsupported encoding \"%s\""
 msgstr "для локали \"%s\" требуется неподдерживаемая кодировка \"%s\""
 
-#: initdb.c:2654
+#: initdb.c:2659
 #, c-format
 msgid "Encoding \"%s\" is not allowed as a server-side encoding."
 msgstr "Кодировка \"%s\" недопустима в качестве серверной кодировки."
 
-#: initdb.c:2656
+#: initdb.c:2661
 #, c-format
 msgid "Rerun %s with a different locale selection."
 msgstr "Перезапустите %s, выбрав другую локаль."
 
-#: initdb.c:2664
+#: initdb.c:2669
 #, c-format
 msgid "The default database encoding has accordingly been set to \"%s\".\n"
 msgstr ""
 "Кодировка БД по умолчанию, выбранная в соответствии с настройками: \"%s\".\n"
 
-#: initdb.c:2733
+#: initdb.c:2738
 #, c-format
 msgid "could not find suitable text search configuration for locale \"%s\""
 msgstr ""
 "не удалось найти подходящую конфигурацию текстового поиска для локали \"%s\""
 
-#: initdb.c:2744
+#: initdb.c:2749
 #, c-format
 msgid "suitable text search configuration for locale \"%s\" is unknown"
 msgstr ""
 "внимание: для локали \"%s\" нет известной конфигурации текстового поиска"
 
-#: initdb.c:2749
+#: initdb.c:2754
 #, c-format
 msgid ""
 "specified text search configuration \"%s\" might not match locale \"%s\""
@@ -929,37 +929,37 @@ msgstr ""
 "указанная конфигурация текстового поиска \"%s\" может не соответствовать "
 "локали \"%s\""
 
-#: initdb.c:2754
+#: initdb.c:2759
 #, c-format
 msgid "The default text search configuration will be set to \"%s\".\n"
 msgstr "Выбрана конфигурация текстового поиска по умолчанию \"%s\".\n"
 
-#: initdb.c:2797 initdb.c:2868
+#: initdb.c:2802 initdb.c:2873
 #, c-format
 msgid "creating directory %s ... "
 msgstr "создание каталога %s... "
 
-#: initdb.c:2802 initdb.c:2873 initdb.c:2921 initdb.c:2977
+#: initdb.c:2807 initdb.c:2878 initdb.c:2926 initdb.c:2982
 #, c-format
 msgid "could not create directory \"%s\": %m"
 msgstr "не удалось создать каталог \"%s\": %m"
 
-#: initdb.c:2811 initdb.c:2883
+#: initdb.c:2816 initdb.c:2888
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "исправление прав для существующего каталога %s... "
 
-#: initdb.c:2816 initdb.c:2888
+#: initdb.c:2821 initdb.c:2893
 #, c-format
 msgid "could not change permissions of directory \"%s\": %m"
 msgstr "не удалось поменять права для каталога \"%s\": %m"
 
-#: initdb.c:2828 initdb.c:2900
+#: initdb.c:2833 initdb.c:2905
 #, c-format
 msgid "directory \"%s\" exists but is not empty"
 msgstr "каталог \"%s\" существует, но он не пуст"
 
-#: initdb.c:2832
+#: initdb.c:2837
 #, c-format
 msgid ""
 "If you want to create a new database system, either remove or empty the "
@@ -968,29 +968,29 @@ msgstr ""
 "Если вы хотите создать новую систему баз данных, удалите или очистите "
 "каталог \"%s\", либо при запуске %s в качестве пути укажите не \"%s\"."
 
-#: initdb.c:2840 initdb.c:2910 initdb.c:3317
+#: initdb.c:2845 initdb.c:2915 initdb.c:3322
 #, c-format
 msgid "could not access directory \"%s\": %m"
 msgstr "ошибка доступа к каталогу \"%s\": %m"
 
-#: initdb.c:2861
+#: initdb.c:2866
 #, c-format
 msgid "WAL directory location must be an absolute path"
 msgstr "расположение каталога WAL должно определяться абсолютным путём"
 
-#: initdb.c:2904
+#: initdb.c:2909
 #, c-format
 msgid ""
 "If you want to store the WAL there, either remove or empty the directory "
 "\"%s\"."
 msgstr "Если вы хотите хранить WAL здесь, удалите или очистите каталог \"%s\"."
 
-#: initdb.c:2914
+#: initdb.c:2919
 #, c-format
 msgid "could not create symbolic link \"%s\": %m"
 msgstr "не удалось создать символическую ссылку \"%s\": %m"
 
-#: initdb.c:2933
+#: initdb.c:2938
 #, c-format
 msgid ""
 "It contains a dot-prefixed/invisible file, perhaps due to it being a mount "
@@ -998,13 +998,13 @@ msgid ""
 msgstr ""
 "Он содержит файл с точкой (невидимый), возможно, это точка монтирования."
 
-#: initdb.c:2935
+#: initdb.c:2940
 #, c-format
 msgid ""
 "It contains a lost+found directory, perhaps due to it being a mount point."
 msgstr "Он содержит подкаталог lost+found, возможно, это точка монтирования."
 
-#: initdb.c:2937
+#: initdb.c:2942
 #, c-format
 msgid ""
 "Using a mount point directly as the data directory is not recommended.\n"
@@ -1014,67 +1014,67 @@ msgstr ""
 "рекомендуется.\n"
 "Создайте в монтируемом ресурсе подкаталог и используйте его."
 
-#: initdb.c:2963
+#: initdb.c:2968
 #, c-format
 msgid "creating subdirectories ... "
 msgstr "создание подкаталогов... "
 
-#: initdb.c:3006
+#: initdb.c:3011
 msgid "performing post-bootstrap initialization ... "
 msgstr "выполняется заключительная инициализация... "
 
-#: initdb.c:3167
+#: initdb.c:3172
 #, c-format
 msgid "-c %s requires a value"
 msgstr "для -c %s требуется значение"
 
-#: initdb.c:3192
+#: initdb.c:3197
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "Программа запущена в режиме отладки.\n"
 
-#: initdb.c:3196
+#: initdb.c:3201
 #, c-format
 msgid "Running in no-clean mode.  Mistakes will not be cleaned up.\n"
 msgstr ""
 "Программа запущена в режиме 'no-clean' - очистки и исправления ошибок не "
 "будет.\n"
 
-#: initdb.c:3266
+#: initdb.c:3271
 #, c-format
 msgid "unrecognized locale provider: %s"
 msgstr "нераспознанный провайдер локали: %s"
 
-#: initdb.c:3294
+#: initdb.c:3299
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: initdb.c:3301 initdb.c:3305
+#: initdb.c:3306 initdb.c:3310
 #, c-format
 msgid "%s cannot be specified unless locale provider \"%s\" is chosen"
 msgstr "%s можно указать, только если выбран провайдер локали \"%s\""
 
-#: initdb.c:3319 initdb.c:3396
+#: initdb.c:3324 initdb.c:3401
 msgid "syncing data to disk ... "
 msgstr "сохранение данных на диске... "
 
-#: initdb.c:3327
+#: initdb.c:3332
 #, c-format
 msgid "password prompt and password file cannot be specified together"
 msgstr "нельзя одновременно запросить пароль и прочитать пароль из файла"
 
-#: initdb.c:3349
+#: initdb.c:3354
 #, c-format
 msgid "argument of --wal-segsize must be a number"
 msgstr "аргументом --wal-segsize должно быть число"
 
-#: initdb.c:3351
+#: initdb.c:3356
 #, c-format
 msgid "argument of --wal-segsize must be a power of two between 1 and 1024"
 msgstr "аргументом --wal-segsize должна быть степень двух от 1 до 1024"
 
-#: initdb.c:3365
+#: initdb.c:3370
 #, c-format
 msgid ""
 "superuser name \"%s\" is disallowed; role names cannot begin with \"pg_\""
@@ -1082,7 +1082,7 @@ msgstr ""
 "имя \"%s\" для суперпользователя не допускается; имена ролей не могут "
 "начинаться с \"pg_\""
 
-#: initdb.c:3367
+#: initdb.c:3372
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -1093,17 +1093,17 @@ msgstr ""
 "От его имени также будет запускаться процесс сервера.\n"
 "\n"
 
-#: initdb.c:3383
+#: initdb.c:3388
 #, c-format
 msgid "Data page checksums are enabled.\n"
 msgstr "Контроль целостности страниц данных включён.\n"
 
-#: initdb.c:3385
+#: initdb.c:3390
 #, c-format
 msgid "Data page checksums are disabled.\n"
 msgstr "Контроль целостности страниц данных отключён.\n"
 
-#: initdb.c:3402
+#: initdb.c:3407
 #, c-format
 msgid ""
 "\n"
@@ -1114,12 +1114,12 @@ msgstr ""
 "Сохранение данных на диск пропускается.\n"
 "Каталог данных может повредиться при сбое операционной системы.\n"
 
-#: initdb.c:3407
+#: initdb.c:3412
 #, c-format
 msgid "enabling \"trust\" authentication for local connections"
 msgstr "включение метода аутентификации \"trust\" для локальных подключений"
 
-#: initdb.c:3408
+#: initdb.c:3413
 #, c-format
 msgid ""
 "You can change this by editing pg_hba.conf or using the option -A, or --auth-"
@@ -1129,11 +1129,11 @@ msgstr ""
 "initdb с ключом -A, --auth-local или --auth-host."
 
 #. translator: This is a placeholder in a shell command.
-#: initdb.c:3438
+#: initdb.c:3443
 msgid "logfile"
 msgstr "файл_журнала"
 
-#: initdb.c:3440
+#: initdb.c:3445
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/initdb/t/001_initdb.pl b/src/bin/initdb/t/001_initdb.pl
index 2d7469d..0e4f0b5 100644
--- a/src/bin/initdb/t/001_initdb.pl
+++ b/src/bin/initdb/t/001_initdb.pl
@@ -187,4 +187,18 @@ command_fails(
 command_fails([ 'initdb', '--no-sync', '--set', 'foo=bar', "$tempdir/dataX" ],
 	'fails for invalid --set option');
 
+# Make sure multiple invocations of -c parameters are added case insensitive
+command_ok(
+	[
+		'initdb', '-cwork_mem=128',
+		'-cWork_Mem=256', '-cWORK_MEM=512',
+		"$tempdir/dataY"
+	],
+	'multiple -c options with different case');
+
+my $conf = slurp_file("$tempdir/dataY/postgresql.conf");
+ok($conf !~ qr/^WORK_MEM = /m, "WORK_MEM should not be configured");
+ok($conf !~ qr/^Work_Mem = /m, "Work_Mem should not be configured");
+ok($conf =~ qr/^work_mem = 512/m, "work_mem should be in config");
+
 done_testing();
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index b9f5e12..c8cef68 100644
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -3,6 +3,7 @@
 
 use strict;
 use warnings;
+use Config;
 use File::Basename qw(basename dirname);
 use File::Path     qw(rmtree);
 use PostgreSQL::Test::Cluster;
@@ -179,6 +180,16 @@ foreach my $filename (
 	close $file;
 }
 
+# Test that macOS system files are skipped. Only test on non-macOS systems
+# however since creating incorrect .DS_Store files on a macOS system may have
+# unintended side effects.
+if ($Config{osname} ne 'darwin')
+{
+	open my $file, '>>', "$pgdata/.DS_Store";
+	print $file "DONOTCOPY";
+	close $file;
+}
+
 # Connect to a database to create global/pg_internal.init.  If this is removed
 # the test to ensure global/pg_internal.init is not copied will return a false
 # positive.
@@ -248,6 +259,12 @@ foreach my $filename (
 	ok(!-f "$tempdir/backup/$filename", "$filename not copied");
 }
 
+# We only test .DS_Store files being skipped on non-macOS systems
+if ($Config{osname} ne 'darwin')
+{
+	ok(!-f "$tempdir/backup/.DS_Store", ".DS_Store not copied");
+}
+
 # Unlogged relation forks other than init should not be copied
 ok(-f "$tempdir/backup/${baseUnloggedPath}_init",
 	'unlogged init fork in backup');
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c
index 19eb67e..64b31d5 100644
--- a/src/bin/pg_checksums/pg_checksums.c
+++ b/src/bin/pg_checksums/pg_checksums.c
@@ -337,6 +337,10 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly)
 					strlen(PG_TEMP_FILES_DIR)) == 0)
 			continue;
 
+		/* Skip macOS system files */
+		if (strcmp(de->d_name, ".DS_Store") == 0)
+			continue;
+
 		snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name);
 		if (lstat(fn, &st) < 0)
 			pg_fatal("could not stat file \"%s\": %m", fn);
diff --git a/src/bin/pg_checksums/po/ru.po b/src/bin/pg_checksums/po/ru.po
index b024869..c761237 100644
--- a/src/bin/pg_checksums/po/ru.po
+++ b/src/bin/pg_checksums/po/ru.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_verify_checksums (PostgreSQL) 11\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2023-08-28 07:59+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2022-09-05 13:34+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -213,52 +213,52 @@ msgstr "контрольные суммы в файле \"%s\" включены"
 msgid "could not open directory \"%s\": %m"
 msgstr "не удалось открыть каталог \"%s\": %m"
 
-#: pg_checksums.c:342 pg_checksums.c:411
+#: pg_checksums.c:346 pg_checksums.c:415
 #, c-format
 msgid "could not stat file \"%s\": %m"
 msgstr "не удалось получить информацию о файле \"%s\": %m"
 
-#: pg_checksums.c:366
+#: pg_checksums.c:370
 #, c-format
 msgid "invalid segment number %d in file name \"%s\""
 msgstr "неверный номер сегмента %d в имени файла \"%s\""
 
-#: pg_checksums.c:508 pg_checksums.c:524 pg_checksums.c:534 pg_checksums.c:542
+#: pg_checksums.c:512 pg_checksums.c:528 pg_checksums.c:538 pg_checksums.c:546
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Для дополнительной информации попробуйте \"%s --help\"."
 
-#: pg_checksums.c:523
+#: pg_checksums.c:527
 #, c-format
 msgid "no data directory specified"
 msgstr "каталог данных не указан"
 
-#: pg_checksums.c:532
+#: pg_checksums.c:536
 #, c-format
 msgid "too many command-line arguments (first is \"%s\")"
 msgstr "слишком много аргументов командной строки (первый: \"%s\")"
 
-#: pg_checksums.c:541
+#: pg_checksums.c:545
 #, c-format
 msgid "option -f/--filenode can only be used with --check"
 msgstr "параметр -f/--filenode можно использовать только с --check"
 
-#: pg_checksums.c:549
+#: pg_checksums.c:553
 #, c-format
 msgid "pg_control CRC value is incorrect"
 msgstr "ошибка контрольного значения в pg_control"
 
-#: pg_checksums.c:552
+#: pg_checksums.c:556
 #, c-format
 msgid "cluster is not compatible with this version of pg_checksums"
 msgstr "кластер несовместим с этой версией pg_checksums"
 
-#: pg_checksums.c:556
+#: pg_checksums.c:560
 #, c-format
 msgid "database cluster is not compatible"
 msgstr "несовместимый кластер баз данных"
 
-#: pg_checksums.c:557
+#: pg_checksums.c:561
 #, c-format
 msgid ""
 "The database cluster was initialized with block size %u, but pg_checksums "
@@ -267,77 +267,77 @@ msgstr ""
 "Кластер баз данных был инициализирован с размером блока %u, а утилита "
 "pg_checksums скомпилирована для размера блока %u."
 
-#: pg_checksums.c:569
+#: pg_checksums.c:573
 #, c-format
 msgid "cluster must be shut down"
 msgstr "кластер должен быть отключён"
 
-#: pg_checksums.c:573
+#: pg_checksums.c:577
 #, c-format
 msgid "data checksums are not enabled in cluster"
 msgstr "контрольные суммы в кластере не включены"
 
-#: pg_checksums.c:577
+#: pg_checksums.c:581
 #, c-format
 msgid "data checksums are already disabled in cluster"
 msgstr "контрольные суммы в кластере уже отключены"
 
-#: pg_checksums.c:581
+#: pg_checksums.c:585
 #, c-format
 msgid "data checksums are already enabled in cluster"
 msgstr "контрольные суммы в кластере уже включены"
 
-#: pg_checksums.c:605
+#: pg_checksums.c:609
 #, c-format
 msgid "Checksum operation completed\n"
 msgstr "Обработка контрольных сумм завершена\n"
 
-#: pg_checksums.c:606
+#: pg_checksums.c:610
 #, c-format
 msgid "Files scanned:   %lld\n"
 msgstr "Просканировано файлов: %lld\n"
 
-#: pg_checksums.c:607
+#: pg_checksums.c:611
 #, c-format
 msgid "Blocks scanned:  %lld\n"
 msgstr "Просканировано блоков: %lld\n"
 
-#: pg_checksums.c:610
+#: pg_checksums.c:614
 #, c-format
 msgid "Bad checksums:  %lld\n"
 msgstr "Неверные контрольные суммы: %lld\n"
 
-#: pg_checksums.c:611 pg_checksums.c:643
+#: pg_checksums.c:615 pg_checksums.c:647
 #, c-format
 msgid "Data checksum version: %u\n"
 msgstr "Версия контрольных сумм данных: %u\n"
 
-#: pg_checksums.c:618
+#: pg_checksums.c:622
 #, c-format
 msgid "Files written:  %lld\n"
 msgstr "Записано файлов: %lld\n"
 
-#: pg_checksums.c:619
+#: pg_checksums.c:623
 #, c-format
 msgid "Blocks written: %lld\n"
 msgstr "Записано блоков: %lld\n"
 
-#: pg_checksums.c:635
+#: pg_checksums.c:639
 #, c-format
 msgid "syncing data directory"
 msgstr "синхронизация каталога данных"
 
-#: pg_checksums.c:639
+#: pg_checksums.c:643
 #, c-format
 msgid "updating control file"
 msgstr "модификация управляющего файла"
 
-#: pg_checksums.c:645
+#: pg_checksums.c:649
 #, c-format
 msgid "Checksums enabled in cluster\n"
 msgstr "Контрольные суммы в кластере включены\n"
 
-#: pg_checksums.c:647
+#: pg_checksums.c:651
 #, c-format
 msgid "Checksums disabled in cluster\n"
 msgstr "Контрольные суммы в кластере отключены\n"
diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl
index 2d63182..1d4d39d 100644
--- a/src/bin/pg_checksums/t/002_actions.pl
+++ b/src/bin/pg_checksums/t/002_actions.pl
@@ -6,6 +6,7 @@
 
 use strict;
 use warnings;
+use Config;
 use PostgreSQL::Test::Cluster;
 use PostgreSQL::Test::Utils;
 
@@ -114,6 +115,12 @@ append_to_file "$pgdata/global/pgsql_tmp/1.1", "foo";
 append_to_file "$pgdata/global/pg_internal.init", "foo";
 append_to_file "$pgdata/global/pg_internal.init.123", "foo";
 
+# These are non-postgres macOS files, which should be ignored by the scan.
+# Only perform this test on non-macOS systems though as creating incorrect
+# system files may have side effects on macOS.
+append_to_file "$pgdata/global/.DS_Store", "foo"
+	unless ($Config{osname} eq 'darwin');
+
 # Enable checksums.
 command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ],
 	"checksums successfully enabled in cluster");
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 2cad796..591fcb0 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -761,28 +761,31 @@ dumpRoles(PGconn *conn)
 				i_is_current_user;
 	int			i;
 
-	/* note: rolconfig is dumped later */
+	/*
+	 * Notes: rolconfig is dumped later, and pg_authid must be used for
+	 * extracting rolcomment regardless of role_catalog.
+	 */
 	if (server_version >= 90600)
 		printfPQExpBuffer(buf,
 						  "SELECT oid, rolname, rolsuper, rolinherit, "
 						  "rolcreaterole, rolcreatedb, "
 						  "rolcanlogin, rolconnlimit, rolpassword, "
 						  "rolvaliduntil, rolreplication, rolbypassrls, "
-						  "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+						  "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
 						  "rolname = current_user AS is_current_user "
 						  "FROM %s "
 						  "WHERE rolname !~ '^pg_' "
-						  "ORDER BY 2", role_catalog, role_catalog);
+						  "ORDER BY 2", role_catalog);
 	else if (server_version >= 90500)
 		printfPQExpBuffer(buf,
 						  "SELECT oid, rolname, rolsuper, rolinherit, "
 						  "rolcreaterole, rolcreatedb, "
 						  "rolcanlogin, rolconnlimit, rolpassword, "
 						  "rolvaliduntil, rolreplication, rolbypassrls, "
-						  "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+						  "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
 						  "rolname = current_user AS is_current_user "
 						  "FROM %s "
-						  "ORDER BY 2", role_catalog, role_catalog);
+						  "ORDER BY 2", role_catalog);
 	else
 		printfPQExpBuffer(buf,
 						  "SELECT oid, rolname, rolsuper, rolinherit, "
@@ -790,10 +793,10 @@ dumpRoles(PGconn *conn)
 						  "rolcanlogin, rolconnlimit, rolpassword, "
 						  "rolvaliduntil, rolreplication, "
 						  "false as rolbypassrls, "
-						  "pg_catalog.shobj_description(oid, '%s') as rolcomment, "
+						  "pg_catalog.shobj_description(oid, 'pg_authid') as rolcomment, "
 						  "rolname = current_user AS is_current_user "
 						  "FROM %s "
-						  "ORDER BY 2", role_catalog, role_catalog);
+						  "ORDER BY 2", role_catalog);
 
 	res = executeQuery(conn, buf->data);
 
diff --git a/src/bin/pg_dump/po/es.po b/src/bin/pg_dump/po/es.po
index fe45d12..ac8e807 100644
--- a/src/bin/pg_dump/po/es.po
+++ b/src/bin/pg_dump/po/es.po
@@ -1725,7 +1725,7 @@ msgstr "  --no-subscriptions           no volcar las suscripciones\n"
 #: pg_dump.c:1116 pg_dumpall.c:665
 #, c-format
 msgid "  --no-table-access-method     do not dump table access methods\n"
-msgstr "  --no-tablespaces             no volcar métodos de acceso de tablas\n"
+msgstr "  --no-table-access-method     no volcar métodos de acceso de tablas\n"
 
 #: pg_dump.c:1117 pg_dumpall.c:666
 #, c-format
diff --git a/src/bin/pg_dump/po/ru.po b/src/bin/pg_dump/po/ru.po
index 6b3dd37..c8de311 100644
--- a/src/bin/pg_dump/po/ru.po
+++ b/src/bin/pg_dump/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:10+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2023-08-30 14:18+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -1124,12 +1124,12 @@ msgstr "сжатие активно"
 msgid "could not get server_version from libpq"
 msgstr "не удалось получить версию сервера из libpq"
 
-#: pg_backup_db.c:53 pg_dumpall.c:1809
+#: pg_backup_db.c:53 pg_dumpall.c:1812
 #, c-format
 msgid "aborting because of server version mismatch"
 msgstr "продолжение работы с другой версией сервера невозможно"
 
-#: pg_backup_db.c:54 pg_dumpall.c:1810
+#: pg_backup_db.c:54 pg_dumpall.c:1813
 #, c-format
 msgid "server version: %s; %s version: %s"
 msgstr "версия сервера: %s; версия %s: %s"
@@ -1139,7 +1139,7 @@ msgstr "версия сервера: %s; версия %s: %s"
 msgid "already connected to a database"
 msgstr "подключение к базе данных уже установлено"
 
-#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1656 pg_dumpall.c:1758
+#: pg_backup_db.c:128 pg_backup_db.c:178 pg_dumpall.c:1659 pg_dumpall.c:1761
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -1154,17 +1154,17 @@ msgid "reconnection failed: %s"
 msgstr "переподключиться не удалось: %s"
 
 #: pg_backup_db.c:190 pg_backup_db.c:264 pg_dump.c:756 pg_dump_sort.c:1280
-#: pg_dump_sort.c:1300 pg_dumpall.c:1683 pg_dumpall.c:1767
+#: pg_dump_sort.c:1300 pg_dumpall.c:1686 pg_dumpall.c:1770
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:271 pg_dumpall.c:1872 pg_dumpall.c:1895
+#: pg_backup_db.c:271 pg_dumpall.c:1875 pg_dumpall.c:1898
 #, c-format
 msgid "query failed: %s"
 msgstr "ошибка при выполнении запроса: %s"
 
-#: pg_backup_db.c:273 pg_dumpall.c:1873 pg_dumpall.c:1896
+#: pg_backup_db.c:273 pg_dumpall.c:1876 pg_dumpall.c:1899
 #, c-format
 msgid "Query was: %s"
 msgstr "Выполнялся запрос: %s"
@@ -2024,7 +2024,7 @@ msgstr ""
 msgid "invalid output format \"%s\" specified"
 msgstr "указан неверный формат вывода: \"%s\""
 
-#: pg_dump.c:1409 pg_dump.c:1465 pg_dump.c:1518 pg_dumpall.c:1449
+#: pg_dump.c:1409 pg_dump.c:1465 pg_dump.c:1518 pg_dumpall.c:1452
 #, c-format
 msgid "improper qualified name (too many dotted names): %s"
 msgstr "неверное полное имя (слишком много компонентов): %s"
@@ -2587,7 +2587,7 @@ msgid ""
 "options -r/--roles-only and -t/--tablespaces-only cannot be used together"
 msgstr "параметры -r/--roles-only и -t/--tablespaces-only исключают друг друга"
 
-#: pg_dumpall.c:469 pg_dumpall.c:1750
+#: pg_dumpall.c:469 pg_dumpall.c:1753
 #, c-format
 msgid "could not connect to database \"%s\""
 msgstr "не удалось подключиться к базе данных: \"%s\""
@@ -2698,64 +2698,64 @@ msgstr ""
 "вывод.\n"
 "\n"
 
-#: pg_dumpall.c:828
+#: pg_dumpall.c:831
 #, c-format
 msgid "role name starting with \"pg_\" skipped (%s)"
 msgstr "имя роли, начинающееся с \"pg_\", пропущено (%s)"
 
-#: pg_dumpall.c:1050
+#: pg_dumpall.c:1053
 #, c-format
 msgid "could not find a legal dump ordering for memberships in role \"%s\""
 msgstr "не удалось найти подходящий порядок выгрузки для членов роли \"%s\""
 
-#: pg_dumpall.c:1185
+#: pg_dumpall.c:1188
 #, c-format
 msgid "could not parse ACL list (%s) for parameter \"%s\""
 msgstr "не удалось разобрать список ACL (%s) для параметра \"%s\""
 
-#: pg_dumpall.c:1303
+#: pg_dumpall.c:1306
 #, c-format
 msgid "could not parse ACL list (%s) for tablespace \"%s\""
 msgstr ""
 "не удалось разобрать список управления доступом (%s) для табл. пространства "
 "\"%s\""
 
-#: pg_dumpall.c:1510
+#: pg_dumpall.c:1513
 #, c-format
 msgid "excluding database \"%s\""
 msgstr "база данных \"%s\" исключается"
 
-#: pg_dumpall.c:1514
+#: pg_dumpall.c:1517
 #, c-format
 msgid "dumping database \"%s\""
 msgstr "выгрузка базы данных \"%s\""
 
-#: pg_dumpall.c:1545
+#: pg_dumpall.c:1548
 #, c-format
 msgid "pg_dump failed on database \"%s\", exiting"
 msgstr "ошибка при обработке базы \"%s\", pg_dump завершается"
 
-#: pg_dumpall.c:1551
+#: pg_dumpall.c:1554
 #, c-format
 msgid "could not re-open the output file \"%s\": %m"
 msgstr "не удалось повторно открыть выходной файл \"%s\": %m"
 
-#: pg_dumpall.c:1592
+#: pg_dumpall.c:1595
 #, c-format
 msgid "running \"%s\""
 msgstr "выполняется \"%s\""
 
-#: pg_dumpall.c:1793
+#: pg_dumpall.c:1796
 #, c-format
 msgid "could not get server version"
 msgstr "не удалось узнать версию сервера"
 
-#: pg_dumpall.c:1796
+#: pg_dumpall.c:1799
 #, c-format
 msgid "could not parse server version \"%s\""
 msgstr "не удалось разобрать строку версии сервера \"%s\""
 
-#: pg_dumpall.c:1866 pg_dumpall.c:1889
+#: pg_dumpall.c:1869 pg_dumpall.c:1892
 #, c-format
 msgid "executing %s"
 msgstr "выполняется %s"
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index bd5c598..435742d 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -647,6 +647,10 @@ decide_file_action(file_entry_t *entry)
 	if (strcmp(path, "global/pg_control") == 0)
 		return FILE_ACTION_NONE;
 
+	/* Skip macOS system files */
+	if (strstr(path, ".DS_Store") != NULL)
+		return FILE_ACTION_NONE;
+
 	/*
 	 * Remove all files matching the exclusion filters in the target.
 	 */
diff --git a/src/bin/pg_rewind/po/ru.po b/src/bin/pg_rewind/po/ru.po
index 3505337..26d4152 100644
--- a/src/bin/pg_rewind/po/ru.po
+++ b/src/bin/pg_rewind/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pg_rewind (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:10+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2023-08-30 15:22+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -260,17 +260,17 @@ msgstr "повторный исходный файл \"%s\""
 msgid "unexpected page modification for non-regular file \"%s\""
 msgstr "неожиданная модификация страницы для файла особого вида \"%s\""
 
-#: filemap.c:679 filemap.c:773
+#: filemap.c:683 filemap.c:777
 #, c-format
 msgid "unknown file type for \"%s\""
 msgstr "неизвестный тип файла \"%s\""
 
-#: filemap.c:706
+#: filemap.c:710
 #, c-format
 msgid "file \"%s\" is of different type in source and target"
 msgstr "файл \"%s\" имеет разный тип в исходном и целевом кластере"
 
-#: filemap.c:778
+#: filemap.c:782
 #, c-format
 msgid "could not decide what to do with file \"%s\""
 msgstr "не удалось определить, что делать с файлом \"%s\""
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl
index 2e06abb..b6bfc5e 100644
--- a/src/bin/pg_rewind/t/003_extrafiles.pl
+++ b/src/bin/pg_rewind/t/003_extrafiles.pl
@@ -5,6 +5,7 @@
 
 use strict;
 use warnings;
+use Config;
 use PostgreSQL::Test::Utils;
 use Test::More;
 
@@ -53,6 +54,10 @@ sub run_test
 	append_to_file
 	  "$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file4",
 	  "in standby4";
+	# Skip testing .DS_Store files on macOS to avoid risk of side effects
+	append_to_file
+	  "$test_standby_datadir/tst_standby_dir/.DS_Store",
+	  "macOS system file" unless ($Config{osname} eq 'darwin');
 
 	mkdir "$test_primary_datadir/tst_primary_dir";
 	append_to_file "$test_primary_datadir/tst_primary_dir/primary_file1",
diff --git a/src/bin/pg_upgrade/t/002_pg_upgrade.pl b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
index e5f57e5..d1b44ad 100644
--- a/src/bin/pg_upgrade/t/002_pg_upgrade.pl
+++ b/src/bin/pg_upgrade/t/002_pg_upgrade.pl
@@ -318,7 +318,8 @@ if (defined($ENV{oldinstall}))
 }
 
 # Create an invalid database, will be deleted below
-$oldnode->safe_psql('postgres', qq(
+$oldnode->safe_psql(
+	'postgres', qq(
   CREATE DATABASE regression_invalid;
   UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
 ));
@@ -352,19 +353,31 @@ ok(-d $newnode->data_dir . "/pg_upgrade_output.d",
 rmtree($newnode->data_dir . "/pg_upgrade_output.d");
 
 # Check that pg_upgrade aborts when encountering an invalid database
-command_checks_all(
-	[
-		'pg_upgrade', '--no-sync', '-d', $oldnode->data_dir,
-		'-D', $newnode->data_dir, '-b', $oldbindir,
-		'-B', $newbindir, '-s', $newnode->host,
-		'-p', $oldnode->port, '-P', $newnode->port,
-		$mode, '--check',
-	],
-	1,
-	[qr/invalid/], # pg_upgrade prints errors on stdout :(
-	[qr//],
-	'invalid database causes failure');
-rmtree($newnode->data_dir . "/pg_upgrade_output.d");
+# (However, versions that were out of support by commit c66a7d75e652 don't
+# know how to do this, so skip this test there.)
+SKIP:
+{
+	skip "database invalidation not implemented", 1
+	  if $oldnode->pg_version < 11;
+
+	command_checks_all(
+		[
+			'pg_upgrade', '--no-sync',
+			'-d', $oldnode->data_dir,
+			'-D', $newnode->data_dir,
+			'-b', $oldbindir,
+			'-B', $newbindir,
+			'-s', $newnode->host,
+			'-p', $oldnode->port,
+			'-P', $newnode->port,
+			$mode, '--check',
+		],
+		1,
+		[qr/invalid/],    # pg_upgrade prints errors on stdout :(
+		[qr/^$/],
+		'invalid database causes failure');
+	rmtree($newnode->data_dir . "/pg_upgrade_output.d");
+}
 
 # And drop it, so we can continue
 $oldnode->start;
diff --git a/src/bin/pg_waldump/po/uk.po b/src/bin/pg_waldump/po/uk.po
index 23ad959..00373f4 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: 2023-12-17 22:17+0000\n"
-"PO-Revision-Date: 2023-12-19 15:38\n"
+"POT-Creation-Date: 2024-02-09 18:17+0000\n"
+"PO-Revision-Date: 2024-02-11 16:35\n"
 "Last-Translator: \n"
 "Language-Team: Ukrainian\n"
 "Language: uk_UA\n"
@@ -388,7 +388,7 @@ msgstr "Спробуйте \"%s --help\" для додаткової інфор�
 #: xlogreader.c:621
 #, c-format
 msgid "invalid record offset at %X/%X: expected at least %u, got %u"
-msgstr ""
+msgstr "неприпустиме зміщення запису в %X/%X: очікувалось хоча б %u, отримано %u"
 
 #: xlogreader.c:630
 #, c-format
@@ -398,7 +398,7 @@ msgstr "по зсуву %X/%X запитано продовження запис
 #: xlogreader.c:671 xlogreader.c:1136
 #, c-format
 msgid "invalid record length at %X/%X: expected at least %u, got %u"
-msgstr ""
+msgstr "неприпустима довжина запису %X/%X: очікувалась мінімум %u, отримано %u"
 
 #: xlogreader.c:760
 #, c-format
@@ -428,12 +428,12 @@ msgstr "некоректна контрольна сума даних менед
 #: xlogreader.c:1245
 #, c-format
 msgid "invalid magic number %04X in WAL segment %s, LSN %X/%X, offset %u"
-msgstr ""
+msgstr "невірне магічне число %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
 #: xlogreader.c:1260 xlogreader.c:1302
 #, c-format
 msgid "invalid info bits %04X in WAL segment %s, LSN %X/%X, offset %u"
-msgstr ""
+msgstr "невірні інформаційні біти %04X в сегменті WAL %s, LSN %X/%X, зсув %u"
 
 #: xlogreader.c:1276
 #, c-format
@@ -453,12 +453,12 @@ msgstr "Файл WAL належить іншій системі баз дани�
 #: xlogreader.c:1322
 #, c-format
 msgid "unexpected pageaddr %X/%X in WAL segment %s, LSN %X/%X, offset %u"
-msgstr ""
+msgstr "неочікуваний pageaddr %X/%X у сегменті WAL %s, LSN %X/%X, зміщення %u"
 
 #: xlogreader.c:1348
 #, c-format
 msgid "out-of-sequence timeline ID %u (after %u) in WAL segment %s, LSN %X/%X, offset %u"
-msgstr ""
+msgstr "порушення послідовності ID лінії часу %u (після %u) у сегменті WAL %s, LSN %X/%X, зсув %u"
 
 #: xlogreader.c:1754
 #, c-format
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 5973df2..3b0710a 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1662,6 +1662,8 @@ ExecQueryAndProcessResults(const char *query,
 
 		if (cancel_pressed)
 		{
+			/* drop this next result, as well as any others not yet read */
+			ClearOrSaveResult(result);
 			ClearOrSaveAllResults();
 			break;
 		}
diff --git a/src/bin/psql/po/de.po b/src/bin/psql/po/de.po
index ab17986..5c5cbe7 100644
--- a/src/bin/psql/po/de.po
+++ b/src/bin/psql/po/de.po
@@ -152,7 +152,7 @@ msgstr "Kann keinen weiteren Spaltenkopf zur Tabelle hinzufügen: Spaltenzahl %d
 #: ../../fe_utils/print.c:3258
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
-msgstr "Cann keine weitere Zelle zur Tabelle hinzufügen: Zellengesamtzahl %d überschritten.\n"
+msgstr "Kann keine weitere Zelle zur Tabelle hinzufügen: Zellengesamtzahl %d überschritten.\n"
 
 #: ../../fe_utils/print.c:3516
 #, c-format
diff --git a/src/bin/psql/po/es.po b/src/bin/psql/po/es.po
index 8abea99..9070c6c 100644
--- a/src/bin/psql/po/es.po
+++ b/src/bin/psql/po/es.po
@@ -1280,7 +1280,7 @@ msgstr "vista"
 
 #: describe.c:1042 describe.c:3951
 msgid "materialized view"
-msgstr "vistas materializadas"
+msgstr "vista materializada"
 
 #: describe.c:1043 describe.c:1193 describe.c:3953
 msgid "sequence"
diff --git a/src/bin/psql/po/ru.po b/src/bin/psql/po/ru.po
index 3f5a870..05076bf 100644
--- a/src/bin/psql/po/ru.po
+++ b/src/bin/psql/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: psql (PostgreSQL current)\n"
 "Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
-"POT-Creation-Date: 2024-02-02 18:10+0300\n"
+"POT-Creation-Date: 2024-05-04 16:29+0300\n"
 "PO-Revision-Date: 2023-08-29 13:37+0300\n"
 "Last-Translator: Alexander Lakhin <exclusion@gmail.com>\n"
 "Language-Team: Russian <pgsql-ru-general@postgresql.org>\n"
@@ -4340,2400 +4340,2402 @@ 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:238
-#: sql_help.c:240 sql_help.c:241 sql_help.c:243 sql_help.c:245 sql_help.c:248
-#: sql_help.c:250 sql_help.c:252 sql_help.c:254 sql_help.c:266 sql_help.c:267
-#: sql_help.c:268 sql_help.c:270 sql_help.c:319 sql_help.c:321 sql_help.c:323
-#: sql_help.c:325 sql_help.c:394 sql_help.c:399 sql_help.c:401 sql_help.c:443
-#: sql_help.c:445 sql_help.c:448 sql_help.c:450 sql_help.c:519 sql_help.c:524
-#: sql_help.c:529 sql_help.c:534 sql_help.c:539 sql_help.c:593 sql_help.c:595
-#: sql_help.c:597 sql_help.c:599 sql_help.c:601 sql_help.c:604 sql_help.c:606
-#: sql_help.c:609 sql_help.c:620 sql_help.c:622 sql_help.c:666 sql_help.c:668
-#: sql_help.c:670 sql_help.c:673 sql_help.c:675 sql_help.c:677 sql_help.c:714
-#: sql_help.c:718 sql_help.c:722 sql_help.c:741 sql_help.c:744 sql_help.c:747
-#: sql_help.c:776 sql_help.c:788 sql_help.c:796 sql_help.c:799 sql_help.c:802
-#: sql_help.c:817 sql_help.c:820 sql_help.c:849 sql_help.c:854 sql_help.c:859
-#: sql_help.c:864 sql_help.c:869 sql_help.c:896 sql_help.c:898 sql_help.c:900
-#: sql_help.c:902 sql_help.c:905 sql_help.c:907 sql_help.c:954 sql_help.c:999
-#: sql_help.c:1004 sql_help.c:1009 sql_help.c:1014 sql_help.c:1019
-#: sql_help.c:1038 sql_help.c:1049 sql_help.c:1051 sql_help.c:1071
-#: sql_help.c:1081 sql_help.c:1082 sql_help.c:1084 sql_help.c:1086
-#: sql_help.c:1098 sql_help.c:1102 sql_help.c:1104 sql_help.c:1116
-#: sql_help.c:1118 sql_help.c:1120 sql_help.c:1122 sql_help.c:1141
-#: sql_help.c:1143 sql_help.c:1147 sql_help.c:1151 sql_help.c:1155
-#: sql_help.c:1158 sql_help.c:1159 sql_help.c:1160 sql_help.c:1163
-#: sql_help.c:1166 sql_help.c:1168 sql_help.c:1307 sql_help.c:1309
-#: sql_help.c:1312 sql_help.c:1315 sql_help.c:1317 sql_help.c:1319
-#: sql_help.c:1322 sql_help.c:1325 sql_help.c:1442 sql_help.c:1444
-#: sql_help.c:1446 sql_help.c:1449 sql_help.c:1470 sql_help.c:1473
-#: sql_help.c:1476 sql_help.c:1479 sql_help.c:1483 sql_help.c:1485
-#: sql_help.c:1487 sql_help.c:1489 sql_help.c:1503 sql_help.c:1506
-#: sql_help.c:1508 sql_help.c:1510 sql_help.c:1520 sql_help.c:1522
-#: sql_help.c:1532 sql_help.c:1534 sql_help.c:1544 sql_help.c:1547
-#: sql_help.c:1570 sql_help.c:1572 sql_help.c:1574 sql_help.c:1576
-#: sql_help.c:1579 sql_help.c:1581 sql_help.c:1584 sql_help.c:1587
-#: sql_help.c:1638 sql_help.c:1681 sql_help.c:1684 sql_help.c:1686
-#: sql_help.c:1688 sql_help.c:1691 sql_help.c:1693 sql_help.c:1695
-#: sql_help.c:1698 sql_help.c:1750 sql_help.c:1766 sql_help.c:1999
-#: sql_help.c:2068 sql_help.c:2087 sql_help.c:2100 sql_help.c:2158
-#: sql_help.c:2166 sql_help.c:2176 sql_help.c:2203 sql_help.c:2235
-#: sql_help.c:2253 sql_help.c:2281 sql_help.c:2392 sql_help.c:2438
-#: sql_help.c:2463 sql_help.c:2486 sql_help.c:2490 sql_help.c:2524
-#: sql_help.c:2544 sql_help.c:2566 sql_help.c:2580 sql_help.c:2601
-#: sql_help.c:2630 sql_help.c:2665 sql_help.c:2690 sql_help.c:2737
-#: sql_help.c:3032 sql_help.c:3045 sql_help.c:3062 sql_help.c:3078
-#: sql_help.c:3118 sql_help.c:3172 sql_help.c:3176 sql_help.c:3178
-#: sql_help.c:3185 sql_help.c:3204 sql_help.c:3231 sql_help.c:3266
-#: sql_help.c:3278 sql_help.c:3287 sql_help.c:3331 sql_help.c:3345
-#: sql_help.c:3373 sql_help.c:3381 sql_help.c:3393 sql_help.c:3403
-#: sql_help.c:3411 sql_help.c:3419 sql_help.c:3427 sql_help.c:3435
-#: sql_help.c:3444 sql_help.c:3455 sql_help.c:3463 sql_help.c:3471
-#: sql_help.c:3479 sql_help.c:3487 sql_help.c:3497 sql_help.c:3506
-#: sql_help.c:3515 sql_help.c:3523 sql_help.c:3533 sql_help.c:3544
-#: sql_help.c:3552 sql_help.c:3561 sql_help.c:3572 sql_help.c:3581
-#: sql_help.c:3589 sql_help.c:3597 sql_help.c:3605 sql_help.c:3613
-#: sql_help.c:3621 sql_help.c:3629 sql_help.c:3637 sql_help.c:3645
-#: sql_help.c:3653 sql_help.c:3661 sql_help.c:3678 sql_help.c:3687
-#: sql_help.c:3695 sql_help.c:3712 sql_help.c:3727 sql_help.c:4039
-#: sql_help.c:4149 sql_help.c:4178 sql_help.c:4194 sql_help.c:4196
-#: sql_help.c:4699 sql_help.c:4747 sql_help.c:4905
+#: 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:716
+#: sql_help.c:720 sql_help.c:724 sql_help.c:743 sql_help.c:746 sql_help.c:749
+#: sql_help.c:778 sql_help.c:790 sql_help.c:798 sql_help.c:801 sql_help.c:804
+#: sql_help.c:819 sql_help.c:822 sql_help.c:851 sql_help.c:856 sql_help.c:861
+#: sql_help.c:866 sql_help.c:871 sql_help.c:898 sql_help.c:900 sql_help.c:902
+#: sql_help.c:904 sql_help.c:907 sql_help.c:909 sql_help.c:956 sql_help.c:1001
+#: sql_help.c:1006 sql_help.c:1011 sql_help.c:1016 sql_help.c:1021
+#: sql_help.c:1040 sql_help.c:1051 sql_help.c:1053 sql_help.c:1073
+#: sql_help.c:1083 sql_help.c:1084 sql_help.c:1086 sql_help.c:1088
+#: sql_help.c:1100 sql_help.c:1104 sql_help.c:1106 sql_help.c:1118
+#: sql_help.c:1120 sql_help.c:1122 sql_help.c:1124 sql_help.c:1143
+#: sql_help.c:1145 sql_help.c:1149 sql_help.c:1153 sql_help.c:1157
+#: sql_help.c:1160 sql_help.c:1161 sql_help.c:1162 sql_help.c:1165
+#: sql_help.c:1168 sql_help.c:1170 sql_help.c:1309 sql_help.c:1311
+#: sql_help.c:1314 sql_help.c:1317 sql_help.c:1319 sql_help.c:1321
+#: sql_help.c:1324 sql_help.c:1327 sql_help.c:1447 sql_help.c:1449
+#: sql_help.c:1451 sql_help.c:1454 sql_help.c:1475 sql_help.c:1478
+#: sql_help.c:1481 sql_help.c:1484 sql_help.c:1488 sql_help.c:1490
+#: sql_help.c:1492 sql_help.c:1494 sql_help.c:1508 sql_help.c:1511
+#: sql_help.c:1513 sql_help.c:1515 sql_help.c:1525 sql_help.c:1527
+#: sql_help.c:1537 sql_help.c:1539 sql_help.c:1549 sql_help.c:1552
+#: sql_help.c:1575 sql_help.c:1577 sql_help.c:1579 sql_help.c:1581
+#: sql_help.c:1584 sql_help.c:1586 sql_help.c:1589 sql_help.c:1592
+#: sql_help.c:1643 sql_help.c:1686 sql_help.c:1689 sql_help.c:1691
+#: sql_help.c:1693 sql_help.c:1696 sql_help.c:1698 sql_help.c:1700
+#: sql_help.c:1703 sql_help.c:1755 sql_help.c:1771 sql_help.c:2004
+#: sql_help.c:2073 sql_help.c:2092 sql_help.c:2105 sql_help.c:2163
+#: sql_help.c:2171 sql_help.c:2181 sql_help.c:2208 sql_help.c:2240
+#: sql_help.c:2258 sql_help.c:2286 sql_help.c:2397 sql_help.c:2443
+#: sql_help.c:2468 sql_help.c:2491 sql_help.c:2495 sql_help.c:2529
+#: sql_help.c:2549 sql_help.c:2571 sql_help.c:2585 sql_help.c:2606
+#: sql_help.c:2635 sql_help.c:2670 sql_help.c:2695 sql_help.c:2742
+#: sql_help.c:3040 sql_help.c:3053 sql_help.c:3070 sql_help.c:3086
+#: sql_help.c:3126 sql_help.c:3180 sql_help.c:3184 sql_help.c:3186
+#: sql_help.c:3193 sql_help.c:3212 sql_help.c:3239 sql_help.c:3274
+#: sql_help.c:3286 sql_help.c:3295 sql_help.c:3339 sql_help.c:3353
+#: sql_help.c:3381 sql_help.c:3389 sql_help.c:3401 sql_help.c:3411
+#: sql_help.c:3419 sql_help.c:3427 sql_help.c:3435 sql_help.c:3443
+#: sql_help.c:3452 sql_help.c:3463 sql_help.c:3471 sql_help.c:3479
+#: sql_help.c:3487 sql_help.c:3495 sql_help.c:3505 sql_help.c:3514
+#: sql_help.c:3523 sql_help.c:3531 sql_help.c:3541 sql_help.c:3552
+#: sql_help.c:3560 sql_help.c:3569 sql_help.c:3580 sql_help.c:3589
+#: sql_help.c:3597 sql_help.c:3605 sql_help.c:3613 sql_help.c:3621
+#: sql_help.c:3629 sql_help.c:3637 sql_help.c:3645 sql_help.c:3653
+#: sql_help.c:3661 sql_help.c:3669 sql_help.c:3686 sql_help.c:3695
+#: sql_help.c:3703 sql_help.c:3720 sql_help.c:3735 sql_help.c:4047
+#: sql_help.c:4161 sql_help.c:4190 sql_help.c:4206 sql_help.c:4208
+#: sql_help.c:4711 sql_help.c:4759 sql_help.c:4917
 msgid "name"
 msgstr "имя"
 
-#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:330 sql_help.c:1847
-#: sql_help.c:3346 sql_help.c:4467
+#: sql_help.c:36 sql_help.c:39 sql_help.c:42 sql_help.c:332 sql_help.c:1852
+#: sql_help.c:3354 sql_help.c:4479
 msgid "aggregate_signature"
 msgstr "сигнатура_агр_функции"
 
-#: sql_help.c:37 sql_help.c:67 sql_help.c:82 sql_help.c:120 sql_help.c:253
-#: sql_help.c:271 sql_help.c:402 sql_help.c:449 sql_help.c:528 sql_help.c:576
-#: sql_help.c:594 sql_help.c:621 sql_help.c:674 sql_help.c:743 sql_help.c:798
-#: sql_help.c:819 sql_help.c:858 sql_help.c:908 sql_help.c:955 sql_help.c:1008
-#: sql_help.c:1040 sql_help.c:1050 sql_help.c:1085 sql_help.c:1105
-#: sql_help.c:1119 sql_help.c:1169 sql_help.c:1316 sql_help.c:1443
-#: sql_help.c:1486 sql_help.c:1507 sql_help.c:1521 sql_help.c:1533
-#: sql_help.c:1546 sql_help.c:1573 sql_help.c:1639 sql_help.c:1692
+#: 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:745 sql_help.c:800
+#: sql_help.c:821 sql_help.c:860 sql_help.c:910 sql_help.c:957 sql_help.c:1010
+#: sql_help.c:1042 sql_help.c:1052 sql_help.c:1087 sql_help.c:1107
+#: sql_help.c:1121 sql_help.c:1171 sql_help.c:1318 sql_help.c:1448
+#: sql_help.c:1491 sql_help.c:1512 sql_help.c:1526 sql_help.c:1538
+#: sql_help.c:1551 sql_help.c:1578 sql_help.c:1644 sql_help.c:1697
 msgid "new_name"
 msgstr "новое_имя"
 
-#: sql_help.c:40 sql_help.c:69 sql_help.c:84 sql_help.c:122 sql_help.c:251
-#: sql_help.c:269 sql_help.c:400 sql_help.c:485 sql_help.c:533 sql_help.c:623
-#: sql_help.c:632 sql_help.c:697 sql_help.c:717 sql_help.c:746 sql_help.c:801
-#: sql_help.c:863 sql_help.c:906 sql_help.c:1013 sql_help.c:1052
-#: sql_help.c:1083 sql_help.c:1103 sql_help.c:1117 sql_help.c:1167
-#: sql_help.c:1380 sql_help.c:1445 sql_help.c:1488 sql_help.c:1509
-#: sql_help.c:1571 sql_help.c:1687 sql_help.c:3018
+#: 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:719 sql_help.c:748 sql_help.c:803
+#: sql_help.c:865 sql_help.c:908 sql_help.c:1015 sql_help.c:1054
+#: sql_help.c:1085 sql_help.c:1105 sql_help.c:1119 sql_help.c:1169
+#: sql_help.c:1382 sql_help.c:1450 sql_help.c:1493 sql_help.c:1514
+#: sql_help.c:1576 sql_help.c:1692 sql_help.c:3026
 msgid "new_owner"
 msgstr "новый_владелец"
 
-#: sql_help.c:43 sql_help.c:71 sql_help.c:86 sql_help.c:255 sql_help.c:322
-#: sql_help.c:451 sql_help.c:538 sql_help.c:676 sql_help.c:721 sql_help.c:749
-#: sql_help.c:804 sql_help.c:868 sql_help.c:1018 sql_help.c:1087
-#: sql_help.c:1121 sql_help.c:1318 sql_help.c:1490 sql_help.c:1511
-#: sql_help.c:1523 sql_help.c:1535 sql_help.c:1575 sql_help.c:1694
+#: 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:723 sql_help.c:751
+#: sql_help.c:806 sql_help.c:870 sql_help.c:1020 sql_help.c:1089
+#: sql_help.c:1123 sql_help.c:1320 sql_help.c:1495 sql_help.c:1516
+#: sql_help.c:1528 sql_help.c:1540 sql_help.c:1580 sql_help.c:1699
 msgid "new_schema"
 msgstr "новая_схема"
 
-#: sql_help.c:44 sql_help.c:1911 sql_help.c:3347 sql_help.c:4496
+#: sql_help.c:44 sql_help.c:1916 sql_help.c:3355 sql_help.c:4508
 msgid "where aggregate_signature is:"
 msgstr "где сигнатура_агр_функции:"
 
-#: sql_help.c:45 sql_help.c:48 sql_help.c:51 sql_help.c:340 sql_help.c:353
-#: sql_help.c:357 sql_help.c:373 sql_help.c:376 sql_help.c:379 sql_help.c:520
-#: sql_help.c:525 sql_help.c:530 sql_help.c:535 sql_help.c:540 sql_help.c:850
-#: sql_help.c:855 sql_help.c:860 sql_help.c:865 sql_help.c:870 sql_help.c:1000
-#: sql_help.c:1005 sql_help.c:1010 sql_help.c:1015 sql_help.c:1020
-#: sql_help.c:1865 sql_help.c:1882 sql_help.c:1888 sql_help.c:1912
-#: sql_help.c:1915 sql_help.c:1918 sql_help.c:2069 sql_help.c:2088
-#: sql_help.c:2091 sql_help.c:2393 sql_help.c:2602 sql_help.c:3348
-#: sql_help.c:3351 sql_help.c:3354 sql_help.c:3445 sql_help.c:3534
-#: sql_help.c:3562 sql_help.c:3914 sql_help.c:4366 sql_help.c:4473
-#: sql_help.c:4480 sql_help.c:4486 sql_help.c:4497 sql_help.c:4500
-#: sql_help.c:4503
+#: 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:852
+#: sql_help.c:857 sql_help.c:862 sql_help.c:867 sql_help.c:872 sql_help.c:1002
+#: sql_help.c:1007 sql_help.c:1012 sql_help.c:1017 sql_help.c:1022
+#: sql_help.c:1870 sql_help.c:1887 sql_help.c:1893 sql_help.c:1917
+#: sql_help.c:1920 sql_help.c:1923 sql_help.c:2074 sql_help.c:2093
+#: sql_help.c:2096 sql_help.c:2398 sql_help.c:2607 sql_help.c:3356
+#: sql_help.c:3359 sql_help.c:3362 sql_help.c:3453 sql_help.c:3542
+#: sql_help.c:3570 sql_help.c:3922 sql_help.c:4378 sql_help.c:4485
+#: sql_help.c:4492 sql_help.c:4498 sql_help.c:4509 sql_help.c:4512
+#: sql_help.c:4515
 msgid "argmode"
 msgstr "режим_аргумента"
 
-#: sql_help.c:46 sql_help.c:49 sql_help.c:52 sql_help.c:341 sql_help.c:354
-#: sql_help.c:358 sql_help.c:374 sql_help.c:377 sql_help.c:380 sql_help.c:521
-#: sql_help.c:526 sql_help.c:531 sql_help.c:536 sql_help.c:541 sql_help.c:851
-#: sql_help.c:856 sql_help.c:861 sql_help.c:866 sql_help.c:871 sql_help.c:1001
-#: sql_help.c:1006 sql_help.c:1011 sql_help.c:1016 sql_help.c:1021
-#: sql_help.c:1866 sql_help.c:1883 sql_help.c:1889 sql_help.c:1913
-#: sql_help.c:1916 sql_help.c:1919 sql_help.c:2070 sql_help.c:2089
-#: sql_help.c:2092 sql_help.c:2394 sql_help.c:2603 sql_help.c:3349
-#: sql_help.c:3352 sql_help.c:3355 sql_help.c:3446 sql_help.c:3535
-#: sql_help.c:3563 sql_help.c:4474 sql_help.c:4481 sql_help.c:4487
-#: sql_help.c:4498 sql_help.c:4501 sql_help.c:4504
+#: 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:853
+#: sql_help.c:858 sql_help.c:863 sql_help.c:868 sql_help.c:873 sql_help.c:1003
+#: sql_help.c:1008 sql_help.c:1013 sql_help.c:1018 sql_help.c:1023
+#: sql_help.c:1871 sql_help.c:1888 sql_help.c:1894 sql_help.c:1918
+#: sql_help.c:1921 sql_help.c:1924 sql_help.c:2075 sql_help.c:2094
+#: sql_help.c:2097 sql_help.c:2399 sql_help.c:2608 sql_help.c:3357
+#: sql_help.c:3360 sql_help.c:3363 sql_help.c:3454 sql_help.c:3543
+#: sql_help.c:3571 sql_help.c:4486 sql_help.c:4493 sql_help.c:4499
+#: sql_help.c:4510 sql_help.c:4513 sql_help.c:4516
 msgid "argname"
 msgstr "имя_аргумента"
 
-#: sql_help.c:47 sql_help.c:50 sql_help.c:53 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:852
-#: sql_help.c:857 sql_help.c:862 sql_help.c:867 sql_help.c:872 sql_help.c:1002
-#: sql_help.c:1007 sql_help.c:1012 sql_help.c:1017 sql_help.c:1022
-#: sql_help.c:1867 sql_help.c:1884 sql_help.c:1890 sql_help.c:1914
-#: sql_help.c:1917 sql_help.c:1920 sql_help.c:2395 sql_help.c:2604
-#: sql_help.c:3350 sql_help.c:3353 sql_help.c:3356 sql_help.c:3447
-#: sql_help.c:3536 sql_help.c:3564 sql_help.c:4475 sql_help.c:4482
-#: sql_help.c:4488 sql_help.c:4499 sql_help.c:4502 sql_help.c:4505
+#: 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:854
+#: sql_help.c:859 sql_help.c:864 sql_help.c:869 sql_help.c:874 sql_help.c:1004
+#: sql_help.c:1009 sql_help.c:1014 sql_help.c:1019 sql_help.c:1024
+#: sql_help.c:1872 sql_help.c:1889 sql_help.c:1895 sql_help.c:1919
+#: sql_help.c:1922 sql_help.c:1925 sql_help.c:2400 sql_help.c:2609
+#: sql_help.c:3358 sql_help.c:3361 sql_help.c:3364 sql_help.c:3455
+#: sql_help.c:3544 sql_help.c:3572 sql_help.c:4487 sql_help.c:4494
+#: sql_help.c:4500 sql_help.c:4511 sql_help.c:4514 sql_help.c:4517
 msgid "argtype"
 msgstr "тип_аргумента"
 
-#: sql_help.c:114 sql_help.c:397 sql_help.c:474 sql_help.c:486 sql_help.c:949
-#: sql_help.c:1100 sql_help.c:1504 sql_help.c:1633 sql_help.c:1665
-#: sql_help.c:1718 sql_help.c:1782 sql_help.c:1969 sql_help.c:1976
-#: sql_help.c:2284 sql_help.c:2334 sql_help.c:2341 sql_help.c:2350
-#: sql_help.c:2439 sql_help.c:2666 sql_help.c:2759 sql_help.c:3047
-#: sql_help.c:3232 sql_help.c:3254 sql_help.c:3394 sql_help.c:3750
-#: sql_help.c:3958 sql_help.c:4193 sql_help.c:4195 sql_help.c:4972
+#: sql_help.c:114 sql_help.c:399 sql_help.c:476 sql_help.c:488 sql_help.c:951
+#: sql_help.c:1102 sql_help.c:1509 sql_help.c:1638 sql_help.c:1670
+#: sql_help.c:1723 sql_help.c:1787 sql_help.c:1974 sql_help.c:1981
+#: sql_help.c:2289 sql_help.c:2339 sql_help.c:2346 sql_help.c:2355
+#: sql_help.c:2444 sql_help.c:2671 sql_help.c:2764 sql_help.c:3055
+#: sql_help.c:3240 sql_help.c:3262 sql_help.c:3402 sql_help.c:3758
+#: sql_help.c:3966 sql_help.c:4205 sql_help.c:4207 sql_help.c:4984
 msgid "option"
 msgstr "параметр"
 
-#: sql_help.c:115 sql_help.c:950 sql_help.c:1634 sql_help.c:2440
-#: sql_help.c:2667 sql_help.c:3233 sql_help.c:3395
+#: sql_help.c:115 sql_help.c:952 sql_help.c:1639 sql_help.c:2445
+#: sql_help.c:2672 sql_help.c:3241 sql_help.c:3403
 msgid "where option can be:"
 msgstr "где допустимые параметры:"
 
-#: sql_help.c:116 sql_help.c:2216
+#: sql_help.c:116 sql_help.c:2221
 msgid "allowconn"
 msgstr "разр_подключения"
 
-#: sql_help.c:117 sql_help.c:951 sql_help.c:1635 sql_help.c:2217
-#: sql_help.c:2441 sql_help.c:2668 sql_help.c:3234
+#: sql_help.c:117 sql_help.c:953 sql_help.c:1640 sql_help.c:2222
+#: sql_help.c:2446 sql_help.c:2673 sql_help.c:3242
 msgid "connlimit"
 msgstr "предел_подключений"
 
-#: sql_help.c:118 sql_help.c:2218
+#: sql_help.c:118 sql_help.c:2223
 msgid "istemplate"
 msgstr "это_шаблон"
 
-#: sql_help.c:124 sql_help.c:611 sql_help.c:679 sql_help.c:693 sql_help.c:1321
-#: sql_help.c:1373 sql_help.c:4199
+#: sql_help.c:124 sql_help.c:613 sql_help.c:681 sql_help.c:695 sql_help.c:1323
+#: sql_help.c:1375 sql_help.c:4211
 msgid "new_tablespace"
 msgstr "новое_табл_пространство"
 
-#: sql_help.c:127 sql_help.c:130 sql_help.c:132 sql_help.c:548 sql_help.c:550
-#: sql_help.c:551 sql_help.c:875 sql_help.c:877 sql_help.c:878 sql_help.c:958
-#: sql_help.c:962 sql_help.c:965 sql_help.c:1027 sql_help.c:1029
-#: sql_help.c:1030 sql_help.c:1180 sql_help.c:1182 sql_help.c:1642
-#: sql_help.c:1646 sql_help.c:1649 sql_help.c:2405 sql_help.c:2608
-#: sql_help.c:3926 sql_help.c:4217 sql_help.c:4378 sql_help.c:4687
+#: 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:877 sql_help.c:879 sql_help.c:880 sql_help.c:960
+#: sql_help.c:964 sql_help.c:967 sql_help.c:1029 sql_help.c:1031
+#: sql_help.c:1032 sql_help.c:1182 sql_help.c:1184 sql_help.c:1647
+#: sql_help.c:1651 sql_help.c:1654 sql_help.c:2410 sql_help.c:2613
+#: sql_help.c:3934 sql_help.c:4229 sql_help.c:4390 sql_help.c:4699
 msgid "configuration_parameter"
 msgstr "параметр_конфигурации"
 
-#: sql_help.c:128 sql_help.c:398 sql_help.c:469 sql_help.c:475 sql_help.c:487
-#: sql_help.c:549 sql_help.c:603 sql_help.c:685 sql_help.c:695 sql_help.c:876
-#: sql_help.c:904 sql_help.c:959 sql_help.c:1028 sql_help.c:1101
-#: sql_help.c:1146 sql_help.c:1150 sql_help.c:1154 sql_help.c:1157
-#: sql_help.c:1162 sql_help.c:1165 sql_help.c:1181 sql_help.c:1352
-#: sql_help.c:1375 sql_help.c:1423 sql_help.c:1448 sql_help.c:1505
-#: sql_help.c:1589 sql_help.c:1643 sql_help.c:1666 sql_help.c:2285
-#: sql_help.c:2335 sql_help.c:2342 sql_help.c:2351 sql_help.c:2406
-#: sql_help.c:2407 sql_help.c:2471 sql_help.c:2474 sql_help.c:2508
-#: sql_help.c:2609 sql_help.c:2610 sql_help.c:2633 sql_help.c:2760
-#: sql_help.c:2799 sql_help.c:2909 sql_help.c:2922 sql_help.c:2936
-#: sql_help.c:2977 sql_help.c:3004 sql_help.c:3021 sql_help.c:3048
-#: sql_help.c:3255 sql_help.c:3959 sql_help.c:4688 sql_help.c:4689
-#: sql_help.c:4690 sql_help.c:4691
+#: 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:878
+#: sql_help.c:906 sql_help.c:961 sql_help.c:1030 sql_help.c:1103
+#: sql_help.c:1148 sql_help.c:1152 sql_help.c:1156 sql_help.c:1159
+#: sql_help.c:1164 sql_help.c:1167 sql_help.c:1183 sql_help.c:1354
+#: sql_help.c:1377 sql_help.c:1425 sql_help.c:1433 sql_help.c:1453
+#: sql_help.c:1510 sql_help.c:1594 sql_help.c:1648 sql_help.c:1671
+#: sql_help.c:2290 sql_help.c:2340 sql_help.c:2347 sql_help.c:2356
+#: sql_help.c:2411 sql_help.c:2412 sql_help.c:2476 sql_help.c:2479
+#: sql_help.c:2513 sql_help.c:2614 sql_help.c:2615 sql_help.c:2638
+#: sql_help.c:2765 sql_help.c:2804 sql_help.c:2914 sql_help.c:2927
+#: sql_help.c:2941 sql_help.c:2982 sql_help.c:2990 sql_help.c:3012
+#: sql_help.c:3029 sql_help.c:3056 sql_help.c:3263 sql_help.c:3967
+#: sql_help.c:4700 sql_help.c:4701 sql_help.c:4702 sql_help.c:4703
 msgid "value"
 msgstr "значение"
 
-#: sql_help.c:200
+#: sql_help.c:202
 msgid "target_role"
 msgstr "целевая_роль"
 
-#: sql_help.c:201 sql_help.c:913 sql_help.c:2269 sql_help.c:2638
-#: sql_help.c:2715 sql_help.c:2720 sql_help.c:3889 sql_help.c:3898
-#: sql_help.c:3917 sql_help.c:3929 sql_help.c:4341 sql_help.c:4350
-#: sql_help.c:4369 sql_help.c:4381
+#: sql_help.c:203 sql_help.c:915 sql_help.c:2274 sql_help.c:2643
+#: sql_help.c:2720 sql_help.c:2725 sql_help.c:3897 sql_help.c:3906
+#: sql_help.c:3925 sql_help.c:3937 sql_help.c:4353 sql_help.c:4362
+#: sql_help.c:4381 sql_help.c:4393
 msgid "schema_name"
 msgstr "имя_схемы"
 
-#: sql_help.c:202
+#: sql_help.c:204
 msgid "abbreviated_grant_or_revoke"
 msgstr "предложение_GRANT_или_REVOKE"
 
-#: sql_help.c:203
+#: sql_help.c:205
 msgid "where abbreviated_grant_or_revoke is one of:"
 msgstr "где допустимое предложение_GRANT_или_REVOKE:"
 
-#: sql_help.c:204 sql_help.c:205 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:574 sql_help.c:610 sql_help.c:678 sql_help.c:822 sql_help.c:969
-#: sql_help.c:1320 sql_help.c:1653 sql_help.c:2444 sql_help.c:2445
-#: sql_help.c:2446 sql_help.c:2447 sql_help.c:2448 sql_help.c:2582
-#: sql_help.c:2671 sql_help.c:2672 sql_help.c:2673 sql_help.c:2674
-#: sql_help.c:2675 sql_help.c:3237 sql_help.c:3238 sql_help.c:3239
-#: sql_help.c:3240 sql_help.c:3241 sql_help.c:3938 sql_help.c:3942
-#: sql_help.c:4390 sql_help.c:4394 sql_help.c:4709
+#: 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:824 sql_help.c:971
+#: sql_help.c:1322 sql_help.c:1658 sql_help.c:2449 sql_help.c:2450
+#: sql_help.c:2451 sql_help.c:2452 sql_help.c:2453 sql_help.c:2587
+#: sql_help.c:2676 sql_help.c:2677 sql_help.c:2678 sql_help.c:2679
+#: sql_help.c:2680 sql_help.c:3245 sql_help.c:3246 sql_help.c:3247
+#: sql_help.c:3248 sql_help.c:3249 sql_help.c:3946 sql_help.c:3950
+#: sql_help.c:4402 sql_help.c:4406 sql_help.c:4721
 msgid "role_name"
 msgstr "имя_роли"
 
-#: sql_help.c:239 sql_help.c:462 sql_help.c:912 sql_help.c:1336 sql_help.c:1338
-#: sql_help.c:1390 sql_help.c:1402 sql_help.c:1427 sql_help.c:1683
-#: sql_help.c:2238 sql_help.c:2242 sql_help.c:2354 sql_help.c:2359
-#: sql_help.c:2467 sql_help.c:2637 sql_help.c:2776 sql_help.c:2781
-#: sql_help.c:2783 sql_help.c:2904 sql_help.c:2917 sql_help.c:2931
-#: sql_help.c:2940 sql_help.c:2952 sql_help.c:2981 sql_help.c:3990
-#: sql_help.c:4005 sql_help.c:4007 sql_help.c:4094 sql_help.c:4097
-#: sql_help.c:4099 sql_help.c:4560 sql_help.c:4561 sql_help.c:4570
-#: sql_help.c:4617 sql_help.c:4618 sql_help.c:4619 sql_help.c:4620
-#: sql_help.c:4621 sql_help.c:4622 sql_help.c:4662 sql_help.c:4663
-#: sql_help.c:4668 sql_help.c:4673 sql_help.c:4817 sql_help.c:4818
-#: sql_help.c:4827 sql_help.c:4874 sql_help.c:4875 sql_help.c:4876
-#: sql_help.c:4877 sql_help.c:4878 sql_help.c:4879 sql_help.c:4933
-#: sql_help.c:4935 sql_help.c:5003 sql_help.c:5063 sql_help.c:5064
-#: sql_help.c:5073 sql_help.c:5120 sql_help.c:5121 sql_help.c:5122
-#: sql_help.c:5123 sql_help.c:5124 sql_help.c:5125
+#: sql_help.c:241 sql_help.c:464 sql_help.c:914 sql_help.c:1338 sql_help.c:1340
+#: sql_help.c:1392 sql_help.c:1404 sql_help.c:1429 sql_help.c:1688
+#: sql_help.c:2243 sql_help.c:2247 sql_help.c:2359 sql_help.c:2364
+#: sql_help.c:2472 sql_help.c:2642 sql_help.c:2781 sql_help.c:2786
+#: sql_help.c:2788 sql_help.c:2909 sql_help.c:2922 sql_help.c:2936
+#: sql_help.c:2945 sql_help.c:2957 sql_help.c:2986 sql_help.c:3998
+#: sql_help.c:4013 sql_help.c:4015 sql_help.c:4104 sql_help.c:4107
+#: sql_help.c:4109 sql_help.c:4572 sql_help.c:4573 sql_help.c:4582
+#: sql_help.c:4629 sql_help.c:4630 sql_help.c:4631 sql_help.c:4632
+#: sql_help.c:4633 sql_help.c:4634 sql_help.c:4674 sql_help.c:4675
+#: sql_help.c:4680 sql_help.c:4685 sql_help.c:4829 sql_help.c:4830
+#: sql_help.c:4839 sql_help.c:4886 sql_help.c:4887 sql_help.c:4888
+#: sql_help.c:4889 sql_help.c:4890 sql_help.c:4891 sql_help.c:4945
+#: sql_help.c:4947 sql_help.c:5015 sql_help.c:5075 sql_help.c:5076
+#: sql_help.c:5085 sql_help.c:5132 sql_help.c:5133 sql_help.c:5134
+#: sql_help.c:5135 sql_help.c:5136 sql_help.c:5137
 msgid "expression"
 msgstr "выражение"
 
-#: sql_help.c:242
+#: sql_help.c:244
 msgid "domain_constraint"
 msgstr "ограничение_домена"
 
-#: sql_help.c:244 sql_help.c:246 sql_help.c:249 sql_help.c:477 sql_help.c:478
-#: sql_help.c:1313 sql_help.c:1360 sql_help.c:1361 sql_help.c:1362
-#: sql_help.c:1389 sql_help.c:1401 sql_help.c:1418 sql_help.c:1853
-#: sql_help.c:1855 sql_help.c:2241 sql_help.c:2353 sql_help.c:2358
-#: sql_help.c:2939 sql_help.c:2951 sql_help.c:4002
+#: sql_help.c:246 sql_help.c:248 sql_help.c:251 sql_help.c:479 sql_help.c:480
+#: sql_help.c:1315 sql_help.c:1362 sql_help.c:1363 sql_help.c:1364
+#: sql_help.c:1391 sql_help.c:1403 sql_help.c:1420 sql_help.c:1858
+#: sql_help.c:1860 sql_help.c:2246 sql_help.c:2358 sql_help.c:2363
+#: sql_help.c:2944 sql_help.c:2956 sql_help.c:4010
 msgid "constraint_name"
 msgstr "имя_ограничения"
 
-#: sql_help.c:247 sql_help.c:1314
+#: sql_help.c:249 sql_help.c:1316
 msgid "new_constraint_name"
 msgstr "имя_нового_ограничения"
 
-#: sql_help.c:320 sql_help.c:1099
+#: sql_help.c:322 sql_help.c:1101
 msgid "new_version"
 msgstr "новая_версия"
 
-#: sql_help.c:324 sql_help.c:326
+#: sql_help.c:326 sql_help.c:328
 msgid "member_object"
 msgstr "элемент_объект"
 
-#: sql_help.c:327
+#: sql_help.c:329
 msgid "where member_object is:"
 msgstr "где элемент_объект:"
 
-#: sql_help.c:328 sql_help.c:333 sql_help.c:334 sql_help.c:335 sql_help.c:336
-#: sql_help.c:337 sql_help.c:338 sql_help.c:343 sql_help.c:347 sql_help.c:349
-#: sql_help.c:351 sql_help.c:360 sql_help.c:361 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:370
-#: sql_help.c:371 sql_help.c:1845 sql_help.c:1850 sql_help.c:1857
-#: sql_help.c:1858 sql_help.c:1859 sql_help.c:1860 sql_help.c:1861
-#: sql_help.c:1862 sql_help.c:1863 sql_help.c:1868 sql_help.c:1870
-#: sql_help.c:1874 sql_help.c:1876 sql_help.c:1880 sql_help.c:1885
-#: sql_help.c:1886 sql_help.c:1893 sql_help.c:1894 sql_help.c:1895
-#: 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:1903
-#: sql_help.c:1908 sql_help.c:1909 sql_help.c:4463 sql_help.c:4468
-#: sql_help.c:4469 sql_help.c:4470 sql_help.c:4471 sql_help.c:4477
-#: sql_help.c:4478 sql_help.c:4483 sql_help.c:4484 sql_help.c:4489
-#: sql_help.c:4490 sql_help.c:4491 sql_help.c:4492 sql_help.c:4493
-#: sql_help.c:4494
+#: 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:1850 sql_help.c:1855 sql_help.c:1862
+#: sql_help.c:1863 sql_help.c:1864 sql_help.c:1865 sql_help.c:1866
+#: sql_help.c:1867 sql_help.c:1868 sql_help.c:1873 sql_help.c:1875
+#: sql_help.c:1879 sql_help.c:1881 sql_help.c:1885 sql_help.c:1890
+#: sql_help.c:1891 sql_help.c:1898 sql_help.c:1899 sql_help.c:1900
+#: 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:1913 sql_help.c:1914 sql_help.c:4475 sql_help.c:4480
+#: sql_help.c:4481 sql_help.c:4482 sql_help.c:4483 sql_help.c:4489
+#: sql_help.c:4490 sql_help.c:4495 sql_help.c:4496 sql_help.c:4501
+#: sql_help.c:4502 sql_help.c:4503 sql_help.c:4504 sql_help.c:4505
+#: sql_help.c:4506
 msgid "object_name"
 msgstr "имя_объекта"
 
 # well-spelled: агр
-#: sql_help.c:329 sql_help.c:1846 sql_help.c:4466
+#: sql_help.c:331 sql_help.c:1851 sql_help.c:4478
 msgid "aggregate_name"
 msgstr "имя_агр_функции"
 
-#: sql_help.c:331 sql_help.c:1848 sql_help.c:2134 sql_help.c:2138
-#: sql_help.c:2140 sql_help.c:3364
+#: sql_help.c:333 sql_help.c:1853 sql_help.c:2139 sql_help.c:2143
+#: sql_help.c:2145 sql_help.c:3372
 msgid "source_type"
 msgstr "исходный_тип"
 
-#: sql_help.c:332 sql_help.c:1849 sql_help.c:2135 sql_help.c:2139
-#: sql_help.c:2141 sql_help.c:3365
+#: sql_help.c:334 sql_help.c:1854 sql_help.c:2140 sql_help.c:2144
+#: sql_help.c:2146 sql_help.c:3373
 msgid "target_type"
 msgstr "целевой_тип"
 
-#: sql_help.c:339 sql_help.c:786 sql_help.c:1864 sql_help.c:2136
-#: sql_help.c:2179 sql_help.c:2257 sql_help.c:2525 sql_help.c:2556
-#: sql_help.c:3124 sql_help.c:4365 sql_help.c:4472 sql_help.c:4589
-#: sql_help.c:4593 sql_help.c:4597 sql_help.c:4600 sql_help.c:4846
-#: sql_help.c:4850 sql_help.c:4854 sql_help.c:4857 sql_help.c:5092
-#: sql_help.c:5096 sql_help.c:5100 sql_help.c:5103
+#: sql_help.c:341 sql_help.c:788 sql_help.c:1869 sql_help.c:2141
+#: sql_help.c:2184 sql_help.c:2262 sql_help.c:2530 sql_help.c:2561
+#: sql_help.c:3132 sql_help.c:4377 sql_help.c:4484 sql_help.c:4601
+#: sql_help.c:4605 sql_help.c:4609 sql_help.c:4612 sql_help.c:4858
+#: sql_help.c:4862 sql_help.c:4866 sql_help.c:4869 sql_help.c:5104
+#: sql_help.c:5108 sql_help.c:5112 sql_help.c:5115
 msgid "function_name"
 msgstr "имя_функции"
 
-#: sql_help.c:344 sql_help.c:779 sql_help.c:1871 sql_help.c:2549
+#: sql_help.c:346 sql_help.c:781 sql_help.c:1876 sql_help.c:2554
 msgid "operator_name"
 msgstr "имя_оператора"
 
-#: sql_help.c:345 sql_help.c:715 sql_help.c:719 sql_help.c:723 sql_help.c:1872
-#: sql_help.c:2526 sql_help.c:3488
+#: sql_help.c:347 sql_help.c:717 sql_help.c:721 sql_help.c:725 sql_help.c:1877
+#: sql_help.c:2531 sql_help.c:3496
 msgid "left_type"
 msgstr "тип_слева"
 
-#: sql_help.c:346 sql_help.c:716 sql_help.c:720 sql_help.c:724 sql_help.c:1873
-#: sql_help.c:2527 sql_help.c:3489
+#: sql_help.c:348 sql_help.c:718 sql_help.c:722 sql_help.c:726 sql_help.c:1878
+#: sql_help.c:2532 sql_help.c:3497
 msgid "right_type"
 msgstr "тип_справа"
 
-#: sql_help.c:348 sql_help.c:350 sql_help.c:742 sql_help.c:745 sql_help.c:748
-#: sql_help.c:777 sql_help.c:789 sql_help.c:797 sql_help.c:800 sql_help.c:803
-#: sql_help.c:1407 sql_help.c:1875 sql_help.c:1877 sql_help.c:2546
-#: sql_help.c:2567 sql_help.c:2957 sql_help.c:3498 sql_help.c:3507
+#: sql_help.c:350 sql_help.c:352 sql_help.c:744 sql_help.c:747 sql_help.c:750
+#: sql_help.c:779 sql_help.c:791 sql_help.c:799 sql_help.c:802 sql_help.c:805
+#: sql_help.c:1409 sql_help.c:1880 sql_help.c:1882 sql_help.c:2551
+#: sql_help.c:2572 sql_help.c:2962 sql_help.c:3506 sql_help.c:3515
 msgid "index_method"
 msgstr "метод_индекса"
 
-#: sql_help.c:352 sql_help.c:1881 sql_help.c:4479
+#: sql_help.c:354 sql_help.c:1886 sql_help.c:4491
 msgid "procedure_name"
 msgstr "имя_процедуры"
 
-#: sql_help.c:356 sql_help.c:1887 sql_help.c:3913 sql_help.c:4485
+#: sql_help.c:358 sql_help.c:1892 sql_help.c:3921 sql_help.c:4497
 msgid "routine_name"
 msgstr "имя_подпрограммы"
 
-#: sql_help.c:368 sql_help.c:1379 sql_help.c:1904 sql_help.c:2401
-#: sql_help.c:2607 sql_help.c:2912 sql_help.c:3091 sql_help.c:3669
-#: sql_help.c:3935 sql_help.c:4387
+#: sql_help.c:370 sql_help.c:1381 sql_help.c:1909 sql_help.c:2406
+#: sql_help.c:2612 sql_help.c:2917 sql_help.c:3099 sql_help.c:3677
+#: sql_help.c:3943 sql_help.c:4399
 msgid "type_name"
 msgstr "имя_типа"
 
-#: sql_help.c:369 sql_help.c:1905 sql_help.c:2400 sql_help.c:2606
-#: sql_help.c:3092 sql_help.c:3322 sql_help.c:3670 sql_help.c:3920
-#: sql_help.c:4372
+#: sql_help.c:371 sql_help.c:1910 sql_help.c:2405 sql_help.c:2611
+#: sql_help.c:3100 sql_help.c:3330 sql_help.c:3678 sql_help.c:3928
+#: sql_help.c:4384
 msgid "lang_name"
 msgstr "имя_языка"
 
-#: sql_help.c:372
+#: sql_help.c:374
 msgid "and aggregate_signature is:"
 msgstr "и сигнатура_агр_функции:"
 
-#: sql_help.c:395 sql_help.c:2001 sql_help.c:2282
+#: sql_help.c:397 sql_help.c:2006 sql_help.c:2287
 msgid "handler_function"
 msgstr "функция_обработчик"
 
-#: sql_help.c:396 sql_help.c:2283
+#: sql_help.c:398 sql_help.c:2288
 msgid "validator_function"
 msgstr "функция_проверки"
 
-#: sql_help.c:444 sql_help.c:523 sql_help.c:667 sql_help.c:853 sql_help.c:1003
-#: sql_help.c:1308 sql_help.c:1580
+#: sql_help.c:446 sql_help.c:525 sql_help.c:669 sql_help.c:855 sql_help.c:1005
+#: sql_help.c:1310 sql_help.c:1585
 msgid "action"
 msgstr "действие"
 
-#: sql_help.c:446 sql_help.c:453 sql_help.c:457 sql_help.c:458 sql_help.c:461
-#: sql_help.c:463 sql_help.c:464 sql_help.c:465 sql_help.c:467 sql_help.c:470
-#: sql_help.c:472 sql_help.c:473 sql_help.c:671 sql_help.c:681 sql_help.c:683
-#: sql_help.c:686 sql_help.c:688 sql_help.c:689 sql_help.c:911 sql_help.c:1080
-#: sql_help.c:1310 sql_help.c:1328 sql_help.c:1332 sql_help.c:1333
-#: sql_help.c:1337 sql_help.c:1339 sql_help.c:1340 sql_help.c:1341
-#: sql_help.c:1342 sql_help.c:1344 sql_help.c:1347 sql_help.c:1348
-#: sql_help.c:1350 sql_help.c:1353 sql_help.c:1355 sql_help.c:1356
-#: sql_help.c:1403 sql_help.c:1405 sql_help.c:1412 sql_help.c:1421
-#: sql_help.c:1426 sql_help.c:1430 sql_help.c:1431 sql_help.c:1682
-#: sql_help.c:1685 sql_help.c:1689 sql_help.c:1727 sql_help.c:1852
-#: sql_help.c:1966 sql_help.c:1972 sql_help.c:1986 sql_help.c:1987
-#: sql_help.c:1988 sql_help.c:2332 sql_help.c:2345 sql_help.c:2398
-#: sql_help.c:2466 sql_help.c:2472 sql_help.c:2505 sql_help.c:2636
-#: sql_help.c:2745 sql_help.c:2780 sql_help.c:2782 sql_help.c:2894
-#: sql_help.c:2903 sql_help.c:2913 sql_help.c:2916 sql_help.c:2926
-#: sql_help.c:2930 sql_help.c:2953 sql_help.c:2955 sql_help.c:2962
-#: sql_help.c:2975 sql_help.c:2980 sql_help.c:2984 sql_help.c:2985
-#: sql_help.c:3001 sql_help.c:3127 sql_help.c:3267 sql_help.c:3892
-#: sql_help.c:3893 sql_help.c:3989 sql_help.c:4004 sql_help.c:4006
-#: sql_help.c:4008 sql_help.c:4093 sql_help.c:4096 sql_help.c:4098
-#: sql_help.c:4344 sql_help.c:4345 sql_help.c:4465 sql_help.c:4626
-#: sql_help.c:4632 sql_help.c:4634 sql_help.c:4883 sql_help.c:4889
-#: sql_help.c:4891 sql_help.c:4932 sql_help.c:4934 sql_help.c:4936
-#: sql_help.c:4991 sql_help.c:5129 sql_help.c:5135 sql_help.c:5137
+#: 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:913 sql_help.c:1082
+#: sql_help.c:1312 sql_help.c:1330 sql_help.c:1334 sql_help.c:1335
+#: sql_help.c:1339 sql_help.c:1341 sql_help.c:1342 sql_help.c:1343
+#: sql_help.c:1344 sql_help.c:1346 sql_help.c:1349 sql_help.c:1350
+#: sql_help.c:1352 sql_help.c:1355 sql_help.c:1357 sql_help.c:1358
+#: sql_help.c:1405 sql_help.c:1407 sql_help.c:1414 sql_help.c:1423
+#: sql_help.c:1428 sql_help.c:1435 sql_help.c:1436 sql_help.c:1687
+#: sql_help.c:1690 sql_help.c:1694 sql_help.c:1732 sql_help.c:1857
+#: sql_help.c:1971 sql_help.c:1977 sql_help.c:1991 sql_help.c:1992
+#: sql_help.c:1993 sql_help.c:2337 sql_help.c:2350 sql_help.c:2403
+#: sql_help.c:2471 sql_help.c:2477 sql_help.c:2510 sql_help.c:2641
+#: sql_help.c:2750 sql_help.c:2785 sql_help.c:2787 sql_help.c:2899
+#: sql_help.c:2908 sql_help.c:2918 sql_help.c:2921 sql_help.c:2931
+#: sql_help.c:2935 sql_help.c:2958 sql_help.c:2960 sql_help.c:2967
+#: sql_help.c:2980 sql_help.c:2985 sql_help.c:2992 sql_help.c:2993
+#: sql_help.c:3009 sql_help.c:3135 sql_help.c:3275 sql_help.c:3900
+#: sql_help.c:3901 sql_help.c:3997 sql_help.c:4012 sql_help.c:4014
+#: sql_help.c:4016 sql_help.c:4103 sql_help.c:4106 sql_help.c:4108
+#: sql_help.c:4110 sql_help.c:4356 sql_help.c:4357 sql_help.c:4477
+#: sql_help.c:4638 sql_help.c:4644 sql_help.c:4646 sql_help.c:4895
+#: sql_help.c:4901 sql_help.c:4903 sql_help.c:4944 sql_help.c:4946
+#: sql_help.c:4948 sql_help.c:5003 sql_help.c:5141 sql_help.c:5147
+#: sql_help.c:5149
 msgid "column_name"
 msgstr "имя_столбца"
 
-#: sql_help.c:447 sql_help.c:672 sql_help.c:1311 sql_help.c:1690
+#: sql_help.c:449 sql_help.c:674 sql_help.c:1313 sql_help.c:1695
 msgid "new_column_name"
 msgstr "новое_имя_столбца"
 
-#: sql_help.c:452 sql_help.c:544 sql_help.c:680 sql_help.c:874 sql_help.c:1024
-#: sql_help.c:1327 sql_help.c:1590
+#: sql_help.c:454 sql_help.c:546 sql_help.c:682 sql_help.c:876 sql_help.c:1026
+#: sql_help.c:1329 sql_help.c:1595
 msgid "where action is one of:"
 msgstr "где допустимое действие:"
 
-#: sql_help.c:454 sql_help.c:459 sql_help.c:1072 sql_help.c:1329
-#: sql_help.c:1334 sql_help.c:1592 sql_help.c:1596 sql_help.c:2236
-#: sql_help.c:2333 sql_help.c:2545 sql_help.c:2738 sql_help.c:2895
-#: sql_help.c:3174 sql_help.c:4150
+#: sql_help.c:456 sql_help.c:461 sql_help.c:1074 sql_help.c:1331
+#: sql_help.c:1336 sql_help.c:1597 sql_help.c:1601 sql_help.c:2241
+#: sql_help.c:2338 sql_help.c:2550 sql_help.c:2743 sql_help.c:2900
+#: sql_help.c:3182 sql_help.c:4162
 msgid "data_type"
 msgstr "тип_данных"
 
-#: sql_help.c:455 sql_help.c:460 sql_help.c:1330 sql_help.c:1335
-#: sql_help.c:1593 sql_help.c:1597 sql_help.c:2237 sql_help.c:2336
-#: sql_help.c:2468 sql_help.c:2897 sql_help.c:2905 sql_help.c:2918
-#: sql_help.c:2932 sql_help.c:3175 sql_help.c:3181 sql_help.c:3999
+#: sql_help.c:457 sql_help.c:462 sql_help.c:1332 sql_help.c:1337
+#: sql_help.c:1430 sql_help.c:1598 sql_help.c:1602 sql_help.c:2242
+#: sql_help.c:2341 sql_help.c:2473 sql_help.c:2902 sql_help.c:2910
+#: sql_help.c:2923 sql_help.c:2937 sql_help.c:2987 sql_help.c:3183
+#: sql_help.c:3189 sql_help.c:4007
 msgid "collation"
 msgstr "правило_сортировки"
 
-#: sql_help.c:456 sql_help.c:1331 sql_help.c:2337 sql_help.c:2346
-#: sql_help.c:2898 sql_help.c:2914 sql_help.c:2927
+#: sql_help.c:458 sql_help.c:1333 sql_help.c:2342 sql_help.c:2351
+#: sql_help.c:2903 sql_help.c:2919 sql_help.c:2932
 msgid "column_constraint"
 msgstr "ограничение_столбца"
 
-#: sql_help.c:466 sql_help.c:608 sql_help.c:682 sql_help.c:1349 sql_help.c:4985
+#: sql_help.c:468 sql_help.c:610 sql_help.c:684 sql_help.c:1351 sql_help.c:4997
 msgid "integer"
 msgstr "целое"
 
-#: sql_help.c:468 sql_help.c:471 sql_help.c:684 sql_help.c:687 sql_help.c:1351
-#: sql_help.c:1354
+#: sql_help.c:470 sql_help.c:473 sql_help.c:686 sql_help.c:689 sql_help.c:1353
+#: sql_help.c:1356
 msgid "attribute_option"
 msgstr "атрибут"
 
-#: sql_help.c:476 sql_help.c:1358 sql_help.c:2338 sql_help.c:2347
-#: sql_help.c:2899 sql_help.c:2915 sql_help.c:2928
+#: sql_help.c:478 sql_help.c:1360 sql_help.c:2343 sql_help.c:2352
+#: sql_help.c:2904 sql_help.c:2920 sql_help.c:2933
 msgid "table_constraint"
 msgstr "ограничение_таблицы"
 
-#: sql_help.c:479 sql_help.c:480 sql_help.c:481 sql_help.c:482 sql_help.c:1363
-#: sql_help.c:1364 sql_help.c:1365 sql_help.c:1366 sql_help.c:1906
+#: sql_help.c:481 sql_help.c:482 sql_help.c:483 sql_help.c:484 sql_help.c:1365
+#: sql_help.c:1366 sql_help.c:1367 sql_help.c:1368 sql_help.c:1911
 msgid "trigger_name"
 msgstr "имя_триггера"
 
-#: sql_help.c:483 sql_help.c:484 sql_help.c:1377 sql_help.c:1378
-#: sql_help.c:2339 sql_help.c:2344 sql_help.c:2902 sql_help.c:2925
+#: sql_help.c:485 sql_help.c:486 sql_help.c:1379 sql_help.c:1380
+#: sql_help.c:2344 sql_help.c:2349 sql_help.c:2907 sql_help.c:2930
 msgid "parent_table"
 msgstr "таблица_родитель"
 
-#: sql_help.c:543 sql_help.c:600 sql_help.c:669 sql_help.c:873 sql_help.c:1023
-#: sql_help.c:1549 sql_help.c:2268
+#: sql_help.c:545 sql_help.c:602 sql_help.c:671 sql_help.c:875 sql_help.c:1025
+#: sql_help.c:1554 sql_help.c:2273
 msgid "extension_name"
 msgstr "имя_расширения"
 
-#: sql_help.c:545 sql_help.c:1025 sql_help.c:2402
+#: sql_help.c:547 sql_help.c:1027 sql_help.c:2407
 msgid "execution_cost"
 msgstr "стоимость_выполнения"
 
-#: sql_help.c:546 sql_help.c:1026 sql_help.c:2403
+#: sql_help.c:548 sql_help.c:1028 sql_help.c:2408
 msgid "result_rows"
 msgstr "строк_в_результате"
 
-#: sql_help.c:547 sql_help.c:2404
+#: sql_help.c:549 sql_help.c:2409
 msgid "support_function"
 msgstr "вспомогательная_функция"
 
-#: sql_help.c:569 sql_help.c:571 sql_help.c:948 sql_help.c:956 sql_help.c:960
-#: sql_help.c:963 sql_help.c:966 sql_help.c:1632 sql_help.c:1640
-#: sql_help.c:1644 sql_help.c:1647 sql_help.c:1650 sql_help.c:2716
-#: sql_help.c:2718 sql_help.c:2721 sql_help.c:2722 sql_help.c:3890
-#: sql_help.c:3891 sql_help.c:3895 sql_help.c:3896 sql_help.c:3899
-#: sql_help.c:3900 sql_help.c:3902 sql_help.c:3903 sql_help.c:3905
-#: sql_help.c:3906 sql_help.c:3908 sql_help.c:3909 sql_help.c:3911
-#: sql_help.c:3912 sql_help.c:3918 sql_help.c:3919 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:3936 sql_help.c:3937 sql_help.c:3939
-#: sql_help.c:3940 sql_help.c:4342 sql_help.c:4343 sql_help.c:4347
-#: sql_help.c:4348 sql_help.c:4351 sql_help.c:4352 sql_help.c:4354
-#: sql_help.c:4355 sql_help.c:4357 sql_help.c:4358 sql_help.c:4360
-#: sql_help.c:4361 sql_help.c:4363 sql_help.c:4364 sql_help.c:4370
-#: sql_help.c:4371 sql_help.c:4373 sql_help.c:4374 sql_help.c:4376
-#: sql_help.c:4377 sql_help.c:4379 sql_help.c:4380 sql_help.c:4382
+#: sql_help.c:571 sql_help.c:573 sql_help.c:950 sql_help.c:958 sql_help.c:962
+#: sql_help.c:965 sql_help.c:968 sql_help.c:1637 sql_help.c:1645
+#: sql_help.c:1649 sql_help.c:1652 sql_help.c:1655 sql_help.c:2721
+#: sql_help.c:2723 sql_help.c:2726 sql_help.c:2727 sql_help.c:3898
+#: sql_help.c:3899 sql_help.c:3903 sql_help.c:3904 sql_help.c:3907
+#: sql_help.c:3908 sql_help.c:3910 sql_help.c:3911 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:3926 sql_help.c:3927 sql_help.c:3929
+#: sql_help.c:3930 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:4354 sql_help.c:4355 sql_help.c:4359
+#: sql_help.c:4360 sql_help.c:4363 sql_help.c:4364 sql_help.c:4366
+#: sql_help.c:4367 sql_help.c:4369 sql_help.c:4370 sql_help.c:4372
+#: sql_help.c:4373 sql_help.c:4375 sql_help.c:4376 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:4391 sql_help.c:4392
+#: sql_help.c:4389 sql_help.c:4391 sql_help.c:4392 sql_help.c:4394
+#: sql_help.c:4395 sql_help.c:4397 sql_help.c:4398 sql_help.c:4400
+#: sql_help.c:4401 sql_help.c:4403 sql_help.c:4404
 msgid "role_specification"
 msgstr "указание_роли"
 
-#: sql_help.c:570 sql_help.c:572 sql_help.c:1663 sql_help.c:2204
-#: sql_help.c:2724 sql_help.c:3252 sql_help.c:3703 sql_help.c:4719
+#: sql_help.c:572 sql_help.c:574 sql_help.c:1668 sql_help.c:2209
+#: sql_help.c:2729 sql_help.c:3260 sql_help.c:3711 sql_help.c:4731
 msgid "user_name"
 msgstr "имя_пользователя"
 
-#: sql_help.c:573 sql_help.c:968 sql_help.c:1652 sql_help.c:2723
-#: sql_help.c:3941 sql_help.c:4393
+#: sql_help.c:575 sql_help.c:970 sql_help.c:1657 sql_help.c:2728
+#: sql_help.c:3949 sql_help.c:4405
 msgid "where role_specification can be:"
 msgstr "где допустимое указание_роли:"
 
-#: sql_help.c:575
+#: sql_help.c:577
 msgid "group_name"
 msgstr "имя_группы"
 
-#: sql_help.c:596 sql_help.c:1424 sql_help.c:2215 sql_help.c:2475
-#: sql_help.c:2509 sql_help.c:2910 sql_help.c:2923 sql_help.c:2937
-#: sql_help.c:2978 sql_help.c:3005 sql_help.c:3017 sql_help.c:3932
-#: sql_help.c:4384
+#: sql_help.c:598 sql_help.c:1426 sql_help.c:2220 sql_help.c:2480
+#: sql_help.c:2514 sql_help.c:2915 sql_help.c:2928 sql_help.c:2942
+#: sql_help.c:2983 sql_help.c:3013 sql_help.c:3025 sql_help.c:3940
+#: sql_help.c:4396
 msgid "tablespace_name"
 msgstr "табл_пространство"
 
-#: sql_help.c:598 sql_help.c:691 sql_help.c:1371 sql_help.c:1381
-#: sql_help.c:1419 sql_help.c:1781 sql_help.c:1784
+#: sql_help.c:600 sql_help.c:693 sql_help.c:1373 sql_help.c:1383
+#: sql_help.c:1421 sql_help.c:1786 sql_help.c:1789
 msgid "index_name"
 msgstr "имя_индекса"
 
-#: sql_help.c:602 sql_help.c:605 sql_help.c:694 sql_help.c:696 sql_help.c:1374
-#: sql_help.c:1376 sql_help.c:1422 sql_help.c:2473 sql_help.c:2507
-#: sql_help.c:2908 sql_help.c:2921 sql_help.c:2935 sql_help.c:2976
-#: sql_help.c:3003
+#: sql_help.c:604 sql_help.c:607 sql_help.c:696 sql_help.c:698 sql_help.c:1376
+#: sql_help.c:1378 sql_help.c:1424 sql_help.c:2478 sql_help.c:2512
+#: sql_help.c:2913 sql_help.c:2926 sql_help.c:2940 sql_help.c:2981
+#: sql_help.c:3011
 msgid "storage_parameter"
 msgstr "параметр_хранения"
 
-#: sql_help.c:607
+#: sql_help.c:609
 msgid "column_number"
 msgstr "номер_столбца"
 
-#: sql_help.c:631 sql_help.c:1869 sql_help.c:4476
+#: sql_help.c:633 sql_help.c:1874 sql_help.c:4488
 msgid "large_object_oid"
 msgstr "oid_большого_объекта"
 
-#: sql_help.c:690 sql_help.c:1357 sql_help.c:2896
+#: sql_help.c:692 sql_help.c:1359 sql_help.c:2901
 msgid "compression_method"
 msgstr "метод_сжатия"
 
-#: sql_help.c:692 sql_help.c:1372
+#: sql_help.c:694 sql_help.c:1374
 msgid "new_access_method"
 msgstr "новый_метод_доступа"
 
-#: sql_help.c:725 sql_help.c:2530
+#: sql_help.c:727 sql_help.c:2535
 msgid "res_proc"
 msgstr "процедура_ограничения"
 
-#: sql_help.c:726 sql_help.c:2531
+#: sql_help.c:728 sql_help.c:2536
 msgid "join_proc"
 msgstr "процедура_соединения"
 
-#: sql_help.c:778 sql_help.c:790 sql_help.c:2548
+#: sql_help.c:780 sql_help.c:792 sql_help.c:2553
 msgid "strategy_number"
 msgstr "номер_стратегии"
 
-#: sql_help.c:780 sql_help.c:781 sql_help.c:784 sql_help.c:785 sql_help.c:791
-#: sql_help.c:792 sql_help.c:794 sql_help.c:795 sql_help.c:2550 sql_help.c:2551
-#: sql_help.c:2554 sql_help.c:2555
+#: sql_help.c:782 sql_help.c:783 sql_help.c:786 sql_help.c:787 sql_help.c:793
+#: sql_help.c:794 sql_help.c:796 sql_help.c:797 sql_help.c:2555 sql_help.c:2556
+#: sql_help.c:2559 sql_help.c:2560
 msgid "op_type"
 msgstr "тип_операции"
 
-#: sql_help.c:782 sql_help.c:2552
+#: sql_help.c:784 sql_help.c:2557
 msgid "sort_family_name"
 msgstr "семейство_сортировки"
 
-#: sql_help.c:783 sql_help.c:793 sql_help.c:2553
+#: sql_help.c:785 sql_help.c:795 sql_help.c:2558
 msgid "support_number"
 msgstr "номер_опорной_процедуры"
 
-#: sql_help.c:787 sql_help.c:2137 sql_help.c:2557 sql_help.c:3094
-#: sql_help.c:3096
+#: sql_help.c:789 sql_help.c:2142 sql_help.c:2562 sql_help.c:3102
+#: sql_help.c:3104
 msgid "argument_type"
 msgstr "тип_аргумента"
 
-#: sql_help.c:818 sql_help.c:821 sql_help.c:910 sql_help.c:1039 sql_help.c:1079
-#: sql_help.c:1545 sql_help.c:1548 sql_help.c:1726 sql_help.c:1780
-#: sql_help.c:1783 sql_help.c:1854 sql_help.c:1879 sql_help.c:1892
-#: sql_help.c:1907 sql_help.c:1965 sql_help.c:1971 sql_help.c:2331
-#: sql_help.c:2343 sql_help.c:2464 sql_help.c:2504 sql_help.c:2581
-#: sql_help.c:2635 sql_help.c:2692 sql_help.c:2744 sql_help.c:2777
-#: sql_help.c:2784 sql_help.c:2893 sql_help.c:2911 sql_help.c:2924
-#: sql_help.c:3000 sql_help.c:3120 sql_help.c:3301 sql_help.c:3524
-#: sql_help.c:3573 sql_help.c:3679 sql_help.c:3888 sql_help.c:3894
-#: sql_help.c:3955 sql_help.c:3987 sql_help.c:4340 sql_help.c:4346
-#: sql_help.c:4464 sql_help.c:4575 sql_help.c:4577 sql_help.c:4639
-#: sql_help.c:4678 sql_help.c:4832 sql_help.c:4834 sql_help.c:4896
-#: sql_help.c:4930 sql_help.c:4990 sql_help.c:5078 sql_help.c:5080
-#: sql_help.c:5142
+#: sql_help.c:820 sql_help.c:823 sql_help.c:912 sql_help.c:1041 sql_help.c:1081
+#: sql_help.c:1550 sql_help.c:1553 sql_help.c:1731 sql_help.c:1785
+#: sql_help.c:1788 sql_help.c:1859 sql_help.c:1884 sql_help.c:1897
+#: sql_help.c:1912 sql_help.c:1970 sql_help.c:1976 sql_help.c:2336
+#: sql_help.c:2348 sql_help.c:2469 sql_help.c:2509 sql_help.c:2586
+#: sql_help.c:2640 sql_help.c:2697 sql_help.c:2749 sql_help.c:2782
+#: sql_help.c:2789 sql_help.c:2898 sql_help.c:2916 sql_help.c:2929
+#: sql_help.c:3008 sql_help.c:3128 sql_help.c:3309 sql_help.c:3532
+#: sql_help.c:3581 sql_help.c:3687 sql_help.c:3896 sql_help.c:3902
+#: sql_help.c:3963 sql_help.c:3995 sql_help.c:4352 sql_help.c:4358
+#: sql_help.c:4476 sql_help.c:4587 sql_help.c:4589 sql_help.c:4651
+#: sql_help.c:4690 sql_help.c:4844 sql_help.c:4846 sql_help.c:4908
+#: sql_help.c:4942 sql_help.c:5002 sql_help.c:5090 sql_help.c:5092
+#: sql_help.c:5154
 msgid "table_name"
 msgstr "имя_таблицы"
 
-#: sql_help.c:823 sql_help.c:2583
+#: sql_help.c:825 sql_help.c:2588
 msgid "using_expression"
 msgstr "выражение_использования"
 
-#: sql_help.c:824 sql_help.c:2584
+#: sql_help.c:826 sql_help.c:2589
 msgid "check_expression"
 msgstr "выражение_проверки"
 
-#: sql_help.c:897 sql_help.c:899 sql_help.c:901 sql_help.c:2631
+#: sql_help.c:899 sql_help.c:901 sql_help.c:903 sql_help.c:2636
 msgid "publication_object"
 msgstr "объект_публикации"
 
-#: sql_help.c:903 sql_help.c:2632
+#: sql_help.c:905 sql_help.c:2637
 msgid "publication_parameter"
 msgstr "параметр_публикации"
 
-#: sql_help.c:909 sql_help.c:2634
+#: sql_help.c:911 sql_help.c:2639
 msgid "where publication_object is one of:"
 msgstr "где объект_публикации:"
 
-#: sql_help.c:952 sql_help.c:1636 sql_help.c:2442 sql_help.c:2669
-#: sql_help.c:3235
+#: sql_help.c:954 sql_help.c:1641 sql_help.c:2447 sql_help.c:2674
+#: sql_help.c:3243
 msgid "password"
 msgstr "пароль"
 
-#: sql_help.c:953 sql_help.c:1637 sql_help.c:2443 sql_help.c:2670
-#: sql_help.c:3236
+#: sql_help.c:955 sql_help.c:1642 sql_help.c:2448 sql_help.c:2675
+#: sql_help.c:3244
 msgid "timestamp"
 msgstr "timestamp"
 
-#: sql_help.c:957 sql_help.c:961 sql_help.c:964 sql_help.c:967 sql_help.c:1641
-#: sql_help.c:1645 sql_help.c:1648 sql_help.c:1651 sql_help.c:3901
-#: sql_help.c:4353
+#: sql_help.c:959 sql_help.c:963 sql_help.c:966 sql_help.c:969 sql_help.c:1646
+#: sql_help.c:1650 sql_help.c:1653 sql_help.c:1656 sql_help.c:3909
+#: sql_help.c:4365
 msgid "database_name"
 msgstr "имя_БД"
 
-#: sql_help.c:1073 sql_help.c:2739
+#: sql_help.c:1075 sql_help.c:2744
 msgid "increment"
 msgstr "шаг"
 
-#: sql_help.c:1074 sql_help.c:2740
+#: sql_help.c:1076 sql_help.c:2745
 msgid "minvalue"
 msgstr "мин_значение"
 
-#: sql_help.c:1075 sql_help.c:2741
+#: sql_help.c:1077 sql_help.c:2746
 msgid "maxvalue"
 msgstr "макс_значение"
 
-#: sql_help.c:1076 sql_help.c:2742 sql_help.c:4573 sql_help.c:4676
-#: sql_help.c:4830 sql_help.c:5007 sql_help.c:5076
+#: sql_help.c:1078 sql_help.c:2747 sql_help.c:4585 sql_help.c:4688
+#: sql_help.c:4842 sql_help.c:5019 sql_help.c:5088
 msgid "start"
 msgstr "начальное_значение"
 
-#: sql_help.c:1077 sql_help.c:1346
+#: sql_help.c:1079 sql_help.c:1348
 msgid "restart"
 msgstr "значение_перезапуска"
 
-#: sql_help.c:1078 sql_help.c:2743
+#: sql_help.c:1080 sql_help.c:2748
 msgid "cache"
 msgstr "кеш"
 
-#: sql_help.c:1123
+#: sql_help.c:1125
 msgid "new_target"
 msgstr "новое_имя"
 
-#: sql_help.c:1142 sql_help.c:2796
+#: sql_help.c:1144 sql_help.c:2801
 msgid "conninfo"
 msgstr "строка_подключения"
 
-#: sql_help.c:1144 sql_help.c:1148 sql_help.c:1152 sql_help.c:2797
+#: sql_help.c:1146 sql_help.c:1150 sql_help.c:1154 sql_help.c:2802
 msgid "publication_name"
 msgstr "имя_публикации"
 
-#: sql_help.c:1145 sql_help.c:1149 sql_help.c:1153
+#: sql_help.c:1147 sql_help.c:1151 sql_help.c:1155
 msgid "publication_option"
 msgstr "параметр_публикации"
 
-#: sql_help.c:1156
+#: sql_help.c:1158
 msgid "refresh_option"
 msgstr "параметр_обновления"
 
-#: sql_help.c:1161 sql_help.c:2798
+#: sql_help.c:1163 sql_help.c:2803
 msgid "subscription_parameter"
 msgstr "параметр_подписки"
 
-#: sql_help.c:1164
+#: sql_help.c:1166
 msgid "skip_option"
 msgstr "параметр_пропуска"
 
-#: sql_help.c:1323 sql_help.c:1326
+#: sql_help.c:1325 sql_help.c:1328
 msgid "partition_name"
 msgstr "имя_секции"
 
-#: sql_help.c:1324 sql_help.c:2348 sql_help.c:2929
+#: sql_help.c:1326 sql_help.c:2353 sql_help.c:2934
 msgid "partition_bound_spec"
 msgstr "указание_границ_секции"
 
-#: sql_help.c:1343 sql_help.c:1393 sql_help.c:2943
+#: sql_help.c:1345 sql_help.c:1395 sql_help.c:2948
 msgid "sequence_options"
 msgstr "параметры_последовательности"
 
-#: sql_help.c:1345
+#: sql_help.c:1347
 msgid "sequence_option"
 msgstr "параметр_последовательности"
 
-#: sql_help.c:1359
+#: sql_help.c:1361
 msgid "table_constraint_using_index"
 msgstr "ограничение_таблицы_с_индексом"
 
-#: sql_help.c:1367 sql_help.c:1368 sql_help.c:1369 sql_help.c:1370
+#: sql_help.c:1369 sql_help.c:1370 sql_help.c:1371 sql_help.c:1372
 msgid "rewrite_rule_name"
 msgstr "имя_правила_перезаписи"
 
-#: sql_help.c:1382 sql_help.c:2360 sql_help.c:2968
+#: sql_help.c:1384 sql_help.c:2365 sql_help.c:2973
 msgid "and partition_bound_spec is:"
 msgstr "и указание_границ_секции:"
 
-#: sql_help.c:1383 sql_help.c:1384 sql_help.c:1385 sql_help.c:2361
-#: sql_help.c:2362 sql_help.c:2363 sql_help.c:2969 sql_help.c:2970
-#: sql_help.c:2971
+#: sql_help.c:1385 sql_help.c:1386 sql_help.c:1387 sql_help.c:2366
+#: sql_help.c:2367 sql_help.c:2368 sql_help.c:2974 sql_help.c:2975
+#: sql_help.c:2976
 msgid "partition_bound_expr"
 msgstr "выражение_границ_секции"
 
-#: sql_help.c:1386 sql_help.c:1387 sql_help.c:2364 sql_help.c:2365
-#: sql_help.c:2972 sql_help.c:2973
+#: sql_help.c:1388 sql_help.c:1389 sql_help.c:2369 sql_help.c:2370
+#: sql_help.c:2977 sql_help.c:2978
 msgid "numeric_literal"
 msgstr "числовая_константа"
 
-#: sql_help.c:1388
+#: sql_help.c:1390
 msgid "and column_constraint is:"
 msgstr "и ограничение_столбца:"
 
-#: sql_help.c:1391 sql_help.c:2355 sql_help.c:2396 sql_help.c:2605
-#: sql_help.c:2941
+#: sql_help.c:1393 sql_help.c:2360 sql_help.c:2401 sql_help.c:2610
+#: sql_help.c:2946
 msgid "default_expr"
 msgstr "выражение_по_умолчанию"
 
-#: sql_help.c:1392 sql_help.c:2356 sql_help.c:2942
+#: sql_help.c:1394 sql_help.c:2361 sql_help.c:2947
 msgid "generation_expr"
 msgstr "генерирующее_выражение"
 
-#: sql_help.c:1394 sql_help.c:1395 sql_help.c:1404 sql_help.c:1406
-#: sql_help.c:1410 sql_help.c:2944 sql_help.c:2945 sql_help.c:2954
-#: sql_help.c:2956 sql_help.c:2960
+#: sql_help.c:1396 sql_help.c:1397 sql_help.c:1406 sql_help.c:1408
+#: sql_help.c:1412 sql_help.c:2949 sql_help.c:2950 sql_help.c:2959
+#: sql_help.c:2961 sql_help.c:2965
 msgid "index_parameters"
 msgstr "параметры_индекса"
 
-#: sql_help.c:1396 sql_help.c:1413 sql_help.c:2946 sql_help.c:2963
+#: sql_help.c:1398 sql_help.c:1415 sql_help.c:2951 sql_help.c:2968
 msgid "reftable"
 msgstr "целевая_таблица"
 
-#: sql_help.c:1397 sql_help.c:1414 sql_help.c:2947 sql_help.c:2964
+#: sql_help.c:1399 sql_help.c:1416 sql_help.c:2952 sql_help.c:2969
 msgid "refcolumn"
 msgstr "целевой_столбец"
 
-#: sql_help.c:1398 sql_help.c:1399 sql_help.c:1415 sql_help.c:1416
-#: sql_help.c:2948 sql_help.c:2949 sql_help.c:2965 sql_help.c:2966
+#: sql_help.c:1400 sql_help.c:1401 sql_help.c:1417 sql_help.c:1418
+#: sql_help.c:2953 sql_help.c:2954 sql_help.c:2970 sql_help.c:2971
 msgid "referential_action"
 msgstr "ссылочное_действие"
 
-#: sql_help.c:1400 sql_help.c:2357 sql_help.c:2950
+#: sql_help.c:1402 sql_help.c:2362 sql_help.c:2955
 msgid "and table_constraint is:"
 msgstr "и ограничение_таблицы:"
 
-#: sql_help.c:1408 sql_help.c:2958
+#: sql_help.c:1410 sql_help.c:2963
 msgid "exclude_element"
 msgstr "объект_исключения"
 
-#: sql_help.c:1409 sql_help.c:2959 sql_help.c:4571 sql_help.c:4674
-#: sql_help.c:4828 sql_help.c:5005 sql_help.c:5074
+#: sql_help.c:1411 sql_help.c:2964 sql_help.c:4583 sql_help.c:4686
+#: sql_help.c:4840 sql_help.c:5017 sql_help.c:5086
 msgid "operator"
 msgstr "оператор"
 
-#: sql_help.c:1411 sql_help.c:2476 sql_help.c:2961
+#: sql_help.c:1413 sql_help.c:2481 sql_help.c:2966
 msgid "predicate"
 msgstr "предикат"
 
-#: sql_help.c:1417
+#: sql_help.c:1419
 msgid "and table_constraint_using_index is:"
 msgstr "и ограничение_таблицы_с_индексом:"
 
-#: sql_help.c:1420 sql_help.c:2974
+#: sql_help.c:1422 sql_help.c:2979
 msgid "index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:"
 msgstr "параметры_индекса в ограничениях UNIQUE, PRIMARY KEY и EXCLUDE:"
 
-#: sql_help.c:1425 sql_help.c:2979
+#: sql_help.c:1427 sql_help.c:2984
 msgid "exclude_element in an EXCLUDE constraint is:"
 msgstr "объект_исключения в ограничении EXCLUDE:"
 
-#: sql_help.c:1428 sql_help.c:2469 sql_help.c:2906 sql_help.c:2919
-#: sql_help.c:2933 sql_help.c:2982 sql_help.c:4000
+#: sql_help.c:1431 sql_help.c:2474 sql_help.c:2911 sql_help.c:2924
+#: sql_help.c:2938 sql_help.c:2988 sql_help.c:4008
 msgid "opclass"
 msgstr "класс_оператора"
 
-#: sql_help.c:1429 sql_help.c:2983
+#: sql_help.c:1432 sql_help.c:2475 sql_help.c:2989
+msgid "opclass_parameter"
+msgstr "параметр_класса_оп"
+
+#: sql_help.c:1434 sql_help.c:2991
 msgid "referential_action in a FOREIGN KEY/REFERENCES constraint is:"
 msgstr "ссылочное действие в ограничении FOREIGN KEY/REFERENCES:"
 
-#: sql_help.c:1447 sql_help.c:1450 sql_help.c:3020
+#: sql_help.c:1452 sql_help.c:1455 sql_help.c:3028
 msgid "tablespace_option"
 msgstr "параметр_табл_пространства"
 
-#: sql_help.c:1471 sql_help.c:1474 sql_help.c:1480 sql_help.c:1484
+#: sql_help.c:1476 sql_help.c:1479 sql_help.c:1485 sql_help.c:1489
 msgid "token_type"
 msgstr "тип_фрагмента"
 
-#: sql_help.c:1472 sql_help.c:1475
+#: sql_help.c:1477 sql_help.c:1480
 msgid "dictionary_name"
 msgstr "имя_словаря"
 
-#: sql_help.c:1477 sql_help.c:1481
+#: sql_help.c:1482 sql_help.c:1486
 msgid "old_dictionary"
 msgstr "старый_словарь"
 
-#: sql_help.c:1478 sql_help.c:1482
+#: sql_help.c:1483 sql_help.c:1487
 msgid "new_dictionary"
 msgstr "новый_словарь"
 
-#: sql_help.c:1577 sql_help.c:1591 sql_help.c:1594 sql_help.c:1595
-#: sql_help.c:3173
+#: sql_help.c:1582 sql_help.c:1596 sql_help.c:1599 sql_help.c:1600
+#: sql_help.c:3181
 msgid "attribute_name"
 msgstr "имя_атрибута"
 
-#: sql_help.c:1578
+#: sql_help.c:1583
 msgid "new_attribute_name"
 msgstr "новое_имя_атрибута"
 
-#: sql_help.c:1582 sql_help.c:1586
+#: sql_help.c:1587 sql_help.c:1591
 msgid "new_enum_value"
 msgstr "новое_значение_перечисления"
 
-#: sql_help.c:1583
+#: sql_help.c:1588
 msgid "neighbor_enum_value"
 msgstr "соседнее_значение_перечисления"
 
-#: sql_help.c:1585
+#: sql_help.c:1590
 msgid "existing_enum_value"
 msgstr "существующее_значение_перечисления"
 
-#: sql_help.c:1588
+#: sql_help.c:1593
 msgid "property"
 msgstr "свойство"
 
-#: sql_help.c:1664 sql_help.c:2340 sql_help.c:2349 sql_help.c:2755
-#: sql_help.c:3253 sql_help.c:3704 sql_help.c:3910 sql_help.c:3956
-#: sql_help.c:4362
+#: sql_help.c:1669 sql_help.c:2345 sql_help.c:2354 sql_help.c:2760
+#: sql_help.c:3261 sql_help.c:3712 sql_help.c:3918 sql_help.c:3964
+#: sql_help.c:4374
 msgid "server_name"
 msgstr "имя_сервера"
 
-#: sql_help.c:1696 sql_help.c:1699 sql_help.c:3268
+#: sql_help.c:1701 sql_help.c:1704 sql_help.c:3276
 msgid "view_option_name"
 msgstr "имя_параметра_представления"
 
-#: sql_help.c:1697 sql_help.c:3269
+#: sql_help.c:1702 sql_help.c:3277
 msgid "view_option_value"
 msgstr "значение_параметра_представления"
 
-#: sql_help.c:1719 sql_help.c:1720 sql_help.c:4973 sql_help.c:4974
+#: sql_help.c:1724 sql_help.c:1725 sql_help.c:4985 sql_help.c:4986
 msgid "table_and_columns"
 msgstr "таблица_и_столбцы"
 
-#: sql_help.c:1721 sql_help.c:1785 sql_help.c:1977 sql_help.c:3753
-#: sql_help.c:4197 sql_help.c:4975
+#: sql_help.c:1726 sql_help.c:1790 sql_help.c:1982 sql_help.c:3761
+#: sql_help.c:4209 sql_help.c:4987
 msgid "where option can be one of:"
 msgstr "где допустимый параметр:"
 
-#: sql_help.c:1722 sql_help.c:1723 sql_help.c:1786 sql_help.c:1979
-#: sql_help.c:1983 sql_help.c:2163 sql_help.c:3754 sql_help.c:3755
-#: sql_help.c:3756 sql_help.c:3757 sql_help.c:3758 sql_help.c:3759
-#: sql_help.c:3760 sql_help.c:3761 sql_help.c:3762 sql_help.c:4198
-#: sql_help.c:4200 sql_help.c:4976 sql_help.c:4977 sql_help.c:4978
-#: 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:4986 sql_help.c:4987
+#: sql_help.c:1727 sql_help.c:1728 sql_help.c:1791 sql_help.c:1984
+#: sql_help.c:1988 sql_help.c:2168 sql_help.c:3762 sql_help.c:3763
+#: sql_help.c:3764 sql_help.c:3765 sql_help.c:3766 sql_help.c:3767
+#: sql_help.c:3768 sql_help.c:3769 sql_help.c:3770 sql_help.c:4210
+#: sql_help.c:4212 sql_help.c:4988 sql_help.c:4989 sql_help.c:4990
+#: sql_help.c:4991 sql_help.c:4992 sql_help.c:4993 sql_help.c:4994
+#: sql_help.c:4995 sql_help.c:4996 sql_help.c:4998 sql_help.c:4999
 msgid "boolean"
 msgstr "логическое_значение"
 
-#: sql_help.c:1724 sql_help.c:4988
+#: sql_help.c:1729 sql_help.c:5000
 msgid "size"
 msgstr "размер"
 
-#: sql_help.c:1725 sql_help.c:4989
+#: sql_help.c:1730 sql_help.c:5001
 msgid "and table_and_columns is:"
 msgstr "и таблица_и_столбцы:"
 
-#: sql_help.c:1741 sql_help.c:4735 sql_help.c:4737 sql_help.c:4761
+#: sql_help.c:1746 sql_help.c:4747 sql_help.c:4749 sql_help.c:4773
 msgid "transaction_mode"
 msgstr "режим_транзакции"
 
-#: sql_help.c:1742 sql_help.c:4738 sql_help.c:4762
+#: sql_help.c:1747 sql_help.c:4750 sql_help.c:4774
 msgid "where transaction_mode is one of:"
 msgstr "где допустимый режим_транзакции:"
 
-#: sql_help.c:1751 sql_help.c:4581 sql_help.c:4590 sql_help.c:4594
-#: sql_help.c:4598 sql_help.c:4601 sql_help.c:4838 sql_help.c:4847
-#: sql_help.c:4851 sql_help.c:4855 sql_help.c:4858 sql_help.c:5084
-#: sql_help.c:5093 sql_help.c:5097 sql_help.c:5101 sql_help.c:5104
+#: sql_help.c:1756 sql_help.c:4593 sql_help.c:4602 sql_help.c:4606
+#: sql_help.c:4610 sql_help.c:4613 sql_help.c:4850 sql_help.c:4859
+#: sql_help.c:4863 sql_help.c:4867 sql_help.c:4870 sql_help.c:5096
+#: sql_help.c:5105 sql_help.c:5109 sql_help.c:5113 sql_help.c:5116
 msgid "argument"
 msgstr "аргумент"
 
-#: sql_help.c:1851
+#: sql_help.c:1856
 msgid "relation_name"
 msgstr "имя_отношения"
 
-#: sql_help.c:1856 sql_help.c:3904 sql_help.c:4356
+#: sql_help.c:1861 sql_help.c:3912 sql_help.c:4368
 msgid "domain_name"
 msgstr "имя_домена"
 
-#: sql_help.c:1878
+#: sql_help.c:1883
 msgid "policy_name"
 msgstr "имя_политики"
 
-#: sql_help.c:1891
+#: sql_help.c:1896
 msgid "rule_name"
 msgstr "имя_правила"
 
-#: sql_help.c:1910 sql_help.c:4495
+#: sql_help.c:1915 sql_help.c:4507
 msgid "string_literal"
 msgstr "строковая_константа"
 
-#: sql_help.c:1935 sql_help.c:4159 sql_help.c:4409
+#: sql_help.c:1940 sql_help.c:4171 sql_help.c:4421
 msgid "transaction_id"
 msgstr "код_транзакции"
 
-#: sql_help.c:1967 sql_help.c:1974 sql_help.c:4026
+#: sql_help.c:1972 sql_help.c:1979 sql_help.c:4034
 msgid "filename"
 msgstr "имя_файла"
 
-#: sql_help.c:1968 sql_help.c:1975 sql_help.c:2694 sql_help.c:2695
-#: sql_help.c:2696
+#: sql_help.c:1973 sql_help.c:1980 sql_help.c:2699 sql_help.c:2700
+#: sql_help.c:2701
 msgid "command"
 msgstr "команда"
 
-#: sql_help.c:1970 sql_help.c:2693 sql_help.c:3123 sql_help.c:3304
-#: sql_help.c:4010 sql_help.c:4087 sql_help.c:4090 sql_help.c:4564
-#: sql_help.c:4566 sql_help.c:4667 sql_help.c:4669 sql_help.c:4821
-#: sql_help.c:4823 sql_help.c:4939 sql_help.c:5067 sql_help.c:5069
+#: sql_help.c:1975 sql_help.c:2698 sql_help.c:3131 sql_help.c:3312
+#: sql_help.c:4018 sql_help.c:4097 sql_help.c:4100 sql_help.c:4576
+#: sql_help.c:4578 sql_help.c:4679 sql_help.c:4681 sql_help.c:4833
+#: sql_help.c:4835 sql_help.c:4951 sql_help.c:5079 sql_help.c:5081
 msgid "condition"
 msgstr "условие"
 
-#: sql_help.c:1973 sql_help.c:2510 sql_help.c:3006 sql_help.c:3270
-#: sql_help.c:3288 sql_help.c:3991
+#: sql_help.c:1978 sql_help.c:2515 sql_help.c:3014 sql_help.c:3278
+#: sql_help.c:3296 sql_help.c:3999
 msgid "query"
 msgstr "запрос"
 
-#: sql_help.c:1978
+#: sql_help.c:1983
 msgid "format_name"
 msgstr "имя_формата"
 
-#: sql_help.c:1980
+#: sql_help.c:1985
 msgid "delimiter_character"
 msgstr "символ_разделитель"
 
-#: sql_help.c:1981
+#: sql_help.c:1986
 msgid "null_string"
 msgstr "представление_NULL"
 
-#: sql_help.c:1982
+#: sql_help.c:1987
 msgid "default_string"
 msgstr "представление_DEFAULT"
 
-#: sql_help.c:1984
+#: sql_help.c:1989
 msgid "quote_character"
 msgstr "символ_кавычек"
 
-#: sql_help.c:1985
+#: sql_help.c:1990
 msgid "escape_character"
 msgstr "спецсимвол"
 
-#: sql_help.c:1989
+#: sql_help.c:1994
 msgid "encoding_name"
 msgstr "имя_кодировки"
 
-#: sql_help.c:2000
+#: sql_help.c:2005
 msgid "access_method_type"
 msgstr "тип_метода_доступа"
 
-#: sql_help.c:2071 sql_help.c:2090 sql_help.c:2093
+#: sql_help.c:2076 sql_help.c:2095 sql_help.c:2098
 msgid "arg_data_type"
 msgstr "тип_данных_аргумента"
 
-#: sql_help.c:2072 sql_help.c:2094 sql_help.c:2102
+#: sql_help.c:2077 sql_help.c:2099 sql_help.c:2107
 msgid "sfunc"
 msgstr "функция_состояния"
 
-#: sql_help.c:2073 sql_help.c:2095 sql_help.c:2103
+#: sql_help.c:2078 sql_help.c:2100 sql_help.c:2108
 msgid "state_data_type"
 msgstr "тип_данных_состояния"
 
-#: sql_help.c:2074 sql_help.c:2096 sql_help.c:2104
+#: sql_help.c:2079 sql_help.c:2101 sql_help.c:2109
 msgid "state_data_size"
 msgstr "размер_данных_состояния"
 
-#: sql_help.c:2075 sql_help.c:2097 sql_help.c:2105
+#: sql_help.c:2080 sql_help.c:2102 sql_help.c:2110
 msgid "ffunc"
 msgstr "функция_завершения"
 
-#: sql_help.c:2076 sql_help.c:2106
+#: sql_help.c:2081 sql_help.c:2111
 msgid "combinefunc"
 msgstr "комбинирующая_функция"
 
-#: sql_help.c:2077 sql_help.c:2107
+#: sql_help.c:2082 sql_help.c:2112
 msgid "serialfunc"
 msgstr "функция_сериализации"
 
-#: sql_help.c:2078 sql_help.c:2108
+#: sql_help.c:2083 sql_help.c:2113
 msgid "deserialfunc"
 msgstr "функция_десериализации"
 
-#: sql_help.c:2079 sql_help.c:2098 sql_help.c:2109
+#: sql_help.c:2084 sql_help.c:2103 sql_help.c:2114
 msgid "initial_condition"
 msgstr "начальное_условие"
 
-#: sql_help.c:2080 sql_help.c:2110
+#: sql_help.c:2085 sql_help.c:2115
 msgid "msfunc"
 msgstr "функция_состояния_движ"
 
-#: sql_help.c:2081 sql_help.c:2111
+#: sql_help.c:2086 sql_help.c:2116
 msgid "minvfunc"
 msgstr "обратная_функция_движ"
 
-#: sql_help.c:2082 sql_help.c:2112
+#: sql_help.c:2087 sql_help.c:2117
 msgid "mstate_data_type"
 msgstr "тип_данных_состояния_движ"
 
-#: sql_help.c:2083 sql_help.c:2113
+#: sql_help.c:2088 sql_help.c:2118
 msgid "mstate_data_size"
 msgstr "размер_данных_состояния_движ"
 
-#: sql_help.c:2084 sql_help.c:2114
+#: sql_help.c:2089 sql_help.c:2119
 msgid "mffunc"
 msgstr "функция_завершения_движ"
 
-#: sql_help.c:2085 sql_help.c:2115
+#: sql_help.c:2090 sql_help.c:2120
 msgid "minitial_condition"
 msgstr "начальное_условие_движ"
 
-#: sql_help.c:2086 sql_help.c:2116
+#: sql_help.c:2091 sql_help.c:2121
 msgid "sort_operator"
 msgstr "оператор_сортировки"
 
-#: sql_help.c:2099
+#: sql_help.c:2104
 msgid "or the old syntax"
 msgstr "или старый синтаксис"
 
-#: sql_help.c:2101
+#: sql_help.c:2106
 msgid "base_type"
 msgstr "базовый_тип"
 
-#: sql_help.c:2159 sql_help.c:2208
+#: sql_help.c:2164 sql_help.c:2213
 msgid "locale"
 msgstr "код_локали"
 
-#: sql_help.c:2160 sql_help.c:2209
+#: sql_help.c:2165 sql_help.c:2214
 msgid "lc_collate"
 msgstr "код_правила_сортировки"
 
-#: sql_help.c:2161 sql_help.c:2210
+#: sql_help.c:2166 sql_help.c:2215
 msgid "lc_ctype"
 msgstr "код_классификации_символов"
 
-#: sql_help.c:2162 sql_help.c:4462
+#: sql_help.c:2167 sql_help.c:4474
 msgid "provider"
 msgstr "провайдер"
 
-#: sql_help.c:2164
+#: sql_help.c:2169
 msgid "rules"
 msgstr "правила"
 
-#: sql_help.c:2165 sql_help.c:2270
+#: sql_help.c:2170 sql_help.c:2275
 msgid "version"
 msgstr "версия"
 
-#: sql_help.c:2167
+#: sql_help.c:2172
 msgid "existing_collation"
 msgstr "существующее_правило_сортировки"
 
-#: sql_help.c:2177
+#: sql_help.c:2182
 msgid "source_encoding"
 msgstr "исходная_кодировка"
 
-#: sql_help.c:2178
+#: sql_help.c:2183
 msgid "dest_encoding"
 msgstr "целевая_кодировка"
 
-#: sql_help.c:2205 sql_help.c:3046
+#: sql_help.c:2210 sql_help.c:3054
 msgid "template"
 msgstr "шаблон"
 
-#: sql_help.c:2206
+#: sql_help.c:2211
 msgid "encoding"
 msgstr "кодировка"
 
-#: sql_help.c:2207
+#: sql_help.c:2212
 msgid "strategy"
 msgstr "стратегия"
 
-#: sql_help.c:2211
+#: sql_help.c:2216
 msgid "icu_locale"
 msgstr "локаль_icu"
 
-#: sql_help.c:2212
+#: sql_help.c:2217
 msgid "icu_rules"
 msgstr "правила_icu"
 
-#: sql_help.c:2213
+#: sql_help.c:2218
 msgid "locale_provider"
 msgstr "провайдер_локали"
 
-#: sql_help.c:2214
+#: sql_help.c:2219
 msgid "collation_version"
 msgstr "версия_правила_сортировки"
 
-#: sql_help.c:2219
+#: sql_help.c:2224
 msgid "oid"
 msgstr "oid"
 
-#: sql_help.c:2239
+#: sql_help.c:2244
 msgid "constraint"
 msgstr "ограничение"
 
-#: sql_help.c:2240
+#: sql_help.c:2245
 msgid "where constraint is:"
 msgstr "где ограничение:"
 
-#: sql_help.c:2254 sql_help.c:2691 sql_help.c:3119
+#: sql_help.c:2259 sql_help.c:2696 sql_help.c:3127
 msgid "event"
 msgstr "событие"
 
-#: sql_help.c:2255
+#: sql_help.c:2260
 msgid "filter_variable"
 msgstr "переменная_фильтра"
 
-#: sql_help.c:2256
+#: sql_help.c:2261
 msgid "filter_value"
 msgstr "значение_фильтра"
 
-#: sql_help.c:2352 sql_help.c:2938
+#: sql_help.c:2357 sql_help.c:2943
 msgid "where column_constraint is:"
 msgstr "где ограничение_столбца:"
 
-#: sql_help.c:2397
+#: sql_help.c:2402
 msgid "rettype"
 msgstr "тип_возврата"
 
-#: sql_help.c:2399
+#: sql_help.c:2404
 msgid "column_type"
 msgstr "тип_столбца"
 
-#: sql_help.c:2408 sql_help.c:2611
+#: sql_help.c:2413 sql_help.c:2616
 msgid "definition"
 msgstr "определение"
 
-#: sql_help.c:2409 sql_help.c:2612
+#: sql_help.c:2414 sql_help.c:2617
 msgid "obj_file"
 msgstr "объектный_файл"
 
-#: sql_help.c:2410 sql_help.c:2613
+#: sql_help.c:2415 sql_help.c:2618
 msgid "link_symbol"
 msgstr "символ_в_экспорте"
 
-#: sql_help.c:2411 sql_help.c:2614
+#: sql_help.c:2416 sql_help.c:2619
 msgid "sql_body"
 msgstr "тело_sql"
 
-#: sql_help.c:2449 sql_help.c:2676 sql_help.c:3242
+#: sql_help.c:2454 sql_help.c:2681 sql_help.c:3250
 msgid "uid"
 msgstr "uid"
 
-#: sql_help.c:2465 sql_help.c:2506 sql_help.c:2907 sql_help.c:2920
-#: sql_help.c:2934 sql_help.c:3002
+#: sql_help.c:2470 sql_help.c:2511 sql_help.c:2912 sql_help.c:2925
+#: sql_help.c:2939 sql_help.c:3010
 msgid "method"
 msgstr "метод"
 
-#: sql_help.c:2470
-msgid "opclass_parameter"
-msgstr "параметр_класса_оп"
-
-#: sql_help.c:2487
+#: sql_help.c:2492
 msgid "call_handler"
 msgstr "обработчик_вызова"
 
-#: sql_help.c:2488
+#: sql_help.c:2493
 msgid "inline_handler"
 msgstr "обработчик_внедрённого_кода"
 
-#: sql_help.c:2489
+#: sql_help.c:2494
 msgid "valfunction"
 msgstr "функция_проверки"
 
-#: sql_help.c:2528
+#: sql_help.c:2533
 msgid "com_op"
 msgstr "коммут_оператор"
 
-#: sql_help.c:2529
+#: sql_help.c:2534
 msgid "neg_op"
 msgstr "обратный_оператор"
 
-#: sql_help.c:2547
+#: sql_help.c:2552
 msgid "family_name"
 msgstr "имя_семейства"
 
-#: sql_help.c:2558
+#: sql_help.c:2563
 msgid "storage_type"
 msgstr "тип_хранения"
 
-#: sql_help.c:2697 sql_help.c:3126
+#: sql_help.c:2702 sql_help.c:3134
 msgid "where event can be one of:"
 msgstr "где допустимое событие:"
 
-#: sql_help.c:2717 sql_help.c:2719
+#: sql_help.c:2722 sql_help.c:2724
 msgid "schema_element"
 msgstr "элемент_схемы"
 
-#: sql_help.c:2756
+#: sql_help.c:2761
 msgid "server_type"
 msgstr "тип_сервера"
 
-#: sql_help.c:2757
+#: sql_help.c:2762
 msgid "server_version"
 msgstr "версия_сервера"
 
-#: sql_help.c:2758 sql_help.c:3907 sql_help.c:4359
+#: sql_help.c:2763 sql_help.c:3915 sql_help.c:4371
 msgid "fdw_name"
 msgstr "имя_обёртки_сторонних_данных"
 
-#: sql_help.c:2775 sql_help.c:2778
+#: sql_help.c:2780 sql_help.c:2783
 msgid "statistics_name"
 msgstr "имя_статистики"
 
-#: sql_help.c:2779
+#: sql_help.c:2784
 msgid "statistics_kind"
 msgstr "вид_статистики"
 
-#: sql_help.c:2795
+#: sql_help.c:2800
 msgid "subscription_name"
 msgstr "имя_подписки"
 
-#: sql_help.c:2900
+#: sql_help.c:2905
 msgid "source_table"
 msgstr "исходная_таблица"
 
-#: sql_help.c:2901
+#: sql_help.c:2906
 msgid "like_option"
 msgstr "параметр_порождения"
 
-#: sql_help.c:2967
+#: sql_help.c:2972
 msgid "and like_option is:"
 msgstr "и параметр_порождения:"
 
-#: sql_help.c:3019
+#: sql_help.c:3027
 msgid "directory"
 msgstr "каталог"
 
-#: sql_help.c:3033
+#: sql_help.c:3041
 msgid "parser_name"
 msgstr "имя_анализатора"
 
-#: sql_help.c:3034
+#: sql_help.c:3042
 msgid "source_config"
 msgstr "исходная_конфигурация"
 
-#: sql_help.c:3063
+#: sql_help.c:3071
 msgid "start_function"
 msgstr "функция_начала"
 
-#: sql_help.c:3064
+#: sql_help.c:3072
 msgid "gettoken_function"
 msgstr "функция_выдачи_фрагмента"
 
-#: sql_help.c:3065
+#: sql_help.c:3073
 msgid "end_function"
 msgstr "функция_окончания"
 
-#: sql_help.c:3066
+#: sql_help.c:3074
 msgid "lextypes_function"
 msgstr "функция_лекс_типов"
 
-#: sql_help.c:3067
+#: sql_help.c:3075
 msgid "headline_function"
 msgstr "функция_создания_выдержек"
 
-#: sql_help.c:3079
+#: sql_help.c:3087
 msgid "init_function"
 msgstr "функция_инициализации"
 
-#: sql_help.c:3080
+#: sql_help.c:3088
 msgid "lexize_function"
 msgstr "функция_выделения_лексем"
 
-#: sql_help.c:3093
+#: sql_help.c:3101
 msgid "from_sql_function_name"
 msgstr "имя_функции_из_sql"
 
-#: sql_help.c:3095
+#: sql_help.c:3103
 msgid "to_sql_function_name"
 msgstr "имя_функции_в_sql"
 
-#: sql_help.c:3121
+#: sql_help.c:3129
 msgid "referenced_table_name"
 msgstr "ссылающаяся_таблица"
 
-#: sql_help.c:3122
+#: sql_help.c:3130
 msgid "transition_relation_name"
 msgstr "имя_переходного_отношения"
 
-#: sql_help.c:3125
+#: sql_help.c:3133
 msgid "arguments"
 msgstr "аргументы"
 
-#: sql_help.c:3177
+#: sql_help.c:3185
 msgid "label"
 msgstr "метка"
 
-#: sql_help.c:3179
+#: sql_help.c:3187
 msgid "subtype"
 msgstr "подтип"
 
-#: sql_help.c:3180
+#: sql_help.c:3188
 msgid "subtype_operator_class"
 msgstr "класс_оператора_подтипа"
 
-#: sql_help.c:3182
+#: sql_help.c:3190
 msgid "canonical_function"
 msgstr "каноническая_функция"
 
-#: sql_help.c:3183
+#: sql_help.c:3191
 msgid "subtype_diff_function"
 msgstr "функция_различий_подтипа"
 
-#: sql_help.c:3184
+#: sql_help.c:3192
 msgid "multirange_type_name"
 msgstr "имя_мультидиапазонного_типа"
 
-#: sql_help.c:3186
+#: sql_help.c:3194
 msgid "input_function"
 msgstr "функция_ввода"
 
-#: sql_help.c:3187
+#: sql_help.c:3195
 msgid "output_function"
 msgstr "функция_вывода"
 
-#: sql_help.c:3188
+#: sql_help.c:3196
 msgid "receive_function"
 msgstr "функция_получения"
 
-#: sql_help.c:3189
+#: sql_help.c:3197
 msgid "send_function"
 msgstr "функция_отправки"
 
-#: sql_help.c:3190
+#: sql_help.c:3198
 msgid "type_modifier_input_function"
 msgstr "функция_ввода_модификатора_типа"
 
-#: sql_help.c:3191
+#: sql_help.c:3199
 msgid "type_modifier_output_function"
 msgstr "функция_вывода_модификатора_типа"
 
-#: sql_help.c:3192
+#: sql_help.c:3200
 msgid "analyze_function"
 msgstr "функция_анализа"
 
-#: sql_help.c:3193
+#: sql_help.c:3201
 msgid "subscript_function"
 msgstr "функция_обращения_по_индексу"
 
-#: sql_help.c:3194
+#: sql_help.c:3202
 msgid "internallength"
 msgstr "внутр_длина"
 
-#: sql_help.c:3195
+#: sql_help.c:3203
 msgid "alignment"
 msgstr "выравнивание"
 
-#: sql_help.c:3196
+#: sql_help.c:3204
 msgid "storage"
 msgstr "хранение"
 
-#: sql_help.c:3197
+#: sql_help.c:3205
 msgid "like_type"
 msgstr "тип_образец"
 
-#: sql_help.c:3198
+#: sql_help.c:3206
 msgid "category"
 msgstr "категория"
 
-#: sql_help.c:3199
+#: sql_help.c:3207
 msgid "preferred"
 msgstr "предпочитаемый"
 
-#: sql_help.c:3200
+#: sql_help.c:3208
 msgid "default"
 msgstr "по_умолчанию"
 
-#: sql_help.c:3201
+#: sql_help.c:3209
 msgid "element"
 msgstr "элемент"
 
-#: sql_help.c:3202
+#: sql_help.c:3210
 msgid "delimiter"
 msgstr "разделитель"
 
-#: sql_help.c:3203
+#: sql_help.c:3211
 msgid "collatable"
 msgstr "сортируемый"
 
-#: sql_help.c:3300 sql_help.c:3986 sql_help.c:4076 sql_help.c:4559
-#: sql_help.c:4661 sql_help.c:4816 sql_help.c:4929 sql_help.c:5062
+#: sql_help.c:3308 sql_help.c:3994 sql_help.c:4086 sql_help.c:4571
+#: sql_help.c:4673 sql_help.c:4828 sql_help.c:4941 sql_help.c:5074
 msgid "with_query"
 msgstr "запрос_WITH"
 
-#: sql_help.c:3302 sql_help.c:3988 sql_help.c:4578 sql_help.c:4584
-#: sql_help.c:4587 sql_help.c:4591 sql_help.c:4595 sql_help.c:4603
-#: sql_help.c:4835 sql_help.c:4841 sql_help.c:4844 sql_help.c:4848
-#: sql_help.c:4852 sql_help.c:4860 sql_help.c:4931 sql_help.c:5081
-#: sql_help.c:5087 sql_help.c:5090 sql_help.c:5094 sql_help.c:5098
-#: sql_help.c:5106
+#: sql_help.c:3310 sql_help.c:3996 sql_help.c:4590 sql_help.c:4596
+#: sql_help.c:4599 sql_help.c:4603 sql_help.c:4607 sql_help.c:4615
+#: sql_help.c:4847 sql_help.c:4853 sql_help.c:4856 sql_help.c:4860
+#: sql_help.c:4864 sql_help.c:4872 sql_help.c:4943 sql_help.c:5093
+#: sql_help.c:5099 sql_help.c:5102 sql_help.c:5106 sql_help.c:5110
+#: sql_help.c:5118
 msgid "alias"
 msgstr "псевдоним"
 
-#: sql_help.c:3303 sql_help.c:4563 sql_help.c:4605 sql_help.c:4607
-#: sql_help.c:4611 sql_help.c:4613 sql_help.c:4614 sql_help.c:4615
-#: sql_help.c:4666 sql_help.c:4820 sql_help.c:4862 sql_help.c:4864
-#: sql_help.c:4868 sql_help.c:4870 sql_help.c:4871 sql_help.c:4872
-#: sql_help.c:4938 sql_help.c:5066 sql_help.c:5108 sql_help.c:5110
-#: sql_help.c:5114 sql_help.c:5116 sql_help.c:5117 sql_help.c:5118
+#: sql_help.c:3311 sql_help.c:4575 sql_help.c:4617 sql_help.c:4619
+#: sql_help.c:4623 sql_help.c:4625 sql_help.c:4626 sql_help.c:4627
+#: sql_help.c:4678 sql_help.c:4832 sql_help.c:4874 sql_help.c:4876
+#: sql_help.c:4880 sql_help.c:4882 sql_help.c:4883 sql_help.c:4884
+#: sql_help.c:4950 sql_help.c:5078 sql_help.c:5120 sql_help.c:5122
+#: sql_help.c:5126 sql_help.c:5128 sql_help.c:5129 sql_help.c:5130
 msgid "from_item"
 msgstr "источник_данных"
 
-#: sql_help.c:3305 sql_help.c:3788 sql_help.c:4126 sql_help.c:4940
+#: sql_help.c:3313 sql_help.c:3796 sql_help.c:4138 sql_help.c:4952
 msgid "cursor_name"
 msgstr "имя_курсора"
 
-#: sql_help.c:3306 sql_help.c:3994 sql_help.c:4941
+#: sql_help.c:3314 sql_help.c:4002 sql_help.c:4953
 msgid "output_expression"
 msgstr "выражение_результата"
 
-#: sql_help.c:3307 sql_help.c:3995 sql_help.c:4562 sql_help.c:4664
-#: sql_help.c:4819 sql_help.c:4942 sql_help.c:5065
+#: sql_help.c:3315 sql_help.c:4003 sql_help.c:4574 sql_help.c:4676
+#: sql_help.c:4831 sql_help.c:4954 sql_help.c:5077
 msgid "output_name"
 msgstr "имя_результата"
 
-#: sql_help.c:3323
+#: sql_help.c:3331
 msgid "code"
 msgstr "внедрённый_код"
 
-#: sql_help.c:3728
+#: sql_help.c:3736
 msgid "parameter"
 msgstr "параметр"
 
-#: sql_help.c:3751 sql_help.c:3752 sql_help.c:4151
+#: sql_help.c:3759 sql_help.c:3760 sql_help.c:4163
 msgid "statement"
 msgstr "оператор"
 
-#: sql_help.c:3787 sql_help.c:4125
+#: sql_help.c:3795 sql_help.c:4137
 msgid "direction"
 msgstr "направление"
 
-#: sql_help.c:3789 sql_help.c:4127
+#: sql_help.c:3797 sql_help.c:4139
 msgid "where direction can be one of:"
 msgstr "где допустимое направление:"
 
-#: sql_help.c:3790 sql_help.c:3791 sql_help.c:3792 sql_help.c:3793
-#: sql_help.c:3794 sql_help.c:4128 sql_help.c:4129 sql_help.c:4130
-#: sql_help.c:4131 sql_help.c:4132 sql_help.c:4572 sql_help.c:4574
-#: sql_help.c:4675 sql_help.c:4677 sql_help.c:4829 sql_help.c:4831
-#: sql_help.c:5006 sql_help.c:5008 sql_help.c:5075 sql_help.c:5077
+#: sql_help.c:3798 sql_help.c:3799 sql_help.c:3800 sql_help.c:3801
+#: sql_help.c:3802 sql_help.c:4140 sql_help.c:4141 sql_help.c:4142
+#: sql_help.c:4143 sql_help.c:4144 sql_help.c:4584 sql_help.c:4586
+#: sql_help.c:4687 sql_help.c:4689 sql_help.c:4841 sql_help.c:4843
+#: sql_help.c:5018 sql_help.c:5020 sql_help.c:5087 sql_help.c:5089
 msgid "count"
 msgstr "число"
 
-#: sql_help.c:3897 sql_help.c:4349
+#: sql_help.c:3905 sql_help.c:4361
 msgid "sequence_name"
 msgstr "имя_последовательности"
 
-#: sql_help.c:3915 sql_help.c:4367
+#: sql_help.c:3923 sql_help.c:4379
 msgid "arg_name"
 msgstr "имя_аргумента"
 
-#: sql_help.c:3916 sql_help.c:4368
+#: sql_help.c:3924 sql_help.c:4380
 msgid "arg_type"
 msgstr "тип_аргумента"
 
-#: sql_help.c:3923 sql_help.c:4375
+#: sql_help.c:3931 sql_help.c:4387
 msgid "loid"
 msgstr "код_БО"
 
-#: sql_help.c:3954
+#: sql_help.c:3962
 msgid "remote_schema"
 msgstr "удалённая_схема"
 
-#: sql_help.c:3957
+#: sql_help.c:3965
 msgid "local_schema"
 msgstr "локальная_схема"
 
-#: sql_help.c:3992
+#: sql_help.c:4000
 msgid "conflict_target"
 msgstr "объект_конфликта"
 
-#: sql_help.c:3993
+#: sql_help.c:4001
 msgid "conflict_action"
 msgstr "действие_при_конфликте"
 
-#: sql_help.c:3996
+#: sql_help.c:4004
 msgid "where conflict_target can be one of:"
 msgstr "где допустимый объект_конфликта:"
 
-#: sql_help.c:3997
+#: sql_help.c:4005
 msgid "index_column_name"
 msgstr "имя_столбца_индекса"
 
-#: sql_help.c:3998
+#: sql_help.c:4006
 msgid "index_expression"
 msgstr "выражение_индекса"
 
-#: sql_help.c:4001
+#: sql_help.c:4009
 msgid "index_predicate"
 msgstr "предикат_индекса"
 
-#: sql_help.c:4003
+#: sql_help.c:4011
 msgid "and conflict_action is one of:"
 msgstr "а допустимое действие_при_конфликте:"
 
-#: sql_help.c:4009 sql_help.c:4937
+#: sql_help.c:4017 sql_help.c:4111 sql_help.c:4949
 msgid "sub-SELECT"
 msgstr "вложенный_SELECT"
 
-#: sql_help.c:4018 sql_help.c:4140 sql_help.c:4913
+#: sql_help.c:4026 sql_help.c:4152 sql_help.c:4925
 msgid "channel"
 msgstr "канал"
 
-#: sql_help.c:4040
+#: sql_help.c:4048
 msgid "lockmode"
 msgstr "режим_блокировки"
 
-#: sql_help.c:4041
+#: sql_help.c:4049
 msgid "where lockmode is one of:"
 msgstr "где допустимый режим_блокировки:"
 
-#: sql_help.c:4077
+#: sql_help.c:4087
 msgid "target_table_name"
 msgstr "имя_целевой_таблицы"
 
-#: sql_help.c:4078
+#: sql_help.c:4088
 msgid "target_alias"
 msgstr "псевдоним_назначения"
 
-#: sql_help.c:4079
+#: sql_help.c:4089
 msgid "data_source"
 msgstr "источник_данных"
 
-#: sql_help.c:4080 sql_help.c:4608 sql_help.c:4865 sql_help.c:5111
+#: sql_help.c:4090 sql_help.c:4620 sql_help.c:4877 sql_help.c:5123
 msgid "join_condition"
 msgstr "условие_соединения"
 
-#: sql_help.c:4081
+#: sql_help.c:4091
 msgid "when_clause"
 msgstr "предложение_when"
 
-#: sql_help.c:4082
+#: sql_help.c:4092
 msgid "where data_source is:"
 msgstr "где источник_данных:"
 
-#: sql_help.c:4083
+#: sql_help.c:4093
 msgid "source_table_name"
 msgstr "имя_исходной_таблицы"
 
-#: sql_help.c:4084
+#: sql_help.c:4094
 msgid "source_query"
 msgstr "исходный_запрос"
 
-#: sql_help.c:4085
+#: sql_help.c:4095
 msgid "source_alias"
 msgstr "псевдоним_источника"
 
-#: sql_help.c:4086
+#: sql_help.c:4096
 msgid "and when_clause is:"
 msgstr "и предложение_when:"
 
-#: sql_help.c:4088
+#: sql_help.c:4098
 msgid "merge_update"
 msgstr "merge_update"
 
-#: sql_help.c:4089
+#: sql_help.c:4099
 msgid "merge_delete"
 msgstr "merge_delete"
 
-#: sql_help.c:4091
+#: sql_help.c:4101
 msgid "merge_insert"
 msgstr "merge_insert"
 
-#: sql_help.c:4092
+#: sql_help.c:4102
 msgid "and merge_insert is:"
 msgstr "и merge_insert:"
 
-#: sql_help.c:4095
+#: sql_help.c:4105
 msgid "and merge_update is:"
 msgstr "и merge_update:"
 
-#: sql_help.c:4100
+#: sql_help.c:4112
 msgid "and merge_delete is:"
 msgstr "и merge_delete:"
 
-#: sql_help.c:4141
+#: sql_help.c:4153
 msgid "payload"
 msgstr "сообщение_нагрузка"
 
-#: sql_help.c:4168
+#: sql_help.c:4180
 msgid "old_role"
 msgstr "старая_роль"
 
-#: sql_help.c:4169
+#: sql_help.c:4181
 msgid "new_role"
 msgstr "новая_роль"
 
-#: sql_help.c:4208 sql_help.c:4417 sql_help.c:4425
+#: sql_help.c:4220 sql_help.c:4429 sql_help.c:4437
 msgid "savepoint_name"
 msgstr "имя_точки_сохранения"
 
-#: sql_help.c:4565 sql_help.c:4623 sql_help.c:4822 sql_help.c:4880
-#: sql_help.c:5068 sql_help.c:5126
+#: sql_help.c:4577 sql_help.c:4635 sql_help.c:4834 sql_help.c:4892
+#: sql_help.c:5080 sql_help.c:5138
 msgid "grouping_element"
 msgstr "элемент_группирования"
 
-#: sql_help.c:4567 sql_help.c:4670 sql_help.c:4824 sql_help.c:5070
+#: sql_help.c:4579 sql_help.c:4682 sql_help.c:4836 sql_help.c:5082
 msgid "window_name"
 msgstr "имя_окна"
 
-#: sql_help.c:4568 sql_help.c:4671 sql_help.c:4825 sql_help.c:5071
+#: sql_help.c:4580 sql_help.c:4683 sql_help.c:4837 sql_help.c:5083
 msgid "window_definition"
 msgstr "определение_окна"
 
-#: sql_help.c:4569 sql_help.c:4583 sql_help.c:4627 sql_help.c:4672
-#: sql_help.c:4826 sql_help.c:4840 sql_help.c:4884 sql_help.c:5072
-#: sql_help.c:5086 sql_help.c:5130
+#: sql_help.c:4581 sql_help.c:4595 sql_help.c:4639 sql_help.c:4684
+#: sql_help.c:4838 sql_help.c:4852 sql_help.c:4896 sql_help.c:5084
+#: sql_help.c:5098 sql_help.c:5142
 msgid "select"
 msgstr "select"
 
-#: sql_help.c:4576 sql_help.c:4833 sql_help.c:5079
+#: sql_help.c:4588 sql_help.c:4845 sql_help.c:5091
 msgid "where from_item can be one of:"
 msgstr "где допустимый источник_данных:"
 
-#: sql_help.c:4579 sql_help.c:4585 sql_help.c:4588 sql_help.c:4592
-#: sql_help.c:4604 sql_help.c:4836 sql_help.c:4842 sql_help.c:4845
-#: sql_help.c:4849 sql_help.c:4861 sql_help.c:5082 sql_help.c:5088
-#: sql_help.c:5091 sql_help.c:5095 sql_help.c:5107
+#: sql_help.c:4591 sql_help.c:4597 sql_help.c:4600 sql_help.c:4604
+#: sql_help.c:4616 sql_help.c:4848 sql_help.c:4854 sql_help.c:4857
+#: sql_help.c:4861 sql_help.c:4873 sql_help.c:5094 sql_help.c:5100
+#: sql_help.c:5103 sql_help.c:5107 sql_help.c:5119
 msgid "column_alias"
 msgstr "псевдоним_столбца"
 
-#: sql_help.c:4580 sql_help.c:4837 sql_help.c:5083
+#: sql_help.c:4592 sql_help.c:4849 sql_help.c:5095
 msgid "sampling_method"
 msgstr "метод_выборки"
 
-#: sql_help.c:4582 sql_help.c:4839 sql_help.c:5085
+#: sql_help.c:4594 sql_help.c:4851 sql_help.c:5097
 msgid "seed"
 msgstr "начальное_число"
 
-#: sql_help.c:4586 sql_help.c:4625 sql_help.c:4843 sql_help.c:4882
-#: sql_help.c:5089 sql_help.c:5128
+#: sql_help.c:4598 sql_help.c:4637 sql_help.c:4855 sql_help.c:4894
+#: sql_help.c:5101 sql_help.c:5140
 msgid "with_query_name"
 msgstr "имя_запроса_WITH"
 
-#: sql_help.c:4596 sql_help.c:4599 sql_help.c:4602 sql_help.c:4853
-#: sql_help.c:4856 sql_help.c:4859 sql_help.c:5099 sql_help.c:5102
-#: sql_help.c:5105
+#: sql_help.c:4608 sql_help.c:4611 sql_help.c:4614 sql_help.c:4865
+#: sql_help.c:4868 sql_help.c:4871 sql_help.c:5111 sql_help.c:5114
+#: sql_help.c:5117
 msgid "column_definition"
 msgstr "определение_столбца"
 
-#: sql_help.c:4606 sql_help.c:4612 sql_help.c:4863 sql_help.c:4869
-#: sql_help.c:5109 sql_help.c:5115
+#: sql_help.c:4618 sql_help.c:4624 sql_help.c:4875 sql_help.c:4881
+#: sql_help.c:5121 sql_help.c:5127
 msgid "join_type"
 msgstr "тип_соединения"
 
-#: sql_help.c:4609 sql_help.c:4866 sql_help.c:5112
+#: sql_help.c:4621 sql_help.c:4878 sql_help.c:5124
 msgid "join_column"
 msgstr "столбец_соединения"
 
-#: sql_help.c:4610 sql_help.c:4867 sql_help.c:5113
+#: sql_help.c:4622 sql_help.c:4879 sql_help.c:5125
 msgid "join_using_alias"
 msgstr "псевдоним_использования_соединения"
 
-#: sql_help.c:4616 sql_help.c:4873 sql_help.c:5119
+#: sql_help.c:4628 sql_help.c:4885 sql_help.c:5131
 msgid "and grouping_element can be one of:"
 msgstr "где допустимый элемент_группирования:"
 
-#: sql_help.c:4624 sql_help.c:4881 sql_help.c:5127
+#: sql_help.c:4636 sql_help.c:4893 sql_help.c:5139
 msgid "and with_query is:"
 msgstr "и запрос_WITH:"
 
-#: sql_help.c:4628 sql_help.c:4885 sql_help.c:5131
+#: sql_help.c:4640 sql_help.c:4897 sql_help.c:5143
 msgid "values"
 msgstr "значения"
 
-#: sql_help.c:4629 sql_help.c:4886 sql_help.c:5132
+#: sql_help.c:4641 sql_help.c:4898 sql_help.c:5144
 msgid "insert"
 msgstr "insert"
 
-#: sql_help.c:4630 sql_help.c:4887 sql_help.c:5133
+#: sql_help.c:4642 sql_help.c:4899 sql_help.c:5145
 msgid "update"
 msgstr "update"
 
-#: sql_help.c:4631 sql_help.c:4888 sql_help.c:5134
+#: sql_help.c:4643 sql_help.c:4900 sql_help.c:5146
 msgid "delete"
 msgstr "delete"
 
-#: sql_help.c:4633 sql_help.c:4890 sql_help.c:5136
+#: sql_help.c:4645 sql_help.c:4902 sql_help.c:5148
 msgid "search_seq_col_name"
 msgstr "имя_столбца_послед_поиска"
 
-#: sql_help.c:4635 sql_help.c:4892 sql_help.c:5138
+#: sql_help.c:4647 sql_help.c:4904 sql_help.c:5150
 msgid "cycle_mark_col_name"
 msgstr "имя_столбца_пометки_цикла"
 
-#: sql_help.c:4636 sql_help.c:4893 sql_help.c:5139
+#: sql_help.c:4648 sql_help.c:4905 sql_help.c:5151
 msgid "cycle_mark_value"
 msgstr "значение_пометки_цикла"
 
-#: sql_help.c:4637 sql_help.c:4894 sql_help.c:5140
+#: sql_help.c:4649 sql_help.c:4906 sql_help.c:5152
 msgid "cycle_mark_default"
 msgstr "пометка_цикла_по_умолчанию"
 
-#: sql_help.c:4638 sql_help.c:4895 sql_help.c:5141
+#: sql_help.c:4650 sql_help.c:4907 sql_help.c:5153
 msgid "cycle_path_col_name"
 msgstr "имя_столбца_пути_цикла"
 
-#: sql_help.c:4665
+#: sql_help.c:4677
 msgid "new_table"
 msgstr "новая_таблица"
 
-#: sql_help.c:4736
+#: sql_help.c:4748
 msgid "snapshot_id"
 msgstr "код_снимка"
 
-#: sql_help.c:5004
+#: sql_help.c:5016
 msgid "sort_expression"
 msgstr "выражение_сортировки"
 
-#: sql_help.c:5148 sql_help.c:6132
+#: sql_help.c:5160 sql_help.c:6144
 msgid "abort the current transaction"
 msgstr "прервать текущую транзакцию"
 
-#: sql_help.c:5154
+#: sql_help.c:5166
 msgid "change the definition of an aggregate function"
 msgstr "изменить определение агрегатной функции"
 
-#: sql_help.c:5160
+#: sql_help.c:5172
 msgid "change the definition of a collation"
 msgstr "изменить определение правила сортировки"
 
-#: sql_help.c:5166
+#: sql_help.c:5178
 msgid "change the definition of a conversion"
 msgstr "изменить определение преобразования"
 
-#: sql_help.c:5172
+#: sql_help.c:5184
 msgid "change a database"
 msgstr "изменить атрибуты базы данных"
 
-#: sql_help.c:5178
+#: sql_help.c:5190
 msgid "define default access privileges"
 msgstr "определить права доступа по умолчанию"
 
-#: sql_help.c:5184
+#: sql_help.c:5196
 msgid "change the definition of a domain"
 msgstr "изменить определение домена"
 
-#: sql_help.c:5190
+#: sql_help.c:5202
 msgid "change the definition of an event trigger"
 msgstr "изменить определение событийного триггера"
 
-#: sql_help.c:5196
+#: sql_help.c:5208
 msgid "change the definition of an extension"
 msgstr "изменить определение расширения"
 
-#: sql_help.c:5202
+#: sql_help.c:5214
 msgid "change the definition of a foreign-data wrapper"
 msgstr "изменить определение обёртки сторонних данных"
 
-#: sql_help.c:5208
+#: sql_help.c:5220
 msgid "change the definition of a foreign table"
 msgstr "изменить определение сторонней таблицы"
 
-#: sql_help.c:5214
+#: sql_help.c:5226
 msgid "change the definition of a function"
 msgstr "изменить определение функции"
 
-#: sql_help.c:5220
+#: sql_help.c:5232
 msgid "change role name or membership"
 msgstr "изменить имя роли или членство"
 
-#: sql_help.c:5226
+#: sql_help.c:5238
 msgid "change the definition of an index"
 msgstr "изменить определение индекса"
 
-#: sql_help.c:5232
+#: sql_help.c:5244
 msgid "change the definition of a procedural language"
 msgstr "изменить определение процедурного языка"
 
-#: sql_help.c:5238
+#: sql_help.c:5250
 msgid "change the definition of a large object"
 msgstr "изменить определение большого объекта"
 
-#: sql_help.c:5244
+#: sql_help.c:5256
 msgid "change the definition of a materialized view"
 msgstr "изменить определение материализованного представления"
 
-#: sql_help.c:5250
+#: sql_help.c:5262
 msgid "change the definition of an operator"
 msgstr "изменить определение оператора"
 
-#: sql_help.c:5256
+#: sql_help.c:5268
 msgid "change the definition of an operator class"
 msgstr "изменить определение класса операторов"
 
-#: sql_help.c:5262
+#: sql_help.c:5274
 msgid "change the definition of an operator family"
 msgstr "изменить определение семейства операторов"
 
-#: sql_help.c:5268
+#: sql_help.c:5280
 msgid "change the definition of a row-level security policy"
 msgstr "изменить определение политики защиты на уровне строк"
 
-#: sql_help.c:5274
+#: sql_help.c:5286
 msgid "change the definition of a procedure"
 msgstr "изменить определение процедуры"
 
-#: sql_help.c:5280
+#: sql_help.c:5292
 msgid "change the definition of a publication"
 msgstr "изменить определение публикации"
 
-#: sql_help.c:5286 sql_help.c:5388
+#: sql_help.c:5298 sql_help.c:5400
 msgid "change a database role"
 msgstr "изменить роль пользователя БД"
 
-#: sql_help.c:5292
+#: sql_help.c:5304
 msgid "change the definition of a routine"
 msgstr "изменить определение подпрограммы"
 
-#: sql_help.c:5298
+#: sql_help.c:5310
 msgid "change the definition of a rule"
 msgstr "изменить определение правила"
 
-#: sql_help.c:5304
+#: sql_help.c:5316
 msgid "change the definition of a schema"
 msgstr "изменить определение схемы"
 
-#: sql_help.c:5310
+#: sql_help.c:5322
 msgid "change the definition of a sequence generator"
 msgstr "изменить определение генератора последовательности"
 
-#: sql_help.c:5316
+#: sql_help.c:5328
 msgid "change the definition of a foreign server"
 msgstr "изменить определение стороннего сервера"
 
-#: sql_help.c:5322
+#: sql_help.c:5334
 msgid "change the definition of an extended statistics object"
 msgstr "изменить определение объекта расширенной статистики"
 
-#: sql_help.c:5328
+#: sql_help.c:5340
 msgid "change the definition of a subscription"
 msgstr "изменить определение подписки"
 
-#: sql_help.c:5334
+#: sql_help.c:5346
 msgid "change a server configuration parameter"
 msgstr "изменить параметр конфигурации сервера"
 
-#: sql_help.c:5340
+#: sql_help.c:5352
 msgid "change the definition of a table"
 msgstr "изменить определение таблицы"
 
-#: sql_help.c:5346
+#: sql_help.c:5358
 msgid "change the definition of a tablespace"
 msgstr "изменить определение табличного пространства"
 
-#: sql_help.c:5352
+#: sql_help.c:5364
 msgid "change the definition of a text search configuration"
 msgstr "изменить определение конфигурации текстового поиска"
 
-#: sql_help.c:5358
+#: sql_help.c:5370
 msgid "change the definition of a text search dictionary"
 msgstr "изменить определение словаря текстового поиска"
 
-#: sql_help.c:5364
+#: sql_help.c:5376
 msgid "change the definition of a text search parser"
 msgstr "изменить определение анализатора текстового поиска"
 
-#: sql_help.c:5370
+#: sql_help.c:5382
 msgid "change the definition of a text search template"
 msgstr "изменить определение шаблона текстового поиска"
 
-#: sql_help.c:5376
+#: sql_help.c:5388
 msgid "change the definition of a trigger"
 msgstr "изменить определение триггера"
 
-#: sql_help.c:5382
+#: sql_help.c:5394
 msgid "change the definition of a type"
 msgstr "изменить определение типа"
 
-#: sql_help.c:5394
+#: sql_help.c:5406
 msgid "change the definition of a user mapping"
 msgstr "изменить сопоставление пользователей"
 
-#: sql_help.c:5400
+#: sql_help.c:5412
 msgid "change the definition of a view"
 msgstr "изменить определение представления"
 
-#: sql_help.c:5406
+#: sql_help.c:5418
 msgid "collect statistics about a database"
 msgstr "собрать статистику о базе данных"
 
-#: sql_help.c:5412 sql_help.c:6210
+#: sql_help.c:5424 sql_help.c:6222
 msgid "start a transaction block"
 msgstr "начать транзакцию"
 
-#: sql_help.c:5418
+#: sql_help.c:5430
 msgid "invoke a procedure"
 msgstr "вызвать процедуру"
 
-#: sql_help.c:5424
+#: sql_help.c:5436
 msgid "force a write-ahead log checkpoint"
 msgstr "произвести контрольную точку в журнале предзаписи"
 
-#: sql_help.c:5430
+#: sql_help.c:5442
 msgid "close a cursor"
 msgstr "закрыть курсор"
 
-#: sql_help.c:5436
+#: sql_help.c:5448
 msgid "cluster a table according to an index"
 msgstr "перегруппировать таблицу по индексу"
 
-#: sql_help.c:5442
+#: sql_help.c:5454
 msgid "define or change the comment of an object"
 msgstr "задать или изменить комментарий объекта"
 
-#: sql_help.c:5448 sql_help.c:6006
+#: sql_help.c:5460 sql_help.c:6018
 msgid "commit the current transaction"
 msgstr "зафиксировать текущую транзакцию"
 
-#: sql_help.c:5454
+#: sql_help.c:5466
 msgid "commit a transaction that was earlier prepared for two-phase commit"
 msgstr "зафиксировать транзакцию, ранее подготовленную для двухфазной фиксации"
 
-#: sql_help.c:5460
+#: sql_help.c:5472
 msgid "copy data between a file and a table"
 msgstr "импорт/экспорт данных в файл"
 
-#: sql_help.c:5466
+#: sql_help.c:5478
 msgid "define a new access method"
 msgstr "создать новый метод доступа"
 
-#: sql_help.c:5472
+#: sql_help.c:5484
 msgid "define a new aggregate function"
 msgstr "создать агрегатную функцию"
 
-#: sql_help.c:5478
+#: sql_help.c:5490
 msgid "define a new cast"
 msgstr "создать приведение типов"
 
-#: sql_help.c:5484
+#: sql_help.c:5496
 msgid "define a new collation"
 msgstr "создать правило сортировки"
 
-#: sql_help.c:5490
+#: sql_help.c:5502
 msgid "define a new encoding conversion"
 msgstr "создать преобразование кодировки"
 
-#: sql_help.c:5496
+#: sql_help.c:5508
 msgid "create a new database"
 msgstr "создать базу данных"
 
-#: sql_help.c:5502
+#: sql_help.c:5514
 msgid "define a new domain"
 msgstr "создать домен"
 
-#: sql_help.c:5508
+#: sql_help.c:5520
 msgid "define a new event trigger"
 msgstr "создать событийный триггер"
 
-#: sql_help.c:5514
+#: sql_help.c:5526
 msgid "install an extension"
 msgstr "установить расширение"
 
-#: sql_help.c:5520
+#: sql_help.c:5532
 msgid "define a new foreign-data wrapper"
 msgstr "создать обёртку сторонних данных"
 
-#: sql_help.c:5526
+#: sql_help.c:5538
 msgid "define a new foreign table"
 msgstr "создать стороннюю таблицу"
 
-#: sql_help.c:5532
+#: sql_help.c:5544
 msgid "define a new function"
 msgstr "создать функцию"
 
-#: sql_help.c:5538 sql_help.c:5598 sql_help.c:5700
+#: sql_help.c:5550 sql_help.c:5610 sql_help.c:5712
 msgid "define a new database role"
 msgstr "создать роль пользователя БД"
 
-#: sql_help.c:5544
+#: sql_help.c:5556
 msgid "define a new index"
 msgstr "создать индекс"
 
-#: sql_help.c:5550
+#: sql_help.c:5562
 msgid "define a new procedural language"
 msgstr "создать процедурный язык"
 
-#: sql_help.c:5556
+#: sql_help.c:5568
 msgid "define a new materialized view"
 msgstr "создать материализованное представление"
 
-#: sql_help.c:5562
+#: sql_help.c:5574
 msgid "define a new operator"
 msgstr "создать оператор"
 
-#: sql_help.c:5568
+#: sql_help.c:5580
 msgid "define a new operator class"
 msgstr "создать класс операторов"
 
-#: sql_help.c:5574
+#: sql_help.c:5586
 msgid "define a new operator family"
 msgstr "создать семейство операторов"
 
-#: sql_help.c:5580
+#: sql_help.c:5592
 msgid "define a new row-level security policy for a table"
 msgstr "создать новую политику защиты на уровне строк для таблицы"
 
-#: sql_help.c:5586
+#: sql_help.c:5598
 msgid "define a new procedure"
 msgstr "создать процедуру"
 
-#: sql_help.c:5592
+#: sql_help.c:5604
 msgid "define a new publication"
 msgstr "создать публикацию"
 
-#: sql_help.c:5604
+#: sql_help.c:5616
 msgid "define a new rewrite rule"
 msgstr "создать правило перезаписи"
 
-#: sql_help.c:5610
+#: sql_help.c:5622
 msgid "define a new schema"
 msgstr "создать схему"
 
-#: sql_help.c:5616
+#: sql_help.c:5628
 msgid "define a new sequence generator"
 msgstr "создать генератор последовательностей"
 
-#: sql_help.c:5622
+#: sql_help.c:5634
 msgid "define a new foreign server"
 msgstr "создать сторонний сервер"
 
-#: sql_help.c:5628
+#: sql_help.c:5640
 msgid "define extended statistics"
 msgstr "создать расширенную статистику"
 
-#: sql_help.c:5634
+#: sql_help.c:5646
 msgid "define a new subscription"
 msgstr "создать подписку"
 
-#: sql_help.c:5640
+#: sql_help.c:5652
 msgid "define a new table"
 msgstr "создать таблицу"
 
-#: sql_help.c:5646 sql_help.c:6168
+#: sql_help.c:5658 sql_help.c:6180
 msgid "define a new table from the results of a query"
 msgstr "создать таблицу из результатов запроса"
 
-#: sql_help.c:5652
+#: sql_help.c:5664
 msgid "define a new tablespace"
 msgstr "создать табличное пространство"
 
-#: sql_help.c:5658
+#: sql_help.c:5670
 msgid "define a new text search configuration"
 msgstr "создать конфигурацию текстового поиска"
 
-#: sql_help.c:5664
+#: sql_help.c:5676
 msgid "define a new text search dictionary"
 msgstr "создать словарь текстового поиска"
 
-#: sql_help.c:5670
+#: sql_help.c:5682
 msgid "define a new text search parser"
 msgstr "создать анализатор текстового поиска"
 
-#: sql_help.c:5676
+#: sql_help.c:5688
 msgid "define a new text search template"
 msgstr "создать шаблон текстового поиска"
 
-#: sql_help.c:5682
+#: sql_help.c:5694
 msgid "define a new transform"
 msgstr "создать преобразование"
 
-#: sql_help.c:5688
+#: sql_help.c:5700
 msgid "define a new trigger"
 msgstr "создать триггер"
 
-#: sql_help.c:5694
+#: sql_help.c:5706
 msgid "define a new data type"
 msgstr "создать тип данных"
 
-#: sql_help.c:5706
+#: sql_help.c:5718
 msgid "define a new mapping of a user to a foreign server"
 msgstr "создать сопоставление пользователя для стороннего сервера"
 
-#: sql_help.c:5712
+#: sql_help.c:5724
 msgid "define a new view"
 msgstr "создать представление"
 
-#: sql_help.c:5718
+#: sql_help.c:5730
 msgid "deallocate a prepared statement"
 msgstr "освободить подготовленный оператор"
 
-#: sql_help.c:5724
+#: sql_help.c:5736
 msgid "define a cursor"
 msgstr "создать курсор"
 
-#: sql_help.c:5730
+#: sql_help.c:5742
 msgid "delete rows of a table"
 msgstr "удалить записи таблицы"
 
-#: sql_help.c:5736
+#: sql_help.c:5748
 msgid "discard session state"
 msgstr "очистить состояние сеанса"
 
-#: sql_help.c:5742
+#: sql_help.c:5754
 msgid "execute an anonymous code block"
 msgstr "выполнить анонимный блок кода"
 
-#: sql_help.c:5748
+#: sql_help.c:5760
 msgid "remove an access method"
 msgstr "удалить метод доступа"
 
-#: sql_help.c:5754
+#: sql_help.c:5766
 msgid "remove an aggregate function"
 msgstr "удалить агрегатную функцию"
 
-#: sql_help.c:5760
+#: sql_help.c:5772
 msgid "remove a cast"
 msgstr "удалить приведение типа"
 
-#: sql_help.c:5766
+#: sql_help.c:5778
 msgid "remove a collation"
 msgstr "удалить правило сортировки"
 
-#: sql_help.c:5772
+#: sql_help.c:5784
 msgid "remove a conversion"
 msgstr "удалить преобразование"
 
-#: sql_help.c:5778
+#: sql_help.c:5790
 msgid "remove a database"
 msgstr "удалить базу данных"
 
-#: sql_help.c:5784
+#: sql_help.c:5796
 msgid "remove a domain"
 msgstr "удалить домен"
 
-#: sql_help.c:5790
+#: sql_help.c:5802
 msgid "remove an event trigger"
 msgstr "удалить событийный триггер"
 
-#: sql_help.c:5796
+#: sql_help.c:5808
 msgid "remove an extension"
 msgstr "удалить расширение"
 
-#: sql_help.c:5802
+#: sql_help.c:5814
 msgid "remove a foreign-data wrapper"
 msgstr "удалить обёртку сторонних данных"
 
-#: sql_help.c:5808
+#: sql_help.c:5820
 msgid "remove a foreign table"
 msgstr "удалить стороннюю таблицу"
 
-#: sql_help.c:5814
+#: sql_help.c:5826
 msgid "remove a function"
 msgstr "удалить функцию"
 
-#: sql_help.c:5820 sql_help.c:5886 sql_help.c:5988
+#: sql_help.c:5832 sql_help.c:5898 sql_help.c:6000
 msgid "remove a database role"
 msgstr "удалить роль пользователя БД"
 
-#: sql_help.c:5826
+#: sql_help.c:5838
 msgid "remove an index"
 msgstr "удалить индекс"
 
-#: sql_help.c:5832
+#: sql_help.c:5844
 msgid "remove a procedural language"
 msgstr "удалить процедурный язык"
 
-#: sql_help.c:5838
+#: sql_help.c:5850
 msgid "remove a materialized view"
 msgstr "удалить материализованное представление"
 
-#: sql_help.c:5844
+#: sql_help.c:5856
 msgid "remove an operator"
 msgstr "удалить оператор"
 
-#: sql_help.c:5850
+#: sql_help.c:5862
 msgid "remove an operator class"
 msgstr "удалить класс операторов"
 
-#: sql_help.c:5856
+#: sql_help.c:5868
 msgid "remove an operator family"
 msgstr "удалить семейство операторов"
 
-#: sql_help.c:5862
+#: sql_help.c:5874
 msgid "remove database objects owned by a database role"
 msgstr "удалить объекты базы данных, принадлежащие роли"
 
-#: sql_help.c:5868
+#: sql_help.c:5880
 msgid "remove a row-level security policy from a table"
 msgstr "удалить из таблицы политику защиты на уровне строк"
 
-#: sql_help.c:5874
+#: sql_help.c:5886
 msgid "remove a procedure"
 msgstr "удалить процедуру"
 
-#: sql_help.c:5880
+#: sql_help.c:5892
 msgid "remove a publication"
 msgstr "удалить публикацию"
 
-#: sql_help.c:5892
+#: sql_help.c:5904
 msgid "remove a routine"
 msgstr "удалить подпрограмму"
 
-#: sql_help.c:5898
+#: sql_help.c:5910
 msgid "remove a rewrite rule"
 msgstr "удалить правило перезаписи"
 
-#: sql_help.c:5904
+#: sql_help.c:5916
 msgid "remove a schema"
 msgstr "удалить схему"
 
-#: sql_help.c:5910
+#: sql_help.c:5922
 msgid "remove a sequence"
 msgstr "удалить последовательность"
 
-#: sql_help.c:5916
+#: sql_help.c:5928
 msgid "remove a foreign server descriptor"
 msgstr "удалить описание стороннего сервера"
 
-#: sql_help.c:5922
+#: sql_help.c:5934
 msgid "remove extended statistics"
 msgstr "удалить расширенную статистику"
 
-#: sql_help.c:5928
+#: sql_help.c:5940
 msgid "remove a subscription"
 msgstr "удалить подписку"
 
-#: sql_help.c:5934
+#: sql_help.c:5946
 msgid "remove a table"
 msgstr "удалить таблицу"
 
-#: sql_help.c:5940
+#: sql_help.c:5952
 msgid "remove a tablespace"
 msgstr "удалить табличное пространство"
 
-#: sql_help.c:5946
+#: sql_help.c:5958
 msgid "remove a text search configuration"
 msgstr "удалить конфигурацию текстового поиска"
 
-#: sql_help.c:5952
+#: sql_help.c:5964
 msgid "remove a text search dictionary"
 msgstr "удалить словарь текстового поиска"
 
-#: sql_help.c:5958
+#: sql_help.c:5970
 msgid "remove a text search parser"
 msgstr "удалить анализатор текстового поиска"
 
-#: sql_help.c:5964
+#: sql_help.c:5976
 msgid "remove a text search template"
 msgstr "удалить шаблон текстового поиска"
 
-#: sql_help.c:5970
+#: sql_help.c:5982
 msgid "remove a transform"
 msgstr "удалить преобразование"
 
-#: sql_help.c:5976
+#: sql_help.c:5988
 msgid "remove a trigger"
 msgstr "удалить триггер"
 
-#: sql_help.c:5982
+#: sql_help.c:5994
 msgid "remove a data type"
 msgstr "удалить тип данных"
 
-#: sql_help.c:5994
+#: sql_help.c:6006
 msgid "remove a user mapping for a foreign server"
 msgstr "удалить сопоставление пользователя для стороннего сервера"
 
-#: sql_help.c:6000
+#: sql_help.c:6012
 msgid "remove a view"
 msgstr "удалить представление"
 
-#: sql_help.c:6012
+#: sql_help.c:6024
 msgid "execute a prepared statement"
 msgstr "выполнить подготовленный оператор"
 
-#: sql_help.c:6018
+#: sql_help.c:6030
 msgid "show the execution plan of a statement"
 msgstr "показать план выполнения оператора"
 
-#: sql_help.c:6024
+#: sql_help.c:6036
 msgid "retrieve rows from a query using a cursor"
 msgstr "получить результат запроса через курсор"
 
-#: sql_help.c:6030
+#: sql_help.c:6042
 msgid "define access privileges"
 msgstr "определить права доступа"
 
-#: sql_help.c:6036
+#: sql_help.c:6048
 msgid "import table definitions from a foreign server"
 msgstr "импортировать определения таблиц со стороннего сервера"
 
-#: sql_help.c:6042
+#: sql_help.c:6054
 msgid "create new rows in a table"
 msgstr "добавить строки в таблицу"
 
-#: sql_help.c:6048
+#: sql_help.c:6060
 msgid "listen for a notification"
 msgstr "ожидать уведомления"
 
-#: sql_help.c:6054
+#: sql_help.c:6066
 msgid "load a shared library file"
 msgstr "загрузить файл разделяемой библиотеки"
 
-#: sql_help.c:6060
+#: sql_help.c:6072
 msgid "lock a table"
 msgstr "заблокировать таблицу"
 
-#: sql_help.c:6066
+#: sql_help.c:6078
 msgid "conditionally insert, update, or delete rows of a table"
 msgstr "добавление, изменение или удаление строк таблицы по условию"
 
-#: sql_help.c:6072
+#: sql_help.c:6084
 msgid "position a cursor"
 msgstr "установить курсор"
 
-#: sql_help.c:6078
+#: sql_help.c:6090
 msgid "generate a notification"
 msgstr "сгенерировать уведомление"
 
-#: sql_help.c:6084
+#: sql_help.c:6096
 msgid "prepare a statement for execution"
 msgstr "подготовить оператор для выполнения"
 
-#: sql_help.c:6090
+#: sql_help.c:6102
 msgid "prepare the current transaction for two-phase commit"
 msgstr "подготовить текущую транзакцию для двухфазной фиксации"
 
-#: sql_help.c:6096
+#: sql_help.c:6108
 msgid "change the ownership of database objects owned by a database role"
 msgstr "изменить владельца объектов БД, принадлежащих заданной роли"
 
-#: sql_help.c:6102
+#: sql_help.c:6114
 msgid "replace the contents of a materialized view"
 msgstr "заменить содержимое материализованного представления"
 
-#: sql_help.c:6108
+#: sql_help.c:6120
 msgid "rebuild indexes"
 msgstr "перестроить индексы"
 
-#: sql_help.c:6114
+#: sql_help.c:6126
 msgid "release a previously defined savepoint"
 msgstr "освободить ранее определённую точку сохранения"
 
-#: sql_help.c:6120
+#: sql_help.c:6132
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "восстановить исходное значение параметра выполнения"
 
-#: sql_help.c:6126
+#: sql_help.c:6138
 msgid "remove access privileges"
 msgstr "удалить права доступа"
 
-#: sql_help.c:6138
+#: sql_help.c:6150
 msgid "cancel a transaction that was earlier prepared for two-phase commit"
 msgstr "отменить транзакцию, подготовленную ранее для двухфазной фиксации"
 
-#: sql_help.c:6144
+#: sql_help.c:6156
 msgid "roll back to a savepoint"
 msgstr "откатиться к точке сохранения"
 
-#: sql_help.c:6150
+#: sql_help.c:6162
 msgid "define a new savepoint within the current transaction"
 msgstr "определить новую точку сохранения в текущей транзакции"
 
-#: sql_help.c:6156
+#: sql_help.c:6168
 msgid "define or change a security label applied to an object"
 msgstr "задать или изменить метку безопасности, применённую к объекту"
 
-#: sql_help.c:6162 sql_help.c:6216 sql_help.c:6252
+#: sql_help.c:6174 sql_help.c:6228 sql_help.c:6264
 msgid "retrieve rows from a table or view"
 msgstr "выбрать строки из таблицы или представления"
 
-#: sql_help.c:6174
+#: sql_help.c:6186
 msgid "change a run-time parameter"
 msgstr "изменить параметр выполнения"
 
-#: sql_help.c:6180
+#: sql_help.c:6192
 msgid "set constraint check timing for the current transaction"
 msgstr "установить время проверки ограничений для текущей транзакции"
 
-#: sql_help.c:6186
+#: sql_help.c:6198
 msgid "set the current user identifier of the current session"
 msgstr "задать идентификатор текущего пользователя в текущем сеансе"
 
-#: sql_help.c:6192
+#: sql_help.c:6204
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
@@ -6741,31 +6743,31 @@ msgstr ""
 "задать идентификатор пользователя сеанса и идентификатор текущего "
 "пользователя в текущем сеансе"
 
-#: sql_help.c:6198
+#: sql_help.c:6210
 msgid "set the characteristics of the current transaction"
 msgstr "задать свойства текущей транзакции"
 
-#: sql_help.c:6204
+#: sql_help.c:6216
 msgid "show the value of a run-time parameter"
 msgstr "показать значение параметра выполнения"
 
-#: sql_help.c:6222
+#: sql_help.c:6234
 msgid "empty a table or set of tables"
 msgstr "опустошить таблицу или набор таблиц"
 
-#: sql_help.c:6228
+#: sql_help.c:6240
 msgid "stop listening for a notification"
 msgstr "прекратить ожидание уведомлений"
 
-#: sql_help.c:6234
+#: sql_help.c:6246
 msgid "update rows of a table"
 msgstr "изменить строки таблицы"
 
-#: sql_help.c:6240
+#: sql_help.c:6252
 msgid "garbage-collect and optionally analyze a database"
 msgstr "произвести сборку мусора и проанализировать базу данных"
 
-#: sql_help.c:6246
+#: sql_help.c:6258
 msgid "compute a set of rows"
 msgstr "получить набор строк"
 
diff --git a/src/bin/psql/sql_help.c b/src/bin/psql/sql_help.c
index 5baae9c..bf2fc48 100644
--- a/src/bin/psql/sql_help.c
+++ b/src/bin/psql/sql_help.c
@@ -162,7 +162,8 @@ sql_help_ALTER_DEFAULT_PRIVILEGES(PQExpBuffer buf)
 					  "    ON TYPES\n"
 					  "    TO { [ GROUP ] %s | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 					  "\n"
-					  "GRANT { USAGE | CREATE | ALL [ PRIVILEGES ] }\n"
+					  "GRANT { { USAGE | CREATE }\n"
+					  "    [, ...] | ALL [ PRIVILEGES ] }\n"
 					  "    ON SCHEMAS\n"
 					  "    TO { [ GROUP ] %s | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"
 					  "\n"
@@ -193,7 +194,8 @@ sql_help_ALTER_DEFAULT_PRIVILEGES(PQExpBuffer buf)
 					  "    [ CASCADE | RESTRICT ]\n"
 					  "\n"
 					  "REVOKE [ GRANT OPTION FOR ]\n"
-					  "    { USAGE | CREATE | ALL [ PRIVILEGES ] }\n"
+					  "    { { USAGE | CREATE }\n"
+					  "    [, ...] | ALL [ PRIVILEGES ] }\n"
 					  "    ON SCHEMAS\n"
 					  "    FROM { [ GROUP ] %s | PUBLIC } [, ...]\n"
 					  "    [ CASCADE | RESTRICT ]",
@@ -1299,7 +1301,7 @@ sql_help_ALTER_TABLE(PQExpBuffer buf)
 					  "\n"
 					  "%s\n"
 					  "\n"
-					  "{ %s | ( %s ) } [ %s ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
+					  "{ %s | ( %s ) } [ COLLATE %s ] [ %s [ ( %s = %s [, ... ] ) ] ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
 					  "\n"
 					  "%s\n"
 					  "\n"
@@ -1425,7 +1427,10 @@ sql_help_ALTER_TABLE(PQExpBuffer buf)
 					  _("exclude_element in an EXCLUDE constraint is:"),
 					  _("column_name"),
 					  _("expression"),
+					  _("collation"),
 					  _("opclass"),
+					  _("opclass_parameter"),
+					  _("value"),
 					  _("referential_action in a FOREIGN KEY/REFERENCES constraint is:"),
 					  _("column_name"),
 					  _("column_name"));
@@ -2187,7 +2192,7 @@ sql_help_CREATE_DATABASE(PQExpBuffer buf)
 					  "    [ WITH ] [ OWNER [=] %s ]\n"
 					  "           [ TEMPLATE [=] %s ]\n"
 					  "           [ ENCODING [=] %s ]\n"
-					  "           [ STRATEGY [=] %s ] ]\n"
+					  "           [ STRATEGY [=] %s ]\n"
 					  "           [ LOCALE [=] %s ]\n"
 					  "           [ LC_COLLATE [=] %s ]\n"
 					  "           [ LC_CTYPE [=] %s ]\n"
@@ -2885,7 +2890,7 @@ sql_help_CREATE_TABLE(PQExpBuffer buf)
 					  "\n"
 					  "%s\n"
 					  "\n"
-					  "{ %s | ( %s ) } [ %s ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
+					  "{ %s | ( %s ) } [ COLLATE %s ] [ %s [ ( %s = %s [, ... ] ) ] ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]\n"
 					  "\n"
 					  "%s\n"
 					  "\n"
@@ -2979,7 +2984,10 @@ sql_help_CREATE_TABLE(PQExpBuffer buf)
 					  _("exclude_element in an EXCLUDE constraint is:"),
 					  _("column_name"),
 					  _("expression"),
+					  _("collation"),
 					  _("opclass"),
+					  _("opclass_parameter"),
+					  _("value"),
 					  _("referential_action in a FOREIGN KEY/REFERENCES constraint is:"),
 					  _("column_name"),
 					  _("column_name"));
@@ -4068,7 +4076,9 @@ sql_help_MERGE(PQExpBuffer buf)
 					  "%s\n"
 					  "\n"
 					  "UPDATE SET { %s = { %s | DEFAULT } |\n"
-					  "             ( %s [, ...] ) = ( { %s | DEFAULT } [, ...] ) } [, ...]\n"
+					  "             ( %s [, ...] ) = [ ROW ] ( { %s | DEFAULT } [, ...] ) |\n"
+					  "             ( %s [, ...] ) = ( %s )\n"
+					  "           } [, ...]\n"
 					  "\n"
 					  "%s\n"
 					  "\n"
@@ -4097,6 +4107,8 @@ sql_help_MERGE(PQExpBuffer buf)
 					  _("expression"),
 					  _("column_name"),
 					  _("expression"),
+					  _("column_name"),
+					  _("sub-SELECT"),
 					  _("and merge_delete is:"));
 }
 
@@ -4437,7 +4449,7 @@ sql_help_SECURITY_LABEL(PQExpBuffer buf)
 					  "  DATABASE %s |\n"
 					  "  DOMAIN %s |\n"
 					  "  EVENT TRIGGER %s |\n"
-					  "  FOREIGN TABLE %s\n"
+					  "  FOREIGN TABLE %s |\n"
 					  "  FUNCTION %s [ ( [ [ %s ] [ %s ] %s [, ...] ] ) ] |\n"
 					  "  LARGE OBJECT %s |\n"
 					  "  MATERIALIZED VIEW %s |\n"
@@ -5178,7 +5190,7 @@ const struct _helpStruct QL_HELP[] = {
 		N_("define default access privileges"),
 		"sql-alterdefaultprivileges",
 		sql_help_ALTER_DEFAULT_PRIVILEGES,
-	59},
+	61},
 
 	{"ALTER DOMAIN",
 		N_("change the definition of a domain"),
@@ -6066,7 +6078,7 @@ const struct _helpStruct QL_HELP[] = {
 		N_("conditionally insert, update, or delete rows of a table"),
 		"sql-merge",
 		sql_help_MERGE,
-	27},
+	29},
 
 	{"MOVE",
 		N_("position a cursor"),
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 9ca86a3..ef34b24 100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -227,7 +227,7 @@ main(int argc, char *argv[])
 		appendStringLiteralConn(&sql, lc_ctype, conn);
 	}
 	if (locale_provider)
-		appendPQExpBuffer(&sql, " LOCALE_PROVIDER %s", locale_provider);
+		appendPQExpBuffer(&sql, " LOCALE_PROVIDER %s", fmtId(locale_provider));
 	if (icu_locale)
 	{
 		appendPQExpBufferStr(&sql, " ICU_LOCALE ");
diff --git a/src/bin/scripts/po/de.po b/src/bin/scripts/po/de.po
index 3e0003d..95deffa 100644
--- a/src/bin/scripts/po/de.po
+++ b/src/bin/scripts/po/de.po
@@ -134,7 +134,7 @@ msgstr "Kann keinen weiteren Spaltenkopf zur Tabelle hinzufügen: Spaltenzahl %d
 #: ../../fe_utils/print.c:3258
 #, c-format
 msgid "Cannot add cell to table content: total cell count of %d exceeded.\n"
-msgstr "Cann keine weitere Zelle zur Tabelle hinzufügen: Zellengesamtzahl %d überschritten.\n"
+msgstr "Kann keine weitere Zelle zur Tabelle hinzufügen: Zellengesamtzahl %d überschritten.\n"
 
 #: ../../fe_utils/print.c:3516
 #, c-format
diff --git a/src/bin/scripts/t/020_createdb.pl b/src/bin/scripts/t/020_createdb.pl
index 4029192..f44775d 100644
--- a/src/bin/scripts/t/020_createdb.pl
+++ b/src/bin/scripts/t/020_createdb.pl
@@ -176,10 +176,20 @@ $node->issues_sql_like(
 	'create database with WAL_LOG strategy');
 
 $node->issues_sql_like(
+	[ 'createdb', '-T', 'foobar2', '-S', 'WAL_LOG', 'foobar6s' ],
+	qr/statement: CREATE DATABASE foobar6s STRATEGY "WAL_LOG" TEMPLATE foobar2/,
+	'create database with WAL_LOG strategy');
+
+$node->issues_sql_like(
 	[ 'createdb', '-T', 'foobar2', '-S', 'file_copy', 'foobar7' ],
 	qr/statement: CREATE DATABASE foobar7 STRATEGY file_copy TEMPLATE foobar2/,
 	'create database with FILE_COPY strategy');
 
+$node->issues_sql_like(
+	[ 'createdb', '-T', 'foobar2', '-S', 'FILE_COPY', 'foobar7s' ],
+	qr/statement: CREATE DATABASE foobar7s STRATEGY "FILE_COPY" TEMPLATE foobar2/,
+	'create database with FILE_COPY strategy');
+
 # Create database owned by role_foobar.
 $node->issues_sql_like(
 	[ 'createdb', '-T', 'foobar2', '-O', 'role_foobar', 'foobar8' ],