[no subject]

[Patrice Dumas]

branch: master
commit 0f0d9553e54d2df77ca701d2af1b59f482769455
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Jul 28 13:18:15 2024 +0200

    * po/Makevars (XGETTEXT_OPTIONS): disable default keywords.  Add
    ngettext.  Reorder.  Remove unused keywords.
---
 ChangeLog   |  5 +++++
 po/Makevars | 15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8059c589bd..6ce408e62b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2024-07-28  Patrice Dumas  <pertusus@free.fr>
+
+       * po/Makevars (XGETTEXT_OPTIONS): disable default keywords.  Add
+       ngettext.  Reorder.  Remove unused keywords.
+
 2024-07-28  Patrice Dumas  <pertusus@free.fr>
 
        * po/POTFILES.in: add tp/Texinfo/XS/convert/converter.c.
diff --git a/po/Makevars b/po/Makevars
index e6fef73fa7..6442d26096 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -13,29 +13,24 @@ top_builddir = ..
 XGETTEXT_OPTIONS = \
  -cTRANSLATORS\
  --from-code=UTF-8\
+ -k  \
  --keyword=_\
  --keyword=N_\
  -k__\
- -k\$$__\
- -k%__\
- -k__x\
- -k__n:1,2\
- -k__nx:1,2\
- -k__xn:1,2\
  -k__p:1c,2\
  -kN__\
+ -kcommand_error:2 \
+ -kcommand_warn:2 \
  -kline_error:1 \
+ -kline_error_ext:3 \
  -kline_warn:1 \
- -kcommand_error:2 \
  -kmessage_list_command_error:4 \
  -kmessage_list_document_error:4 \
- -kcommand_warn:2 \
  -kmessage_list_command_warn:5 \
  -kpmessage_list_command_warn:5c,6 \
- -knoticed_line_warn:3 \
  -kmessage_list_document_warn:4 \
- -kline_error_ext:3 \
  -kmessage_list_line_error_ext:6 \
+ -kngettext:1,2 \
  -kpgettext:1c,2 \
  --flag=error:1:c-format\
  --flag=warning:1:c-format\