Merge branch 'master' into core-updates

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.

Merge branch 'master' into core-updates

build: Update PO files as per 'make dist'.

nls: Update 'eo' and 'vi' translations.

nls: Add German translation.

nls: Update eo, pt_BR, sr, and vi package translations.

nls: Update 'sr' translation.

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.

nls: Remove obsolete messages from PO files.

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

* po/guix/eo.po, po/guix/pt_BR.po, po/guix/sr.po, po/guix/vi.po,
  po/packages/eo.po, po/packages/pt_BR.po, po/packages/sr.po,
  po/packages/vi.po: Remove obsolete messages.

Merge branch 'master' into core-updates

i18n: Move package descriptions from 'guix' to 'guix-packages'.

* po/guix: Merge with po/packages as per
  <https://lists.gnu.org/archive/html/guix-devel/2014-06/msg00058.html>.
* po/packages/LINGUAS: Add eo, pt_BR, sr, and vi.

Separate package description translations from string translations.

* po/packages/LINGUAS, po/packages/Makevars, po/packages/POTFILES.in:
  New files.
* po/guix/Makevars (DOMAIN): Change to "guix".
  (XGETTEXT_OPTIONS): Remove "--keyword=synopsis --keyword=description".
* po/guix/POTFILES.in: Remove gnu/packages/*.scm.
* configure.ac: Change to gettext 0.18.3.  Produce
  po/packages/Makefile.in.
* Makefile.am (SUBDIRS): Add po/packages.
* guix/ui.scm (%package-text-domain): New variable.
  (P_): New procedure.
  (package->recutils): Use 'P_' instead of '_'.
* guix/scripts/package.scm (find-packages-by-description): Use 'P_'
  instead of 'gettext'.