summary refs log tree commit diff
path: root/po
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-08-12 15:45:55 +0200
committerLudovic Courtès <ludo@gnu.org>2014-08-12 15:46:21 +0200
commit599f146400ea687dfda590babc9992ca8f86a482 (patch)
tree07a6ec77dea3f25a1c219b2a097e73403eeffbc5 /po
parentd759cf6774efd4f321efe78f0bfcfeaa33f30e79 (diff)
downloadguix-599f146400ea687dfda590babc9992ca8f86a482.tar.gz
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.
Diffstat (limited to 'po')
-rw-r--r--po/guix/Makevars3
-rw-r--r--po/packages/Makevars3
2 files changed, 0 insertions, 6 deletions
diff --git a/po/guix/Makevars b/po/guix/Makevars
index 691cc0b2af..87bb438418 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 cf0eba5ed1..1b4689b7c3 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