From 648453e8d6005a7a2caec688cc035db86fe73c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 17 Jun 2014 00:26:32 +0200
Subject: [PATCH] nls: Use xgettext and msgmerge with --no-wrap.

Suggested by Benno Schulenberg <coordinator@translationproject.org>.

* po/guix/Makevars (XGETTEXT_OPTIONS): Add --no-wrap.
  (MSGMERGE_OPTIONS): New variable.
* po/packages/Makevars (XGETTEXT_OPTIONS): Add --no-wrap.
  (MSGMERGE_OPTIONS): New variable.
---
 po/guix/Makevars     | 3 +++
 po/packages/Makevars | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/po/guix/Makevars b/po/guix/Makevars
index 87bb4384188..691cc0b2af0 100644
--- a/po/guix/Makevars
+++ b/po/guix/Makevars
@@ -8,10 +8,13 @@ top_builddir = ../..
 # These options get passed to xgettext.  We want to catch standard
 # gettext uses, and SRFI-35 error condition messages.
 XGETTEXT_OPTIONS =				\
+  --no-wrap					\
   --language=Scheme --from-code=UTF-8		\
   --keyword=_ --keyword=N_			\
   --keyword=message
 
+MSGMERGE_OPTIONS = --no-wrap
+
 COPYRIGHT_HOLDER = Ludovic Courtès
 
 MSGID_BUGS_ADDRESS = ludo@gnu.org
diff --git a/po/packages/Makevars b/po/packages/Makevars
index 1b4689b7c35..cf0eba5ed1e 100644
--- a/po/packages/Makevars
+++ b/po/packages/Makevars
@@ -9,9 +9,12 @@ top_builddir = ../..
 # These options get passed to xgettext.  We want to catch exclusively package
 # synopses and descriptions.
 XGETTEXT_OPTIONS =				\
+  --no-wrap					\
   --language=Scheme --from-code=UTF-8		\
   --keyword=synopsis --keyword=description
 
+MSGMERGE_OPTIONS = --no-wrap
+
 COPYRIGHT_HOLDER = Ludovic Courtès
 
 MSGID_BUGS_ADDRESS = ludo@gnu.org
-- 
GitLab