This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 5ee095a57a0 Fix conflicts for po file on pg_checksums
5ee095a57a0 is described below
commit 5ee095a57a0646d75d66f4bafd9a0b224d2c0a67
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Mar 9 23:19:10 2026 -0400
Fix conflicts for po file on pg_checksums
---
src/bin/pg_checksums/po/el.po | 70 ---------------
src/bin/pg_checksums/po/es.po | 4 -
src/bin/pg_checksums/po/fr.po | 46 ----------
src/bin/pg_checksums/po/ja.po | 150 +-------------------------------
src/bin/pg_checksums/po/ru.po | 143 ------------------------------
src/bin/pg_checksums/po/sv.po | 158 +---------------------------------
src/bin/pg_checksums/po/uk.po | 146 -------------------------------
src/bin/pg_checksums/po/zh_CN.po | 99 ++++++++++-----------
src/bin/pg_checksums/t/002_actions.pl | 4 -
9 files changed, 54 insertions(+), 766 deletions(-)
diff --git a/src/bin/pg_checksums/po/el.po b/src/bin/pg_checksums/po/el.po
index 9c2473d0337..86395bee78e 100644
--- a/src/bin/pg_checksums/po/el.po
+++ b/src/bin/pg_checksums/po/el.po
@@ -9,24 +9,15 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_checksums (PostgreSQL) 15\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-07-21 05:18+0000\n"
-"PO-Revision-Date: 2021-07-21 09:45+0200\n"
-=======
"POT-Creation-Date: 2023-04-14 09:21+0000\n"
"PO-Revision-Date: 2023-04-14 13:01+0200\n"
->>>>>>> REL_16_9
"Last-Translator: Georgios Kokolatos <[email protected]>\n"
"Language-Team: \n"
"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-"X-Generator: Poedit 3.0\n"
-=======
"X-Generator: Poedit 3.2.2\n"
->>>>>>> REL_16_9
#: ../../../src/common/logging.c:276
#, c-format
@@ -86,57 +77,6 @@ msgstr ""
"\n"
"Επιλογές:\n"
-<<<<<<< HEAD
-#: pg_checksums.c:79
-#, c-format
-msgid " [-D, --pgdata=]DATADIR data directory\n"
-msgstr " [-D, --pgdata=]DATADIR κατάλογος δεδομένων\n"
-
-#: pg_checksums.c:80
-#, c-format
-msgid " -c, --check check data checksums (default)\n"
-msgstr " -c, --check έλεγξε αθροίσματα ελέγχου δεδομένων
(προεπιλογή)\n"
-
-#: pg_checksums.c:81
-#, c-format
-msgid " -d, --disable disable data checksums\n"
-msgstr " -d, --disable απενεργοποίησε τα αθροίσματα ελέγχου
δεδομένων\n"
-
-#: pg_checksums.c:82
-#, c-format
-msgid " -e, --enable enable data checksums\n"
-msgstr " -e, --enable ενεργοποίησε τα αθροίσματα ελέγχου
δεδομένων\n"
-
-#: pg_checksums.c:83
-#, c-format
-msgid " -f, --filenode=FILENODE check only relation with specified
filenode\n"
-msgstr " -f, --filenode=FILENODE έλεγξε μόνο τη σχέση με το καθορισμένο
filenode\n"
-
-#: pg_checksums.c:84
-#, c-format
-msgid " -N, --no-sync do not wait for changes to be written safely
to disk\n"
-msgstr " -N, --no-sync να μην αναμένει την ασφαλή εγγραφή αλλαγών
στον δίσκο\n"
-
-#: pg_checksums.c:85
-#, c-format
-msgid " -P, --progress show progress information\n"
-msgstr " -P, --progress εμφάνισε πληροφορίες προόδου\n"
-
-#: pg_checksums.c:86
-#, c-format
-msgid " -v, --verbose output verbose messages\n"
-msgstr " -v, --verbose περιφραστικά μηνύματα εξόδου\n"
-
-#: pg_checksums.c:87
-#, c-format
-msgid " -V, --version output version information, then exit\n"
-msgstr " -V, --version εμφάνισε πληροφορίες έκδοσης, στη συνέχεια
έξοδος\n"
-
-#: pg_checksums.c:88
-#, c-format
-msgid " -?, --help show this help, then exit\n"
-msgstr " -?, --help εμφάνισε αυτό το μήνυμα βοήθειας, στη
συνέχεια έξοδος\n"
-=======
#: pg_checksums.c:83
#, c-format
msgid " [-D, --pgdata=]DATADIR data directory\n"
@@ -166,7 +106,6 @@ msgstr " -f, --filenode=FILENODE έλεγξε μόνο τη σχέση με τ
#, c-format
msgid " -N, --no-sync do not wait for changes to be written safely
to disk\n"
msgstr " -N, --no-sync να μην αναμένει την ασφαλή εγγραφή αλλαγών
στον δίσκο\n"
->>>>>>> REL_16_9
#: pg_checksums.c:89
#, c-format
@@ -281,16 +220,7 @@ msgstr "μη έγκυρος αριθμός τμήματος %d στο αρχεί
msgid "Try \"%s --help\" for more information."
msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες."
-<<<<<<< HEAD
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες.\n"
-
-#: pg_checksums.c:537
-=======
#: pg_checksums.c:527
->>>>>>> REL_16_9
#, c-format
msgid "no data directory specified"
msgstr "δεν ορίστηκε κατάλογος δεδομένων"
diff --git a/src/bin/pg_checksums/po/es.po b/src/bin/pg_checksums/po/es.po
index 5284a6e03a5..24abb1da4ac 100644
--- a/src/bin/pg_checksums/po/es.po
+++ b/src/bin/pg_checksums/po/es.po
@@ -8,11 +8,7 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_checksums (PostgreSQL) 14\n"
-=======
"Project-Id-Version: pg_checksums (PostgreSQL) 16\n"
->>>>>>> REL_16_9
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-11-09 06:11+0000\n"
"PO-Revision-Date: 2023-05-22 12:05+0200\n"
diff --git a/src/bin/pg_checksums/po/fr.po b/src/bin/pg_checksums/po/fr.po
index 002d20d7c9b..86afbd9d543 100644
--- a/src/bin/pg_checksums/po/fr.po
+++ b/src/bin/pg_checksums/po/fr.po
@@ -80,51 +80,6 @@ msgstr ""
"\n"
"Options :\n"
-<<<<<<< HEAD
-#: pg_checksums.c:79
-#, c-format
-msgid " [-D, --pgdata=]DATADIR data directory\n"
-msgstr " [-D, --pgdata=]REP_DONNEES répertoire des données\n"
-
-#: pg_checksums.c:80
-#, c-format
-msgid " -c, --check check data checksums (default)\n"
-msgstr " -c, --check vérifie les sommes de contrôle (par
défaut)\n"
-
-#: pg_checksums.c:81
-#, c-format
-msgid " -d, --disable disable data checksums\n"
-msgstr " -d, --disable désactive les sommes de contrôle\n"
-
-#: pg_checksums.c:82
-#, c-format
-msgid " -e, --enable enable data checksums\n"
-msgstr " -e, --enable active les sommes de contrôle\n"
-
-#: pg_checksums.c:83
-#, c-format
-msgid " -f, --filenode=FILENODE check only relation with specified
filenode\n"
-msgstr ""
-" -f, --filenode=FILENODE vérifie seulement la relation dont
l'identifiant\n"
-" relfilenode est indiqué\n"
-
-#: pg_checksums.c:84
-#, c-format
-msgid " -N, --no-sync do not wait for changes to be written safely
to disk\n"
-msgstr ""
-" -N, --no-sync n'attend pas que les modifications soient\n"
-" proprement écrites sur disque\n"
-
-#: pg_checksums.c:85
-#, c-format
-msgid " -P, --progress show progress information\n"
-msgstr " -P, --progress affiche la progression de l'opération\n"
-
-#: pg_checksums.c:86
-#, c-format
-msgid " -v, --verbose output verbose messages\n"
-msgstr " -v, --verbose affiche des messages verbeux\n"
-=======
#: pg_checksums.c:83
#, c-format
msgid " [-D, --pgdata=]DATADIR data directory\n"
@@ -144,7 +99,6 @@ msgstr " -d, --disable désactive les sommes de
contrôle\n"
#, c-format
msgid " -e, --enable enable data checksums\n"
msgstr " -e, --enable active les sommes de contrôle\n"
->>>>>>> REL_16_9
#: pg_checksums.c:87
#, c-format
diff --git a/src/bin/pg_checksums/po/ja.po b/src/bin/pg_checksums/po/ja.po
index d0e541d6162..aacabdea6fc 100644
--- a/src/bin/pg_checksums/po/ja.po
+++ b/src/bin/pg_checksums/po/ja.po
@@ -4,17 +4,10 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_checksums (PostgreSQL 14)\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-08-25 17:21+0900\n"
-"PO-Revision-Date: 2021-05-18 17:11+0900\n"
-=======
"Project-Id-Version: pg_checksums (PostgreSQL 15)\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-08-09 12:00+0900\n"
"PO-Revision-Date: 2022-05-10 13:45+0900\n"
->>>>>>> REL_16_9
"Last-Translator: Kyotaro Horiguchi <[email protected]>\n"
"Language-Team: Japan PostgreSQL Users Group <[email protected]>\n"
"Language: ja\n"
@@ -23,25 +16,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.13\n"
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:259
-#, c-format
-msgid "fatal: "
-msgstr "致命的エラー: "
-
-#: ../../../src/common/logging.c:266
-=======
#: ../../../src/common/logging.c:276
->>>>>>> REL_16_9
#, c-format
msgid "error: "
msgstr "エラー: "
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:273
-=======
#: ../../../src/common/logging.c:283
->>>>>>> REL_16_9
#, c-format
msgid "warning: "
msgstr "警告: "
@@ -186,248 +166,136 @@ msgstr "ファイル\"%2$s\"で%1$uブロックを読み取れませんでした
msgid "could not read block %u in file \"%s\": read %d of %d"
msgstr " ファイル\"%2$s\"のブロック%1$uが読み込めませんでした: %4$d中%3$d読み込み済み"
-<<<<<<< HEAD
-#: pg_checksums.c:250
-=======
#: pg_checksums.c:240
->>>>>>> REL_16_9
#, c-format
msgid "checksum verification failed in file \"%s\", block %u: calculated
checksum %X but block contains %X"
msgstr "ファイル\"%s\" ブロック%uでチェックサム検証が失敗: 算出したチェックサムは%X 、しかしブロック上の値は%X"
-<<<<<<< HEAD
-#: pg_checksums.c:265
-=======
#: pg_checksums.c:263
->>>>>>> REL_16_9
#, c-format
msgid "seek failed for block %u in file \"%s\": %m"
msgstr "ファイル\"%2$s\" ブロック%1$uへのシーク失敗: %3$m"
-<<<<<<< HEAD
-#: pg_checksums.c:274
-=======
#: pg_checksums.c:270
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": %m"
msgstr "ファイル\"%2$s\"で%1$uブロックが書き出せませんでした: %3$m"
-<<<<<<< HEAD
-#: pg_checksums.c:277
-=======
#: pg_checksums.c:273
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": wrote %d of %d"
msgstr "ファイル\"%2$s\"のブロック%1$uの書き込みに失敗しました: %4$dバイト中%3$dバイトのみ書き込みました"
-<<<<<<< HEAD
-#: pg_checksums.c:290
-=======
#: pg_checksums.c:285
->>>>>>> REL_16_9
#, c-format
msgid "checksums verified in file \"%s\""
msgstr "ファイル\"%s\"のチェックサムは検証されました"
-<<<<<<< HEAD
-#: pg_checksums.c:292
-=======
#: pg_checksums.c:287
->>>>>>> REL_16_9
#, c-format
msgid "checksums enabled in file \"%s\""
msgstr "ファイル\"%s\"のチェックサムは有効化されました"
-<<<<<<< HEAD
-#: pg_checksums.c:317
-=======
#: pg_checksums.c:318
->>>>>>> REL_16_9
#, c-format
msgid "could not open directory \"%s\": %m"
msgstr "ディレクトリ\"%s\"をオープンできませんでした: %m"
-<<<<<<< HEAD
-#: pg_checksums.c:344 pg_checksums.c:423
-=======
#: pg_checksums.c:342 pg_checksums.c:415
->>>>>>> REL_16_9
#, c-format
msgid "could not stat file \"%s\": %m"
msgstr "ファイル\"%s\"のstatに失敗しました: %m"
-<<<<<<< HEAD
-#: pg_checksums.c:371
-=======
#: pg_checksums.c:366
->>>>>>> REL_16_9
#, c-format
msgid "invalid segment number %d in file name \"%s\""
msgstr "ファイル名\"%2$s\"の不正なセグメント番号%1$d"
-<<<<<<< HEAD
-#: pg_checksums.c:504
-=======
#: pg_checksums.c:512 pg_checksums.c:528 pg_checksums.c:538 pg_checksums.c:546
->>>>>>> REL_16_9
#, c-format
msgid "Try \"%s --help\" for more information."
msgstr "詳細については\"%s --help\"を実行してください。"
-<<<<<<< HEAD
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "詳細は\"%s --help\"で確認してください。\n"
-
-#: pg_checksums.c:537
-=======
#: pg_checksums.c:527
->>>>>>> REL_16_9
#, c-format
msgid "no data directory specified"
msgstr "データディレクトリが指定されていません"
-<<<<<<< HEAD
-#: pg_checksums.c:546
-=======
#: pg_checksums.c:536
->>>>>>> REL_16_9
#, c-format
msgid "too many command-line arguments (first is \"%s\")"
-msgstr "コマンドライン引数が多すぎます (先頭は\"%s\")"
+msgstr "コマンドライン引数が多すぎます (最初は\"%s\")"
-<<<<<<< HEAD
-#: pg_checksums.c:556
-=======
#: pg_checksums.c:545
->>>>>>> REL_16_9
#, c-format
msgid "option -f/--filenode can only be used with --check"
msgstr "オプション-f/--filenodeは--checkを指定したときのみ指定可能"
-<<<<<<< HEAD
-#: pg_checksums.c:566
-=======
#: pg_checksums.c:553
->>>>>>> REL_16_9
#, c-format
msgid "pg_control CRC value is incorrect"
msgstr "pg_controlのCRC値が正しくありません"
-<<<<<<< HEAD
-#: pg_checksums.c:572
-=======
#: pg_checksums.c:556
->>>>>>> REL_16_9
#, c-format
msgid "cluster is not compatible with this version of pg_checksums"
msgstr "クラスタはこのバージョンのpg_checksumsと互換性がありません"
-<<<<<<< HEAD
-#: pg_checksums.c:578
-=======
#: pg_checksums.c:560
->>>>>>> REL_16_9
#, c-format
msgid "database cluster is not compatible"
msgstr "データベースクラスタが非互換です"
-<<<<<<< HEAD
-#: pg_checksums.c:579
-=======
#: pg_checksums.c:561
->>>>>>> REL_16_9
#, c-format
msgid "The database cluster was initialized with block size %u, but
pg_checksums was compiled with block size %u."
msgstr "データベースクラスタはブロックサイズ%uで初期化されています、しかしpg_checksumsはブロックサイズ%uでコンパイルされています。"
-<<<<<<< HEAD
-#: pg_checksums.c:592
-=======
#: pg_checksums.c:573
->>>>>>> REL_16_9
#, c-format
msgid "cluster must be shut down"
msgstr "クラスタはシャットダウンされていなければなりません"
-<<<<<<< HEAD
-#: pg_checksums.c:599
-=======
#: pg_checksums.c:577
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are not enabled in cluster"
msgstr "クラスタのデータチェックサムは有効になっていません"
-<<<<<<< HEAD
-#: pg_checksums.c:606
-=======
#: pg_checksums.c:581
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already disabled in cluster"
msgstr "クラスタのデータチェックサムはすでに無効になっています"
-<<<<<<< HEAD
-#: pg_checksums.c:613
-=======
#: pg_checksums.c:585
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already enabled in cluster"
msgstr "クラスタのデータチェックサムはすでに有効になっています"
-<<<<<<< HEAD
-#: pg_checksums.c:639
-=======
#: pg_checksums.c:609
->>>>>>> REL_16_9
#, c-format
msgid "Checksum operation completed\n"
msgstr "チェックサム操作が完了しました\n"
-<<<<<<< HEAD
-#: pg_checksums.c:640
-=======
#: pg_checksums.c:610
->>>>>>> REL_16_9
#, c-format
msgid "Files scanned: %lld\n"
msgstr "スキャンしたファイル数: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:641
-=======
#: pg_checksums.c:611
->>>>>>> REL_16_9
#, c-format
msgid "Blocks scanned: %lld\n"
msgstr "スキャンしたブロック数: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:644
-=======
#: pg_checksums.c:614
->>>>>>> REL_16_9
#, c-format
msgid "Bad checksums: %lld\n"
msgstr "不正なチェックサム数: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:645 pg_checksums.c:672
-=======
#: pg_checksums.c:615 pg_checksums.c:647
->>>>>>> REL_16_9
#, c-format
msgid "Data checksum version: %u\n"
msgstr "データチェックサムバージョン: %u\n"
-<<<<<<< HEAD
-#: pg_checksums.c:664
-=======
#: pg_checksums.c:622
#, c-format
msgid "Files written: %lld\n"
@@ -439,35 +307,20 @@ msgid "Blocks written: %lld\n"
msgstr "スキャンしたブロック数: %lld\n"
#: pg_checksums.c:639
->>>>>>> REL_16_9
#, c-format
msgid "syncing data directory"
msgstr "データディレクトリを同期しています"
-<<<<<<< HEAD
-#: pg_checksums.c:668
-=======
#: pg_checksums.c:643
->>>>>>> REL_16_9
#, c-format
msgid "updating control file"
msgstr "コントロールファイルを更新しています"
-<<<<<<< HEAD
-#: pg_checksums.c:674
-=======
#: pg_checksums.c:649
->>>>>>> REL_16_9
#, c-format
msgid "Checksums enabled in cluster\n"
msgstr "クラスタのチェックサムが有効化されました\n"
-<<<<<<< HEAD
-#: pg_checksums.c:676
-#, c-format
-msgid "Checksums disabled in cluster\n"
-msgstr "クラスタのチェックサムが無効化されました\n"
-=======
#: pg_checksums.c:651
#, c-format
msgid "Checksums disabled in cluster\n"
@@ -484,4 +337,3 @@ msgstr "クラスタのチェックサムが無効化されました\n"
#~ msgid "Report bugs to <[email protected]>.\n"
#~ msgstr "バグは <[email protected]> に報告してください。\n"
->>>>>>> REL_16_9
diff --git a/src/bin/pg_checksums/po/ru.po b/src/bin/pg_checksums/po/ru.po
index 177e4f75d1b..dc4f0cca9a6 100644
--- a/src/bin/pg_checksums/po/ru.po
+++ b/src/bin/pg_checksums/po/ru.po
@@ -3,13 +3,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_verify_checksums (PostgreSQL) 11\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-08-14 06:29+0300\n"
-"PO-Revision-Date: 2021-02-08 07:59+0300\n"
-=======
"POT-Creation-Date: 2024-05-04 16:29+0300\n"
"PO-Revision-Date: 2022-09-05 13:34+0300\n"
->>>>>>> REL_16_9
"Last-Translator: Alexander Lakhin <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -17,25 +12,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:259
-#, c-format
-msgid "fatal: "
-msgstr "важно: "
-
-#: ../../../src/common/logging.c:266
-=======
#: ../../../src/common/logging.c:276
->>>>>>> REL_16_9
#, c-format
msgid "error: "
msgstr "ошибка: "
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:273
-=======
#: ../../../src/common/logging.c:283
->>>>>>> REL_16_9
#, c-format
msgid "warning: "
msgstr "предупреждение: "
@@ -192,11 +174,7 @@ msgstr "не удалось прочитать блок %u в файле \"%s\":
msgid "could not read block %u in file \"%s\": read %d of %d"
msgstr "не удалось прочитать блок %u в файле \"%s\" (прочитано байт: %d из %d)"
-<<<<<<< HEAD
-#: pg_checksums.c:250
-=======
#: pg_checksums.c:240
->>>>>>> REL_16_9
#, c-format
msgid ""
"checksum verification failed in file \"%s\", block %u: calculated checksum "
@@ -205,151 +183,82 @@ msgstr ""
"ошибка контрольных сумм в файле \"%s\", блоке %u: вычислена контрольная "
"сумма %X, но блок содержит %X"
-<<<<<<< HEAD
-#: pg_checksums.c:265
-=======
#: pg_checksums.c:263
->>>>>>> REL_16_9
#, c-format
msgid "seek failed for block %u in file \"%s\": %m"
msgstr "ошибка при переходе к блоку %u в файле \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:274
-=======
#: pg_checksums.c:270
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": %m"
msgstr "не удалось записать блок %u в файл \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:277
-=======
#: pg_checksums.c:273
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": wrote %d of %d"
msgstr "не удалось записать блок %u в файле \"%s\" (записано байт: %d из %d)"
-<<<<<<< HEAD
-#: pg_checksums.c:290
-=======
#: pg_checksums.c:285
->>>>>>> REL_16_9
#, c-format
msgid "checksums verified in file \"%s\""
msgstr "контрольные суммы в файле \"%s\" проверены"
-<<<<<<< HEAD
-#: pg_checksums.c:292
-=======
#: pg_checksums.c:287
->>>>>>> REL_16_9
#, c-format
msgid "checksums enabled in file \"%s\""
msgstr "контрольные суммы в файле \"%s\" включены"
-<<<<<<< HEAD
-#: pg_checksums.c:317
-=======
#: pg_checksums.c:318
->>>>>>> REL_16_9
#, c-format
msgid "could not open directory \"%s\": %m"
msgstr "не удалось открыть каталог \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:344 pg_checksums.c:423
-=======
#: pg_checksums.c:346 pg_checksums.c:415
->>>>>>> REL_16_9
#, c-format
msgid "could not stat file \"%s\": %m"
msgstr "не удалось получить информацию о файле \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:371
-=======
#: pg_checksums.c:370
->>>>>>> REL_16_9
#, c-format
msgid "invalid segment number %d in file name \"%s\""
msgstr "неверный номер сегмента %d в имени файла \"%s\""
-<<<<<<< HEAD
-#: pg_checksums.c:504
-=======
#: pg_checksums.c:512 pg_checksums.c:528 pg_checksums.c:538 pg_checksums.c:546
->>>>>>> REL_16_9
#, c-format
msgid "Try \"%s --help\" for more information."
msgstr "Для дополнительной информации попробуйте \"%s --help\"."
-<<<<<<< HEAD
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Для дополнительной информации попробуйте \"%s --help\".\n"
-
-#: pg_checksums.c:537
-=======
#: pg_checksums.c:527
->>>>>>> REL_16_9
#, c-format
msgid "no data directory specified"
msgstr "каталог данных не указан"
-<<<<<<< HEAD
-#: pg_checksums.c:546
-=======
#: pg_checksums.c:536
->>>>>>> REL_16_9
#, c-format
msgid "too many command-line arguments (first is \"%s\")"
msgstr "слишком много аргументов командной строки (первый: \"%s\")"
-<<<<<<< HEAD
-#: pg_checksums.c:556
-=======
#: pg_checksums.c:545
->>>>>>> REL_16_9
#, c-format
msgid "option -f/--filenode can only be used with --check"
msgstr "параметр -f/--filenode можно использовать только с --check"
-<<<<<<< HEAD
-#: pg_checksums.c:566
-=======
#: pg_checksums.c:553
->>>>>>> REL_16_9
#, c-format
msgid "pg_control CRC value is incorrect"
msgstr "ошибка контрольного значения в pg_control"
-<<<<<<< HEAD
-#: pg_checksums.c:572
-=======
#: pg_checksums.c:556
->>>>>>> REL_16_9
#, c-format
msgid "cluster is not compatible with this version of pg_checksums"
msgstr "кластер несовместим с этой версией pg_checksums"
-<<<<<<< HEAD
-#: pg_checksums.c:578
-=======
#: pg_checksums.c:560
->>>>>>> REL_16_9
#, c-format
msgid "database cluster is not compatible"
msgstr "несовместимый кластер баз данных"
-<<<<<<< HEAD
-#: pg_checksums.c:579
-=======
#: pg_checksums.c:561
->>>>>>> REL_16_9
#, c-format
msgid ""
"The database cluster was initialized with block size %u, but pg_checksums "
@@ -358,90 +267,51 @@ msgstr ""
"Кластер баз данных был инициализирован с размером блока %u, а утилита "
"pg_checksums скомпилирована для размера блока %u."
-<<<<<<< HEAD
-#: pg_checksums.c:592
-=======
#: pg_checksums.c:573
->>>>>>> REL_16_9
#, c-format
msgid "cluster must be shut down"
msgstr "кластер должен быть отключён"
-<<<<<<< HEAD
-#: pg_checksums.c:599
-=======
#: pg_checksums.c:577
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are not enabled in cluster"
msgstr "контрольные суммы в кластере не включены"
-<<<<<<< HEAD
-#: pg_checksums.c:606
-=======
#: pg_checksums.c:581
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already disabled in cluster"
msgstr "контрольные суммы в кластере уже отключены"
-<<<<<<< HEAD
-#: pg_checksums.c:613
-=======
#: pg_checksums.c:585
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already enabled in cluster"
msgstr "контрольные суммы в кластере уже включены"
-<<<<<<< HEAD
-#: pg_checksums.c:639
-=======
#: pg_checksums.c:609
->>>>>>> REL_16_9
#, c-format
msgid "Checksum operation completed\n"
msgstr "Обработка контрольных сумм завершена\n"
-<<<<<<< HEAD
-#: pg_checksums.c:640
-=======
#: pg_checksums.c:610
->>>>>>> REL_16_9
#, c-format
msgid "Files scanned: %lld\n"
msgstr "Просканировано файлов: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:641
-=======
#: pg_checksums.c:611
->>>>>>> REL_16_9
#, c-format
msgid "Blocks scanned: %lld\n"
msgstr "Просканировано блоков: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:644
-=======
#: pg_checksums.c:614
->>>>>>> REL_16_9
#, c-format
msgid "Bad checksums: %lld\n"
msgstr "Неверные контрольные суммы: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:645 pg_checksums.c:672
-=======
#: pg_checksums.c:615 pg_checksums.c:647
->>>>>>> REL_16_9
#, c-format
msgid "Data checksum version: %u\n"
msgstr "Версия контрольных сумм данных: %u\n"
-<<<<<<< HEAD
-#: pg_checksums.c:664
-=======
#: pg_checksums.c:622
#, c-format
msgid "Files written: %lld\n"
@@ -453,34 +323,21 @@ msgid "Blocks written: %lld\n"
msgstr "Записано блоков: %lld\n"
#: pg_checksums.c:639
->>>>>>> REL_16_9
#, c-format
msgid "syncing data directory"
msgstr "синхронизация каталога данных"
-<<<<<<< HEAD
-#: pg_checksums.c:668
-=======
#: pg_checksums.c:643
->>>>>>> REL_16_9
#, c-format
msgid "updating control file"
msgstr "модификация управляющего файла"
-<<<<<<< HEAD
-#: pg_checksums.c:674
-=======
#: pg_checksums.c:649
->>>>>>> REL_16_9
#, c-format
msgid "Checksums enabled in cluster\n"
msgstr "Контрольные суммы в кластере включены\n"
-<<<<<<< HEAD
-#: pg_checksums.c:676
-=======
#: pg_checksums.c:651
->>>>>>> REL_16_9
#, c-format
msgid "Checksums disabled in cluster\n"
msgstr "Контрольные суммы в кластере отключены\n"
diff --git a/src/bin/pg_checksums/po/sv.po b/src/bin/pg_checksums/po/sv.po
index 0421fbb0a19..8e92a9e5443 100644
--- a/src/bin/pg_checksums/po/sv.po
+++ b/src/bin/pg_checksums/po/sv.po
@@ -1,16 +1,6 @@
# Swedish message translation file for pg_checksums
# Copyright (C) 2019 PostgreSQL Global Development Group
# This file is distributed under the same license as the pg_checksums
(PostgreSQL) package.
-<<<<<<< HEAD
-# Dennis Björklund <[email protected]>, 2019, 2020, 2021.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PostgreSQL 14\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-11-06 22:18+0000\n"
-"PO-Revision-Date: 2021-11-07 06:44+0100\n"
-=======
# Dennis Björklund <[email protected]>, 2019, 2020, 2021, 2022.
#
msgid ""
@@ -19,7 +9,6 @@ msgstr ""
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-09 18:52+0000\n"
"PO-Revision-Date: 2022-05-09 21:46+0200\n"
->>>>>>> REL_16_9
"Last-Translator: Dennis Björklund <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
"Language: sv\n"
@@ -28,25 +17,12 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:259
-#, c-format
-msgid "fatal: "
-msgstr "fatalt: "
-
-#: ../../../src/common/logging.c:266
-=======
#: ../../../src/common/logging.c:277
->>>>>>> REL_16_9
#, c-format
msgid "error: "
msgstr "fel: "
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:273
-=======
#: ../../../src/common/logging.c:284
->>>>>>> REL_16_9
#, c-format
msgid "warning: "
msgstr "varning: "
@@ -177,266 +153,151 @@ msgstr "hemsida för %s: <%s>\n"
msgid "%lld/%lld MB (%d%%) computed"
msgstr "%lld/%lld MB (%d%%) beräknad"
-<<<<<<< HEAD
-#: pg_checksums.c:207
-=======
#: pg_checksums.c:200
->>>>>>> REL_16_9
#, c-format
msgid "could not open file \"%s\": %m"
msgstr "kunde inte öppna fil \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:223
-=======
#: pg_checksums.c:214
->>>>>>> REL_16_9
#, c-format
msgid "could not read block %u in file \"%s\": %m"
msgstr "kunde inte läsa block %u i fil \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:226
-=======
#: pg_checksums.c:217
->>>>>>> REL_16_9
#, c-format
msgid "could not read block %u in file \"%s\": read %d of %d"
msgstr "kunde inte läsa block %u i fil \"%s\": läste %d av %d"
-#: pg_checksums.c:250
+#: pg_checksums.c:240
#, c-format
msgid "checksum verification failed in file \"%s\", block %u: calculated
checksum %X but block contains %X"
msgstr "verifiering av kontrollsumma misslyckades i fil \"%s\", block %u:
beräknad kontrollsumma är %X men blocket innehåller %X"
-<<<<<<< HEAD
-#: pg_checksums.c:265
-=======
#: pg_checksums.c:263
->>>>>>> REL_16_9
#, c-format
msgid "seek failed for block %u in file \"%s\": %m"
msgstr "seek misslyckades för block %u i fil \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:274
-=======
#: pg_checksums.c:270
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": %m"
msgstr "kunde inte skriva block %u i fil \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:277
-=======
#: pg_checksums.c:273
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": wrote %d of %d"
msgstr "kunde inte skriva block %u i fil \"%s\": skrev %d av %d"
-<<<<<<< HEAD
-#: pg_checksums.c:290
-=======
#: pg_checksums.c:285
->>>>>>> REL_16_9
#, c-format
msgid "checksums verified in file \"%s\""
msgstr "kontrollsummor verifierade i fil \"%s\""
-<<<<<<< HEAD
-#: pg_checksums.c:292
-=======
#: pg_checksums.c:287
->>>>>>> REL_16_9
#, c-format
msgid "checksums enabled in file \"%s\""
msgstr "kontrollsummor påslagen i fil \"%s\""
-<<<<<<< HEAD
-#: pg_checksums.c:317
-=======
#: pg_checksums.c:318
->>>>>>> REL_16_9
#, c-format
msgid "could not open directory \"%s\": %m"
msgstr "kunde inte öppna katalog \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:344 pg_checksums.c:423
-=======
#: pg_checksums.c:342 pg_checksums.c:415
->>>>>>> REL_16_9
#, c-format
msgid "could not stat file \"%s\": %m"
msgstr "kunde inte göra stat() på fil \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:371
-=======
#: pg_checksums.c:366
->>>>>>> REL_16_9
#, c-format
msgid "invalid segment number %d in file name \"%s\""
msgstr "ogiltigt segmentnummer %d i filnamn \"%s\""
-<<<<<<< HEAD
-#: pg_checksums.c:504
-#, c-format
-msgid "invalid filenode specification, must be numeric: %s"
-msgstr "ogiltigt angiven filnod, måste vara numerisk: %s"
-
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Försök med \"%s --help\" för mer information.\n"
-=======
#: 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 "Försök med \"%s --help\" för mer information."
->>>>>>> REL_16_9
-#: pg_checksums.c:537
+#: pg_checksums.c:527
#, c-format
msgid "no data directory specified"
msgstr "ingen datakatalog angiven"
-#: pg_checksums.c:546
+#: pg_checksums.c:536
#, c-format
msgid "too many command-line arguments (first is \"%s\")"
msgstr "för många kommandoradsargument (första är \"%s\")"
-<<<<<<< HEAD
-#: pg_checksums.c:556
-=======
#: pg_checksums.c:545
->>>>>>> REL_16_9
#, c-format
msgid "option -f/--filenode can only be used with --check"
msgstr "inställningen -f/--filenode tillåts bara med --check"
-<<<<<<< HEAD
-#: pg_checksums.c:566
-=======
#: pg_checksums.c:553
->>>>>>> REL_16_9
#, c-format
msgid "pg_control CRC value is incorrect"
msgstr "pg_control CRC-värde är inkorrekt"
-<<<<<<< HEAD
-#: pg_checksums.c:572
-=======
#: pg_checksums.c:556
->>>>>>> REL_16_9
#, c-format
msgid "cluster is not compatible with this version of pg_checksums"
msgstr "klustret är inte kompatibelt med denna version av pg_checksums"
-<<<<<<< HEAD
-#: pg_checksums.c:578
-=======
#: pg_checksums.c:560
->>>>>>> REL_16_9
#, c-format
msgid "database cluster is not compatible"
msgstr "databasklustret är inte kompatibelt"
-<<<<<<< HEAD
-#: pg_checksums.c:579
-=======
#: pg_checksums.c:561
->>>>>>> REL_16_9
#, c-format
msgid "The database cluster was initialized with block size %u, but
pg_checksums was compiled with block size %u."
msgstr "Databasklustret initierades med blockstorlek %u men pg_checksums
kompilerades med blockstorlek %u."
-<<<<<<< HEAD
-#: pg_checksums.c:592
-=======
#: pg_checksums.c:573
->>>>>>> REL_16_9
#, c-format
msgid "cluster must be shut down"
msgstr "klustret måste stängas ner"
-<<<<<<< HEAD
-#: pg_checksums.c:599
-=======
#: pg_checksums.c:577
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are not enabled in cluster"
msgstr "datakontrollsummor är inte påslaget i klustret"
-<<<<<<< HEAD
-#: pg_checksums.c:606
-=======
#: pg_checksums.c:581
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already disabled in cluster"
msgstr "datakontrollsummor är redan avslaget i klustret"
-<<<<<<< HEAD
-#: pg_checksums.c:613
-=======
#: pg_checksums.c:585
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already enabled in cluster"
msgstr "datakontrollsummor är redan påslagna i klustret"
-<<<<<<< HEAD
-#: pg_checksums.c:639
-=======
#: pg_checksums.c:609
->>>>>>> REL_16_9
#, c-format
msgid "Checksum operation completed\n"
msgstr "Kontrollsummeoperation avslutad\n"
-<<<<<<< HEAD
-#: pg_checksums.c:640
-=======
#: pg_checksums.c:610
->>>>>>> REL_16_9
#, c-format
msgid "Files scanned: %lld\n"
msgstr "Skannade filer: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:641
-=======
#: pg_checksums.c:611
->>>>>>> REL_16_9
#, c-format
msgid "Blocks scanned: %lld\n"
msgstr "Skannade block: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:644
-=======
#: pg_checksums.c:614
->>>>>>> REL_16_9
#, c-format
msgid "Bad checksums: %lld\n"
msgstr "Felaktiga kontrollsummor: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:645 pg_checksums.c:672
-=======
#: pg_checksums.c:615 pg_checksums.c:647
->>>>>>> REL_16_9
#, c-format
msgid "Data checksum version: %u\n"
msgstr "Datakontrollsummeversion: %u\n"
-<<<<<<< HEAD
-#: pg_checksums.c:664
-=======
#: pg_checksums.c:622
#, c-format
msgid "Files written: %lld\n"
@@ -448,34 +309,21 @@ msgid "Blocks written: %lld\n"
msgstr "Skrivna block: %lld\n"
#: pg_checksums.c:639
->>>>>>> REL_16_9
#, c-format
msgid "syncing data directory"
msgstr "synkar datakatalogen"
-<<<<<<< HEAD
-#: pg_checksums.c:668
-=======
#: pg_checksums.c:643
->>>>>>> REL_16_9
#, c-format
msgid "updating control file"
msgstr "uppdaterar kontrollfil"
-<<<<<<< HEAD
-#: pg_checksums.c:674
-=======
#: pg_checksums.c:649
->>>>>>> REL_16_9
#, c-format
msgid "Checksums enabled in cluster\n"
msgstr "Kontrollsummor påslaget i klustret\n"
-<<<<<<< HEAD
-#: pg_checksums.c:676
-=======
#: pg_checksums.c:651
->>>>>>> REL_16_9
#, c-format
msgid "Checksums disabled in cluster\n"
msgstr "Kontrollsummor avslaget i klustret\n"
diff --git a/src/bin/pg_checksums/po/uk.po b/src/bin/pg_checksums/po/uk.po
index 76188e9e525..f27bd1ec3e9 100644
--- a/src/bin/pg_checksums/po/uk.po
+++ b/src/bin/pg_checksums/po/uk.po
@@ -2,13 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: postgresql\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-06-10 08:49+0000\n"
-"PO-Revision-Date: 2021-08-17 10:54\n"
-=======
"POT-Creation-Date: 2022-08-12 10:52+0000\n"
"PO-Revision-Date: 2023-09-05 10:04+0200\n"
->>>>>>> REL_16_9
"Last-Translator: \n"
"Language-Team: Ukrainian\n"
"Language: uk_UA\n"
@@ -19,31 +14,15 @@ msgstr ""
"X-Crowdin-Project: postgresql\n"
"X-Crowdin-Project-ID: 324573\n"
"X-Crowdin-Language: uk\n"
-<<<<<<< HEAD
-"X-Crowdin-File: /REL_14_DEV/pg_checksums.pot\n"
-"X-Crowdin-File-ID: 764\n"
-
-#: ../../../src/common/logging.c:259
-#, c-format
-msgid "fatal: "
-msgstr "збій: "
-
-#: ../../../src/common/logging.c:266
-=======
"X-Crowdin-File: /REL_15_STABLE/pg_checksums.pot\n"
"X-Crowdin-File-ID: 888\n"
#: ../../../src/common/logging.c:276
->>>>>>> REL_16_9
#, c-format
msgid "error: "
msgstr "помилка: "
-<<<<<<< HEAD
-#: ../../../src/common/logging.c:273
-=======
#: ../../../src/common/logging.c:283
->>>>>>> REL_16_9
#, c-format
msgid "warning: "
msgstr "попередження: "
@@ -188,248 +167,136 @@ msgstr "не вдалося прочитати блок %u в файлі \"%s\":
msgid "could not read block %u in file \"%s\": read %d of %d"
msgstr "не вдалося прочитати блок %u у файлі \"%s\": прочитано %d з %d"
-<<<<<<< HEAD
-#: pg_checksums.c:250
-=======
#: pg_checksums.c:240
->>>>>>> REL_16_9
#, c-format
msgid "checksum verification failed in file \"%s\", block %u: calculated
checksum %X but block contains %X"
msgstr "помилка перевірки контрольних сум у файлі \"%s\", блок %u: обчислена
контрольна сума %X, але блок містить %X"
-<<<<<<< HEAD
-#: pg_checksums.c:265
-=======
#: pg_checksums.c:263
->>>>>>> REL_16_9
#, c-format
msgid "seek failed for block %u in file \"%s\": %m"
msgstr "помилка пошуку для блоку %u у файлі \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:274
-=======
#: pg_checksums.c:270
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": %m"
msgstr "не вдалося записати блок %u у файл \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:277
-=======
#: pg_checksums.c:273
->>>>>>> REL_16_9
#, c-format
msgid "could not write block %u in file \"%s\": wrote %d of %d"
msgstr "не вдалося записати блок %u у файлі \"%s\": записано %d з %d"
-<<<<<<< HEAD
-#: pg_checksums.c:290
-=======
#: pg_checksums.c:285
->>>>>>> REL_16_9
#, c-format
msgid "checksums verified in file \"%s\""
msgstr "контрольні суми у файлі \"%s\" перевірені"
-<<<<<<< HEAD
-#: pg_checksums.c:292
-=======
#: pg_checksums.c:287
->>>>>>> REL_16_9
#, c-format
msgid "checksums enabled in file \"%s\""
msgstr "контрольні суми у файлі \"%s\" активовані"
-<<<<<<< HEAD
-#: pg_checksums.c:317
-=======
#: pg_checksums.c:318
->>>>>>> REL_16_9
#, c-format
msgid "could not open directory \"%s\": %m"
msgstr "не вдалося відкрити каталог \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:344 pg_checksums.c:423
-=======
#: pg_checksums.c:342 pg_checksums.c:415
->>>>>>> REL_16_9
#, c-format
msgid "could not stat file \"%s\": %m"
msgstr "не вдалося отримати інформацію від файлу \"%s\": %m"
-<<<<<<< HEAD
-#: pg_checksums.c:371
-=======
#: pg_checksums.c:366
->>>>>>> REL_16_9
#, c-format
msgid "invalid segment number %d in file name \"%s\""
msgstr "неприпустимий номер сегменту %d в імені файлу \"%s\""
-<<<<<<< HEAD
-#: pg_checksums.c:504
-=======
#: pg_checksums.c:512 pg_checksums.c:528 pg_checksums.c:538 pg_checksums.c:546
->>>>>>> REL_16_9
#, c-format
msgid "Try \"%s --help\" for more information."
msgstr "Спробуйте \"%s --help\" для додаткової інформації."
-<<<<<<< HEAD
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
-
-#: pg_checksums.c:537
-=======
#: pg_checksums.c:527
->>>>>>> REL_16_9
#, c-format
msgid "no data directory specified"
msgstr "каталог даних не вказано"
-<<<<<<< HEAD
-#: pg_checksums.c:546
-=======
#: pg_checksums.c:536
->>>>>>> REL_16_9
#, c-format
msgid "too many command-line arguments (first is \"%s\")"
msgstr "забагато аргументів у командному рядку (перший \"%s\")"
-<<<<<<< HEAD
-#: pg_checksums.c:556
-=======
#: pg_checksums.c:545
->>>>>>> REL_16_9
#, c-format
msgid "option -f/--filenode can only be used with --check"
msgstr "параметр -f/--filenode може бути використаний тільки з --check"
-<<<<<<< HEAD
-#: pg_checksums.c:566
-=======
#: pg_checksums.c:553
->>>>>>> REL_16_9
#, c-format
msgid "pg_control CRC value is incorrect"
msgstr "значення CRC pg_control неправильне"
-<<<<<<< HEAD
-#: pg_checksums.c:572
-=======
#: pg_checksums.c:556
->>>>>>> REL_16_9
#, c-format
msgid "cluster is not compatible with this version of pg_checksums"
msgstr "кластер не сумісний з цією версією pg_checksum"
-<<<<<<< HEAD
-#: pg_checksums.c:578
-=======
#: pg_checksums.c:560
->>>>>>> REL_16_9
#, c-format
msgid "database cluster is not compatible"
msgstr "кластер бази даних не сумісний"
-<<<<<<< HEAD
-#: pg_checksums.c:579
-=======
#: pg_checksums.c:561
->>>>>>> REL_16_9
#, c-format
msgid "The database cluster was initialized with block size %u, but
pg_checksums was compiled with block size %u."
msgstr "Кластер бази даних було ініціалізовано з розміром блоку %u, але
pg_checksums було скомпільовано з розміром блоку %u."
-<<<<<<< HEAD
-#: pg_checksums.c:592
-=======
#: pg_checksums.c:573
->>>>>>> REL_16_9
#, c-format
msgid "cluster must be shut down"
msgstr "кластер повинен бути закритий"
-<<<<<<< HEAD
-#: pg_checksums.c:599
-=======
#: pg_checksums.c:577
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are not enabled in cluster"
msgstr "контрольні суми в кластері неактивовані"
-<<<<<<< HEAD
-#: pg_checksums.c:606
-=======
#: pg_checksums.c:581
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already disabled in cluster"
msgstr "контрольні суми вже неактивовані в кластері"
-<<<<<<< HEAD
-#: pg_checksums.c:613
-=======
#: pg_checksums.c:585
->>>>>>> REL_16_9
#, c-format
msgid "data checksums are already enabled in cluster"
msgstr "контрольні суми вже активовані в кластері"
-<<<<<<< HEAD
-#: pg_checksums.c:639
-=======
#: pg_checksums.c:609
->>>>>>> REL_16_9
#, c-format
msgid "Checksum operation completed\n"
msgstr "Операція контрольної суми завершена\n"
-<<<<<<< HEAD
-#: pg_checksums.c:640
-=======
#: pg_checksums.c:610
->>>>>>> REL_16_9
#, c-format
msgid "Files scanned: %lld\n"
msgstr "Файлів проскановано: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:641
-=======
#: pg_checksums.c:611
->>>>>>> REL_16_9
#, c-format
msgid "Blocks scanned: %lld\n"
msgstr "Блоків відскановано: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:644
-=======
#: pg_checksums.c:614
->>>>>>> REL_16_9
#, c-format
msgid "Bad checksums: %lld\n"
msgstr "Помилкові контрольні суми: %lld\n"
-<<<<<<< HEAD
-#: pg_checksums.c:645 pg_checksums.c:672
-=======
#: pg_checksums.c:615 pg_checksums.c:647
->>>>>>> REL_16_9
#, c-format
msgid "Data checksum version: %u\n"
msgstr "Версія контрольних сум даних: %u\n"
-<<<<<<< HEAD
-#: pg_checksums.c:664
-=======
#: pg_checksums.c:622
#, c-format
msgid "Files written: %lld\n"
@@ -441,34 +308,21 @@ msgid "Blocks written: %lld\n"
msgstr "Блоків записано: %lld\n"
#: pg_checksums.c:639
->>>>>>> REL_16_9
#, c-format
msgid "syncing data directory"
msgstr "синхронізація даних каталогу"
-<<<<<<< HEAD
-#: pg_checksums.c:668
-=======
#: pg_checksums.c:643
->>>>>>> REL_16_9
#, c-format
msgid "updating control file"
msgstr "оновлення контрольного файлу"
-<<<<<<< HEAD
-#: pg_checksums.c:674
-=======
#: pg_checksums.c:649
->>>>>>> REL_16_9
#, c-format
msgid "Checksums enabled in cluster\n"
msgstr "Контрольні суми активовані в кластері\n"
-<<<<<<< HEAD
-#: pg_checksums.c:676
-=======
#: pg_checksums.c:651
->>>>>>> REL_16_9
#, c-format
msgid "Checksums disabled in cluster\n"
msgstr "Контрольні суми вимкнені у кластері\n"
diff --git a/src/bin/pg_checksums/po/zh_CN.po b/src/bin/pg_checksums/po/zh_CN.po
index 3da7c46da53..012872b87aa 100644
--- a/src/bin/pg_checksums/po/zh_CN.po
+++ b/src/bin/pg_checksums/po/zh_CN.po
@@ -1,32 +1,32 @@
# LANGUAGE message translation file for pg_checksums
# Copyright (C) 2020 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-# FIRST AUTHOR <[email protected]>, 2019.
+# FIRST AUTHOR <[email protected]>, 2019.
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_checksums (PostgreSQL) 14\n"
+"Project-Id-Version: pg_checksums (PostgreSQL) 13\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-08-14 05:49+0000\n"
-"PO-Revision-Date: 2021-08-14 16:00+0800\n"
-"Last-Translator: Jie Zhang <[email protected]>\n"
-"Language-Team: Chinese (Simplified) <[email protected]>\n"
+"POT-Creation-Date: 2020-06-05 01:47+0000\n"
+"PO-Revision-Date: 2020-06-21 16:00+0800\n"
+"Last-Translator: Jie Zhang <[email protected]>\n"
+"Language-Team: Chinese (Simplified) <[email protected]>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../../../src/common/logging.c:259
+#: ../../../src/common/logging.c:236
#, c-format
msgid "fatal: "
msgstr "致命的: "
-#: ../../../src/common/logging.c:266
+#: ../../../src/common/logging.c:243
#, c-format
msgid "error: "
msgstr "错误: "
-#: ../../../src/common/logging.c:273
+#: ../../../src/common/logging.c:250
#, c-format
msgid "warning: "
msgstr "警告: "
@@ -125,7 +125,7 @@ msgstr ""
#: pg_checksums.c:91
#, c-format
msgid "Report bugs to <%s>.\n"
-msgstr "臭虫报告至<%s>.\n"
+msgstr "臭虫报告至 <%s>.\n"
#: pg_checksums.c:92
#, c-format
@@ -137,171 +137,172 @@ msgstr "%s 主页: <%s>\n"
msgid "%*s/%s MB (%d%%) computed"
msgstr "已计算%*s/%s MB (%d%%)"
-#: pg_checksums.c:207
+#: pg_checksums.c:204
#, c-format
msgid "could not open file \"%s\": %m"
msgstr "无法打开文件 \"%s\": %m"
-#: pg_checksums.c:223
+#: pg_checksums.c:220
#, c-format
msgid "could not read block %u in file \"%s\": %m"
msgstr "无法在文件\"%2$s\"中读取块%1$u: %3$m"
-#: pg_checksums.c:226
+#: pg_checksums.c:223
#, c-format
msgid "could not read block %u in file \"%s\": read %d of %d"
msgstr "无法读取文件\"%2$s\"中的块%1$u:读取第%3$d个，共%4$d个"
-#: pg_checksums.c:250
+#: pg_checksums.c:240
#, c-format
msgid "checksum verification failed in file \"%s\", block %u: calculated
checksum %X but block contains %X"
msgstr "校验和验证在文件\"%s\"中失败，块%u:计算的校验和 %X ，但块包含 %X"
-#: pg_checksums.c:265
+#: pg_checksums.c:255
#, c-format
msgid "seek failed for block %u in file \"%s\": %m"
msgstr "在文件\"%2$s\"中查找块%1$u失败: %3$m"
-#: pg_checksums.c:274
+#: pg_checksums.c:264
#, c-format
msgid "could not write block %u in file \"%s\": %m"
msgstr "无法在文件 \"%2$s\"中写入块%1$u: %3$m"
-#: pg_checksums.c:277
+#: pg_checksums.c:267
#, c-format
msgid "could not write block %u in file \"%s\": wrote %d of %d"
msgstr "无法对文件\"%2$s\"写操作数据块%1$u: 已写入%3$d个，共%4$d个"
-#: pg_checksums.c:290
+#: pg_checksums.c:280
#, c-format
msgid "checksums verified in file \"%s\""
msgstr "在文件\"%s\"中验证的校验和"
-#: pg_checksums.c:292
+#: pg_checksums.c:282
#, c-format
msgid "checksums enabled in file \"%s\""
msgstr "文件\"%s\"中启用的校验和"
-#: pg_checksums.c:317
+#: pg_checksums.c:307
#, c-format
msgid "could not open directory \"%s\": %m"
msgstr "无法打开目录 \"%s\": %m"
-#: pg_checksums.c:344 pg_checksums.c:423
+#: pg_checksums.c:334 pg_checksums.c:413
#, c-format
msgid "could not stat file \"%s\": %m"
msgstr "无法取文件 \"%s\" 的状态: %m"
-#: pg_checksums.c:371
+#: pg_checksums.c:361
#, c-format
msgid "invalid segment number %d in file name \"%s\""
msgstr "文件名\"%2$s\"中的无效段号%1$d"
-#: pg_checksums.c:504
+#: pg_checksums.c:494
#, c-format
msgid "invalid filenode specification, must be numeric: %s"
msgstr "filenode指定无效，必须是数字: %s"
-#: pg_checksums.c:522 pg_checksums.c:538 pg_checksums.c:548 pg_checksums.c:557
+#: pg_checksums.c:512 pg_checksums.c:528 pg_checksums.c:538 pg_checksums.c:547
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: pg_checksums.c:537
+#: pg_checksums.c:527
#, c-format
msgid "no data directory specified"
-msgstr "没有指定数据目录"
+msgstr "未指定数据目录"
-#: pg_checksums.c:546
+#: pg_checksums.c:536
#, c-format
msgid "too many command-line arguments (first is \"%s\")"
-msgstr "命令行参数太多 (第一个是 \"%s\")"
+msgstr "命令行参数太多（第一个是\"%s\")"
-#: pg_checksums.c:556
+#: pg_checksums.c:546
#, c-format
msgid "option -f/--filenode can only be used with --check"
msgstr " -f/--filenode选项只能与--check一起使用"
-#: pg_checksums.c:566
+#: pg_checksums.c:556
#, c-format
msgid "pg_control CRC value is incorrect"
msgstr "pg_control的CRC值不正确 "
-#: pg_checksums.c:572
+#: pg_checksums.c:562
#, c-format
msgid "cluster is not compatible with this version of pg_checksums"
msgstr "群集与此版本的pg_checksums不兼容”"
-#: pg_checksums.c:578
+#: pg_checksums.c:568
#, c-format
msgid "database cluster is not compatible"
msgstr "数据库群集不兼容"
-#: pg_checksums.c:579
+#: pg_checksums.c:569
#, c-format
msgid "The database cluster was initialized with block size %u, but
pg_checksums was compiled with block size %u.\n"
msgstr "数据库群集是用块大小%u初始化的，但pg_checksums是用块大小%u编译的.\n"
-#: pg_checksums.c:592
+#: pg_checksums.c:582
#, c-format
msgid "cluster must be shut down"
msgstr "必须关闭群集"
-#: pg_checksums.c:599
+#: pg_checksums.c:589
#, c-format
msgid "data checksums are not enabled in cluster"
msgstr "群集中未启用数据校验和"
-#: pg_checksums.c:606
+#: pg_checksums.c:596
#, c-format
msgid "data checksums are already disabled in cluster"
msgstr "群集中已禁用数据校验和"
-#: pg_checksums.c:613
+#: pg_checksums.c:603
#, c-format
msgid "data checksums are already enabled in cluster"
msgstr "群集中已启用数据校验和"
-#: pg_checksums.c:639
+#: pg_checksums.c:632
#, c-format
msgid "Checksum operation completed\n"
msgstr "校验和操作已完成\n"
-#: pg_checksums.c:640
+#: pg_checksums.c:633
#, c-format
msgid "Files scanned: %s\n"
msgstr "扫描的文件: %s\n"
-#: pg_checksums.c:641
+#: pg_checksums.c:634
#, c-format
msgid "Blocks scanned: %s\n"
msgstr "扫描的块: %s\n"
-#: pg_checksums.c:644
+#: pg_checksums.c:637
#, c-format
msgid "Bad checksums: %s\n"
msgstr "坏校验和: %s\n"
-#: pg_checksums.c:645 pg_checksums.c:672
-msgid "Data checksum version: %u\n"
-msgstr "数据校验和版本: %u\n"
+#: pg_checksums.c:638 pg_checksums.c:665
+#, c-format
+msgid "Data checksum version: %d\n"
+msgstr "数据校验和版本: %d\n"
-#: pg_checksums.c:664
+#: pg_checksums.c:657
#, c-format
msgid "syncing data directory"
msgstr "同步数据目录"
-#: pg_checksums.c:668
+#: pg_checksums.c:661
#, c-format
msgid "updating control file"
msgstr "正在更新控制文件"
-#: pg_checksums.c:674
+#: pg_checksums.c:667
#, c-format
msgid "Checksums enabled in cluster\n"
msgstr "群集中启用的校验和\n"
-#: pg_checksums.c:676
+#: pg_checksums.c:669
#, c-format
msgid "Checksums disabled in cluster\n"
-msgstr "在群集中禁用校验和\n"
+msgstr "在群集中禁用校验和\n"
\ No newline at end of file
diff --git a/src/bin/pg_checksums/t/002_actions.pl
b/src/bin/pg_checksums/t/002_actions.pl
index 9ec99dcb951..1d4d39db587 100644
--- a/src/bin/pg_checksums/t/002_actions.pl
+++ b/src/bin/pg_checksums/t/002_actions.pl
@@ -10,11 +10,7 @@ use Config;
use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils;
-<<<<<<< HEAD
-use Test::More tests => 63;
-=======
use Test::More;
->>>>>>> REL_16_9
# Utility routine to create and check a table with corrupted checksums
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
