From: Daniel Axtens <dja@axtens.net>
Date: Mon, 14 Nov 2016 03:20:59 +0000 (+1100)
Subject: Use --no-location instead of --add-location=never
X-Git-Tag: v1.7.0~21
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=591b8b6d39b2cf3c5a977afe99e3286166565096

Use --no-location instead of --add-location=never

This fixes things for old versions of msgmerge such as the one
used on Travis CI (Ubuntu 14.04)

Signed-off-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---

diff --git a/po/Makevars b/po/Makevars
index e644c5b..7652ac2 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -57,7 +57,7 @@ USE_MSGCTXT = no
 # Useful options are in particular:
 #   --previous            to keep previous msgids of translated messages,
 #   --quiet               to reduce the verbosity.
-MSGMERGE_OPTIONS = --add-location=never
+MSGMERGE_OPTIONS = --no-location
 
 # These options get passed to msginit.
 # If you want to disable line wrapping when writing PO files, add