Hi, Attached is a patch that should add the option --no-wrap to the runs of msgmerge (after a renewal of the POT file) to reduce the number of spurious differences. However, I can't get the thing to work here. When i run autogen.sh it says "Copying file po/Makefile.in.in", and when I then look in that file it mentions "# Origin: gettext-0.14". But the only Makefile.in.in I have on this testing system is /usr/share/gettext/po/Makefile.in.in and in that file it says "# Origin: gettext-0.18". (That version is needed, otherwise it doesn't know the MSGMERGE_OPTIONS variable.) So... where does autogen.sh/autopoint take its Makefile.in.in from? Regards, Benno -- http://www.fastmail.fm - Or how I learned to stop worrying and love email again
From 4d9a629b2d3a9e1768eb268acaf9e73fb169978f Mon Sep 17 00:00:00 2001 From: Benno Schulenberg <bensberg@xxxxxxxxxxxxx> 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 <bensberg@xxxxxxxxxxxxx> --- po/Makevars | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/po/Makevars b/po/Makevars index 9938e44..4d5629c 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 -- 1.7.0.4
