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

@@ -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

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