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 84abb556b6b Fix conflict on po files of pg_test_fsync
84abb556b6b is described below
commit 84abb556b6b22305868327f7265cdf6d08ce3486
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Mar 10 09:26:11 2026 -0400
Fix conflict on po files of pg_test_fsync
---
src/bin/pg_test_fsync/po/el.po | 14 ----
src/bin/pg_test_fsync/po/es.po | 4 -
src/bin/pg_test_fsync/po/ja.po | 162 +++++---------------------------------
src/bin/pg_test_fsync/po/ru.po | 131 ------------------------------
src/bin/pg_test_fsync/po/sv.po | 120 ----------------------------
src/bin/pg_test_fsync/po/uk.po | 121 ----------------------------
src/bin/pg_test_fsync/po/zh_CN.po | 91 +++++++++++----------
7 files changed, 67 insertions(+), 576 deletions(-)
diff --git a/src/bin/pg_test_fsync/po/el.po b/src/bin/pg_test_fsync/po/el.po
index 0f6a88d0eb9..4cd3771bc1f 100644
--- a/src/bin/pg_test_fsync/po/el.po
+++ b/src/bin/pg_test_fsync/po/el.po
@@ -9,13 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_test_fsync (PostgreSQL) 15\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-07-20 08:49+0000\n"
-"PO-Revision-Date: 2021-07-20 10:59+0200\n"
-=======
"POT-Creation-Date: 2023-04-14 09:21+0000\n"
"PO-Revision-Date: 2023-04-14 14:41+0200\n"
->>>>>>> REL_16_9
"Last-Translator: Georgios Kokolatos <[email protected]>\n"
"Language-Team: \n"
"Language: el\n"
@@ -23,9 +18,6 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-<<<<<<< HEAD
-"X-Generator: Poedit 3.0\n"
-=======
"X-Generator: Poedit 3.2.2\n"
#: ../../../src/common/logging.c:276
@@ -47,7 +39,6 @@ msgstr "λεπτομέρεια: "
#, c-format
msgid "hint: "
msgstr "υπόδειξη: "
->>>>>>> REL_16_9
#. translator: maintain alignment with NA_FORMAT
#: pg_test_fsync.c:32
@@ -72,13 +63,8 @@ msgstr "Χρήση: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
#: pg_test_fsync.c:185
#, c-format
-<<<<<<< HEAD
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες.\n"
-=======
msgid "invalid argument for option %s"
msgstr "μη έγκυρη παράμετρος για την επιλογή %s"
->>>>>>> REL_16_9
#: pg_test_fsync.c:186 pg_test_fsync.c:198 pg_test_fsync.c:207
#, c-format
diff --git a/src/bin/pg_test_fsync/po/es.po b/src/bin/pg_test_fsync/po/es.po
index 2f24f0e5b7a..e4df34210d9 100644
--- a/src/bin/pg_test_fsync/po/es.po
+++ b/src/bin/pg_test_fsync/po/es.po
@@ -7,11 +7,7 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_test_fsync (PostgreSQL) 14\n"
-=======
"Project-Id-Version: pg_test_fsync (PostgreSQL) 16\n"
->>>>>>> REL_16_9
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-11-09 06:10+0000\n"
"PO-Revision-Date: 2023-05-22 12:06+0200\n"
diff --git a/src/bin/pg_test_fsync/po/ja.po b/src/bin/pg_test_fsync/po/ja.po
index 7f78745a4a0..b775b3bcac2 100644
--- a/src/bin/pg_test_fsync/po/ja.po
+++ b/src/bin/pg_test_fsync/po/ja.po
@@ -5,17 +5,10 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_test_fsync (PostgreSQL 14)\n"
-"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-08-25 17:22+0900\n"
-"PO-Revision-Date: 2021-05-17 14:56+0900\n"
-=======
"Project-Id-Version: pg_test_fsync (PostgreSQL 16)\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-07-14 10:48+0900\n"
"PO-Revision-Date: 2022-05-10 15:25+0900\n"
->>>>>>> REL_16_9
"Last-Translator: Michihide Hotta <[email protected]>\n"
"Language-Team: \n"
"Language: ja\n"
@@ -24,11 +17,6 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Poedit 1.8.13\n"
-<<<<<<< HEAD
-
-#. translator: maintain alignment with NA_FORMAT
-#: pg_test_fsync.c:31
-=======
#: ../../../src/common/logging.c:276
#, c-format
@@ -52,13 +40,10 @@ msgstr "ヒント: "
#. translator: maintain alignment with NA_FORMAT
#: pg_test_fsync.c:32
->>>>>>> REL_16_9
#, c-format
msgid "%13.3f ops/sec %6.0f usecs/op\n"
-msgstr "%13.3f 操作/秒 %6.0f μ秒/操作\n"
+msgstr "%13.3f 操作/秒 %6.0f マイクロ秒/操作\n"
-<<<<<<< HEAD
-=======
#: pg_test_fsync.c:50
#, c-format
msgid "could not create thread for alarm"
@@ -69,26 +54,11 @@ msgstr "アラーム用のスレッドを生成できませんでした"
msgid "%s: %m"
msgstr "%s: %m"
->>>>>>> REL_16_9
#: pg_test_fsync.c:159
#, c-format
msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
msgstr "使用法: %s [-f ファイル名] [-s テストあたりの秒数]\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:186 pg_test_fsync.c:200 pg_test_fsync.c:211
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "詳細は\"%s --help\"で確認してください。\n"
-
-#: pg_test_fsync.c:216
-#, c-format
-msgid "%u second per test\n"
-msgid_plural "%u seconds per test\n"
-msgstr[0] "テスト1件あたり%u秒\n"
-
-#: pg_test_fsync.c:221
-=======
#: pg_test_fsync.c:185
#, c-format
msgid "invalid argument for option %s"
@@ -116,44 +86,20 @@ msgid_plural "%u seconds per test\n"
msgstr[0] "テスト１件あたり %u秒\n"
#: pg_test_fsync.c:216
->>>>>>> REL_16_9
#, c-format
msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
-msgstr ""
-"このプラットフォームではopen_datasyncとopen_syncについてO_DIRECTが\n"
-"サポートされています。\n"
+msgstr "このプラットフォームでは open_datasync と open_sync について O_DIRECT がサポートされています。\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:223
-=======
#: pg_test_fsync.c:218
#, c-format
msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
msgstr "このプラットフォームでは open_datasync と open_sync について F_NOCACHE がサポートされています。\n"
#: pg_test_fsync.c:220
->>>>>>> REL_16_9
#, c-format
msgid "Direct I/O is not supported on this platform.\n"
-msgstr "このプラットフォームではダイレクトI/Oがサポートされていません。\n"
+msgstr "このプラットフォームではダイレクト I/O がサポートされていません。\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:248 pg_test_fsync.c:314 pg_test_fsync.c:339
-#: pg_test_fsync.c:363 pg_test_fsync.c:507 pg_test_fsync.c:519
-#: pg_test_fsync.c:535 pg_test_fsync.c:541 pg_test_fsync.c:563
-msgid "could not open output file"
-msgstr "出力ファイルをオープンできませんでした"
-
-#: pg_test_fsync.c:252 pg_test_fsync.c:297 pg_test_fsync.c:323
-#: pg_test_fsync.c:348 pg_test_fsync.c:372 pg_test_fsync.c:411
-#: pg_test_fsync.c:470 pg_test_fsync.c:509 pg_test_fsync.c:537
-#: pg_test_fsync.c:568
-msgid "write failed"
-msgstr "書き込みに失敗"
-
-#: pg_test_fsync.c:256 pg_test_fsync.c:350 pg_test_fsync.c:374
-#: pg_test_fsync.c:511 pg_test_fsync.c:543
-=======
#: pg_test_fsync.c:245 pg_test_fsync.c:336 pg_test_fsync.c:361
#: pg_test_fsync.c:385 pg_test_fsync.c:529 pg_test_fsync.c:541
#: pg_test_fsync.c:557 pg_test_fsync.c:563 pg_test_fsync.c:585
@@ -169,57 +115,32 @@ msgstr "書き込みに失敗"
#: pg_test_fsync.c:253 pg_test_fsync.c:372 pg_test_fsync.c:396
#: pg_test_fsync.c:533 pg_test_fsync.c:565
->>>>>>> REL_16_9
msgid "fsync failed"
-msgstr "fsyncに失敗"
+msgstr "fsync に失敗"
-<<<<<<< HEAD
-#: pg_test_fsync.c:270
-=======
#: pg_test_fsync.c:292
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
"Compare file sync methods using one %dkB write:\n"
msgstr ""
"\n"
-"%dkBの書込みを1回行ってファイル同期方法を比較します:\n"
+"１個の %dkB write を使ってファイル同期メソッドを比較します:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:272
-=======
#: pg_test_fsync.c:294
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
"Compare file sync methods using two %dkB writes:\n"
msgstr ""
"\n"
-"%dkBの書込みを2回行ってファイル同期方法を比較します:\n"
+"２個の %dkB write を使ってファイル同期メソッドを比較します:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:273
-=======
#: pg_test_fsync.c:295
->>>>>>> REL_16_9
#, c-format
msgid "(in wal_sync_method preference order, except fdatasync is Linux's
default)\n"
-msgstr "(Linuxのデフォルトであるfdatasyncを除きwal_sync_methodの優先順)\n"
-
-<<<<<<< HEAD
-#: pg_test_fsync.c:284 pg_test_fsync.c:391 pg_test_fsync.c:458
-msgid "n/a*"
-msgstr "利用不可*"
-
-#: pg_test_fsync.c:303 pg_test_fsync.c:329 pg_test_fsync.c:379
-#: pg_test_fsync.c:417 pg_test_fsync.c:476
-msgid "n/a"
-msgstr "利用不可"
+msgstr "（wal_sync_method の指定順の中で、Linux のデフォルトである fdatasync は除きます）\n"
-#: pg_test_fsync.c:422
-=======
#: pg_test_fsync.c:306 pg_test_fsync.c:413 pg_test_fsync.c:480
msgid "n/a*"
msgstr "利用不可*"
@@ -230,121 +151,77 @@ msgid "n/a"
msgstr "利用不可"
#: pg_test_fsync.c:444
->>>>>>> REL_16_9
#, c-format
msgid ""
"* This file system and its mount options do not support direct\n"
" I/O, e.g. ext4 in journaled mode.\n"
msgstr ""
-"* このファイルシステムとそのマウントオプションではダイレクトI/Oをサポート\n"
+"* このファイルシステムとそのマウントオプションではダイレクト I/O をサポート\n"
" していません。例）ジャーナルモードの ext4。\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:430
-=======
#: pg_test_fsync.c:452
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
"Compare open_sync with different write sizes:\n"
msgstr ""
"\n"
-"open_sync を異なった書込みサイズで比較します:\n"
+"open_sync を異なった write サイズで比較します:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:431
-=======
#: pg_test_fsync.c:453
->>>>>>> REL_16_9
#, c-format
msgid ""
"(This is designed to compare the cost of writing 16kB in different write\n"
"open_sync sizes.)\n"
msgstr ""
-"(これはopen_syncの書込みサイズを変えながら、16kBの書込みのコストを比較する\n"
-"よう指定されています。)\n"
+"(これは open_sync の write サイズを変えながら、16kB write のコストを\n"
+"比較するよう指定されています。)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:434
-=======
#: pg_test_fsync.c:456
->>>>>>> REL_16_9
msgid " 1 * 16kB open_sync write"
-msgstr " 1 * 16kB open_sync書込み"
+msgstr " 1 * 16kB open_sync write"
-<<<<<<< HEAD
-#: pg_test_fsync.c:435
-=======
#: pg_test_fsync.c:457
->>>>>>> REL_16_9
msgid " 2 * 8kB open_sync writes"
-msgstr " 2 * 8kB open_sync書込み"
+msgstr " 2 * 8kB open_sync writes"
-<<<<<<< HEAD
-#: pg_test_fsync.c:436
-=======
#: pg_test_fsync.c:458
->>>>>>> REL_16_9
msgid " 4 * 4kB open_sync writes"
-msgstr " 4 * 4kB open_sync書込み"
+msgstr " 4 * 4kB open_sync writes"
-<<<<<<< HEAD
-#: pg_test_fsync.c:437
-=======
#: pg_test_fsync.c:459
->>>>>>> REL_16_9
msgid " 8 * 2kB open_sync writes"
-msgstr " 8 * 2kB open_sync書込み"
+msgstr " 8 * 2kB open_sync writes"
-<<<<<<< HEAD
-#: pg_test_fsync.c:438
-=======
#: pg_test_fsync.c:460
->>>>>>> REL_16_9
msgid "16 * 1kB open_sync writes"
-msgstr "16 * 1kB open_sync書込み"
+msgstr "16 * 1kB open_sync writes"
-<<<<<<< HEAD
-#: pg_test_fsync.c:492
-=======
#: pg_test_fsync.c:514
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
"Test if fsync on non-write file descriptor is honored:\n"
msgstr ""
"\n"
-"書き込みのないのファイルディスクリプタ上のfsyncが無視されないかをテストします:\n"
+"書き込みなしのファイルディスクリプタ上の fsync の方が優れているかをテストします:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:493
-=======
#: pg_test_fsync.c:515
->>>>>>> REL_16_9
#, c-format
msgid ""
"(If the times are similar, fsync() can sync data written on a different\n"
"descriptor.)\n"
msgstr ""
-"（もし実行時間が同等であれば、fsync()は異なったファイルディスクリプタ上で\n"
-"データをsyncできることになります。）\n"
+"（もし実行時間が同等であれば、fsync() は異なったファイルディスクリプタ上で\n"
+"データを sync できることになります。）\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:558
-=======
#: pg_test_fsync.c:580
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
"Non-sync'ed %dkB writes:\n"
msgstr ""
"\n"
-<<<<<<< HEAD
-"%dkBの同期なし書込み:\n"
-=======
"%dkB の sync なし write:\n"
#~ msgid "Try \"%s --help\" for more information.\n"
@@ -358,4 +235,3 @@ msgstr ""
#~ msgid "%s: %s\n"
#~ msgstr "%s: %s\n"
->>>>>>> REL_16_9
diff --git a/src/bin/pg_test_fsync/po/ru.po b/src/bin/pg_test_fsync/po/ru.po
index e60a061b50d..a8a2363d68b 100644
--- a/src/bin/pg_test_fsync/po/ru.po
+++ b/src/bin/pg_test_fsync/po/ru.po
@@ -1,22 +1,13 @@
# Russian message translation file for pg_test_fsync
# Copyright (C) 2017 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-<<<<<<< HEAD
-# Alexander Lakhin <[email protected]>, 2017, 2021.
-=======
# Alexander Lakhin <[email protected]>, 2017, 2021, 2022, 2024.
->>>>>>> REL_16_9
msgid ""
msgstr ""
"Project-Id-Version: pg_test_fsync (PostgreSQL) 10\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-08-14 06:29+0300\n"
-"PO-Revision-Date: 2021-09-04 12:16+0300\n"
-=======
"POT-Creation-Date: 2023-08-28 07:59+0300\n"
"PO-Revision-Date: 2022-09-05 13:36+0300\n"
->>>>>>> REL_16_9
"Last-Translator: Alexander Lakhin <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -47,17 +38,11 @@ msgid "hint: "
msgstr "подсказка: "
#. translator: maintain alignment with NA_FORMAT
-<<<<<<< HEAD
-#: pg_test_fsync.c:31
-=======
#: pg_test_fsync.c:32
->>>>>>> REL_16_9
#, c-format
msgid "%13.3f ops/sec %6.0f usecs/op\n"
msgstr "%13.3f оп/с %6.0f мкс/оп\n"
-<<<<<<< HEAD
-=======
#: pg_test_fsync.c:50
#, c-format
msgid "could not create thread for alarm"
@@ -68,32 +53,16 @@ msgstr "не удалось создать поток для обработки
msgid "%s: %m"
msgstr "%s: %m"
->>>>>>> REL_16_9
#: pg_test_fsync.c:159
#, c-format
msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
msgstr "Использование: %s [-f ИМЯ_ФАЙЛА ] [-s ТЕСТ_СЕК]\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:186 pg_test_fsync.c:200 pg_test_fsync.c:211
-=======
#: pg_test_fsync.c:185
->>>>>>> REL_16_9
#, c-format
msgid "invalid argument for option %s"
msgstr "недопустимый аргумент параметра %s"
-<<<<<<< HEAD
-#: pg_test_fsync.c:216
-#, c-format
-msgid "%u second per test\n"
-msgid_plural "%u seconds per test\n"
-msgstr[0] "на тест отводится %u сек.\n"
-msgstr[1] "на тест отводится %u сек.\n"
-msgstr[2] "на тест отводится %u сек.\n"
-
-#: pg_test_fsync.c:221
-=======
#: pg_test_fsync.c:186 pg_test_fsync.c:198 pg_test_fsync.c:207
#, c-format
msgid "Try \"%s --help\" for more information."
@@ -118,15 +87,11 @@ msgstr[1] "на тест отводится %u сек.\n"
msgstr[2] "на тест отводится %u сек.\n"
#: pg_test_fsync.c:216
->>>>>>> REL_16_9
#, c-format
msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
msgstr ""
"O_DIRECT на этой платформе не поддерживается для open_datasync и open_sync.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:223
-=======
#: pg_test_fsync.c:218
#, c-format
msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
@@ -134,32 +99,10 @@ msgstr ""
"F_NOCACHE на этой платформе поддерживается для open_datasync и open_sync.\n"
#: pg_test_fsync.c:220
->>>>>>> REL_16_9
#, c-format
msgid "Direct I/O is not supported on this platform.\n"
msgstr "Прямой ввод/вывод не поддерживается на этой платформе.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:248 pg_test_fsync.c:314 pg_test_fsync.c:339
-#: pg_test_fsync.c:363 pg_test_fsync.c:507 pg_test_fsync.c:519
-#: pg_test_fsync.c:535 pg_test_fsync.c:541 pg_test_fsync.c:563
-msgid "could not open output file"
-msgstr "не удалось открыть выходной файл"
-
-#: pg_test_fsync.c:252 pg_test_fsync.c:297 pg_test_fsync.c:323
-#: pg_test_fsync.c:348 pg_test_fsync.c:372 pg_test_fsync.c:411
-#: pg_test_fsync.c:470 pg_test_fsync.c:509 pg_test_fsync.c:537
-#: pg_test_fsync.c:568
-msgid "write failed"
-msgstr "ошибка записи"
-
-#: pg_test_fsync.c:256 pg_test_fsync.c:350 pg_test_fsync.c:374
-#: pg_test_fsync.c:511 pg_test_fsync.c:543
-msgid "fsync failed"
-msgstr "ошибка синхронизации с ФС"
-
-#: pg_test_fsync.c:270
-=======
#: pg_test_fsync.c:245 pg_test_fsync.c:335 pg_test_fsync.c:357
#: pg_test_fsync.c:381 pg_test_fsync.c:525 pg_test_fsync.c:537
#: pg_test_fsync.c:553 pg_test_fsync.c:559 pg_test_fsync.c:581
@@ -179,7 +122,6 @@ msgid "fsync failed"
msgstr "ошибка синхронизации с ФС"
#: pg_test_fsync.c:292
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -188,11 +130,7 @@ msgstr ""
"\n"
"Сравнение методов синхронизации файлов при однократной записи %d КБ:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:272
-=======
#: pg_test_fsync.c:294
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -201,11 +139,7 @@ msgstr ""
"\n"
"Сравнение методов синхронизации файлов при двухкратной записи %d КБ:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:273
-=======
#: pg_test_fsync.c:295
->>>>>>> REL_16_9
#, c-format
msgid ""
"(in wal_sync_method preference order, except fdatasync is Linux's default)\n"
@@ -213,18 +147,6 @@ msgstr ""
"(в порядке предпочтения для wal_sync_method, без учёта наибольшего "
"предпочтения fdatasync в Linux)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:284 pg_test_fsync.c:391 pg_test_fsync.c:458
-msgid "n/a*"
-msgstr "н/д*"
-
-#: pg_test_fsync.c:303 pg_test_fsync.c:329 pg_test_fsync.c:379
-#: pg_test_fsync.c:417 pg_test_fsync.c:476
-msgid "n/a"
-msgstr "н/д"
-
-#: pg_test_fsync.c:422
-=======
#: pg_test_fsync.c:306 pg_test_fsync.c:409 pg_test_fsync.c:476
msgid "n/a*"
msgstr "н/д*"
@@ -235,7 +157,6 @@ msgid "n/a"
msgstr "н/д"
#: pg_test_fsync.c:440
->>>>>>> REL_16_9
#, c-format
msgid ""
"* This file system and its mount options do not support direct\n"
@@ -244,11 +165,7 @@ msgstr ""
"* Эта файловая система с текущими параметрами монтирования не поддерживает\n"
" прямой ввод/вывод, как например, ext4 в режиме журналирования.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:430
-=======
#: pg_test_fsync.c:448
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -257,11 +174,7 @@ msgstr ""
"\n"
"Сравнение open_sync при различных объёмах записываемых данных:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:431
-=======
#: pg_test_fsync.c:449
->>>>>>> REL_16_9
#, c-format
msgid ""
"(This is designed to compare the cost of writing 16kB in different write\n"
@@ -272,29 +185,6 @@ msgstr ""
"записи с open_sync.)\n"
# skip-rule: double-space
-<<<<<<< HEAD
-#: pg_test_fsync.c:434
-msgid " 1 * 16kB open_sync write"
-msgstr "запись с open_sync 1 * 16 КБ"
-
-#: pg_test_fsync.c:435
-msgid " 2 * 8kB open_sync writes"
-msgstr "запись с open_sync 2 * 8 КБ"
-
-#: pg_test_fsync.c:436
-msgid " 4 * 4kB open_sync writes"
-msgstr "запись с open_sync 4 * 4 КБ"
-
-#: pg_test_fsync.c:437
-msgid " 8 * 2kB open_sync writes"
-msgstr "запись с open_sync 8 * 2 КБ"
-
-#: pg_test_fsync.c:438
-msgid "16 * 1kB open_sync writes"
-msgstr "запись с open_sync 16 * 1 КБ"
-
-#: pg_test_fsync.c:492
-=======
#: pg_test_fsync.c:452
msgid " 1 * 16kB open_sync write"
msgstr "запись с open_sync 1 * 16 КБ"
@@ -316,7 +206,6 @@ msgid "16 * 1kB open_sync writes"
msgstr "запись с open_sync 16 * 1 КБ"
#: pg_test_fsync.c:510
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -326,11 +215,7 @@ msgstr ""
"Проверка, производится ли fsync с указателем файла, открытого не для "
"записи:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:493
-=======
#: pg_test_fsync.c:511
->>>>>>> REL_16_9
#, c-format
msgid ""
"(If the times are similar, fsync() can sync data written on a different\n"
@@ -340,11 +225,7 @@ msgstr ""
"данные,\n"
"записанные через другой дескриптор.)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:558
-=======
#: pg_test_fsync.c:576
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -355,15 +236,3 @@ msgstr ""
#~ msgid "seek failed"
#~ msgstr "ошибка позиционирования"
-<<<<<<< HEAD
-
-#~ msgid "Could not create thread for alarm\n"
-#~ msgstr "Не удалось создать поток для обработки сигналов\n"
-
-#~ msgid "%s: too many command-line arguments (first is \"%s\")\n"
-#~ msgstr "%s: слишком много аргументов командной строки (первый: \"%s\")\n"
-
-#~ msgid "%s: %s\n"
-#~ msgstr "%s: %s\n"
-=======
->>>>>>> REL_16_9
diff --git a/src/bin/pg_test_fsync/po/sv.po b/src/bin/pg_test_fsync/po/sv.po
index d615260758b..45f059e9db5 100644
--- a/src/bin/pg_test_fsync/po/sv.po
+++ b/src/bin/pg_test_fsync/po/sv.po
@@ -1,16 +1,6 @@
# Swedish message translation file for pg_test_fsync
# Copyright (C) 2017 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-<<<<<<< HEAD
-# Dennis Björklund <[email protected]>, 2017, 2018, 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 07:19+0100\n"
-=======
# Dennis Björklund <[email protected]>, 2017, 2018, 2019, 2020, 2021, 2022.
#
msgid ""
@@ -19,7 +9,6 @@ msgstr ""
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2022-05-09 18:51+0000\n"
"PO-Revision-Date: 2022-05-09 21:44+0200\n"
->>>>>>> REL_16_9
"Last-Translator: Dennis Björklund <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
"Language: sv\n"
@@ -49,17 +38,11 @@ msgid "hint: "
msgstr "tips: "
#. translator: maintain alignment with NA_FORMAT
-<<<<<<< HEAD
-#: pg_test_fsync.c:31
-=======
#: pg_test_fsync.c:32
->>>>>>> REL_16_9
#, c-format
msgid "%13.3f ops/sec %6.0f usecs/op\n"
msgstr "%13.3f ops/sek %6.0f useks/op\n"
-<<<<<<< HEAD
-=======
#: pg_test_fsync.c:50
#, c-format
msgid "could not create thread for alarm"
@@ -70,31 +53,16 @@ msgstr "kunde inte skapa alarmtråd"
msgid "%s: %m"
msgstr "%s: %m"
->>>>>>> REL_16_9
#: pg_test_fsync.c:159
#, c-format
msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
msgstr "Användning: %s [-f FILENAMN] [-s SEK-PER-TEST]\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:186 pg_test_fsync.c:200 pg_test_fsync.c:211
-=======
#: pg_test_fsync.c:185
->>>>>>> REL_16_9
#, c-format
msgid "invalid argument for option %s"
msgstr "ogiltigt argument för flaggan %s"
-<<<<<<< HEAD
-#: pg_test_fsync.c:216
-#, c-format
-msgid "%u second per test\n"
-msgid_plural "%u seconds per test\n"
-msgstr[0] "%u sekund per test\n"
-msgstr[1] "%u sekunder per test\n"
-
-#: pg_test_fsync.c:221
-=======
#: pg_test_fsync.c:186 pg_test_fsync.c:198 pg_test_fsync.c:207
#, c-format
msgid "Try \"%s --help\" for more information."
@@ -118,46 +86,20 @@ msgstr[0] "%u sekund per test\n"
msgstr[1] "%u sekunder per test\n"
#: pg_test_fsync.c:216
->>>>>>> REL_16_9
#, c-format
msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
msgstr "O_DIRECT stöds på denna plattform för open_datasync och open_sync.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:223
-=======
#: pg_test_fsync.c:218
#, c-format
msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
msgstr "F_NOCACHE stöds på denna plattform för open_datasync och open_sync.\n"
#: pg_test_fsync.c:220
->>>>>>> REL_16_9
#, c-format
msgid "Direct I/O is not supported on this platform.\n"
msgstr "Direkt I/O stöds inte på denna plattform.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:248 pg_test_fsync.c:314 pg_test_fsync.c:339
-#: pg_test_fsync.c:363 pg_test_fsync.c:507 pg_test_fsync.c:519
-#: pg_test_fsync.c:535 pg_test_fsync.c:541 pg_test_fsync.c:563
-msgid "could not open output file"
-msgstr "kunde inte öppna utdatafil"
-
-#: pg_test_fsync.c:252 pg_test_fsync.c:297 pg_test_fsync.c:323
-#: pg_test_fsync.c:348 pg_test_fsync.c:372 pg_test_fsync.c:411
-#: pg_test_fsync.c:470 pg_test_fsync.c:509 pg_test_fsync.c:537
-#: pg_test_fsync.c:568
-msgid "write failed"
-msgstr "skrivning misslyckades"
-
-#: pg_test_fsync.c:256 pg_test_fsync.c:350 pg_test_fsync.c:374
-#: pg_test_fsync.c:511 pg_test_fsync.c:543
-msgid "fsync failed"
-msgstr "fsync misslyckades"
-
-#: pg_test_fsync.c:270
-=======
#: pg_test_fsync.c:245 pg_test_fsync.c:336 pg_test_fsync.c:361
#: pg_test_fsync.c:385 pg_test_fsync.c:529 pg_test_fsync.c:541
#: pg_test_fsync.c:557 pg_test_fsync.c:563 pg_test_fsync.c:585
@@ -177,7 +119,6 @@ msgid "fsync failed"
msgstr "fsync misslyckades"
#: pg_test_fsync.c:292
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -186,11 +127,7 @@ msgstr ""
"\n"
"Jämför filsynkningsmetoder genom att använda en %dkB-skrivning:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:272
-=======
#: pg_test_fsync.c:294
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -199,27 +136,11 @@ msgstr ""
"\n"
"Jämför filsynkningsmetoder genom att använda två %dkB-skrivningar:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:273
-=======
#: pg_test_fsync.c:295
->>>>>>> REL_16_9
#, c-format
msgid "(in wal_sync_method preference order, except fdatasync is Linux's
default)\n"
msgstr "(i wal_sync_method inställningsordning, förutom att fdatasync är
standard i Linux)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:284 pg_test_fsync.c:391 pg_test_fsync.c:458
-msgid "n/a*"
-msgstr "ej tillämpbar*"
-
-#: pg_test_fsync.c:303 pg_test_fsync.c:329 pg_test_fsync.c:379
-#: pg_test_fsync.c:417 pg_test_fsync.c:476
-msgid "n/a"
-msgstr "ej tillämpbar"
-
-#: pg_test_fsync.c:422
-=======
#: pg_test_fsync.c:306 pg_test_fsync.c:413 pg_test_fsync.c:480
msgid "n/a*"
msgstr "ej tillämpbar*"
@@ -230,7 +151,6 @@ msgid "n/a"
msgstr "ej tillämpbar"
#: pg_test_fsync.c:444
->>>>>>> REL_16_9
#, c-format
msgid ""
"* This file system and its mount options do not support direct\n"
@@ -239,11 +159,7 @@ msgstr ""
"* Detta filsystem och dess monteringsflaffor stöder inte\n"
" direkt I/O, t.ex. ext4 i journalläge.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:430
-=======
#: pg_test_fsync.c:452
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -252,11 +168,7 @@ msgstr ""
"\n"
"Jämför open_sync med olika skrivstorlekar:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:431
-=======
#: pg_test_fsync.c:453
->>>>>>> REL_16_9
#, c-format
msgid ""
"(This is designed to compare the cost of writing 16kB in different write\n"
@@ -265,29 +177,6 @@ msgstr ""
"(Detta är gjort för att jämföra kostnaden att skriva 16kB med olika\n"
"open_sync skrivstorlekar.)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:434
-msgid " 1 * 16kB open_sync write"
-msgstr " 1 * 16kB open_sync skrivning"
-
-#: pg_test_fsync.c:435
-msgid " 2 * 8kB open_sync writes"
-msgstr " 2 * 8kB open_sync skrivningar"
-
-#: pg_test_fsync.c:436
-msgid " 4 * 4kB open_sync writes"
-msgstr " 4 * 4kB open_sync skrivningar"
-
-#: pg_test_fsync.c:437
-msgid " 8 * 2kB open_sync writes"
-msgstr " 8 * 2kB open_sync skrivningar"
-
-#: pg_test_fsync.c:438
-msgid "16 * 1kB open_sync writes"
-msgstr "16 * 1kB open_sync skrivningar"
-
-#: pg_test_fsync.c:492
-=======
#: pg_test_fsync.c:456
msgid " 1 * 16kB open_sync write"
msgstr " 1 * 16kB open_sync skrivning"
@@ -309,7 +198,6 @@ msgid "16 * 1kB open_sync writes"
msgstr "16 * 1kB open_sync skrivningar"
#: pg_test_fsync.c:514
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
@@ -318,11 +206,7 @@ msgstr ""
"\n"
"Testa om fsync på en icke skrivbar fildeskriptor respekteras:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:493
-=======
#: pg_test_fsync.c:515
->>>>>>> REL_16_9
#, c-format
msgid ""
"(If the times are similar, fsync() can sync data written on a different\n"
@@ -331,11 +215,7 @@ msgstr ""
"(Om tiderna är liknande, så kan fsync() synka data skriven på\n"
"olika deskriptorer.)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:558
-=======
#: pg_test_fsync.c:580
->>>>>>> REL_16_9
#, c-format
msgid ""
"\n"
diff --git a/src/bin/pg_test_fsync/po/uk.po b/src/bin/pg_test_fsync/po/uk.po
index 7a8d93ccaaf..00a789b1a42 100644
--- a/src/bin/pg_test_fsync/po/uk.po
+++ b/src/bin/pg_test_fsync/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:51+0000\n"
"PO-Revision-Date: 2022-09-13 11:52\n"
->>>>>>> REL_16_9
"Last-Translator: \n"
"Language-Team: Ukrainian\n"
"Language: uk_UA\n"
@@ -19,13 +14,6 @@ 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_test_fsync.pot\n"
-"X-Crowdin-File-ID: 750\n"
-
-#. translator: maintain alignment with NA_FORMAT
-#: pg_test_fsync.c:31
-=======
"X-Crowdin-File: /REL_15_STABLE/pg_test_fsync.pot\n"
"X-Crowdin-File-ID: 886\n"
@@ -51,13 +39,10 @@ msgstr "підказка: "
#. translator: maintain alignment with NA_FORMAT
#: pg_test_fsync.c:32
->>>>>>> REL_16_9
#, c-format
msgid "%13.3f ops/sec %6.0f usecs/op\n"
msgstr "%13.3f оп/с %6.0f мкс/оп\n"
-<<<<<<< HEAD
-=======
#: pg_test_fsync.c:50
#, c-format
msgid "could not create thread for alarm"
@@ -68,29 +53,11 @@ msgstr "не вдалося створити потік для сигналіз
msgid "%s: %m"
msgstr "%s: %m"
->>>>>>> REL_16_9
#: pg_test_fsync.c:159
#, c-format
msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
msgstr "Використання: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:186 pg_test_fsync.c:200 pg_test_fsync.c:211
-#, c-format
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
-
-#: pg_test_fsync.c:216
-#, c-format
-msgid "%u second per test\n"
-msgid_plural "%u seconds per test\n"
-msgstr[0] "%u секунда на тест\n"
-msgstr[1] "%u секунди на тест\n"
-msgstr[2] "%u секунд на тест\n"
-msgstr[3] "%u секунд на тест\n"
-
-#: pg_test_fsync.c:221
-=======
#: pg_test_fsync.c:185
#, c-format
msgid "invalid argument for option %s"
@@ -121,46 +88,20 @@ msgstr[2] "%u секунд на тест\n"
msgstr[3] "%u секунд на тест\n"
#: pg_test_fsync.c:216
->>>>>>> REL_16_9
#, c-format
msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
msgstr "O_DIRECT на цій платформі підтримується для open_datasync і
open_sync.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:223
-=======
#: pg_test_fsync.c:218
#, c-format
msgid "F_NOCACHE supported on this platform for open_datasync and open_sync.\n"
msgstr "F_NOCACHE підтримується на цій платформі для open_datasync і
open_sync.\n"
#: pg_test_fsync.c:220
->>>>>>> REL_16_9
#, c-format
msgid "Direct I/O is not supported on this platform.\n"
msgstr "Пряме введення/виведення не підтримується на цій платформі.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:248 pg_test_fsync.c:314 pg_test_fsync.c:339
-#: pg_test_fsync.c:363 pg_test_fsync.c:507 pg_test_fsync.c:519
-#: pg_test_fsync.c:535 pg_test_fsync.c:541 pg_test_fsync.c:563
-msgid "could not open output file"
-msgstr "неможливо відкрити файл виводу"
-
-#: pg_test_fsync.c:252 pg_test_fsync.c:297 pg_test_fsync.c:323
-#: pg_test_fsync.c:348 pg_test_fsync.c:372 pg_test_fsync.c:411
-#: pg_test_fsync.c:470 pg_test_fsync.c:509 pg_test_fsync.c:537
-#: pg_test_fsync.c:568
-msgid "write failed"
-msgstr "записування не вдалося"
-
-#: pg_test_fsync.c:256 pg_test_fsync.c:350 pg_test_fsync.c:374
-#: pg_test_fsync.c:511 pg_test_fsync.c:543
-msgid "fsync failed"
-msgstr "помилка fsync"
-
-#: pg_test_fsync.c:270
-=======
#: pg_test_fsync.c:245 pg_test_fsync.c:336 pg_test_fsync.c:361
#: pg_test_fsync.c:385 pg_test_fsync.c:529 pg_test_fsync.c:541
#: pg_test_fsync.c:557 pg_test_fsync.c:563 pg_test_fsync.c:585
@@ -180,45 +121,24 @@ msgid "fsync failed"
msgstr "помилка fsync"
#: pg_test_fsync.c:292
->>>>>>> REL_16_9
#, c-format
msgid "\n"
"Compare file sync methods using one %dkB write:\n"
msgstr "\n"
"Порівнювання методів синхронізації файлу, використовуючи один запис %dkB:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:272
-=======
#: pg_test_fsync.c:294
->>>>>>> REL_16_9
#, c-format
msgid "\n"
"Compare file sync methods using two %dkB writes:\n"
msgstr "\n"
"Порівнювання методів синхронізації файлу, використовуючи два записи %dkB: \n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:273
-=======
#: pg_test_fsync.c:295
->>>>>>> REL_16_9
#, c-format
msgid "(in wal_sync_method preference order, except fdatasync is Linux's
default)\n"
msgstr "(в порядку переваги для wal_sync_method, окрім переваги fdatasync в
Linux)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:284 pg_test_fsync.c:391 pg_test_fsync.c:458
-msgid "n/a*"
-msgstr "н/д*"
-
-#: pg_test_fsync.c:303 pg_test_fsync.c:329 pg_test_fsync.c:379
-#: pg_test_fsync.c:417 pg_test_fsync.c:476
-msgid "n/a"
-msgstr "н/д"
-
-#: pg_test_fsync.c:422
-=======
#: pg_test_fsync.c:306 pg_test_fsync.c:413 pg_test_fsync.c:480
msgid "n/a*"
msgstr "н/д*"
@@ -229,58 +149,26 @@ msgid "n/a"
msgstr "н/д"
#: pg_test_fsync.c:444
->>>>>>> REL_16_9
#, c-format
msgid "* This file system and its mount options do not support direct\n"
" I/O, e.g. ext4 in journaled mode.\n"
msgstr "* Ця файлова система з поточними параметрами монтування не підтримує\n"
" пряме введення/виведення, наприклад, ext4 в режимі журналювання.\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:430
-=======
#: pg_test_fsync.c:452
->>>>>>> REL_16_9
#, c-format
msgid "\n"
"Compare open_sync with different write sizes:\n"
msgstr "\n"
"Порівняння open_sync з різними розмірами записування:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:431
-=======
#: pg_test_fsync.c:453
->>>>>>> REL_16_9
#, c-format
msgid "(This is designed to compare the cost of writing 16kB in different
write\n"
"open_sync sizes.)\n"
msgstr "(Це створено для порівняння вартості запису 16 КБ з різними
розмірами\n"
"записування open_sync.)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:434
-msgid " 1 * 16kB open_sync write"
-msgstr " запис з open_sync 1 * 16 КБ"
-
-#: pg_test_fsync.c:435
-msgid " 2 * 8kB open_sync writes"
-msgstr " запис з open_sync 2 * 8 КБ"
-
-#: pg_test_fsync.c:436
-msgid " 4 * 4kB open_sync writes"
-msgstr " запис з open_sync 4 * 4 КБ"
-
-#: pg_test_fsync.c:437
-msgid " 8 * 2kB open_sync writes"
-msgstr " запис з open_sync 8 * 2 КБ"
-
-#: pg_test_fsync.c:438
-msgid "16 * 1kB open_sync writes"
-msgstr "запис з open_sync 16 * 1 КБ"
-
-#: pg_test_fsync.c:492
-=======
#: pg_test_fsync.c:456
msgid " 1 * 16kB open_sync write"
msgstr " запис з open_sync 1 * 16 КБ"
@@ -302,28 +190,19 @@ msgid "16 * 1kB open_sync writes"
msgstr "запис з open_sync 16 * 1 КБ"
#: pg_test_fsync.c:514
->>>>>>> REL_16_9
#, c-format
msgid "\n"
"Test if fsync on non-write file descriptor is honored:\n"
msgstr "\n"
"Перевірка, чи здійснюється fsync з дескриптором файлу, відкритого не для
запису:\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:493
-=======
#: pg_test_fsync.c:515
->>>>>>> REL_16_9
#, c-format
msgid "(If the times are similar, fsync() can sync data written on a
different\n"
"descriptor.)\n"
msgstr "(Якщо час однаковий, fsync() може синхронізувати дані, записані іншим
дескриптором.)\n"
-<<<<<<< HEAD
-#: pg_test_fsync.c:558
-=======
#: pg_test_fsync.c:580
->>>>>>> REL_16_9
#, c-format
msgid "\n"
"Non-sync'ed %dkB writes:\n"
diff --git a/src/bin/pg_test_fsync/po/zh_CN.po
b/src/bin/pg_test_fsync/po/zh_CN.po
index e00a64bb085..6331efdf423 100644
--- a/src/bin/pg_test_fsync/po/zh_CN.po
+++ b/src/bin/pg_test_fsync/po/zh_CN.po
@@ -1,20 +1,20 @@
# LANGUAGE message translation file for pg_test_fsync
# Copyright (C) 2019 PostgreSQL Global Development Group
# This file is distributed under the same license as the pg_test_fsync
(PostgreSQL) package.
-# FIRST AUTHOR <[email protected]>, 2019.
+# FIRST AUTHOR <[email protected]>, 2019.
#
msgid ""
msgstr ""
-"Project-Id-Version: pg_test_fsync (PostgreSQL) 14\n"
+"Project-Id-Version: pg_test_fsync (PostgreSQL) 12\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2021-08-14 05:49+0000\n"
-"PO-Revision-Date: 2021-08-15 18:00+0800\n"
-"Last-Translator: Jie Zhang <[email protected]>\n"
-"Language-Team: Chinese (Simplified) <[email protected]>\n"
-"Language: zh_CN\n"
+"POT-Creation-Date: 2019-05-22 17:56+0800\n"
+"PO-Revision-Date: 2019-05-31 18:00+0800\n"
+"Last-Translator: Jie Zhang <[email protected]>\n"
+"Language-Team: Chinese (Simplified) <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#. translator: maintain alignment with NA_FORMAT
@@ -23,51 +23,52 @@ msgstr ""
msgid "%13.3f ops/sec %6.0f usecs/op\n"
msgstr "%13.3f ops/sec %6.0f usecs/op\n"
-#: pg_test_fsync.c:159
+#: pg_test_fsync.c:157
#, c-format
msgid "Usage: %s [-f FILENAME] [-s SECS-PER-TEST]\n"
msgstr "用法: %s [-f 文件名] [-s 每次测试的秒数]\n"
-#: pg_test_fsync.c:186 pg_test_fsync.c:200 pg_test_fsync.c:211
+#: pg_test_fsync.c:181 pg_test_fsync.c:192
#, c-format
msgid "Try \"%s --help\" for more information.\n"
msgstr "请用 \"%s --help\" 获取更多的信息.\n"
-#: pg_test_fsync.c:216
-msgid "%u second per test\n"
-msgid_plural "%u seconds per test\n"
-msgstr[0] "%u 每次测试的秒数\n"
-msgstr[1] "%u 每次测试的秒数\n"
+#: pg_test_fsync.c:197
+#, c-format
+msgid "%d second per test\n"
+msgid_plural "%d seconds per test\n"
+msgstr[0] "%d 每次测试的秒数\n"
+msgstr[1] "%d 每次测试的秒数\n"
-#: pg_test_fsync.c:221
+#: pg_test_fsync.c:202
#, c-format
msgid "O_DIRECT supported on this platform for open_datasync and open_sync.\n"
msgstr "在此平台上，O_DIRECT支持open_datasync和open_sync.\n"
-#: pg_test_fsync.c:223
+#: pg_test_fsync.c:204
#, c-format
msgid "Direct I/O is not supported on this platform.\n"
msgstr "此平台不支持直接I/O.\n"
-#: pg_test_fsync.c:248 pg_test_fsync.c:314 pg_test_fsync.c:339
-#: pg_test_fsync.c:363 pg_test_fsync.c:507 pg_test_fsync.c:519
-#: pg_test_fsync.c:535 pg_test_fsync.c:541 pg_test_fsync.c:563
+#: pg_test_fsync.c:229 pg_test_fsync.c:294 pg_test_fsync.c:318
+#: pg_test_fsync.c:341 pg_test_fsync.c:482 pg_test_fsync.c:494
+#: pg_test_fsync.c:510 pg_test_fsync.c:516 pg_test_fsync.c:541
msgid "could not open output file"
msgstr "无法打开输出文件"
-#: pg_test_fsync.c:252 pg_test_fsync.c:297 pg_test_fsync.c:323
-#: pg_test_fsync.c:348 pg_test_fsync.c:372 pg_test_fsync.c:411
-#: pg_test_fsync.c:470 pg_test_fsync.c:509 pg_test_fsync.c:537
-#: pg_test_fsync.c:568
+#: pg_test_fsync.c:233 pg_test_fsync.c:275 pg_test_fsync.c:300
+#: pg_test_fsync.c:324 pg_test_fsync.c:347 pg_test_fsync.c:385
+#: pg_test_fsync.c:443 pg_test_fsync.c:484 pg_test_fsync.c:512
+#: pg_test_fsync.c:543
msgid "write failed"
msgstr "写入失败"
-#: pg_test_fsync.c:256 pg_test_fsync.c:350 pg_test_fsync.c:374
-#: pg_test_fsync.c:511 pg_test_fsync.c:543
+#: pg_test_fsync.c:237 pg_test_fsync.c:326 pg_test_fsync.c:349
+#: pg_test_fsync.c:486 pg_test_fsync.c:518
msgid "fsync failed"
msgstr "fsync失败"
-#: pg_test_fsync.c:270
+#: pg_test_fsync.c:251
#, c-format
msgid ""
"\n"
@@ -76,7 +77,7 @@ msgstr ""
"\n"
"使用一个%dkB写操作比较文件同步方法:\n"
-#: pg_test_fsync.c:272
+#: pg_test_fsync.c:253
#, c-format
msgid ""
"\n"
@@ -85,21 +86,26 @@ msgstr ""
"\n"
"使用两个%dkB写操作比较文件同步方法:\n"
-#: pg_test_fsync.c:273
+#: pg_test_fsync.c:254
#, c-format
msgid "(in wal_sync_method preference order, except fdatasync is Linux's
default)\n"
msgstr "(按照wal_sync_method首选顺序，fdatasync是Linux的默认值除外)\n"
-#: pg_test_fsync.c:284 pg_test_fsync.c:391 pg_test_fsync.c:458
+#: pg_test_fsync.c:265 pg_test_fsync.c:368 pg_test_fsync.c:434
msgid "n/a*"
msgstr "n/a*"
-#: pg_test_fsync.c:303 pg_test_fsync.c:329 pg_test_fsync.c:379
-#: pg_test_fsync.c:417 pg_test_fsync.c:476
+#: pg_test_fsync.c:277 pg_test_fsync.c:303 pg_test_fsync.c:328
+#: pg_test_fsync.c:351 pg_test_fsync.c:387 pg_test_fsync.c:445
+msgid "seek failed"
+msgstr "查找失败"
+
+#: pg_test_fsync.c:283 pg_test_fsync.c:308 pg_test_fsync.c:356
+#: pg_test_fsync.c:393 pg_test_fsync.c:451
msgid "n/a"
msgstr "n/a"
-#: pg_test_fsync.c:422
+#: pg_test_fsync.c:398
#, c-format
msgid ""
"* This file system and its mount options do not support direct\n"
@@ -108,7 +114,7 @@ msgstr ""
"* 此文件系统及其安装选项不支持直接I/O\n"
" 例如. ext4 在 journaled 模式.\n"
-#: pg_test_fsync.c:430
+#: pg_test_fsync.c:406
#, c-format
msgid ""
"\n"
@@ -117,34 +123,34 @@ msgstr ""
"\n"
"在不同的写入大小的情况下比较open_sync:\n"
-#: pg_test_fsync.c:431
+#: pg_test_fsync.c:407
#, c-format
msgid ""
"(This is designed to compare the cost of writing 16kB in different write\n"
"open_sync sizes.)\n"
msgstr "这是为了比较在写入不同的open_sync大小的情况下写入16kB的时间花费\n"
-#: pg_test_fsync.c:434
+#: pg_test_fsync.c:410
msgid " 1 * 16kB open_sync write"
msgstr " 1 * 16kB open_sync写入"
-#: pg_test_fsync.c:435
+#: pg_test_fsync.c:411
msgid " 2 * 8kB open_sync writes"
msgstr " 2 * 8kB open_sync写入"
-#: pg_test_fsync.c:436
+#: pg_test_fsync.c:412
msgid " 4 * 4kB open_sync writes"
msgstr " 4 * 4kB open_sync写入"
-#: pg_test_fsync.c:437
+#: pg_test_fsync.c:413
msgid " 8 * 2kB open_sync writes"
msgstr " 8 * 2kB open_sync写入"
-#: pg_test_fsync.c:438
+#: pg_test_fsync.c:414
msgid "16 * 1kB open_sync writes"
msgstr "16 * 1kB open_sync写入"
-#: pg_test_fsync.c:492
+#: pg_test_fsync.c:467
#, c-format
msgid ""
"\n"
@@ -153,14 +159,14 @@ msgstr ""
"\n"
"测试是否支持非写文件描述符上的fsync:\n"
-#: pg_test_fsync.c:493
+#: pg_test_fsync.c:468
#, c-format
msgid ""
"(If the times are similar, fsync() can sync data written on a different\n"
"descriptor.)\n"
msgstr "(如果时间相似，fsync()可以同步写在不同描述符上的数据.)\n"
-#: pg_test_fsync.c:558
+#: pg_test_fsync.c:533
#, c-format
msgid ""
"\n"
@@ -168,4 +174,3 @@ msgid ""
msgstr ""
"\n"
"不同步的写入 %dkB :\n"
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
