Break up long GETTEXT_FILES lists

One file per line seems best.  We already did this in some cases.
This adopts the same format everywhere (except in some cases where the
list reasonably fits on one line).

12 files changed, 138 insertions, 31 deletions

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 19c9136849..80af642dbf 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,16 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/file_utils.c ../../common/pgfnames.c ../../common/restricted_token.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   findtimezone.c \
+                   initdb.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/file_utils.c \
+                   ../../common/pgfnames.c \
+                   ../../common/restricted_token.c \
+                   ../../common/rmtree.c \
+                   ../../common/username.c \
+                   ../../common/wait_error.c \
+                   ../../port/dirmod.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 84e7fb4e56..fd6355483c 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,3 +1,7 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME     = pg_ctl
-GETTEXT_FILES    = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
+GETTEXT_FILES    = pg_ctl.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/wait_error.c \
+                   ../../port/path.c
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 3054f93fad..ecb4b79b93 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,13 +1,25 @@
 # src/bin/pg_dump/nls.mk
 CATALOG_NAME     = pg_dump
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
-                   pg_backup_null.c pg_backup_tar.c \
-                   pg_backup_directory.c dumputils.c compress_io.c \
-                   pg_dump.c common.c pg_dump_sort.c \
-                   pg_restore.c pg_dumpall.c \
-                   parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
-                   ../../common/exec.c ../../common/fe_memutils.c \
+                   pg_backup_archiver.c \
+                   pg_backup_db.c \
+                   pg_backup_custom.c \
+                   pg_backup_null.c \
+                   pg_backup_tar.c \
+                   pg_backup_directory.c \
+                   dumputils.c \
+                   compress_io.c \
+                   pg_dump.c \
+                   common.c \
+                   pg_dump_sort.c \
+                   pg_restore.c \
+                   pg_dumpall.c \
+                   parallel.c \
+                   parallel.h \
+                   pg_backup_utils.c \
+                   pg_backup_utils.h \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
                    ../../common/wait_error.c \
                    ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk
index bc25482f2c..7fc84f0825 100644
--- a/src/bin/pg_resetwal/nls.mk
+++ b/src/bin/pg_resetwal/nls.mk
@@ -1,5 +1,7 @@
 # src/bin/pg_resetwal/nls.mk
 CATALOG_NAME     = pg_resetwal
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   pg_resetwal.c \
+                   ../../common/restricted_token.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk
index 0618cb8c2c..8f5f20593a 100644
--- a/src/bin/pg_rewind/nls.mk
+++ b/src/bin/pg_rewind/nls.mk
@@ -1,6 +1,19 @@
 # src/bin/pg_rewind/nls.mk
 CATALOG_NAME     = pg_rewind
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) datapagemap.c file_ops.c filemap.c libpq_source.c local_source.c parsexlog.c pg_rewind.c timeline.c xlogreader.c ../../common/fe_memutils.c ../../common/restricted_token.c ../../fe_utils/archive.c ../../fe_utils/recovery_gen.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   datapagemap.c \
+                   file_ops.c \
+                   filemap.c \
+                   libpq_source.c \
+                   local_source.c \
+                   parsexlog.c \
+                   pg_rewind.c \
+                   timeline.c \
+                   xlogreader.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/restricted_token.c \
+                   ../../fe_utils/archive.c \
+                   ../../fe_utils/recovery_gen.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
     report_invalid_record:2:c-format
diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk
index 4721fa6b5a..9e2c1386e2 100644
--- a/src/bin/pg_upgrade/nls.mk
+++ b/src/bin/pg_upgrade/nls.mk
@@ -1,8 +1,20 @@
 # src/bin/pg_upgrade/nls.mk
 CATALOG_NAME     = pg_upgrade
-GETTEXT_FILES    = check.c controldata.c dump.c exec.c file.c function.c \
-                   info.c option.c parallel.c pg_upgrade.c relfilenumber.c \
-                   server.c tablespace.c util.c version.c
+GETTEXT_FILES    = check.c \
+                   controldata.c \
+                   dump.c \
+                   exec.c \
+                   file.c \
+                   function.c \
+                   info.c \
+                   option.c \
+                   parallel.c \
+                   pg_upgrade.c \
+                   relfilenumber.c \
+                   server.c \
+                   tablespace.c \
+                   util.c \
+                   version.c
 GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
 GETTEXT_FLAGS    = \
     pg_fatal:1:c-format \
diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk
index 1cc7335d59..4f00e129ff 100644
--- a/src/bin/pg_waldump/nls.mk
+++ b/src/bin/pg_waldump/nls.mk
@@ -1,6 +1,9 @@
 # src/bin/pg_waldump/nls.mk
 CATALOG_NAME     = pg_waldump
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c xlogreader.c xlogstats.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
+                   pg_waldump.c \
+                   xlogreader.c \
+                   xlogstats.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
     report_invalid_record:2:c-format
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index dad5816b9c..cf0b800291 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,13 +1,29 @@
 # src/bin/psql/nls.mk
 CATALOG_NAME     = psql
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   command.c common.c copy.c crosstabview.c help.c input.c large_obj.c \
-                   mainloop.c psqlscanslash.c startup.c \
-                   describe.c sql_help.h sql_help.c \
-                   tab-complete.c variables.c \
-                   ../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
-                   ../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
-                   ../../common/wait_error.c ../../port/thread.c
+                   command.c \
+                   common.c \
+                   copy.c \
+                   crosstabview.c \
+                   help.c \
+                   input.c \
+                   large_obj.c \
+                   mainloop.c \
+                   psqlscanslash.c \
+                   startup.c \
+                   describe.c \
+                   sql_help.h \
+                   sql_help.c \
+                   tab-complete.c \
+                   variables.c \
+                   ../../fe_utils/cancel.c \
+                   ../../fe_utils/print.c \
+                   ../../fe_utils/psqlscan.c \
+                   ../../common/exec.c \
+                   ../../common/fe_memutils.c \
+                   ../../common/username.c \
+                   ../../common/wait_error.c \
+                   ../../port/thread.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
                    HELP0 HELPN N_ simple_prompt simple_prompt_extended
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index f4638a06f0..5fe63fa710 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,16 +1,22 @@
 # src/bin/scripts/nls.mk
 CATALOG_NAME     = pgscripts
 GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   createdb.c createuser.c \
-                   dropdb.c dropuser.c \
-                   clusterdb.c vacuumdb.c reindexdb.c \
+                   createdb.c \
+                   createuser.c \
+                   dropdb.c \
+                   dropuser.c \
+                   clusterdb.c \
+                   vacuumdb.c \
+                   reindexdb.c \
                    pg_isready.c \
                    common.c \
                    ../../fe_utils/parallel_slot.c \
-                   ../../fe_utils/cancel.c ../../fe_utils/print.c \
+                   ../../fe_utils/cancel.c \
+                   ../../fe_utils/print.c \
                    ../../fe_utils/connect_utils.c \
                    ../../fe_utils/option_utils.c \
                    ../../fe_utils/query_utils.c \
-                   ../../common/fe_memutils.c ../../common/username.c
+                   ../../common/fe_memutils.c \
+                   ../../common/username.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 4df544ecef..b6ed455183 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,6 +1,19 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME     = libpq
-GETTEXT_FILES    = fe-auth.c fe-auth-scram.c fe-connect.c fe-exec.c fe-gssapi-common.c fe-lobj.c fe-misc.c fe-protocol3.c fe-secure.c fe-secure-common.c fe-secure-gssapi.c fe-secure-openssl.c win32.c ../../port/thread.c
+GETTEXT_FILES    = fe-auth.c \
+                   fe-auth-scram.c \
+                   fe-connect.c \
+                   fe-exec.c \
+                   fe-gssapi-common.c \
+                   fe-lobj.c \
+                   fe-misc.c \
+                   fe-protocol3.c \
+                   fe-secure.c \
+                   fe-secure-common.c \
+                   fe-secure-gssapi.c \
+                   fe-secure-openssl.c \
+                   win32.c \
+                   ../../port/thread.c
 GETTEXT_TRIGGERS = libpq_append_conn_error:2 \
                    libpq_append_error:2 \
                    libpq_gettext pqInternalNotice:2
diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index 2bd620a8dd..e1d3bde6c3 100644
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -1,5 +1,10 @@
 # src/pl/plpgsql/src/nls.mk
 CATALOG_NAME     = plpgsql
-GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
+GETTEXT_FILES    = pl_comp.c \
+                   pl_exec.c \
+                   pl_gram.c \
+                   pl_funcs.c \
+                   pl_handler.c \
+                   pl_scanner.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)
diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk
index 4c68a0e571..e7a25ca013 100644
--- a/src/pl/plpython/nls.mk
+++ b/src/pl/plpython/nls.mk
@@ -1,7 +1,17 @@
 # src/pl/plpython/nls.mk
 CATALOG_NAME     = plpython
-GETTEXT_FILES    = plpy_cursorobject.c plpy_elog.c plpy_exec.c plpy_main.c plpy_planobject.c plpy_plpymodule.c \
-                   plpy_procedure.c plpy_resultobject.c plpy_spi.c plpy_subxactobject.c plpy_typeio.c plpy_util.c
+GETTEXT_FILES    = plpy_cursorobject.c \
+                   plpy_elog.c \
+                   plpy_exec.c \
+                   plpy_main.c \
+                   plpy_planobject.c \
+                   plpy_plpymodule.c \
+                   plpy_procedure.c \
+                   plpy_resultobject.c \
+                   plpy_spi.c \
+                   plpy_subxactobject.c \
+                   plpy_typeio.c \
+                   plpy_util.c
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS) \
     PLy_elog:2:c-format \