From e3e16717ec8c86f3f2710bb667c9e154aefa0bc9 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 16 Dec 2013 22:41:56 +0100 Subject: [PATCH] po: add '--no-wrap' to msgmerge, to not wrap long message lines This avoids unneeded churn during POT-file renewal and PO-file updates, as the PO files at the TP are made with '--no-wrap'. Signed-off-by: Benno Schulenberg Acked-by: Sami Kerola --- configure.ac | 2 +- po/Makevars | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8665780f0e..5444cd3e64 100644 --- a/configure.ac +++ b/configure.ac @@ -145,7 +145,7 @@ UL_SET_ARCH([HPPA], [hppa*]) AC_SYS_LARGEFILE -AM_GNU_GETTEXT_VERSION([0.14.1]) +AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) AS_IF([test -d "$srcdir/po"], [ diff --git a/po/Makevars b/po/Makevars index 9938e44266..4d5629cba2 100644 --- a/po/Makevars +++ b/po/Makevars @@ -10,6 +10,9 @@ top_builddir = .. # These options get passed to xgettext. XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2 +# This option gets passed to msgmerge. +MSGMERGE_OPTIONS = --no-wrap + # This is the copyright holder that gets inserted into the header of the # $(DOMAIN).pot file. Set this to the copyright holder of the surrounding # package. (Note that the msgstr strings, extracted from the package's -- 2.39.5