From 599f146400ea687dfda590babc9992ca8f86a482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 12 Aug 2014 15:45:55 +0200
Subject: [PATCH] Revert "nls: Use xgettext and msgmerge with --no-wrap."

This reverts commit 648453e8d6005a7a2caec688cc035db86fe73c02.

See <http://lists.gnu.org/archive/html/bug-gettext/2014-08/msg00005.html>
for the rationale.
---
 po/guix/Makevars     | 3 ---
 po/packages/Makevars | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/po/guix/Makevars b/po/guix/Makevars
index 691cc0b2af0..87bb4384188 100644
--- a/po/guix/Makevars
+++ b/po/guix/Makevars
@@ -8,13 +8,10 @@ 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 cf0eba5ed1e..1b4689b7c35 100644
--- a/po/packages/Makevars
+++ b/po/packages/Makevars
@@ -9,12 +9,9 @@ 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