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 67aa2249637 Fix conflicts for pg_archivecleanup
67aa2249637 is described below
commit 67aa2249637bec6c97909a2bb19cc22e6e36c6d3
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Mar 9 23:02:06 2026 -0400
Fix conflicts for pg_archivecleanup
---
src/bin/pg_archivecleanup/nls.mk | 4 ----
src/bin/pg_archivecleanup/po/el.po | 28 ----------------------------
src/bin/pg_archivecleanup/po/es.po | 4 ----
src/bin/pg_archivecleanup/po/ja.po | 27 +--------------------------
src/bin/pg_archivecleanup/po/ru.po | 18 ------------------
src/bin/pg_archivecleanup/po/sv.po | 11 -----------
src/bin/pg_archivecleanup/po/uk.po | 26 --------------------------
7 files changed, 1 insertion(+), 117 deletions(-)
diff --git a/src/bin/pg_archivecleanup/nls.mk b/src/bin/pg_archivecleanup/nls.mk
index d98450d9674..801cf1c51e8 100644
--- a/src/bin/pg_archivecleanup/nls.mk
+++ b/src/bin/pg_archivecleanup/nls.mk
@@ -1,9 +1,5 @@
# src/bin/pg_archivecleanup/nls.mk
CATALOG_NAME = pg_archivecleanup
-<<<<<<< HEAD
-AVAIL_LANGUAGES = cs de el es fr ja ko ru sv tr uk zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/bin/pg_archivecleanup/po/el.po
b/src/bin/pg_archivecleanup/po/el.po
index 20ade920fbc..5a1b7a657e6 100644
--- a/src/bin/pg_archivecleanup/po/el.po
+++ b/src/bin/pg_archivecleanup/po/el.po
@@ -9,24 +9,15 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_archivecleanup (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 10:02+0200\n"
-=======
"POT-Creation-Date: 2023-04-12 16:50+0000\n"
"PO-Revision-Date: 2023-04-13 13:51+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
@@ -57,16 +48,6 @@ msgstr "η τοποθεσία της αρχειοθήκης «%s» δεν υπά
#, c-format
msgid "could not remove file \"%s\": %m"
msgstr "δεν ήταν δυνατή η αφαίρεση του αρχείου «%s»: %m"
-<<<<<<< HEAD
-
-#: pg_archivecleanup.c:160
-#, c-format
-msgid "could not read archive location \"%s\": %m"
-msgstr "δεν ήταν δυνατή η ανάγνωση της τοποθεσίας αρχειοθήκης «%s»: %m"
-
-#: pg_archivecleanup.c:163
-#, c-format
-=======
#: pg_archivecleanup.c:157
#, c-format
@@ -75,7 +56,6 @@ msgstr "δεν ήταν δυνατή η ανάγνωση της τοποθεσί
#: pg_archivecleanup.c:160
#, c-format
->>>>>>> REL_16_9
msgid "could not close archive location \"%s\": %m"
msgstr "δεν ήταν δυνατό το κλείσιμο της τοποθεσίας αρχειοθήκης «%s»: %m"
@@ -92,13 +72,8 @@ msgstr "μη έγκυρη παράμετρος ονόματος αρχείου"
#: pg_archivecleanup.c:238 pg_archivecleanup.c:313 pg_archivecleanup.c:333
#: pg_archivecleanup.c:345 pg_archivecleanup.c:352
#, c-format
-<<<<<<< HEAD
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες.\n"
-=======
msgid "Try \"%s --help\" for more information."
msgstr "Δοκιμάστε «%s --help» για περισσότερες πληροφορίες."
->>>>>>> REL_16_9
#: pg_archivecleanup.c:251
#, c-format
@@ -209,9 +184,6 @@ msgstr "πρέπει να καθορίσετε το παλαιότερο κρα
#, c-format
msgid "too many command-line arguments"
msgstr "πάρα πολλές παράμετροι εισόδου από την γραμμή εντολών"
-<<<<<<< HEAD
-=======
#~ msgid "fatal: "
#~ msgstr "κρίσιμο: "
->>>>>>> REL_16_9
diff --git a/src/bin/pg_archivecleanup/po/es.po
b/src/bin/pg_archivecleanup/po/es.po
index 15c1f76268f..272f3dca2df 100644
--- a/src/bin/pg_archivecleanup/po/es.po
+++ b/src/bin/pg_archivecleanup/po/es.po
@@ -6,11 +6,7 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_archivecleanup (PostgreSQL) 14\n"
-=======
"Project-Id-Version: pg_archivecleanup (PostgreSQL) 16\n"
->>>>>>> REL_16_9
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2024-11-09 06:09+0000\n"
"PO-Revision-Date: 2023-05-22 12:05+0200\n"
diff --git a/src/bin/pg_archivecleanup/po/ja.po
b/src/bin/pg_archivecleanup/po/ja.po
index 9ae5624df42..ea705fbeada 100644
--- a/src/bin/pg_archivecleanup/po/ja.po
+++ b/src/bin/pg_archivecleanup/po/ja.po
@@ -4,17 +4,10 @@
#
msgid ""
msgstr ""
-<<<<<<< HEAD
-"Project-Id-Version: pg_archivecleanup (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:08+0900\n"
-=======
"Project-Id-Version: pg_archivecleanup (PostgreSQL 16)\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2023-07-04 09:43+0900\n"
"PO-Revision-Date: 2023-07-04 09:48+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 "警告: "
@@ -89,13 +69,8 @@ msgstr "ファイル名引数が無効です"
#: pg_archivecleanup.c:238 pg_archivecleanup.c:313 pg_archivecleanup.c:333
#: pg_archivecleanup.c:345 pg_archivecleanup.c:352
#, c-format
-<<<<<<< HEAD
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "詳細は\"%s --help\"で確認してください。\n"
-=======
msgid "Try \"%s --help\" for more information."
msgstr "詳細は\"%s --help\"を実行してください。"
->>>>>>> REL_16_9
#: pg_archivecleanup.c:251
#, c-format
@@ -109,7 +84,7 @@ msgstr ""
#: pg_archivecleanup.c:252
#, c-format
msgid "Usage:\n"
-msgstr "使用方法:\n"
+msgstr "使用法:\n"
#: pg_archivecleanup.c:253
#, c-format
diff --git a/src/bin/pg_archivecleanup/po/ru.po
b/src/bin/pg_archivecleanup/po/ru.po
index d854c0b2fcf..acf84faf1ea 100644
--- a/src/bin/pg_archivecleanup/po/ru.po
+++ b/src/bin/pg_archivecleanup/po/ru.po
@@ -6,13 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pg_archivecleanup (PostgreSQL) 10\n"
"Report-Msgid-Bugs-To: [email protected]\n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2021-08-14 06:29+0300\n"
-"PO-Revision-Date: 2020-09-03 12:40+0300\n"
-=======
"POT-Creation-Date: 2022-08-27 14:52+0300\n"
"PO-Revision-Date: 2024-09-07 06:17+0300\n"
->>>>>>> REL_16_9
"Last-Translator: Alexander Lakhin <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -22,25 +17,12 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-<<<<<<< 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 "предупреждение: "
diff --git a/src/bin/pg_archivecleanup/po/sv.po
b/src/bin/pg_archivecleanup/po/sv.po
index f0fda7b94a2..6cebbc1ad1b 100644
--- a/src/bin/pg_archivecleanup/po/sv.po
+++ b/src/bin/pg_archivecleanup/po/sv.po
@@ -1,16 +1,6 @@
# Swedish message translation file for pg_archivecleanup
# Copyright (C) 2017 PostgreSQL Global Development Group
# This file is distributed under the same license as the PostgreSQL package.
-<<<<<<< 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: 2020-04-11 01:17+0000\n"
-"PO-Revision-Date: 2021-11-07 10:36+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-04-11 13:50+0000\n"
"PO-Revision-Date: 2022-04-11 16:06+0200\n"
->>>>>>> REL_16_9
"Last-Translator: FDennis Björklund <[email protected]>\n"
"Language-Team: Swedish <[email protected]>\n"
"Language: sv\n"
diff --git a/src/bin/pg_archivecleanup/po/uk.po
b/src/bin/pg_archivecleanup/po/uk.po
index 4cfd43c49cd..120f799bc70 100644
--- a/src/bin/pg_archivecleanup/po/uk.po
+++ b/src/bin/pg_archivecleanup/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,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_archivecleanup.pot\n"
-"X-Crowdin-File-ID: 760\n"
-
-#: ../../../src/common/logging.c:259
-#, c-format
-msgid "fatal: "
-msgstr "збій: "
-
-#: ../../../src/common/logging.c:266
-=======
"X-Crowdin-File: /REL_15_STABLE/pg_archivecleanup.pot\n"
"X-Crowdin-File-ID: 898\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 "попередження: "
@@ -91,13 +70,8 @@ msgstr "недійсна назва файла з аргументом"
#: pg_archivecleanup.c:238 pg_archivecleanup.c:313 pg_archivecleanup.c:333
#: pg_archivecleanup.c:345 pg_archivecleanup.c:352
#, c-format
-<<<<<<< HEAD
-msgid "Try \"%s --help\" for more information.\n"
-msgstr "Спробуйте \"%s --help\" для додаткової інформації.\n"
-=======
msgid "Try \"%s --help\" for more information."
msgstr "Спробуйте \"%s --help\" для додаткової інформації."
->>>>>>> REL_16_9
#: pg_archivecleanup.c:251
#, c-format
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
