13 files changed, 10 insertions, 12 deletions
diff --git a/src/backend/nls.mk b/src/backend/nls.mk
index 52373103f97..8d83c41daf3 100644
--- a/src/backend/nls.mk
+++ b/src/backend/nls.mk
@@ -2,7 +2,7 @@
 CATALOG_NAME     = postgres
 AVAIL_LANGUAGES  = de es fr ja pt_BR tr zh_CN zh_TW
 GETTEXT_FILES    = + gettext-files
-GETTEXT_TRIGGERS = _ errmsg errmsg_plural:1,2 errdetail errdetail_log \
+GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log \
     errdetail_plural:1,2 errhint errcontext \
     GUC_check_errmsg GUC_check_errdetail GUC_check_errhint \
     write_stderr yyerror parser_yyerror
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 31f1cd9e772..3fdf52655ab 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = initdb
 AVAIL_LANGUAGES  = cs de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES    = initdb.c ../../port/dirmod.c ../../port/exec.c
-GETTEXT_TRIGGERS = _ simple_prompt
+GETTEXT_TRIGGERS = simple_prompt
diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk
index 4004efa5f0b..0c594f93f5d 100644
--- a/src/bin/pg_basebackup/nls.mk
+++ b/src/bin/pg_basebackup/nls.mk
@@ -2,4 +2,3 @@
 CATALOG_NAME     = pg_basebackup
 AVAIL_LANGUAGES  = de es
 GETTEXT_FILES    = pg_basebackup.c
-GETTEXT_TRIGGERS = _
diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk
index 173d2aac125..5e5c9a1f400 100644
--- a/src/bin/pg_config/nls.mk
+++ b/src/bin/pg_config/nls.mk
@@ -2,4 +2,3 @@
 CATALOG_NAME     = pg_config
 AVAIL_LANGUAGES  = de es fr it ja ko nb pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES    = pg_config.c ../../port/exec.c
-GETTEXT_TRIGGERS = _
diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk
index f4c09a045ba..f2f8b3d0e63 100644
--- a/src/bin/pg_controldata/nls.mk
+++ b/src/bin/pg_controldata/nls.mk
@@ -2,4 +2,3 @@
 CATALOG_NAME     = pg_controldata
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES    = pg_controldata.c
-GETTEXT_TRIGGERS = _
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index a90b0a0eaaf..198615c5855 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -2,4 +2,3 @@
 CATALOG_NAME     = pg_ctl
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES    = pg_ctl.c ../../port/exec.c
-GETTEXT_TRIGGERS = _
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 34b49e0df64..48a4990163b 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -6,4 +6,4 @@ GETTEXT_FILES    = pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \
                    pg_backup_tar.c pg_restore.c pg_dumpall.c \
                    ../../port/exec.c
 GETTEXT_TRIGGERS = write_msg:2 die_horribly:3 exit_horribly:3 simple_prompt \
-                   ExecuteSqlCommand:3 ahlog:3 _
+                   ExecuteSqlCommand:3 ahlog:3
diff --git a/src/bin/pg_resetxlog/nls.mk b/src/bin/pg_resetxlog/nls.mk
index 1a19c2c064e..8a645fc165d 100644
--- a/src/bin/pg_resetxlog/nls.mk
+++ b/src/bin/pg_resetxlog/nls.mk
@@ -2,4 +2,3 @@
 CATALOG_NAME     = pg_resetxlog
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ro ru sv ta tr zh_CN zh_TW
 GETTEXT_FILES    = pg_resetxlog.c
-GETTEXT_TRIGGERS = _
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index 3bc0f457117..38d9b157f2c 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -4,4 +4,4 @@ AVAIL_LANGUAGES  = cs de es fr ja pt_BR sv tr zh_CN zh_TW
 GETTEXT_FILES    = command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c sql_help.h sql_help.c \
                    ../../port/exec.c
-GETTEXT_TRIGGERS = _ N_ psql_error simple_prompt
+GETTEXT_TRIGGERS = N_ psql_error simple_prompt
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 38daba7461d..ebea045a783 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -5,4 +5,4 @@ GETTEXT_FILES    = createdb.c createlang.c createuser.c \
                    dropdb.c droplang.c dropuser.c \
                    clusterdb.c vacuumdb.c reindexdb.c \
                    common.c
-GETTEXT_TRIGGERS = _ simple_prompt yesno_prompt
+GETTEXT_TRIGGERS = simple_prompt yesno_prompt
diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk
index f41cfc64cfc..2c66d7833af 100644
--- a/src/interfaces/ecpg/preproc/nls.mk
+++ b/src/interfaces/ecpg/preproc/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = ecpg
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR tr zh_CN zh_TW
 GETTEXT_FILES    = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
-GETTEXT_TRIGGERS = _ mmerror:3
+GETTEXT_TRIGGERS = mmerror:3
diff --git a/src/nls-global.mk b/src/nls-global.mk
index 32b3c0fbd61..da62e940201 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -39,6 +39,9 @@ ifdef XGETTEXT
 XGETTEXT += -ctranslator --copyright-holder='PostgreSQL Global Development Group' --msgid-bugs-address=pgsql-bugs@postgresql.org
 endif
 
+# _ is defined in c.h, so it's global
+GETTEXT_TRIGGERS += _
+
 
 all-po: $(MO_FILES)
 
diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk
index 4caa580bed5..c21dbe00148 100644
--- a/src/pl/plpgsql/src/nls.mk
+++ b/src/pl/plpgsql/src/nls.mk
@@ -2,4 +2,4 @@
 CATALOG_NAME     = plpgsql
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR ro zh_CN zh_TW
 GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
-GETTEXT_TRIGGERS = _ errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext yyerror plpgsql_yyerror
+GETTEXT_TRIGGERS = errmsg errmsg_plural:1,2 errdetail errdetail_log errdetail_plural:1,2 errhint errcontext yyerror plpgsql_yyerror