Add missing source files to nls.mk

Files in common/ and fe_utils/ that contain translatable strings need
to be listed in the nls.mk files of the programs that use them.  (Not
great, but that's the way it works for now.)  This usually requires
some manual analysis which is done about once during each major
release beta period.  This time, I wrote a hackish script that figures
some of this out more automatically, so this update is a bit larger as
it also includes some files that were missed in the past.

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 2ff43590111ac595f7a692f4a64412420daafc84..acbfdb3418cba021aa05055c63caf143ba288c1d 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -12,6 +12,7 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    ../../common/username.c \
                    ../../common/wait_error.c \
                    ../../fe_utils/option_utils.c \
+                   ../../fe_utils/string_utils.c \
                    ../../port/dirmod.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_amcheck/nls.mk b/src/bin/pg_amcheck/nls.mk
index 5e6171952c0f756b432c5c97ed1175a8bfd40021..941d224e180598721cd0e18ec8275df76c5bdf68 100644 (file)
--- a/src/bin/pg_amcheck/nls.mk
+++ b/src/bin/pg_amcheck/nls.mk
@@ -2,10 +2,15 @@
 CATALOG_NAME     = pg_amcheck
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_amcheck.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
+                   ../../common/username.c \
                    ../../fe_utils/cancel.c \
                    ../../fe_utils/connect_utils.c \
                    ../../fe_utils/option_utils.c \
-                   ../../fe_utils/query_utils.c
+                   ../../fe_utils/parallel_slot.c \
+                   ../../fe_utils/query_utils.c \
+                   ../../fe_utils/string_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    log_no_match
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

diff --git a/src/bin/pg_archivecleanup/nls.mk b/src/bin/pg_archivecleanup/nls.mk
index 801cf1c51e8426cf8685f7db8ffb6f29e03d466a..c23cdf609691662d923bbef8fdef8ec38ee1d686 100644 (file)
--- a/src/bin/pg_archivecleanup/nls.mk
+++ b/src/bin/pg_archivecleanup/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_archivecleanup/nls.mk
 CATALOG_NAME     = pg_archivecleanup
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c ../../common/fe_memutils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index 7870cea71ceb7bb4e52d8a5ce0810f0a215e36fe..384dbb021e9222029b16b32c7eb40035ee2eb80e 100644 (file)
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -15,9 +15,12 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    streamutil.c \
                    walmethods.c \
                    ../../common/compression.c \
+                   ../../common/controldata_utils.c \
                    ../../common/fe_memutils.c \
                    ../../common/file_utils.c \
+                   ../../common/restricted_token.c \
                    ../../fe_utils/option_utils.c \
-                   ../../fe_utils/recovery_gen.c
+                   ../../fe_utils/recovery_gen.c \
+                   ../../fe_utils/string_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_checksums/nls.mk b/src/bin/pg_checksums/nls.mk
index f7cd2a5ee937116545dabd0c582a34647e9ef26c..9f1b5a8b4a2dcdaa3c4a85075a74bebfe947a83a 100644 (file)
--- a/src/bin/pg_checksums/nls.mk
+++ b/src/bin/pg_checksums/nls.mk
@@ -2,6 +2,9 @@
 CATALOG_NAME     = pg_checksums
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_checksums.c \
+                   ../../common/controldata_utils.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_combinebackup/nls.mk b/src/bin/pg_combinebackup/nls.mk
index 05f12c682ffc521d2f5020cf37e0981b16e8d341..55dc173a17e245bf172f8cb82f31a9ab0e01977e 100644 (file)
--- a/src/bin/pg_combinebackup/nls.mk
+++ b/src/bin/pg_combinebackup/nls.mk
@@ -7,9 +7,14 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_combinebackup.c \
                    reconstruct.c \
                    write_manifest.c \
+                   ../../common/controldata_utils.c \
+                   ../../common/cryptohash.c \
+                   ../../common/cryptohash_openssl.c \
                    ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../common/jsonapi.c \
-                   ../../common/parse_manifest.c
+                   ../../common/parse_manifest.c \
+                   ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    json_token_error:2 \
                    json_manifest_parse_failure:2 \

diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index d86c28c404d682e74fd707cc83b43507b1673f65..faa45848428a9960e06e4ae39d4f015e31f24a93 100644 (file)
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -1,3 +1,6 @@
 # src/bin/pg_config/nls.mk
 CATALOG_NAME     = pg_config
-GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c
+GETTEXT_FILES    = pg_config.c \
+                   ../../common/config_info.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c

diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index ab34205b960105a111700ab5282aef490f1a57fa..3e7e018470a896ed264ab3f48ff3c9be6ee124c7 100644 (file)
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -1,5 +1,7 @@
 # src/bin/pg_controldata/nls.mk
 CATALOG_NAME     = pg_controldata
-GETTEXT_FILES    = pg_controldata.c ../../common/controldata_utils.c
+GETTEXT_FILES    = pg_controldata.c \
+                   ../../common/controldata_utils.c \
+                   ../../common/fe_memutils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index fd6355483c47c21961453faaf572ea43846cc4df..27694a249ba529e52c5b142d0ffb02c32b83d86e 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,6 +1,7 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME     = pg_ctl
 GETTEXT_FILES    = pg_ctl.c \
+                   ../../common/controldata_utils.c \
                    ../../common/exec.c \
                    ../../common/fe_memutils.c \
                    ../../common/wait_error.c \

diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 766ead89c7b230983c034e30c4efec44bbcfdb8b..b7b77394f0fa6a6b6c3bfac6e41a7f5ef22b1c8a 100644 (file)
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -26,8 +26,10 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    ../../common/compression.c \
                    ../../common/exec.c \
                    ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../common/wait_error.c \
-                   ../../fe_utils/option_utils.c
+                   ../../fe_utils/option_utils.c \
+                   ../../fe_utils/string_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    simple_prompt \
                    ExecuteSqlCommand:3 \

diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk
index eb5da1c2fcb0bae1c992ce15300fd05c7f8474e1..694d5420a2923c5241fbbec50ae2e481652dc999 100644 (file)
--- a/src/bin/pg_resetwal/nls.mk
+++ b/src/bin/pg_resetwal/nls.mk
@@ -2,6 +2,9 @@
 CATALOG_NAME     = pg_resetwal
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_resetwal.c \
+                   ../../common/controldata_utils.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../common/restricted_token.c \
                    ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)

diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk
index 36a3993f02f52aec5daeca61be0708c7eb7ece19..475ed2e416a90114d1651280aeb9ddd5a5529ede 100644 (file)
--- a/src/bin/pg_rewind/nls.mk
+++ b/src/bin/pg_rewind/nls.mk
@@ -10,11 +10,15 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_rewind.c \
                    timeline.c \
                    xlogreader.c \
+                   ../../common/controldata_utils.c \
                    ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../common/percentrepl.c \
                    ../../common/restricted_token.c \
                    ../../fe_utils/archive.c \
-                   ../../fe_utils/recovery_gen.c
+                   ../../fe_utils/option_utils.c \
+                   ../../fe_utils/recovery_gen.c \
+                   ../../fe_utils/string_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

diff --git a/src/bin/pg_test_fsync/nls.mk b/src/bin/pg_test_fsync/nls.mk
index a50782036ca662e994660e06a439cc3ef55bba88..cfe4779071e3cd301c7ad338c43ff7349a187a27 100644 (file)
--- a/src/bin/pg_test_fsync/nls.mk
+++ b/src/bin/pg_test_fsync/nls.mk
@@ -1,5 +1,5 @@
 # src/bin/pg_test_fsync/nls.mk
 CATALOG_NAME     = pg_test_fsync
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c ../../common/fe_memutils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/pg_test_timing/nls.mk b/src/bin/pg_test_timing/nls.mk
index 331931c591f7d01611de38ebf2f6a181ca4936e0..c1255db64cd8f5edeec72fe99feeb2a12d019cc1 100644 (file)
--- a/src/bin/pg_test_timing/nls.mk
+++ b/src/bin/pg_test_timing/nls.mk
@@ -1,3 +1,3 @@
 # src/bin/pg_test_timing/nls.mk
 CATALOG_NAME     = pg_test_timing
-GETTEXT_FILES    = pg_test_timing.c
+GETTEXT_FILES    = pg_test_timing.c ../../common/fe_memutils.c

diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk
index 06fd40e4218767d28c663658cab797ec1a04a3b4..db5aa18013b056c01e8452567207bf17ffc96f7d 100644 (file)
--- a/src/bin/pg_upgrade/nls.mk
+++ b/src/bin/pg_upgrade/nls.mk
@@ -14,7 +14,13 @@ GETTEXT_FILES    = check.c \
                    server.c \
                    tablespace.c \
                    util.c \
-                   version.c
+                   version.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
+                   ../../common/restricted_token.c \
+                   ../../common/username.c \
+                   ../../fe_utils/option_utils.c \
+                   ../../fe_utils/string_utils.c
 GETTEXT_TRIGGERS = pg_fatal \
                    pg_log:2 \
                    prep_status \

diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk
index 8b8a4ad5ec4f2ac91e66de0d70b474d21978ac3b..6ad078350f607dd70e609114b99f80cf9fbf4ca3 100644 (file)
--- a/src/bin/pg_verifybackup/nls.mk
+++ b/src/bin/pg_verifybackup/nls.mk
@@ -2,6 +2,9 @@
 CATALOG_NAME     = pg_verifybackup
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_verifybackup.c \
+                   ../../common/controldata_utils.c \
+                   ../../common/cryptohash.c \
+                   ../../common/cryptohash_openssl.c \
                    ../../common/fe_memutils.c \
                    ../../common/jsonapi.c \
                    ../../common/parse_manifest.c

diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk
index f2336ddfdfe8c6c031c9b5d58dd03a833639e4ce..5932bab2c58139186ff490798c4d24a5f7d079b8 100644 (file)
--- a/src/bin/pg_waldump/nls.mk
+++ b/src/bin/pg_waldump/nls.mk
@@ -3,7 +3,9 @@ CATALOG_NAME     = pg_waldump
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    pg_waldump.c \
                    xlogreader.c \
-                   xlogstats.c
+                   xlogstats.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

diff --git a/src/bin/pg_walsummary/nls.mk b/src/bin/pg_walsummary/nls.mk
index f411dcfe9e4780314e8c3f26e28d2fb6916b2788..b22905e447b15ec505fe542d0f86ef73dd72b4b2 100644 (file)
--- a/src/bin/pg_walsummary/nls.mk
+++ b/src/bin/pg_walsummary/nls.mk
@@ -1,6 +1,9 @@
 # src/bin/pg_combinebackup/nls.mk
 CATALOG_NAME     = pg_walsummary
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-          pg_walsummary.c
+                   pg_walsummary.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
+                   ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)

diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index 8624612969ca500e2c1de24cf37d5e14e77eb677..7fd8fedead4f56bfff72828c739ded305b2168e8 100644 (file)
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -19,6 +19,7 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    ../../fe_utils/cancel.c \
                    ../../fe_utils/print.c \
                    ../../fe_utils/psqlscan.c \
+                   ../../fe_utils/string_utils.c \
                    ../../common/exec.c \
                    ../../common/fe_memutils.c \
                    ../../common/username.c \

diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 5fe63fa71069577d48f05b2c89373c5f46c70dca..4b358da018911e4c507a1736e609953b84fb2273 100644 (file)
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -16,7 +16,9 @@ GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
                    ../../fe_utils/connect_utils.c \
                    ../../fe_utils/option_utils.c \
                    ../../fe_utils/query_utils.c \
+                   ../../fe_utils/string_utils.c \
                    ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
                    ../../common/username.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)