Merge branch 'master' into core-updates

author: Ludovic Courtès <ludo@gnu.org> 2016-04-06 12:00:29 +0200
committer: Ludovic Courtès <ludo@gnu.org> 2016-04-06 12:00:29 +0200
commit: 933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch)
tree: f10581ed0da1911eed9b02e69d999ba481d9d3c6
parent: f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff)
parent: 998afc3608242b75051f43ece36d52474c51e285 (diff)
download: patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar
patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz
155 files changed, 6380 insertions, 3323 deletions
diff --git a/.gitignore b/.gitignore
index b5bbbaabdb..003412eeab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -123,3 +123,4 @@ Makefile.in
 config.cache
 stamp-h[0-9]
 tmp
+/doc/os-config-lightweight-desktop.texi
diff --git a/.mailmap b/.mailmap
index a5fa85708c..93cb24bbba 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,14 +1,20 @@
 # This list is used to avoid multiple name/email instances of the same
 # contributors reported by "git log" and "git shortlog" commands.
 
+Al McElrath <hello@yrns.org> <hello@atonesir.com>
 Alexander I. Grafov <grafov@gmail.com>
+Alírio Eyng <alirioeyng@gmail.com>
 Amirouche Boubekki <amirouche@hypermove.net>
+Andreas Enge <andreas@enge.fr> <andreas.enge@inria.fr>
+Andreas Enge <andreas@enge.fr> <privat@xobs-novena>
 Andy Wingo <wingo@igalia.com> <wingo@pobox.com>
-Ben Woodcroft <b.woodcroft@uq.edu.au> <donttrustben@gmail.com>
+Ben Woodcroft <donttrustben@gmail.com> <b.woodcroft@uq.edu.au>
+Ben Woodcroft <donttrustben@gmail.com> <donttrustben near gmail.com>
 Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
 Cyprien Nicolas <cyprien@nicolas.tf> <c.nicolas+gitorious@gmail.com>
 David Thompson <davet@gnu.org> <dthompson2@worcester.edu>
 David Thompson <davet@gnu.org> <dthompson@member.fsf.org>
+David Thompson <davet@gnu.org> <dthompson@vistahigherlearning.com>
 Deck Pickard <deck.r.pickard@gmail.com> <nebu@kipple>
 Eric Bavier <bavier@member.fsf.org> <ericbavier@gmail.com>
 Eric Dvorsak <eric@dvorsak.fr> <yenda1@gmail.com>
@@ -17,11 +23,15 @@ Joshua Grant <tadni@riseup.net> <gzg@riseup.net>
 Joshua Grant <tadni@riseup.net> <jgrant@parenthetical.io>
 Joshua Grant <tadni@riseup.net> <tadnimi@gmail.com>
 Joshua Grant <tadni@riseup.net> <youlysses@riseup.net>
+Leo Famulari <leo@famulari.name> <lfamular@gmail.com>
 Ludovic Courtès <ludo@gnu.org> <ludovic.courtes@inria.fr>
-Mathieu Lirzin <mthl@openmailbox.org> <mathieu.lirzin@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mthl@openmailbox.org>
+Mathieu Lirzin <mthl@gnu.org> <mathieu.lirzin@openmailbox.org>
 Nikita Karetnikov <nikita@karetnikov.org> <nikita.karetnikov@gmail.com>
+Nils Gillmann <niasterisk@grrlz.net> <ng@niasterisk.space>
 Pjotr Prins <pjotr.public01@thebird.nl>
 Pjotr Prins <pjotr.public01@thebird.nl> <pjotr.public12@thebird.nl>
+Raimon Grau <raimonster@gmail.com> <raimon@3scale.net>
 Ricardo Wurmus <rekado@elephly.net>
 Ricardo Wurmus <rekado@elephly.net> <ricardo.wurmus@mdc-berlin.de>
 Sou Bunnbu (宋文武) <iyzsong@gmail.com>
diff --git a/CODE-OF-CONDUCT b/CODE-OF-CONDUCT
index 836f437f28..0458fd787c 100644
--- a/CODE-OF-CONDUCT
+++ b/CODE-OF-CONDUCT
@@ -1,5 +1,8 @@
 Contributor Code of Conduct
 
+  Note: In the sequel, "project" refers to GNU Guix, and "project
+  maintainer(s)" refers to maintainer(s) of GNU Guix.
+
 As contributors and maintainers of this project, and in the interest of
 fostering an open and welcoming community, we pledge to respect all
 people who contribute through reporting issues, posting feature
diff --git a/Makefile.am b/Makefile.am
index a9c281d4d1..4c00db1ab3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -183,7 +183,8 @@ KCONFIGS =					\
 # Templates, examples.
 EXAMPLES =					\
   gnu/system/examples/bare-bones.tmpl		\
-  gnu/system/examples/desktop.tmpl
+  gnu/system/examples/desktop.tmpl		\
+  gnu/system/examples/lightweight-desktop.tmpl
 
 GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
 
@@ -292,10 +293,11 @@ endif BUILD_DAEMON
 
 TESTS = $(SCM_TESTS) $(SH_TESTS)
 
-AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)"
+AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0
 
-SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE)
-AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
+SCM_LOG_DRIVER = $(top_builddir)/test-env $(GUILE) --no-auto-compile \
+                   -e main $(top_srcdir)/build-aux/test-driver.scm
+AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
 
 SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL)
 AM_SH_LOG_FLAGS = -x -e
@@ -345,6 +347,7 @@ EXTRA_DIST =						\
   build-aux/download.scm				\
   build-aux/make-binary-tarball.scm			\
   build-aux/generate-authors.scm			\
+  build-aux/test-driver.scm				\
   srfi/srfi-37.scm.in					\
   srfi/srfi-64.scm					\
   srfi/srfi-64.upstream.scm				\
diff --git a/NEWS b/NEWS
index ec929909d7..2ab208f206 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 #+TITLE: Guix NEWS – history of user-visible changes
 #+STARTUP: content hidestars
 
-Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
@@ -10,11 +10,16 @@ Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 
 Please send Guix bug reports to bug-guix@gnu.org.
 
-* Changes in 0.9.1 (since 0.9.0)
+* Changes in 0.10.0 (since 0.9.0)
+
+** Community
+
+GNU Guix adopted a contributor code of conduct, see ‘CODE-OF-CONDUCT’ in the
+source tree.
 
 ** Package management
 
-*** New syntax for separating package names and version numbers
+*** New command-line syntax for separating package names and version numbers
 
 Use ‘@’ instead of ‘-’ as a separator, as in ‘gnupg@2.0’.  This new separator
 is a reserved character which is not allowed both in package names and version
@@ -23,9 +28,31 @@ numbers.
 The old syntax to specify a package’s version—e.g., as “gnupg-2.0”—is obsolete
 and support for it will be removed in the future.
 
-*** Emacs interface for licenses
-*** Emacs interface for system generations
-*** Emacs interface for hydra.gnu.org
+*** “Grafts” apply recursively, based on run-time dependencies
+
+“Grafts” is the mechanism by which we can apply security updates of core
+packages without rebuilding or re-downloading the entire set of dependent
+packages.  See “Security Updates” in the manual, as well as
+<https://savannah.gnu.org/forum/forum.php?forum_id=8470> and
+<http://bugs.gnu.org/22139> for more info.
+
+*** Substitutes are fetched over HTTPS by default
+*** Substitutes are cached for the duration reported in ‘Cache-Control’ headers
+*** Default substitute URL list includes a faster mirror, mirror.hydra.gnu.org
+*** New ‘--with-input’ and ‘--with-source’ for ‘guix package’ and ‘guix build’
+
+See “Package Transformation Options” in the manual.
+
+*** ‘guix package --search-paths -p X -p Y’ combines search paths for X and Y
+*** ‘guix package’ can be passed several ‘--search’ options
+*** New ‘--rounds’ and ‘--check’ for ‘guix build’, for bit-reproducibility
+*** New ‘--rounds’ option for ‘guix-daemon’
+*** New ‘--quiet’ option for ‘guix build’
+*** ‘guix package -u’ no longer checks for upstream GNU releases
+*** ‘guix-daemon’ always uses /tmp in chroots, regardless of $TMPDIR
+*** New Emacs interface to browse licenses: M-x guix-licenses
+*** New Emacs interface to list system generations: M-x guix-system-generations
+*** New Emacs interface for hydra.gnu.org: M-x guix-hydra-…
 *** Changes in Emacs interface variables and faces
 
 In the following names, BUFFER-TYPE means "info" or "list";
@@ -57,9 +84,375 @@ ENTRY-TYPE means "package", "output" or "generation".
   guix-ENTRY-TYPE-list-describe-warning-count
 - guix-package-info-fill-heading -> guix-info-fill
 
+*** New ‘cve’ linter: ‘guix lint -c cve’ reports pending vulnerabilities
+*** New ‘gnome’, ‘xorg’, and ‘github’ updaters for ‘guix refresh’
+*** ‘guix lint’ times out after 3 seconds when probing URLs
+*** ‘guix graph -t bag-with-origins’ includes origins in the graph
+*** ‘guix import cran’ can import packages from bioconductor.org
+
+** Distribution
+
+*** GuixSD upgraded to GNU Shepherd 0.3.1 and GNU Linux-libre 4.5.0
+
+See <http://git.savannah.gnu.org/cgit/shepherd.git/tree/NEWS?id=v0.3.1> for
+information on the changes between GNU dmd 0.2 and the GNU Shepherd 0.3.1.
+
+*** “System Installation” section of the manual has been expounded
+*** Installation image runs GPM and includes more programs
+*** GNOME and Xfce desktops are available via services; see "Desktop Services"
+*** New ‘tor-hidden-service’ procedure, to declare Tor hidden services
+*** New Dovecot service
+*** New ‘fstab-service-type’, to populate /etc/fstab
+*** New ‘mount?’ field for ‘file-system’ forms
+*** Most global environment variables are now set in /etc/environment (pam_env)
+*** ‘guix system reconfigure’ now loads/starts new services, stops old ones
+    (see <http://bugs.gnu.org/22039>)
+*** ‘local-file’ resolves file names relative to the current source file
+*** Many reproducibility issues fixed: glibc, perl, bison, emacs-*, python-*, …
+*** Initial RAM disk supports ‘modprobe.blacklist’ on the kernel command line
+*** New “Running GuixSD in a VM” section in the manual
+*** ‘dmd’ changed to ’shepherd’ in ‘guix system’ sub-commands
+*** A Bourne-like shell is spawned upon ‘fsck’ failure
+    (see <http://bugs.gnu.org/22588>)
+*** 639 new packages
+
+aide, allegro, amb-plugins, aria2, armadillo, armadillo, artanis, aseprite,
+aspell-dict-it, aspell-dict-nl, assword, asymptote, audit, augeas, autojump,
+awscli, baobab, beets, bioawk, blender, bless, borg, bristol, btrfs-progs,
+bwa-pssm, byzanz, c-ares, caribou, cd-hit, cereal, cmocka, codingquarry,
+colord-gtk, cppcheck, cpulimit, cracklib, crossguid, cuetools, cufflinks,
+dcadec, dconf-editor, desmume, devil, dialog, docker-compose, drumstick,
+einstein, emacs-async, emacs-constants, emacs-god-mode, emacs-mit-scheme-doc,
+emacs-popup, emacs-scheme-complete, emacs-slime, emacs-undo-tree,
+emacs-with-editor, emulation-station, etl, evolution-data-server, eyed3, fdm,
+fil-plugins, findnewest, fluxbox, font-abattis-cantarell, font-google-noto,
+font-un, fraggenescan, freefall, fritzing, fxtract, g-wrap, g2reverb,
+gdk-pixbuf+svg, gdm, gdsl, gedit, ghc-aeson-qq, ghc-asn1-encoding,
+ghc-asn1-parse, ghc-asn1-types, ghc-byteable, ghc-chasingbottoms, ghc-cmark,
+ghc-conduit, ghc-connection, ghc-cryptonite, ghc-deepseq-generics, ghc-diff,
+ghc-enclosed-exceptions, ghc-executable-path, ghc-filemanip,
+ghc-haskell-src-meta, ghc-highlighting-kate, ghc-hostname, ghc-hourglass,
+ghc-hslua, ghc-hspec-contrib, ghc-http-client, ghc-http-client-tls,
+ghc-juicypixels, ghc-libxml, ghc-logging-facade, ghc-memory, ghc-mime-types,
+ghc-mmap, ghc-mockery, ghc-packedstring, ghc-pandoc, ghc-pandoc-types,
+ghc-pem, ghc-regex-pcre-builtin, ghc-sha, ghc-socks, ghc-tasty-kat,
+ghc-test-framework, ghc-test-framework-hunit, ghc-test-framework-quickcheck2,
+ghc-texmath, ghc-th-expand-syns, ghc-th-lift, ghc-th-orphans,
+ghc-th-reify-many, ghc-tls, ghc-x509, ghc-x509-store, ghc-x509-system,
+ghc-x509-validation, ghc-yaml, git-annex-remote-hubic, gjs, gnome,
+gnome-backgrounds, gnome-bluetooth, gnome-control-center,
+gnome-online-accounts, gnome-screenshot, gnome-session, gnome-shell,
+gnunet-gtk, gpm, graphicsmagick, gst-plugins-bad, gtk-engines, gtk-vnc,
+gtklick, guile-config, guile-gnunet, guile-irregex, guile-sly, gumbo-parser,
+icedtea, icedtea, idle3-tools, iftop, info-reader, inklingreader, jasper,
+jellyfish, jpegoptim, khal, khard, kodi, kyotocabinet, lcov, ldb, ldc, ledger,
+letsencrypt, libbigwig, libcanberra-gtk2, libconfig, libgit2, libgtop,
+liblangtag, libmateweather, libmbim, libotf, libpwquality, libqmi, libvdpau,
+libxml++, lispf4, love, mate-desktop, mate-icon-theme, mate-menus,
+mate-themes, mcp-plugins, microscheme, mlt, modem-manager, munge,
+mupen64plus-audio-sdl, mupen64plus-core, mupen64plus-input-sdl,
+mupen64plus-rsp-hle, mupen64plus-rsp-z64, mupen64plus-ui-console,
+mupen64plus-video-arachnoid, mupen64plus-video-glide64,
+mupen64plus-video-glide64mk2, mupen64plus-video-rice, mupen64plus-video-z64,
+murrine, mutter, myrepos, nagios, nautilus, network-manager,
+network-manager-applet, nload, notmuch-addrlookup-c, nqc, obs, ocaml-findlib,
+owncloud-client, password-store, pepr, perl-cgi, perl-dbd-mysql,
+perl-file-slurp-tiny, perl-html-template, perl-log-report,
+perl-log-report-optional, perl-mime-charset, perl-module-pluggable,
+perl-shell-command, perl-string-print, perl-text-neattemplate,
+perl-unicode-linebreak, perl-xml-compile, perl-xml-compile-cache,
+perl-xml-compile-soap, perl-xml-compile-tester, perl-xml-compile-wsdl11,
+perl-xml-libxml-simple, pfff, pianobar, pinball, pioneers, pixz, powwow, ppp,
+procmail, pyicoteo, python-acme, python-alembic, python-amqp, python-anyjson,
+python-apipkg, python-args, python-astor, python-atomicwrites,
+python-backports-abc, python-beautifulsoup4, python-billiard, python-botocore,
+python-celery, python-click-log, python-click-threading, python-clint,
+python-colorama, python-configargparse, python-configobj, python-contextlib2,
+python-cookies, python-docker-py, python-dockerpty, python-docopt,
+python-editor, python-efl, python-execnet, python-flask, python-futures,
+python-gst, python-hy, python-hypothesis, python-icalendar, python-jellyfish,
+python-jmespath, python-keystoneclient, python-kombu, python-mako,
+python-markdown, python-minimal-wrapper, python-mpd2, python-munkres,
+python-musicbrainzngs, python-mutagen, python-ndg-httpsclient, python-paste,
+python-pastedeploy, python-pastescript, python-pathlib, python-pluggy,
+python-psycopg2, python-pyasn1-modules, python-pybigwig, python-pyechonest,
+python-pygpgme, python-pyicu, python-pylast, python-pyliblo, python-pyquery,
+python-pyrfc3339, python-pystache, python-pytest-cache, python-pytest-cov,
+python-pytest-localserver, python-pytest-subtesthack, python-pytest-xdist,
+python-pytest-xprocess, python-rarfile, python-rauth,
+python-requests-toolbelt, python-responses, python-rply, python-rsa,
+python-sphinx-repoze-autointerface, python-sphinxcontrib-newsfeed,
+python-sphinxcontrib-programoutput, python-swiftclient, python-texttable,
+python-tox, python-translitcodec, python-urllib3, python-vcversioner,
+python-vobject, python-waitress, python-websocket-client, python-webtest,
+python-werkzeug, python-wheel, python-wsgi-intercept, python-wsgiproxy2,
+python-wtforms, python-zope-component, python-zope-configuration,
+python-zope-event, python-zope-exceptions, python-zope-i18nmessageid,
+python-zope-interface, python-zope-location, python-zope-proxy,
+python-zope-schema, python-zope-security, python-zope-testing,
+python-zope-testrunner, python2-acme, python2-alembic, python2-amqp,
+python2-anyjson, python2-apipkg, python2-args, python2-astor,
+python2-atomicwrites, python2-backports-abc, python2-beautifulsoup4,
+python2-billiard, python2-botocore, python2-celery, python2-clint,
+python2-colorama, python2-configargparse, python2-configobj,
+python2-contextlib2, python2-cookies, python2-docopt, python2-editor,
+python2-efl, python2-enum34, python2-execnet, python2-flask,
+python2-functools32, python2-futures, python2-gst, python2-hy,
+python2-hypothesis, python2-jellyfish, python2-jmespath,
+python2-keystoneclient, python2-kombu, python2-mako, python2-markdown,
+python2-mpd2, python2-munkres, python2-musicbrainzngs, python2-mutagen,
+python2-ndg-httpsclient, python2-parsedatetime, python2-paste,
+python2-pastedeploy, python2-pastescript, python2-pathlib, python2-pluggy,
+python2-psycopg2, python2-pyasn1-modules, python2-pybigwig,
+python2-pyechonest, python2-pygpgme, python2-pylast, python2-pyliblo,
+python2-pyquery, python2-pyrfc3339, python2-pystache, python2-pytest-cov,
+python2-pytest-subtesthack, python2-pytest-xdist, python2-pythondialog,
+python2-rarfile, python2-rauth, python2-responses, python2-rply, python2-rsa,
+python2-sphinx-repoze-autointerface, python2-sphinxcontrib-programoutput,
+python2-swiftclient, python2-texttable, python2-tox, python2-translitcodec,
+python2-unicodecsv, python2-urllib3, python2-vcversioner, python2-vobject,
+python2-waitress, python2-websocket-client, python2-webtest, python2-werkzeug,
+python2-wheel, python2-wsgiproxy2, python2-wtforms, python2-xdo,
+python2-zope-component, python2-zope-configuration, python2-zope-event,
+python2-zope-exceptions, python2-zope-i18nmessageid, python2-zope-interface,
+python2-zope-location, python2-zope-proxy, python2-zope-schema,
+python2-zope-security, python2-zope-testing, python2-zope-testrunner, qca,
+qemu-minimal, qtkeychain, qtractor, quassel, r-acsnminer, r-adaptivesparsity,
+r-annotationdbi, r-base64enc, r-biobase, r-biocgenerics, r-biocparallel,
+r-biomart, r-biostrings, r-bitops, r-brew, r-bsgenome, r-catools, r-curl,
+r-data-table, r-devtools, r-dnacopy, r-doparallel, r-dt, r-foreach,
+r-futile-logger, r-futile-options, r-genomation, r-genomeinfodb,
+r-genomicalignments, r-genomicfeatures, r-genomicranges, r-git2r, r-go-db,
+r-graph, r-gridbase, r-gridextra, r-httr, r-impute, r-iranges, r-iterators,
+r-lambda-r, r-lattice, r-matrixstats, r-org-ce-eg-db, r-org-dm-eg-db,
+r-org-hs-eg-db, r-org-mm-eg-db, r-plotly, r-plotrix, r-r-cache, r-r-methodss3,
+r-r-oo, r-r-rsp, r-r-utils, r-rcpparmadillo, r-rcurl, r-readr, r-rmarkdown,
+r-roxygen2, r-rsamtools, r-rsqlite, r-rstudioapi, r-rtracklayer, r-rversions,
+r-s4vectors, r-seqpattern, r-snow, r-sparsem, r-summarizedexperiment, r-topgo,
+r-viridis, r-whisker, r-xml, r-xml2, r-xvector, radicale, ragel, rakarrack,
+rdmd, redshift, rev-plugins, ruby-ae, ruby-afm, ruby-ansi, ruby-ascii85,
+ruby-atoulme-saikuro, ruby-bio-commandeer, ruby-blankslate, ruby-brass,
+ruby-ci-reporter, ruby-clap, ruby-crass, ruby-cutest, ruby-domain-name,
+ruby-eventmachine, ruby-fivemat, ruby-gem-hadar, ruby-gettext, ruby-guard,
+ruby-hashery, ruby-http-cookie, ruby-instantiator, ruby-introspection,
+ruby-json-pure, ruby-lemon, ruby-locale, ruby-metaclass, ruby-mime-types,
+ruby-mime-types-data, ruby-minitest-bonus-assertions, ruby-minitest-focus,
+ruby-minitest-moar, ruby-minitest-pretty-diff, ruby-minitest-rg,
+ruby-minitest-tu-shim, ruby-mocha, ruby-net-ssh, ruby-netrc,
+ruby-nokogiri-diff, ruby-nokogumbo, ruby-packnga, ruby-power-assert,
+ruby-pry-editline, ruby-pstree, ruby-pygmentize, ruby-qed, ruby-rb-fsevent,
+ruby-rc4, ruby-redcarpet, ruby-redcloth, ruby-rubytest, ruby-rubytest-cli,
+ruby-saikuro-treemap, ruby-sanitize, ruby-sdoc, ruby-shoulda,
+ruby-shoulda-context, ruby-shoulda-matchers, ruby-shoulda-matchers,
+ruby-simplecov, ruby-sqlite3, ruby-systemu, ruby-tdiff, ruby-term-ansicolor,
+ruby-test-unit, ruby-text, ruby-tins, ruby-ttfunk, ruby-turn, ruby-unf,
+ruby-unf-ext, ruby-utils, scribus, sdl2-image, sdl2-mixer, sdl2-ttf, sdparm,
+shepherd, shntool, slurm, smithlab-cpp, snap-aligner, snorenotify, sortmerna,
+sparsehash, ste-plugins, stringtie, synfig, synfigstudio, tcllib, tclxml,
+telepathy-logger, tevent, texlive-minimal, tilda, tinyxml, tlsdate, tophat,
+transmission-remote-cli, ustr, v4l-utils, vco-plugins, vdirsyncer, vdpauinfo,
+vmpk, wah-plugins, wcalc, xaos, xfce4-power-manager, xfce4-xkb-plugin,
+xmlstarlet, yoshimi, zenity
+
+*** 577 package updates
+
+abcde-2.7.1, abduco-0.5, adwaita-icon-theme-3.18.0, aisleriot-3.18.2,
+alsa-modular-synth-2.1.2, alsa-utils-1.1.0, american-fuzzy-lop-1.96b,
+ant-1.9.6, ao-1.2.0, arb-2.8.1, ardour-4.7, aspell-dict-en-2016.01.19-0,
+atkmm-2.24.2, attr-2.4.47, autogen-5.18.7, bash-4.3.42, bash-minimal-4.3.42,
+bash-static-4.3.42, bazaar-2.7.0, bdftopcf-1.0.5, bedtools-2.25.0,
+bind-utils-9.10.3-P4, bitcoin-core-0.11.2, bitlbee-3.4.1, bluez-5.36,
+boost-1.60.0, bowtie-2.2.6, bundler-1.11.2, calibre-2.51.0, catch-1.3.5,
+ccache-3.2.4, chicken-4.10.0, clang-3.6.2, claws-mail-3.13.2, clutter-1.24.2,
+clutter-gst-3.0.14, clutter-gtk-1.6.6, cm-0.3, cogl-1.22.0, colordiff-1.0.16,
+complexity-1.10, cppunit-1.13.2, cups-filters-1.4.0, curl-7.47.0,
+datamash-1.1.0, dconf-0.24.0, ddrescue-1.21, deeptools-2.1.1, devhelp-3.18.1,
+diffoscope-51, docbook-xml-4.3, docbook-xml-4.4, docbook-xml-4.5,
+dovecot-2.2.19, doxygen-1.8.11, dropbear-2016.72, dvdisaster-0.79.5,
+dvtm-0.15, edirect-3.50, efl-1.17.0, eigen-3.2.7, elementary-1.17.0,
+elogind-219.14, emacs-dash-2.12.1, emacs-debbugs-0.9, emacs-pdf-tools-0.70,
+emacs-w3m-1.4.538+0.20141022, emotion-generic-players-1.17.0,
+enlightenment-0.20.6, eog-3.18.1, epiphany-3.18.2,
+evas-generic-loaders-1.17.0, evince-3.18.1, exim-4.86.2,
+extra-cmake-modules-5.19.0, feh-2.14.1, ffmpeg-2.8.6, file-5.25,
+file-roller-3.16.4, findutils-4.6.0, flex-2.6.0,
+font-adobe-source-han-sans-1.004, font-terminus-4.40, font-ubuntu-0.83,
+font-util-1.3.1, fontforge-20150824, freeipmi-1.5.1, frescobaldi-2.18.2,
+fribidi-0.19.7, fuse-2.9.5, gajim-0.16.5, gcc-5.3.0, gcc-toolchain-5.3.0,
+gccgo-4.9.3, gcr-3.18.0, gdb-7.11, gdk-pixbuf-2.32.3, geocode-glib-3.18.0,
+getmail-4.48.0, gettext-0.19.7, gfortran-5.3.0, git-2.7.3, git-manpages-2.7.3,
+git-modes-1.2.1, gitolite-3.6.5, glade-3.18.3, glibc-2.22, glibmm-2.46.3,
+global-6.5.2, glpk-4.59, gmime-2.6.20, gmp-6.1.0, gmsh-2.11.0, gmtp-1.3.10,
+gnome-common-3.18.0, gnome-desktop-3.18.1, gnome-keyring-3.18.3,
+gnome-klotski-3.18.2, gnome-mines-3.18.2, gnome-settings-daemon-3.18.2,
+gnome-terminal-3.18.2, gnome-themes-standard-3.18.0, gnucash-2.6.9,
+gnumeric-1.12.24, gnupg-2.0.29, gnupg-2.1.11, gnuplot-5.0.2, gnutls-3.4.7,
+goffice-0.10.24, gp2c-0.0.9pl5, gpgme-1.6.0, gpsbabel-1.5.2, graphite2-1.3.6,
+grep-2.22, grilo-0.2.14, grilo-plugins-0.2.16, gsl-2.1, gst-libav-1.6.3,
+gst-plugins-base-1.6.3, gst-plugins-good-1.6.3, gst-plugins-ugly-1.6.3,
+gstreamer-1.6.3, gtksourceview-3.18.2, guile-2.0.11, guile-2.0.11,
+guile-json-0.5.0, guile-ssh-0.9.0, guitarix-0.34.0, guix-0.9.0,
+guix-0.9.0-1.dd21, gvfs-1.26.2, harfbuzz-1.0.6, help2man-1.47.3, hevea-2.28,
+htop-2.0.1, hwloc-1.11.1, hydrogen-0.9.6.1, iceauth-1.0.7, icecast-2.4.3,
+icecat-38.6.0-gnu1, iproute2-4.4.0, irssi-0.8.18, isc-dhcp-4.3.3-P1,
+isync-1.2.1, jrnl-1.9.7, julia-0.4.3, kbproto-1.0.7, keepassx-2.0.2,
+kwindowsystem-5.19.0, libass-0.13.2, libassuan-2.4.2, libbluray-0.9.2,
+libcddb-1.3.2, libchamplain-0.12.12, libdvdcss-1.4.0, libevent-2.0.22,
+libffi-3.2.1, libfontenc-1.1.3, libfs-1.0.7, libgcrypt-1.6.5,
+libgnome-keyring-3.12.0, libgpg-error-1.21, libgweather-3.18.1,
+libinput-1.2.0, libjpeg-9a, libmicrohttpd-0.9.48, libotr-4.1.1,
+libpeas-1.16.0, libpng-1.5.26, librecad-2.0.9, libreoffice-5.0.5.2,
+libressl-2.3.3, librsvg-2.40.13, libsecret-0.18.3, libshout-2.4.1,
+libsndfile-1.0.26, libssh-0.7.3, libssh2-1.7.0, libstdc++-doc-5.3.0,
+libtasn1-4.7, libtiff-4.0.6, libuninameslist-0.5.20150701, libvpx-1.5.0,
+libwnck-3.14.0, libx11-1.6.3, libx264-20160220-2245, libxaw-1.0.13,
+libxdmcp-1.1.2, libxi-1.7.6, libxkbfile-1.0.9, libxml2-2.9.3, libxmp-4.3.10,
+libxp-1.0.3, libxrandr-1.5.0, libxrender-0.9.9, libxshmfence-1.2, libxt-1.1.5,
+libxvmc-1.0.9, libxxf86vm-1.1.4, libyubikey-1.13, lilypond-2.19.33,
+linux-libre-4.4.6, linux-libre-4.5, lua-5.2.3, macs-2.1.0.20151222,
+mafft-7.267, magit-2.5.0, man-pages-4.04, manaplus-1.6.3.12, mariadb-10.1.12,
+mercurial-3.7.2, mesa-11.0.9, mesa-headers-11.0.9, mit-krb5-1.13.3,
+mkfontscale-1.1.2, moe-1.8, moreutils-0.57, mozjs-24.2.0, mpd-0.19.12,
+mplayer-1.2.1, mpv-0.16.0, msmtp-1.6.3, mumps-5.0.1, mumps-metis-5.0.1,
+mumps-metis-openmpi-5.0.1, mumps-openmpi-5.0.1, mupdf-1.8, mysql-5.7.11,
+nano-2.5.3, ncbi-vdb-2.5.7, ncmpcpp-0.7.3, neon-0.30.1, nettle-3.2,
+nginx-1.8.1, ngs-java-1.2.3, ngs-sdk-1.2.3, nix-1.11.2, notmuch-0.21,
+nspr-4.10.10, nss-3.21.1, nss-certs-3.21.1, ntp-4.2.8p6, numactl-2.0.11,
+octave-4.0.0, offlineimap-6.7.0, openbox-3.6.1, openjpeg-2.0.1,
+openjpeg-2.1.0, openmpi-1.10.1, openssh-7.2p2, openssl-1.0.2g, opus-1.1.2,
+opusfile-0.7, orc-0.4.25, orfm-0.5.3, oxygen-icons-5.19.0, parallel-20160222,
+paredit-24, pari-gp-2.7.5, parted-3.2, pcre-8.38, pelican-3.6.3, perf-4.5,
+perl-5.22.1, perl-tk-804.033, petsc-3.6.2, petsc-complex-3.6.2,
+petsc-complex-openmpi-3.6.2, petsc-openmpi-3.6.2, pidgin-otr-4.0.2,
+pinentry-0.9.6, pius-2.2.2, pkg-config-0.29, postgresql-9.5.1, powertop-2.8,
+preseq-2.0, privoxy-3.0.24, procps-3.3.11, prodigal-2.6.3, pspp-0.10.0,
+pulseaudio-8.0, pumpa-0.9.2, python-3.4.3, python-apsw-3.9.2-r1,
+python-babel-2.1.1, python-biopython-1.66, python-blinker-1.4,
+python-certifi-2015.11.20.1, python-cffi-1.4.2, python-click-6.2,
+python-coverage-4.0.3, python-cryptography-1.2.3,
+python-cryptography-vectors-1.2.3, python-cython-0.23.4,
+python-dateutil-2.4.2, python-debtcollector-1.0.0, python-decorator-4.0.9,
+python-enum34-1.1.0, python-exif-read-2.1.2, python-file-5.25,
+python-fixtures-1.4.0, python-flake8-2.5.4, python-gnupg-0.3.8,
+python-html5lib-1.0b8, python-isodate-0.5.4, python-jinja2-2.8,
+python-jsonschema-2.5.1, python-keyring-5.7.1, python-libarchive-c-2.2,
+python-libxml2-2.9.3, python-llfuse-0.41.1, python-llfuse-1.0,
+python-lxml-3.5.0, python-ly-0.9.3, python-matplotlib-1.4.3,
+python-mccabe-0.4.0, python-mox3-0.13.0, python-msgpack-0.4.7,
+python-networkx-1.11, python-nose-1.3.7, python-numpy-1.10.4,
+python-oauthlib-1.0.3, python-os-client-config-1.12.0, python-os-testr-0.5.0,
+python-oslo.context-1.0.0, python-oslo.i18n-3.0.0,
+python-oslo.serialization-2.2.0, python-oslo.utils-3.0.0,
+python-oslosphinx-4.2.0, python-pandas-0.16.2, python-parsedatetime-1.5,
+python-passlib-1.6.5, python-patsy-0.4.1, python-pbr-1.8.1, python-pep8-1.7.0,
+python-pillow-3.1.1, python-pip-8.0.2, python-psutil-3.3.0, python-py-1.4.31,
+python-pycparser-2.14, python-pyflakes-1.0.0, python-pygments-2.0.2,
+python-pyjwt-1.4.0, python-pyld-0.6.8, python-pysam-0.8.4, python-pytz-2015.7,
+python-pyzmq-15.1.0, python-requests-2.9.1, python-requests-mock-0.7.0,
+python-rpy2-2.7.6, python-setuptools-scm-1.9.0, python-six-1.10.0,
+python-sqlalchemy-1.0.12, python-stevedore-1.10.0, python-tempest-lib-0.12.0,
+python-tlsh-3.4.4, python-tornado-4.3, python-traitlets-4.1.0,
+python-tzlocal-1.2, python-unidecode-0.04.18, python-virtualenv-13.1.2,
+python-webob-1.5.1, python2-apsw-3.9.2-r1, python2-babel-2.1.1,
+python2-backport-ssl-match-hostname-3.5.0.1, python2-biopython-1.66,
+python2-blinker-1.4, python2-certifi-2015.11.20.1, python2-cffi-1.4.2,
+python2-click-6.2, python2-coverage-4.0.3, python2-cryptography-1.2.3,
+python2-cryptography-vectors-1.2.3, python2-cython-0.23.4,
+python2-dateutil-2.4.2, python2-debtcollector-1.0.0, python2-decorator-4.0.9,
+python2-exif-read-2.1.2, python2-fastlmm-0.2.21, python2-file-5.25,
+python2-fixtures-1.4.0, python2-flake8-2.5.4, python2-gnupg-0.3.8,
+python2-html5lib-1.0b8, python2-isodate-0.5.4, python2-jinja2-2.8,
+python2-jsonschema-2.5.1, python2-keyring-5.7.1, python2-libarchive-c-2.2,
+python2-libxml2-2.9.3, python2-llfuse-1.0, python2-lxml-3.5.0,
+python2-matplotlib-1.4.3, python2-mccabe-0.4.0, python2-mox3-0.13.0,
+python2-msgpack-0.4.7, python2-networkx-1.11, python2-nose-1.3.7,
+python2-numpy-1.10.4, python2-oauthlib-1.0.3, python2-os-client-config-1.12.0,
+python2-os-testr-0.5.0, python2-oslo.context-1.0.0, python2-oslo.i18n-3.0.0,
+python2-oslo.serialization-2.2.0, python2-oslo.utils-3.0.0,
+python2-oslosphinx-4.2.0, python2-pandas-0.16.2, python2-passlib-1.6.5,
+python2-patsy-0.4.1, python2-pbr-1.8.1, python2-pep8-1.7.0,
+python2-pillow-3.1.1, python2-pip-8.0.2, python2-psutil-3.3.0,
+python2-py-1.4.31, python2-pycparser-2.14, python2-pyflakes-1.0.0,
+python2-pygments-2.0.2, python2-pyicu-1.9.2, python2-pyjwt-1.4.0,
+python2-pyld-0.6.8, python2-pysam-0.8.4, python2-pysnptools-0.3.5,
+python2-pysqlite-2.8.1, python2-pytz-2015.7, python2-pyzmq-15.1.0,
+python2-requests-2.9.1, python2-requests-mock-0.7.0, python2-rpy2-2.7.6,
+python2-setuptools-scm-1.9.0, python2-six-1.10.0, python2-sqlalchemy-1.0.12,
+python2-stevedore-1.10.0, python2-tempest-lib-0.12.0, python2-tlsh-3.4.4,
+python2-tornado-4.3, python2-traitlets-4.1.0, python2-unidecode-0.04.18,
+python2-virtualenv-13.1.2, python2-webob-1.5.1, qemu-2.5.0, qrencode-3.4.4,
+r-3.2.3, r-ggplot2-2.0.0, r-qtl-1.38-4, randrproto-1.5.0, retroarch-1.3.1,
+rsync-3.1.2, ruby-2.2.4, ruby-2.3.0, ruby-mini-portile-2.0.0,
+ruby-nokogiri-1.6.7.1, samba-4.3.6, samtools-1.3, sdl2-2.0.4, seahorse-3.18.0,
+sessreg-1.1.0, setxkbmap-1.3.1, shflags-1.2.0, simple-scan-3.19.91,
+sipwitch-1.9.15, skribilo-0.9.3, slepc-3.6.2, slepc-complex-3.6.2,
+slepc-complex-openmpi-3.6.2, slepc-openmpi-3.6.2, smproxy-1.0.6,
+socat-1.7.3.1, sqlite-3.10.0, sra-tools-2.5.7, star-2.5.1b, stow-2.2.2,
+subversion-1.8.15, sudo-1.8.15, sxiv-1.3.2, talloc-2.1.5, tdb-1.3.8,
+texinfo-5.2, texinfo-6.0, texinfo-6.1, the-silver-searcher-0.31.0, tig-2.1.1,
+tiled-0.15.1, tmux-2.1, tor-0.2.7.6, torsocks-2.0.0, totem-3.18.1,
+tzdata-2015g, ucommon-7.0.0, upower-0.99.3, utf8proc-1.3.1, vapoursynth-28,
+vera-1.23, vigra-1.11.0, vsearch-1.10.0, vte-0.42.3, wayland-1.10.0,
+webkitgtk-2.12.0, webkitgtk-2.4.10, webkitgtk-gtk2-2.4.10, weechat-1.4,
+wget-1.17.1, wine-1.9.4, x11perf-1.6.0, xcmsdb-1.0.5, xdotool-3.20150503.1,
+xdpyinfo-1.3.2, xdriinfo-1.0.5, xev-1.2.2, xf86-input-evdev-2.10.1,
+xf86-input-keyboard-1.8.1, xf86-input-libinput-0.16.0,
+xf86-input-synaptics-1.8.3, xf86-input-void-1.4.1, xf86-video-ati-7.6.1,
+xf86-video-cirrus-1.5.3, xf86-video-geode-2.11.18,
+xf86-video-intel-2.99.917-1-d167280, xf86-video-mach64-6.9.5,
+xf86-video-mga-1.6.4, xf86-video-neomagic-1.2.9, xf86-video-nouveau-1.0.12,
+xf86-video-r128-6.10.1, xf86-video-savage-2.3.8,
+xf86-video-siliconmotion-1.7.8, xf86-video-sis-0.10.8, xf86-video-tdfx-1.4.6,
+xf86-video-trident-1.3.7, xf86-video-vesa-2.3.4, xf86-video-vmware-13.1.0,
+xgamma-1.0.6, xhost-1.0.7, xinput-1.6.2, xkbevd-1.1.4, xkeyboard-config-2.17,
+xlockmore-5.46, xlsatoms-1.1.2, xmlto-0.0.28, xmodmap-1.0.9,
+xorg-server-1.18.1, xorriso-1.4.2, xproto-7.0.28, xrandr-1.5.0, xterm-322,
+xvid-1.3.4, xvinfo-1.1.3, xz-5.2.2, yasm-1.3.0, yelp-3.18.1,
+yelp-tools-3.18.0, yelp-xsl-3.18.1, ykclient-2.15, youtube-dl-2016.03.01,
+zlib-1.2.8, znc-1.6.2, zynaddsubfx-2.5.3
+
+** Programming interfaces
+
+*** Build systems always set the ‘SOURCE_DATE_EPOCH’ environment variable
+*** New (guix graph) graph manipulation module, abstracted from ‘guix graph’
+*** New (guix cve) module, to navigate the CVE database
+*** ‘build-things’ procedure takes a new ‘mode’ parameter
+*** Mass rename of ‘dmd’ to ‘shepherd’ in the (gnu …) modules
+*** New ‘gnome-desktop-service’ and ‘xfce-desktop-service’ procedures
+*** ‘pam-root-service-type’ can be extended with cross-cutting transformations
+*** ‘package-with-python2’ honors the ‘python2-variant’ package property
+    (see <http://bugs.gnu.org/22437>)
+
 ** Noteworthy bug fixes
 
-*** Numbers in package names are correctly handled (http://bugs.gnu.org/19219)
+*** Grafts are applied recursively (<http://bugs.gnu.org/22139>)
+*** Commands correctly handle numbers in package names
+    (http://bugs.gnu.org/19219)
+*** ‘guix-daemon’ deduplication code detects corrupt items
+*** eudev now populates /dev/disk/by-{id,label}
+*** Selected locale is automatically built (<http://bugs.gnu.org/22572>)
+*** Substitutes can be downloaded over HTTPS (<http://bugs.gnu.org/22937>)
+*** umask explicitly set in /etc/profile (<http://bugs.gnu.org/22650>)
+*** ‘guix system init’ writes GC root on the target file system
+    (<http://bugs.gnu.org/22802>)
+*** ‘guix system vm’ now works in the absence of KVM support
+    (<http://bugs.gnu.org/22633>)
+*** GuixSD includes an Info reader by default (<http://bugs.gnu.org/22598>)
+*** MacBook keyboards are now properly detected (<http://bugs.gnu.org/20433>)
+*** GRUB searches root by label or UUID (<http://bugs.gnu.org/22281>)
+*** ‘guix package --search-paths’ honors propagated inputs
+    (<http://bugs.gnu.org/22073>)
+*** GCC uses ‘C_INCLUDE_PATH’ et al. instead of ‘CPATH’
+    (<http://bugs.gnu.org/22186>)
+*** ‘ld-wrapper’ computes library search path based on all ‘-L’ flags
+    (<http://bugs.gnu.org/21941>)
+*** ‘guix environment --container’ gracefully handles abnormal exists
+    (<http://bugs.gnu.org/21958>)
+
+** Native language support
+
+*** Updated translations: da, de
+*** New translation: pl (Polish)
 
 * Changes in 0.9.0 (since 0.8.3)
 
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index c5004a65ac..548d9e044a 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -161,7 +161,7 @@ system.")
                        (set-guile-for-build (default-guile))
                        (system-disk-image installation-os
                                           #:disk-image-size
-                                          (* 860 MiB))))))
+                                          (* 1024 MiB))))))
       '()))
 
 (define (tarball-jobs store system)
diff --git a/build-aux/test-driver.scm b/build-aux/test-driver.scm
new file mode 100644
index 0000000000..e9cc2cb24c
--- /dev/null
+++ b/build-aux/test-driver.scm
@@ -0,0 +1,189 @@
+;;;; test-driver.scm - Guile test driver for Automake testsuite harness
+
+(define script-version "2016-04-03.12") ;UTC
+
+;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
+;;;
+;;; This program is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; This program is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;;;; Commentary:
+;;;
+;;; This script provides a Guile test driver using the SRFI-64 Scheme API for
+;;; test suites.  SRFI-64 is distributed with Guile since version 2.0.9.
+;;;
+;;;; Code:
+
+(use-modules (ice-9 getopt-long)
+             (ice-9 pretty-print)
+             (srfi srfi-26)
+             (srfi srfi-64))
+
+(define (show-help)
+  (display "Usage:
+   test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
+               [--expect-failure={yes|no}] [--color-tests={yes|no}]
+               [--enable-hard-errors={yes|no}] [--brief={yes|no}}] [--]
+               TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
+The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n"))
+
+(define %options
+  '((test-name                 (value #t))
+    (log-file                  (value #t))
+    (trs-file                  (value #t))
+    (color-tests               (value #t))
+    (expect-failure            (value #t)) ;XXX: not implemented yet
+    (enable-hard-errors        (value #t)) ;not implemented in SRFI-64
+    (brief                     (value #t))
+    (help    (single-char #\h) (value #f))
+    (version (single-char #\V) (value #f))))
+
+(define (option->boolean options key)
+  "Return #t if the value associated with KEY in OPTIONS is \"yes\"."
+  (and=> (option-ref options key #f) (cut string=? <> "yes")))
+
+(define* (test-display field value  #:optional (port (current-output-port))
+                       #:key pretty?)
+  "Display \"FIELD: VALUE\\n\" on PORT."
+  (if pretty?
+      (begin
+        (format port "~A:~%" field)
+        (pretty-print value port #:per-line-prefix "+ "))
+      (format port "~A: ~A~%" field value)))
+
+(define* (result->string symbol #:key colorize?)
+  "Return SYMBOL as an upper case string.  Use colors when COLORIZE is #t."
+  (let ((result (string-upcase (symbol->string symbol))))
+    (if colorize?
+        (string-append (case symbol
+                         ((pass)       "[0;32m")  ;green
+                         ((xfail)      "[1;32m")  ;light green
+                         ((skip)       "[1;34m")  ;blue
+                         ((fail xpass) "[0;31m")  ;red
+                         ((error)      "[0;35m")) ;magenta
+                       result
+                       "[m")          ;no color
+        result)))
+
+(define* (test-runner-gnu test-name #:key color? brief? out-port trs-port)
+  "Return an custom SRFI-64 test runner.  TEST-NAME is a string specifying the
+file name of the current the test.  COLOR? specifies whether to use colors,
+and BRIEF?, well, you know.  OUT-PORT and TRS-PORT must be output ports.  The
+current output port is supposed to be redirected to a '.log' file."
+
+  (define (test-on-test-begin-gnu runner)
+    ;; Procedure called at the start of an individual test case, before the
+    ;; test expression (and expected value) are evaluated.
+    (let ((result (cute assq-ref (test-result-alist runner) <>)))
+      (test-display "test-name" (result 'test-name))
+      (test-display "location"
+                    (string-append (result 'source-file) ":"
+                                   (number->string (result 'source-line))))
+      (test-display "source" (result 'source-form) #:pretty? #t)))
+
+  (define (test-on-test-end-gnu runner)
+    ;; Procedure called at the end of an individual test case, when the result
+    ;; of the test is available.
+    (let* ((results (test-result-alist runner))
+           (result? (cut assq <> results))
+           (result  (cut assq-ref results <>)))
+      (unless brief?
+        ;; Display the result of each test case on the console.
+        (test-display
+         (result->string (test-result-kind runner) #:colorize? color?)
+         (string-append test-name " - " (test-runner-test-name runner))
+         out-port))
+      (when (result? 'expected-value)
+        (test-display "expected-value" (result 'expected-value)))
+      (when (result? 'expected-error)
+        (test-display "expected-error" (result 'expected-error) #:pretty? #t))
+      (when (result? 'actual-value)
+        (test-display "actual-value" (result 'actual-value)))
+      (when (result? 'actual-error)
+        (test-display "actual-error" (result 'actual-error) #:pretty? #t))
+      (test-display "result" (result->string (result 'result-kind)))
+      (newline)
+      (test-display ":test-result"
+                    (string-append (result->string (test-result-kind runner))
+                                   " " (test-runner-test-name runner))
+                    trs-port)))
+
+  (define (test-on-group-end-gnu runner)
+    ;; Procedure called by a 'test-end', including at the end of a test-group.
+    (let ((fail (or (positive? (test-runner-fail-count runner))
+                    (positive? (test-runner-xpass-count runner))))
+          (skip (or (positive? (test-runner-skip-count runner))
+                    (positive? (test-runner-xfail-count runner)))))
+      ;; XXX: The global results need some refinements for XPASS.
+      (test-display ":global-test-result"
+                    (if fail "FAIL" (if skip "SKIP" "PASS"))
+                    trs-port)
+      (test-display ":recheck"
+                    (if fail "yes" "no")
+                    trs-port)
+      (test-display ":copy-in-global-log"
+                    (if (or fail skip) "yes" "no")
+                    trs-port)
+      (when brief?
+        ;; Display the global test group result on the console.
+        (test-display (result->string (if fail 'fail (if skip 'skip 'pass))
+                                      #:colorize? color?)
+                      test-name
+                      out-port))
+      #f))
+
+  (let ((runner (test-runner-null)))
+    (test-runner-on-test-begin! runner test-on-test-begin-gnu)
+    (test-runner-on-test-end! runner test-on-test-end-gnu)
+    (test-runner-on-group-end! runner test-on-group-end-gnu)
+    (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple)
+    runner))
+
+
+;;;
+;;; Entry point.
+;;;
+
+(define (main . args)
+  (let* ((opts   (getopt-long (command-line) %options))
+         (option (cut option-ref opts <> <>)))
+    (cond
+     ((option 'help #f)    (show-help))
+     ((option 'version #f) (format #t "test-driver.scm ~A" script-version))
+     (else
+      (let ((log (open-file (option 'log-file "") "w0"))
+            (trs (open-file (option 'trs-file "") "wl"))
+            (out (duplicate-port (current-output-port) "wl")))
+        (redirect-port log (current-output-port))
+        (redirect-port log (current-warning-port))
+        (redirect-port log (current-error-port))
+        (test-with-runner
+            (test-runner-gnu (option 'test-name #f)
+                             #:color? (option->boolean opts 'color-tests)
+                             #:brief? (option->boolean opts 'brief)
+                             #:out-port out #:trs-port trs)
+          (load-from-path (option 'test-name #f)))
+        (close-port log)
+        (close-port trs)
+        (close-port out))))
+    (exit 0)))
+
+;;; Local Variables:
+;;; eval: (add-hook 'write-file-functions 'time-stamp)
+;;; time-stamp-start: "(define script-version \""
+;;; time-stamp-format: "%:y-%02m-%02d.%02H"
+;;; time-stamp-time-zone: "UTC"
+;;; time-stamp-end: "\") ;UTC"
+;;; End:
+
+;;;; test-driver.scm ends here.
diff --git a/configure.ac b/configure.ac
index f61c04cac8..6296b1f2ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT([GNU Guix], [0.9.1], [bug-guix@gnu.org], [guix],
+AC_INIT([GNU Guix], [0.10.0], [bug-guix@gnu.org], [guix],
   [http://www.gnu.org/software/guix/])
 AC_CONFIG_AUX_DIR([build-aux])
 
diff --git a/doc.am b/doc.am
index 8356ffa2dd..b9f07c3590 100644
--- a/doc.am
+++ b/doc.am
@@ -47,7 +47,8 @@ EXTRA_DIST +=					\
 
 OS_CONFIG_EXAMPLES_TEXI =			\
   doc/os-config-bare-bones.texi			\
-  doc/os-config-desktop.texi
+  doc/os-config-desktop.texi			\
+  doc/os-config-lightweight-desktop.texi
 
 # Bundle this file so that makeinfo finds it in out-of-source-tree builds.
 BUILT_SOURCES        += $(OS_CONFIG_EXAMPLES_TEXI)
diff --git a/doc/emacs.texi b/doc/emacs.texi
index 27f5365caa..c4fdfff272 100644
--- a/doc/emacs.texi
+++ b/doc/emacs.texi
@@ -48,13 +48,19 @@ command (@pxref{Emacs Popup Interface}).
 
 @end itemize
 
-When it is done ``guix.el'' may be configured by requiring a special
-@code{guix-init} file---i.e., by adding the following code into your
-init file (@pxref{Init File,,, emacs, The GNU Emacs Manual}):
+When it is done, ``guix.el'' may be configured by requiring
+@code{guix-autoloads} file.  If you install Guix in your user profile,
+this auto-loading is done automatically by our Emacs package
+(@pxref{Application Setup}), so a universal recipe for configuring
+``guix.el'' is: @command{guix package -i guix}.  If you do this, there
+is no need to read further.
+
+For the manual installation, you need to add the following code into
+your init file (@pxref{Init File,,, emacs, The GNU Emacs Manual}):
 
 @example
 (add-to-list 'load-path "/path/to/directory-with-guix.el")
-(require 'guix-init nil t)
+(require 'guix-autoloads nil t)
 @end example
 
 So the only thing you need to figure out is where the directory with
@@ -66,17 +72,19 @@ If it was installed by a package manager of your distribution or by a
 usual @code{./configure && make && make install} command sequence, then
 elisp files are placed in a standard directory with Emacs packages
 (usually it is @file{/usr/share/emacs/site-lisp/}), which is already in
-@code{load-path}, so there is no need to add that directory there.
+@code{load-path}, so there is no need to add that directory there.  Note
+that if you don't update this installation periodically, you may get an
+outdated Emacs code which does not work with the current Guile code of
+Guix.
 
 @item
 If you used a binary installation method (@pxref{Binary Installation}),
 then Guix is installed somewhere in the store, so the elisp files are
 placed in @file{/gnu/store/@dots{}-guix-0.8.2/share/emacs/site-lisp/} or
 alike.  However it is not recommended to refer directly to a store
-directory.  Instead you can install Guix using Guix itself with
-@command{guix package -i guix} command (@pxref{Invoking guix package})
-and add @file{~/.guix-profile/share/emacs/site-lisp/} directory to
-@code{load-path} variable.
+directory, as it may be garbage-collected one day.  So a better choice
+would be to install Guix using Guix itself with @command{guix package -i
+guix}.
 
 @item
 If you did not install Guix at all and prefer a hacking way
@@ -88,26 +96,10 @@ same directory, so your final configuration will look like this:
 (let ((dir "/path/to/your-guix-git-tree/emacs"))
   (add-to-list 'load-path dir)
   (setq guix-load-path dir))
-(require 'guix-init nil t)
+(require 'guix-autoloads nil t)
 @end example
 @end itemize
 
-By default, along with autoloading (@pxref{Autoload,,, elisp, The GNU
-Emacs Lisp Reference Manual}) the main interactive commands for
-``guix.el'' (@pxref{Emacs Commands}), requiring @code{guix-init} will
-also autoload commands for the Emacs packages installed in your user
-profile.
-
-To disable automatic loading of installed Emacs packages, set
-@code{guix-package-enable-at-startup} variable to @code{nil} before
-requiring @code{guix-init}.  This variable has the same meaning for
-Emacs packages installed with Guix, as @code{package-enable-at-startup}
-for the built-in Emacs package system (@pxref{Package Installation,,,
-emacs, The GNU Emacs Manual}).
-
-You can activate Emacs packages installed in your profile whenever you
-want using @kbd{M-x@tie{}guix-emacs-autoload-packages}.
-
 
 @node Emacs Package Management
 @section Package Management
diff --git a/doc/guix.texi b/doc/guix.texi
index 913545f1a7..a34d547f7c 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -249,20 +249,52 @@ Coding Style
 @node Introduction
 @chapter Introduction
 
+@cindex purpose
 GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks''
-using the international phonetic alphabet (IPA).} is a functional
-package management tool for the GNU system.  Package management consists
-of all activities that relate to building packages from sources,
-honoring their build-time and run-time dependencies,
-installing packages in user environments, upgrading installed packages
-to new versions or rolling back to a previous set, removing unused
-software packages, etc.
+using the international phonetic alphabet (IPA).} is a package
+management tool for the GNU system.  Guix makes it easy for unprivileged
+users to install, upgrade, or remove packages, to roll back to a
+previous package set, to build packages from source, and generally
+assists with the creation and maintenance of software environments.
+
+@cindex user interfaces
+Guix provides a command-line package management interface
+(@pxref{Invoking guix package}), a set of command-line utilities
+(@pxref{Utilities}), a visual user interface in Emacs (@pxref{Emacs
+Interface}), as well as Scheme programming interfaces
+(@pxref{Programming Interface}).
+@cindex build daemon
+Its @dfn{build daemon} is responsible for building packages on behalf of
+users (@pxref{Setting Up the Daemon}) and for downloading pre-built
+binaries from authorized sources (@pxref{Substitutes}).
+
+@cindex extensibility of the distribution
+@cindex customization of packages
+Guix includes package definitions for many GNU and non-GNU packages, all
+of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the
+user's computing freedom}.  It is @emph{extensible}: users can write
+their own package definitions (@pxref{Defining Packages}) and make them
+available as independent package modules (@pxref{Package Modules}).  It
+is also @emph{customizable}: users can @emph{derive} specialized package
+definitions from existing ones, including from the command line
+(@pxref{Package Transformation Options}).
+
+@cindex Guix System Distribution
+@cindex GuixSD
+You can install GNU@tie{}Guix on top of an existing GNU/Linux system
+where it complements the available tools without interference
+(@pxref{Installation}), or you can use it as part of the standalone
+@dfn{Guix System Distribution} or GuixSD (@pxref{GNU Distribution}).
+With GNU@tie{}GuixSD, you @emph{declare} all aspects of the operating
+system configuration and Guix takes care of instantiating the
+configuration in a transactional, reproducible, and stateless fashion
+(@pxref{System Configuration}).
 
 @cindex functional package management
-The term @dfn{functional} refers to a specific package management
+Under the hood, Guix implements the @dfn{functional package management}
 discipline pioneered by Nix (@pxref{Acknowledgments}).
 In Guix, the package build and installation process is seen
-as a function, in the mathematical sense.  That function takes inputs,
+as a @emph{function}, in the mathematical sense.  That function takes inputs,
 such as build scripts, a compiler, and libraries, and
 returns an installed package.  As a pure function, its result depends
 solely on its inputs---for instance, it cannot refer to software or
@@ -286,18 +318,6 @@ This approach is the foundation for the salient features of Guix: support
 for transactional package upgrade and rollback, per-user installation, and
 garbage collection of packages (@pxref{Features}).
 
-Guix has a command-line interface, which allows users to build, install,
-upgrade, and remove packages, as well as a Scheme programming interface.
-
-@cindex Guix System Distribution
-@cindex GuixSD
-Last but not least, Guix is used to build a distribution of the GNU
-system, with many GNU and non-GNU free software packages.  The Guix
-System Distribution, or GNU@tie{}GuixSD, takes advantage of the core
-properties of Guix at the system level.  With GuixSD, users
-@emph{declare} all aspects of the operating system configuration, and
-Guix takes care of instantiating that configuration in a reproducible,
-stateless fashion.  @xref{GNU Distribution}.
 
 @c *********************************************************************
 @node Installation
@@ -576,12 +596,18 @@ It is also possible to run a subset of the tests by defining the
 make check TESTS="tests/store.scm tests/cpio.scm"
 @end example
 
+By default, tests results are displayed at a file level.  In order to
+see the details of every individual test cases, it is possible to define
+the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:
+
+@example
+make check TESTS="tests/base64.scm" SCM_LOG_DRIVER_FLAGS="--brief=no"
+@end example
+
 Upon failure, please email @email{bug-guix@@gnu.org} and attach the
-@file{test-suite.log} file.  When @file{tests/@var{something}.scm}
-fails, please also attach the @file{@var{something}.log} file available
-in the top-level build directory.  Please specify the Guix version being
-used as well as version numbers of the dependencies
-(@pxref{Requirements}) in your message.
+@file{test-suite.log} file.  Please specify the Guix version being used
+as well as version numbers of the dependencies (@pxref{Requirements}) in
+your message.
 
 @node Setting Up the Daemon
 @section Setting Up the Daemon
@@ -1214,7 +1240,8 @@ In addition, any package transaction may be @emph{rolled back}.  So, if,
 for example, an upgrade installs a new version of a package that turns
 out to have a serious bug, users may roll back to the previous instance
 of their profile, which was known to work well.  Similarly, the global
-system configuration is subject to transactional upgrades and roll-back
+system configuration on GuixSD is subject to
+transactional upgrades and roll-back
 (@pxref{Using the Configuration System}).
 
 All packages in the package store may be @emph{garbage-collected}.
@@ -1243,7 +1270,10 @@ deployment}.  When a pre-built binary for a @file{/gnu/store} item is
 available from an external source---a @dfn{substitute}, Guix just
 downloads it and unpacks it;
 otherwise, it builds the package from source, locally
-(@pxref{Substitutes}).
+(@pxref{Substitutes}).  Because build results are usually bit-for-bit
+reproducible, users do not have to trust servers that provide
+substitutes: they can force a local build and @emph{challenge} providers
+(@pxref{Invoking guix challenge}).
 
 Control over the build environment is a feature that is also useful for
 developers.  The @command{guix environment} command allows developers of
@@ -2830,8 +2860,11 @@ For packages that install stand-alone Python programs under @code{bin/},
 it takes care of wrapping these programs so that their @code{PYTHONPATH}
 environment variable points to all the Python libraries they depend on.
 
-Which Python package is used can be specified with the @code{#:python}
-parameter.
+Which Python package is used to perform the build can be specified with
+the @code{#:python} parameter.  This is a useful way to force a package
+to be built for a specific version of the Python interpreter, which
+might be necessary if the package is only compatible with a single
+interpreter version.
 @end defvr
 
 @defvr {Scheme Variable} perl-build-system
@@ -3221,7 +3254,7 @@ provides a framework for working with @dfn{monads}, and a particularly
 useful monad for our uses, the @dfn{store monad}.  Monads are a
 construct that allows two things: associating ``context'' with values
 (in our case, the context is the store), and building sequences of
-computations (here computations include accesses to the store.)  Values
+computations (here computations include accesses to the store).  Values
 in a monad---values that carry this additional context---are called
 @dfn{monadic values}; procedures that return such values are called
 @dfn{monadic procedures}.
@@ -3250,7 +3283,7 @@ as a monadic function:
                                  #$output))))
 @end example
 
-There several things to note in the second version: the @code{store}
+There are several things to note in the second version: the @code{store}
 parameter is now implicit and is ``threaded'' in the calls to the
 @code{package->derivation} and @code{gexp->derivation} monadic
 procedures, and the monadic value returned by @code{package->derivation}
@@ -3268,7 +3301,7 @@ omitted since it will take place implicitly, as we will see later
 @end example
 
 @c See
-@c <https://syntaxexclamation.wordpress.com/2014/06/26/escaping-continuations/> 
+@c <https://syntaxexclamation.wordpress.com/2014/06/26/escaping-continuations/>
 @c for the funny quote.
 Calling the monadic @code{sh-symlink} has no effect.  As someone once
 said, ``you exit a monad like you exit a building on fire: by running''.
@@ -3517,7 +3550,7 @@ S-expressions adapted to build expressions.  G-expressions, or
 @code{ungexp}, and @code{ungexp-splicing} (or simply: @code{#~},
 @code{#$}, and @code{#$@@}), which are comparable to
 @code{quasiquote}, @code{unquote}, and @code{unquote-splicing},
-respectivel (@pxref{Expression Syntax, @code{quasiquote},, guile,
+respectively (@pxref{Expression Syntax, @code{quasiquote},, guile,
 GNU Guile Reference Manual}).  However, there are major differences:
 
 @itemize
@@ -3878,9 +3911,10 @@ has an associated gexp compiler, such as a @code{<package>}.
 @node Utilities
 @chapter Utilities
 
-This section describes tools primarily targeted at developers and users
-who write new package definitions.  They complement the Scheme
-programming interface of Guix in a convenient way.
+This section describes Guix command-line utilities.  Some of them are
+primarily targeted at developers and users who write new package
+definitions, while others are more generally useful.  They complement
+the Scheme programming interface of Guix in a convenient way.
 
 @menu
 * Invoking guix build::         Building packages from the command line.
@@ -4314,7 +4348,7 @@ So for instance, imagine you want to see the build log of GDB on MIPS,
 but you are actually on an @code{x86_64} machine:
 
 @example
-$ guix build --log-file gdb -s mips64el-linux 
+$ guix build --log-file gdb -s mips64el-linux
 https://hydra.gnu.org/log/@dots{}-gdb-7.10
 @end example
 
@@ -4764,6 +4798,8 @@ the updater for @uref{https://pypi.python.org, PyPI} packages.
 the updater for @uref{https://rubygems.org, RubyGems} packages.
 @item github
 the updater for @uref{https://github.com, GitHub} packages.
+@item hackage
+the updater for @uref{https://hackage.haskell.org, Hackage} packages.
 @end table
 
 For instance, the following command only checks for updates of Emacs
@@ -4888,11 +4924,26 @@ just a version number or ``git-checkout'', without a declared
 @code{file-name} (@pxref{origin Reference}).
 
 @item cve
+@cindex security vulnerabilities
+@cindex CVE, Common Vulnerabilities and Exposures
 Report known vulnerabilities found in the Common Vulnerabilities and
-Exposures (CVE) database
+Exposures (CVE) databases of the current and past year
 @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US
 NIST}.
 
+To view information about a particular vulnerability, visit pages such as:
+
+@itemize
+@item
+@indicateurl{https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD}
+@item
+@indicateurl{https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD}
+@end itemize
+
+@noindent
+where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g.,
+@code{CVE-2015-7554}.
+
 @item formatting
 Warn about obvious source code formatting issues: trailing white space,
 use of tabulations, etc.
@@ -5313,10 +5364,11 @@ Attempt to build for @var{system}---e.g., @code{i686-linux}.
 @itemx -C
 @cindex container
 Run @var{command} within an isolated container.  The current working
-directory outside the container is mapped inside the
-container.  Additionally, the spawned process runs as the current user
-outside the container, but has root privileges in the context of the
-container.
+directory outside the container is mapped inside the container.
+Additionally, a dummy home directory is created that matches the current
+user's home directory, and @file{/etc/passwd} is configured accordingly.
+The spawned process runs as the current user outside the container, but
+has root privileges in the context of the container.
 
 @item --network
 @itemx -N
@@ -5685,12 +5737,17 @@ also be installed on top of a running GNU/Linux system,
 @pxref{Installation}.
 
 @ifinfo
+@quotation Note
 @c This paragraph is for people reading this from tty2 of the
 @c installation image.
 You are reading this documentation with an Info reader.  For details on
 how to use it, hit the @key{RET} key (``return'' or ``enter'') on the
-link that follows: @pxref{Help,,, info, Info: An Introduction}.  Hit
-@kbd{l} afterwards to come back here.
+link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU
+Info}.  Hit @kbd{l} afterwards to come back here.
+
+Alternately, run @command{info info} in another tty to keep the manual
+available.
+@end quotation
 @end ifinfo
 
 @menu
@@ -5732,7 +5789,7 @@ Few system services are currently supported out-of-the-box
 (@pxref{Services}).
 
 @item
-More than 3,000 packages are available, but you may
+More than 3,200 packages are available, but you may
 occasionally find that a useful package is missing.
 
 @item
@@ -5830,10 +5887,16 @@ menu, where you can choose to boot from the USB stick.
 Once you have successfully booted the image on the USB stick, you should
 end up with a root prompt.  Several console TTYs are configured and can
 be used to run commands as root.  TTY2 shows this documentation,
-browsable using the Info reader commands (@pxref{Help,,, info, Info: An
-Introduction}).  The installation system runs the GPM mouse daemon,
-which allows you to select text with the left mouse button and to paste
-it with the middle button.
+browsable using the Info reader commands (@pxref{Top,,, info-stnd,
+Stand-alone GNU Info}).  The installation system runs the GPM mouse
+daemon, which allows you to select text with the left mouse button and
+to paste it with the middle button.
+
+@quotation Note
+Installation requires access to the Internet so that any missing
+dependencies of your system configuration can be downloaded.  See the
+``Networking'' section below.
+@end quotation
 
 @subsubsection Keyboard Layout
 
@@ -5903,14 +5966,14 @@ network interface you want to use):
 wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B
 @end example
 
-Run @command{man wpa_supplication} for more information.
+Run @command{man wpa_supplicant} for more information.
 @end table
 
 At this point, you need to acquire an IP address.  On a network where IP
 addresses are automatically assigned @i{via} DHCP, you can run:
 
 @example
-dhclient @var{interface}
+dhclient -v @var{interface}
 @end example
 
 Try to ping a server to see if networking is up and running:
@@ -5986,16 +6049,19 @@ With the target partitions ready and the target root mounted on
 herd start cow-store /mnt
 @end example
 
-This makes @file{/gnu/store} copy-on-write, such that packages added to
-it during the installation phase are written to the target disk rather
-than kept in memory.
+This makes @file{/gnu/store} copy-on-write, such that packages added to it
+during the installation phase are written to the target disk on @file{/mnt}
+rather than kept in memory.  This is necessary because the first phase of
+the @command{guix system init} command (see below) entails downloads or
+builds to @file{/gnu/store} which, initially, is an in-memory file system.
 
 Next, you have to edit a file and
 provide the declaration of the operating system to be installed.  To
 that end, the installation system comes with two text editors: GNU nano
 (@pxref{Top,,, nano, GNU nano Manual}), and GNU Zile, an Emacs clone.
-It is better to store that file on the target root file system, say, as
-@file{/mnt/etc/config.scm}.
+We strongly recommend storing that file on the target root file system, say,
+as @file{/mnt/etc/config.scm}.  Failing to do that, you will have lost your
+configuration file once you have rebooted into the newly-installed system.
 
 @xref{Using the Configuration System}, for an overview of the
 configuration file.  The example configurations discussed in that
@@ -6056,8 +6122,9 @@ good.
 The installation image described above was built using the @command{guix
 system} command, specifically:
 
+@c FIXME: 1G is too much; see <http://bugs.gnu.org/23077>.
 @example
-guix system disk-image --image-size=850MiB gnu/system/install.scm
+guix system disk-image --image-size=1G gnu/system/install.scm
 @end example
 
 Have a look at @file{gnu/system/install.scm} in the source tree,
@@ -6218,13 +6285,21 @@ to create a new configuration which has the same values as the old
 configuration, but with a few modifications.
 
 The configuration for a typical ``desktop'' usage, with the X11 display
-server, a desktop environment, network management, power management, and
-more, would look like this:
+server, GNOME and Xfce (users can choose which of these desktop
+environments to use at the log-in screen by pressing @kbd{F1}), network
+management, power management, and more, would look like this:
 
 @lisp
 @include os-config-desktop.texi
 @end lisp
 
+A graphical environment with a choice of lightweight window managers
+instead of full-blown desktop environments would look like this:
+
+@lisp
+@include os-config-lightweight-desktop.texi
+@end lisp
+
 @xref{Desktop Services}, for the exact list of services provided by
 @var{%desktop-services}.  @xref{X.509 Certificates}, for background
 information about the @code{nss-certs} package that is used here.
@@ -8714,7 +8789,7 @@ isn't enough disk space, just skip it.
 @item fcntl
 Use this if possible.  Works with NFS too if lockd is used.
 @item flock
-May not exist in all systems.  Doesn't work with NFS. 
+May not exist in all systems.  Doesn't work with NFS.
 @item lockf
 May not exist in all systems.  Doesn't work with NFS.
 @end table
@@ -10415,14 +10490,32 @@ the load.  To check whether a package has a @code{debug} output, use
 @node Security Updates
 @section Security Updates
 
+@cindex security updates
+@cindex security vulnerabilities
+Occasionally, important security vulnerabilities are discovered in software
+packages and must be patched.  Guix developers try hard to keep track of
+known vulnerabilities and to apply fixes as soon as possible in the
+@code{master} branch of Guix (we do not yet provide a ``stable'' branch
+containing only security updates.)  The @command{guix lint} tool helps
+developers find out about vulnerable versions of software packages in the
+distribution:
+
+@smallexample
+$ guix lint -c cve
+gnu/packages/base.scm:652:2: glibc-2.21: probably vulnerable to CVE-2015-1781, CVE-2015-7547
+gnu/packages/gcc.scm:334:2: gcc-4.9.3: probably vulnerable to CVE-2015-5276
+gnu/packages/image.scm:312:2: openjpeg-2.1.0: probably vulnerable to CVE-2016-1923, CVE-2016-1924
+@dots{}
+@end smallexample
+
+@xref{Invoking guix lint}, for more information.
+
 @quotation Note
-As of version @value{VERSION}, the feature described in this section is
-experimental.
+As of version @value{VERSION}, the feature described below is considered
+``beta''.
 @end quotation
 
-@cindex security updates
-Occasionally, important security vulnerabilities are discovered in core
-software packages and must be patched.  Guix follows a functional
+Guix follows a functional
 package management discipline (@pxref{Introduction}), which implies
 that, when a package is changed, @emph{every package that depends on it}
 must be rebuilt.  This can significantly slow down the deployment of
diff --git a/doc/htmlxref.cnf b/doc/htmlxref.cnf
index fee1b4c9d8..559cdce5aa 100644
--- a/doc/htmlxref.cnf
+++ b/doc/htmlxref.cnf
@@ -1,7 +1,7 @@
 # htmlxref.cnf - reference file for free Texinfo manuals on the web.
 # Modified by Ludovic Courtès <ludo@gnu.org> for the GNU Guix manual.
 
-htmlxrefversion=2016-02-21.21; # UTC
+htmlxrefversion=2016-03-30.07; # UTC
 
 # Copyright 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
 # 
@@ -324,7 +324,7 @@ gnutls		mono	http://gnutls.org/manual/gnutls.html
 gnutls		node	http://gnutls.org/manual/html_node/
 
 gnutls-guile	mono	http://gnutls.org/manual/gnutls-guile.html
-gnutls-guile	node	http://gnutls.org/manual/gnutls-guile/index.html
+gnutls-guile	node	http://gnutls.org/manual/gnutls-guile/
 
 gperf		mono	${GS}/gperf/manual/gperf.html
 gperf		node	${GS}/gperf/manual/html_node/
diff --git a/emacs/guix-geiser.el b/emacs/guix-geiser.el
index 0e6cc03a84..833f5bb2b3 100644
--- a/emacs/guix-geiser.el
+++ b/emacs/guix-geiser.el
@@ -46,11 +46,23 @@ Return a list of strings with result values of evaluation."
 (defun guix-geiser-eval-read (str &optional repl)
   "Evaluate STR with guile expression using Geiser REPL.
 Return elisp expression of the first result value of evaluation."
-  ;; Parsing scheme code with elisp `read' is probably not the best idea.
-  (read (replace-regexp-in-string
-         "#f\\|#<unspecified>" "nil"
-         (replace-regexp-in-string
-          "#t" "t" (car (guix-geiser-eval str repl))))))
+  ;; The goal is to convert a string with scheme expression into elisp
+  ;; expression.
+  (let ((result (car (guix-geiser-eval str repl))))
+    (cond
+     ((or (string= result "#f")
+          (string= result "#<unspecified>"))
+      nil)
+     ((string= result "#t")
+      t)
+     (t
+      (read (replace-regexp-in-string
+             "[ (]\\(#f\\)" "nil"
+             (replace-regexp-in-string
+              "[ (]\\(#t\\)" "t"
+              result
+              nil nil 1)
+             nil nil 1))))))
 
 (defun guix-repl-send (cmd &optional save-history)
   "Send CMD input string to the current REPL buffer.
diff --git a/emacs/guix-init.el b/emacs/guix-init.el
index 1d7d258f69..bd75e54e03 100644
--- a/emacs/guix-init.el
+++ b/emacs/guix-init.el
@@ -1,4 +1,3 @@
 (require 'guix-autoloads)
-(require 'guix-emacs)
-
+(message "(require 'guix-init) is obsolete, use (require 'guix-autoloads) instead.")
 (provide 'guix-init)
diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm
index 86cedfd459..c62044056f 100644
--- a/emacs/guix-main.scm
+++ b/emacs/guix-main.scm
@@ -58,9 +58,7 @@
  (guix licenses)
  (guix utils)
  (guix ui)
- (guix scripts lint)
  (guix scripts package)
- (guix scripts pull)
  (gnu packages)
  (gnu system))
 
@@ -105,24 +103,34 @@ return two values: name and version.  For example, for SPEC
 (define name+version->key cons)
 (define key->name+version car+cdr)
 
-(define %packages
-  (fold-packages (lambda (pkg res)
-                   (vhash-consq (object-address pkg) pkg res))
-                 vlist-null))
+(define %package-vhash
+  (delay
+    (fold-packages (lambda (pkg res)
+                     (vhash-consq (object-address pkg) pkg res))
+                   vlist-null)))
+
+(define (package-vhash)
+  "Return vhash of 'package ID (address)'/'package' pairs."
+  (force %package-vhash))
 
 (define %package-table
-  (let ((table (make-hash-table (vlist-length %packages))))
-    (vlist-for-each
-     (lambda (elem)
-       (match elem
-         ((address . pkg)
-          (let* ((key (name+version->key (package-name pkg)
-                                         (package-version pkg)))
-                 (ref (hash-ref table key)))
-            (hash-set! table key
-                       (if ref (cons pkg ref) (list pkg)))))))
-     %packages)
-    table))
+  (delay
+    (let ((table (make-hash-table (vlist-length (package-vhash)))))
+      (vlist-for-each
+       (lambda (elem)
+         (match elem
+           ((address . pkg)
+            (let* ((key (name+version->key (package-name pkg)
+                                           (package-version pkg)))
+                   (ref (hash-ref table key)))
+              (hash-set! table key
+                         (if ref (cons pkg ref) (list pkg)))))))
+       (package-vhash))
+      table)))
+
+(define (package-table)
+  "Return hash table of 'name+version key'/'list of packages' pairs."
+  (force %package-table))
 
 (define (manifest-entry->name+version+output entry)
   (values
@@ -293,8 +301,10 @@ Example:
 
 (define (package-unique? package)
   "Return #t if PACKAGE is a single package with such name/version."
-  (null? (cdr (packages-by-name (package-name package)
-                                (package-version package)))))
+  (match (packages-by-name (package-name package)
+                           (package-version package))
+    ((package) #t)
+    (_ #f)))
 
 (define %package-param-alist
   `((id                . ,object-address)
@@ -330,11 +340,12 @@ Example:
 ;;; Finding packages.
 
 (define (package-by-address address)
-  (and=> (vhash-assq address %packages)
-         cdr))
+  (match (vhash-assq address (package-vhash))
+    ((_ . package) package)
+    (_ #f)))
 
 (define (packages-by-name+version name version)
-  (or (hash-ref %package-table
+  (or (hash-ref (package-table)
                 (name+version->key name version))
       '()))
 
@@ -917,34 +928,14 @@ OUTPUTS is a list of package outputs (may be an empty list)."
                         manifest transaction)))
     (unless (and (null? install) (null? remove))
       (with-store store
-        (let* ((derivation (run-with-store store
-                             (mbegin %store-monad
-                               (set-guile-for-build (default-guile))
-                               (profile-derivation new-manifest))))
-               (derivations (list derivation))
-               (new-profile (derivation->output-path derivation)))
-          (set-build-options store
-                             #:print-build-trace #f
-                             #:use-substitutes? use-substitutes?)
-          (show-manifest-transaction store manifest transaction
-                                     #:dry-run? dry-run?)
-          (show-what-to-build store derivations
-                              #:use-substitutes? use-substitutes?
-                              #:dry-run? dry-run?)
-          (unless dry-run?
-            (let ((name (generation-file-name
-                         profile
-                         (+ 1 (generation-number profile)))))
-              (and (build-derivations store derivations)
-                   (let* ((entries (manifest-entries new-manifest))
-                          (count   (length entries)))
-                     (switch-symlinks name new-profile)
-                     (switch-symlinks profile name)
-                     (format #t (N_ "~a package in profile~%"
-                                    "~a packages in profile~%"
-                                    count)
-                             count)
-                     (display-search-paths entries (list profile)))))))))))
+        (set-build-options store
+                           #:print-build-trace #f
+                           #:use-substitutes? use-substitutes?)
+        (show-manifest-transaction store manifest transaction
+                                   #:dry-run? dry-run?)
+        (build-and-use-profile store profile new-manifest
+                               #:use-substitutes? use-substitutes?
+                               #:dry-run? dry-run?)))))
 
 (define (delete-generations* profile generations)
   "Delete GENERATIONS from PROFILE.
@@ -1040,8 +1031,9 @@ Return #t if the shell command was executed successfully."
 (define (lint-checker-names)
   "Return a list of names of available lint checkers."
   (map (lambda (checker)
-         (symbol->string (lint-checker-name checker)))
-       %checkers))
+         (symbol->string ((@ (guix scripts lint) lint-checker-name)
+                          checker)))
+       (@ (guix scripts lint) %checkers)))
 
 (define (package-names)
   "Return a list of names of available packages."
diff --git a/emacs/guix-ui-package.el b/emacs/guix-ui-package.el
index 9d81c6126e..df5f8d12d1 100644
--- a/emacs/guix-ui-package.el
+++ b/emacs/guix-ui-package.el
@@ -357,7 +357,8 @@ formatted with this string, an action button is inserted.")
             (guix-buffer-get-display-entries-current
              'info guix-package-info-type
              (list (guix-ui-current-profile)
-                   'name (button-label btn))
+                   'name (or (button-get btn 'spec)
+                             (button-label btn)))
              'add)))
 
 (define-button-type 'guix-package-heading
@@ -374,10 +375,12 @@ formatted with this string, an action button is inserted.")
             (message "Yes, this is the source URL. What did you expect?")))
 
 (defun guix-package-info-insert-heading (entry)
-  "Insert package ENTRY heading (name specification) at point."
+  "Insert package ENTRY heading (name and version) at point."
   (guix-insert-button
-   (guix-package-entry->name-specification entry)
-   'guix-package-heading))
+   (concat (guix-entry-value entry 'name) " "
+           (guix-entry-value entry 'version))
+   'guix-package-heading
+   'spec (guix-package-entry->name-specification entry)))
 
 (defun guix-package-info-insert-systems (systems entry)
   "Insert supported package SYSTEMS at point."
diff --git a/gnu-system.am b/gnu-system.am
index 805464f658..fc5a233ae3 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -134,6 +134,7 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/gl.scm				\
   gnu/packages/glib.scm				\
   gnu/packages/gnome.scm			\
+  gnu/packages/gnu-doc.scm			\
   gnu/packages/gnucash.scm			\
   gnu/packages/gnunet.scm			\
   gnu/packages/gnupg.scm			\
@@ -222,7 +223,6 @@ GNU_SYSTEM_MODULES =				\
   gnu/packages/mcrypt.scm			\
   gnu/packages/messaging.scm			\
   gnu/packages/mg.scm				\
-  gnu/packages/miscfiles.scm			\
   gnu/packages/mit-krb5.scm			\
   gnu/packages/moe.scm				\
   gnu/packages/moreutils.scm			\
@@ -579,6 +579,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/libcmis-fix-test-onedrive.patch		\
   gnu/packages/patches/libdrm-symbol-check.patch		\
   gnu/packages/patches/libevent-dns-tests.patch			\
+  gnu/packages/patches/libextractor-ffmpeg-3.patch		\
   gnu/packages/patches/libmtp-devices.patch			\
   gnu/packages/patches/liboop-mips64-deplibs-fix.patch		\
   gnu/packages/patches/libotr-test-auth-fix.patch		\
@@ -622,7 +623,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/mars-sfml-2.3.patch			\
   gnu/packages/patches/matplotlib-setupext-tk.patch		\
   gnu/packages/patches/maxima-defsystem-mkdir.patch		\
-  gnu/packages/patches/mc-fix-ncurses-build.patch		\
   gnu/packages/patches/mcron-install.patch			\
   gnu/packages/patches/mdadm-gcc-4.9-fix.patch			\
   gnu/packages/patches/mhash-keygen-test-segfault.patch		\
@@ -651,7 +651,6 @@ dist_patch_DATA =						\
   gnu/packages/patches/openjpeg-CVE-2015-6581.patch		\
   gnu/packages/patches/openjpeg-use-after-free-fix.patch	\
   gnu/packages/patches/openssl-runpath.patch			\
-  gnu/packages/patches/openssl-c-rehash.patch			\
   gnu/packages/patches/openssl-c-rehash-in.patch		\
   gnu/packages/patches/orpheus-cast-errors-and-includes.patch	\
   gnu/packages/patches/ots-no-include-missing-file.patch	\
@@ -776,13 +775,12 @@ dist_patch_DATA =						\
   gnu/packages/patches/w3m-force-ssl_verify_server-on.patch	\
   gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch	\
   gnu/packages/patches/w3m-disable-weak-ciphers.patch		\
-  gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch	\
   gnu/packages/patches/weechat-python.patch			\
   gnu/packages/patches/weex-vacopy.patch			\
   gnu/packages/patches/wicd-bitrate-none-fix.patch		\
   gnu/packages/patches/wicd-get-selected-profile-fix.patch	\
-  gnu/packages/patches/wicd-template-instantiation.patch	\
   gnu/packages/patches/wicd-urwid-1.3.patch			\
+  gnu/packages/patches/wicd-wpa2-ttls.patch			\
   gnu/packages/patches/wmctrl-64-fix.patch			\
   gnu/packages/patches/wpa-supplicant-CVE-2015-5310.patch	\
   gnu/packages/patches/wpa-supplicant-CVE-2015-5314.patch	\
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index ae614994d6..6666cb4856 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -92,7 +92,8 @@
     (for-each (lambda (file)
                 (let ((target (string-append home "/" file)))
                   (copy-recursively (string-append directory "/" file)
-                                    target)
+                                    target
+                                    #:log (%make-void-port "w"))
                   (make-file-writable target)))
               files)))
 
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 69802e9a36..9636ee939f 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
-;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
+;;; Copyright © 2015, 2016 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
@@ -42,8 +42,10 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages lua)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages gettext)
+  #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages compression)
@@ -53,6 +55,7 @@
   #:use-module (gnu packages flex)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages openldap)
+  #:use-module (gnu packages mcrypt)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages texinfo)
@@ -66,6 +69,37 @@
   #:use-module (gnu packages man)
   #:use-module (gnu packages autotools))
 
+(define-public aide
+  (package
+    (name "aide")
+    (version "0.15.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/aide/aide/"
+                                  version "/aide-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vsrc0s62kv1i84skm6k6zy868gayjck268qwj38rpspc8c5qgih"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("bison" ,bison)
+       ("flex" ,flex)))
+    (inputs
+     `(("libgcrypt" ,libgcrypt)
+       ("libgpg-error" ,libgpg-error)
+       ("libmhash" ,libmhash)
+       ("zlib" ,zlib)))
+    (synopsis "File and directory integrity checker")
+    (description
+     "AIDE (Advanced Intrusion Detection Environment) is a file and directory
+integrity checker.  It creates a database from the regular expression rules
+that it finds from its configuration files.  Once this database is initialized
+it can be used to verify the integrity of the files.  It has several message
+digest algorithms that are used to check the integrity of files.  All of the
+usual file attributes can be checked for inconsistencies.")
+    (home-page "http://aide.sourceforge.net/")
+    (license license:gpl2+)))
+
 (define-public dmd
   ;; Deprecated.  Kept around "just in case."
   (let ((base-version "0.2")
@@ -109,14 +143,14 @@ interface and is based on GNU Guile.")
 (define-public shepherd
   (package
     (name "shepherd")
-    (version "0.3")
+    (version "0.3.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://alpha.gnu.org/gnu/dmd/shepherd-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "13mcy2131h7hggqvxbfxyrnbz46aaiaq2agng3x3f789a78n4mnn"))))
+                "0f3yi3n4sl9myiay95yhv2a9an338qddfjrbv7da753ip66dkfz6"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--localstatedir=/var")))
@@ -157,14 +191,14 @@ graphs and can export its output to different formats.")
 (define-public htop
   (package
    (name "htop")
-   (version "2.0.0")
+   (version "2.0.1")
    (source (origin
             (method url-fetch)
             (uri (string-append "http://hisham.hm/htop/releases/"
                   version "/htop-" version ".tar.gz"))
             (sha256
              (base32
-              "1d944hn0ldxvxfrz9acr26lpmzlwj91m0s7x2xnivnfnmfha4p6i"))))
+              "0rjn9ybqx5sav7z4gn18f1q6k23nmqyb6yydfgghzdznz9nn447l"))))
    (build-system gnu-build-system)
    (inputs
     `(("ncurses" ,ncurses)))
@@ -1497,3 +1531,80 @@ for writing audit records to the disk.  Viewing the logs is done with the
 @code{ausearch} or @code{aureport} utilities.  Configuring the audit rules is
 done with the @code{auditctl} utility.")
     (license license:gpl2+)))
+
+(define-public nmap
+  (package
+    (name "nmap")
+    (version "7.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://nmap.org/dist/nmap-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "0jlmq1w0gjqpa7qa523kdj73ndm1xzww2wjvb94hxh6yalargyhk"))
+              (modules '((guix build utils)))
+              (snippet
+               '(map delete-file-recursively
+                 ;; Remove bundled lua, pcap, and pcre libraries.
+                 ;; FIXME: Remove bundled liblinear once packaged.
+                 '("liblua"
+                   "libpcap"
+                   "libpcre"
+                   ;; Remove pre-compiled binares.
+                   "mswin32")))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("openssl" ,openssl)
+       ("libpcap" ,libpcap)
+       ("pcre" ,pcre)
+       ("lua" ,lua)
+       ;; For 'ndiff'.
+       ("python" ,python-2)))
+
+    ;; TODO Add zenmap output.
+    (outputs '("out" "ndiff"))
+    (arguments
+     '(#:configure-flags '("--without-zenmap")
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (define (make out . args)
+               (unless (zero? (apply system* "make"
+                                     (string-append "prefix=" out)
+                                     args))
+                 (error "make failed")))
+             (define (python-path dir)
+               (string-append dir "/lib/python2.7/site-packages"))
+             (let ((out (assoc-ref outputs "out"))
+                   (ndiff (assoc-ref outputs "ndiff")))
+               (for-each mkdir-p (list out ndiff))
+               (make out
+                 "install-nmap"
+                 "install-nse"
+                 "install-ncat"
+                 "install-nping")
+               (make ndiff "install-ndiff")
+               (wrap-program (string-append ndiff "/bin/ndiff")
+                 `("PYTHONPATH" prefix
+                   (,(python-path ndiff)))))))
+         ;; These are the tests that do not require network access.
+         (replace 'check
+           (lambda _ (zero? (system* "make"
+                                     "check-nse"
+                                     "check-ndiff"
+                                     "check-dns")))))
+       ;; Nmap can't cope with out-of-source building.
+       #:out-of-source? #f))
+    (home-page "https://nmap.org/")
+    (synopsis "Network discovery and security auditing tool")
+    (description
+     "Nmap (\"Network Mapper\") is a network discovery and security auditing
+tool.  It is also useful for tasks such as network inventory, managing service
+upgrade schedules, and monitoring host or service uptime.  It also provides an
+advanced netcat implementation (ncat), a utility for comparing scan
+results (ndiff), and a packet generation and response analysis tool (nping).")
+    ;; This package uses nmap's bundled versions of libdnet and liblinear, which
+    ;; both use a 3-clause BSD license.
+    (license (list license:nmap license:bsd-3))))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 11fb460df5..a7455feb88 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -20,6 +20,7 @@
 
 (define-module (gnu packages algebra)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages multiprecision)
   #:use-module (gnu packages mpi)
@@ -133,17 +134,14 @@ solve the shortest vector problem.")
              ("readline" ,readline)))
    (arguments
     '(#:make-flags '("all")
-      ;; FIXME: building the documentation requires tex; once this is
-      ;; available, replace "gp" by "all"
       #:test-target "dobench"
-      #:phases
-      (alist-replace
-       'configure
-       (lambda* (#:key outputs #:allow-other-keys)
-         (let ((out (assoc-ref outputs "out")))
-           (zero?
-            (system* "./Configure" (string-append "--prefix=" out)))))
-       %standard-phases)))
+      #:phases (modify-phases %standard-phases
+                 (replace 'configure
+                          (lambda* (#:key outputs #:allow-other-keys)
+                           (let ((out (assoc-ref outputs "out")))
+                            (zero?
+                             (system* "./Configure"
+                                      (string-append "--prefix=" out)))))))))
    (synopsis "PARI/GP, a computer algebra system for number theory")
    (description
     "PARI/GP is a widely used computer algebra system designed for fast
@@ -284,6 +282,46 @@ real and complex numbers, with automatic, rigorous error control.")
    (license license:gpl2+)
    (home-page "http://fredrikj.net/arb/")))
 
+(define-public ntl
+  (package
+   (name "ntl")
+   (version "9.7.0")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "http://shoup.net/ntl/ntl-"
+                                version ".tar.gz"))
+            (sha256 (base32
+                     "115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("libtool" ,libtool)
+      ("perl" ,perl))) ; for configuration
+   ;; FIXME: Add optional input gf2x once available; then also add
+   ;; configure flag "NTL_GF2X_LIB=on".
+   (inputs
+    `(("gmp" ,gmp)))
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (replace 'configure
+         (lambda* (#:key outputs #:allow-other-keys)
+           (chdir "src")
+           (system* "./configure"
+                    (string-append "PREFIX=" (assoc-ref outputs "out"))
+                    ;; Do not build especially for the build machine.
+                    "NATIVE=off"
+                    ;; Also do not tune to the build machine.
+                    "WIZARD=off"
+                    "SHARED=on")
+           #t)))))
+   (synopsis "C++ library for number theory")
+   (description
+    "NTL is a C++ library providing data structures and algorithms
+for manipulating signed, arbitrary length integers, and for vectors,
+matrices, and polynomials over the integers and over finite fields.")
+   (license license:gpl2+)
+   (home-page "http://shoup.net/ntl/")))
+
 (define-public bc
   (package
     (name "bc")
diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm
index aa8ccbce69..ec95769a5e 100644
--- a/gnu/packages/backup.scm
+++ b/gnu/packages/backup.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -348,8 +348,16 @@ rdiff-backup is easy to use and settings have sensible defaults.")
     (inputs
      `(("acl" ,acl)
        ("openssl" ,openssl)
-       ("python-llfuse" ,python-llfuse)
-       ("python-msgpack" ,python-msgpack)))
+       ("python-msgpack" ,python-msgpack)
+
+       ;; Attic is probably incompatible with llfuse > 0.41.
+       ;; These links are to discussions of llfuse compatibility from
+       ;; the borg project. Borg is a recent fork of attic, and attic
+       ;; has not been updated since the fork, so it's likely that
+       ;; llfuse compatibility requirements are still the same.
+       ;; https://github.com/borgbackup/borg/issues/642
+       ;; https://github.com/borgbackup/borg/issues/643
+       ("python-llfuse" ,python-llfuse-0.41)))
     (synopsis "Deduplicating backup program")
     (description "Attic is a deduplicating backup program.  The main goal of
 Attic is to provide an efficient and secure way to backup data.  The data
@@ -398,3 +406,56 @@ compression, and more.  The library itself implements storage techniques such
 as content-addressable storage, content hash keys, Merkle trees, similarity
 detection, and lossless compression.")
     (license license:gpl3+)))
+
+(define-public borg
+  (package
+    (name "borg")
+    (version "1.0.0")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "borgbackup" version))
+              (sha256
+               (base32
+                "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'set-env
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((openssl (assoc-ref inputs "openssl"))
+                   (lz4 (assoc-ref inputs "lz4")))
+               (setenv "BORG_OPENSSL_PREFIX" openssl)
+               (setenv "BORG_LZ4_PREFIX" lz4)
+               (setenv "PYTHON_EGG_CACHE" "/tmp")
+               #t)))
+         (add-after 'install 'install-doc
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (man (string-append out "/share/man/man1")))
+               (and
+                 (zero? (system* "python3" "setup.py" "build_ext" "--inplace"))
+                 (zero? (system* "make" "-C" "docs" "man"))
+                 (begin
+                   (install-file "docs/_build/man/borg.1" man)
+                   #t))))))))
+    (native-inputs
+     `(("python-setuptools-scm" ,python-setuptools-scm)
+       ;; For generating the documentation.
+       ("python-sphinx" ,python-sphinx)
+       ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme)))
+    (inputs
+     `(("acl" ,acl)
+       ("lz4" ,lz4)
+       ("openssl" ,openssl)
+       ("python-llfuse" ,python-llfuse)
+       ("python-msgpack" ,python-msgpack)))
+    (synopsis "Deduplicated, encrypted, authenticated and compressed backups")
+    (description "Borg is a deduplicating backup program.  Optionally, it
+supports compression and authenticated encryption.  The main goal of Borg is to
+provide an efficient and secure way to backup data.  The data deduplication
+technique used makes Borg suitable for daily backups since only changes are
+stored.  The authenticated encryption technique makes it suitable for backups
+to not fully trusted targets.  Borg is a fork of Attic.")
+    (home-page "https://borgbackup.github.io/borgbackup/")
+    (license license:bsd-3)))
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 281bd1f427..0afc0a6979 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015, 2016 Pjotr Prins <pjotr.guix@thebird.nl>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2507,16 +2508,13 @@ interrupted by stop codons.  OrfM finds and prints these ORFs.")
 (define-public python2-pbcore
   (package
     (name "python2-pbcore")
-    (version "0.9.3")
+    (version "1.2.8")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "https://github.com/PacificBiosciences/pbcore/archive/"
-                    version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (uri (pypi-uri "pbcore" version))
               (sha256
                (base32
-                "1z46rwjac93jm87cbj2zgjg6qvsgs65140wkbbxsvxps7ai4pm09"))))
+                "02pfn5raa3zf739672bg0dkx7z3j2c4nx7vmpfjqy5b12jrqpymk"))))
     (build-system python-build-system)
     (arguments `(#:python ,python-2)) ; pbcore requires Python 2.7
     (inputs
@@ -2525,7 +2523,10 @@ interrupted by stop codons.  OrfM finds and prints these ORFs.")
        ("python-pysam" ,python2-pysam)
        ("python-h5py" ,python2-h5py)))
     (native-inputs
-     `(("python-setuptools" ,python2-setuptools)))
+     `(("python-docutils" ,python2-docutils)
+       ("python-nose" ,python2-nose)
+       ("python-setuptools" ,python2-setuptools)
+       ("python-sphinx" ,python2-sphinx)))
     (home-page "http://pacificbiosciences.github.io/pbcore/")
     (synopsis "Library for reading and writing PacBio data files")
     (description
@@ -3691,15 +3692,15 @@ Cuffdiff or Ballgown programs.")
 (define-public vcftools
   (package
     (name "vcftools")
-    (version "0.1.12b")
+    (version "0.1.14")
     (source (origin
               (method url-fetch)
               (uri (string-append
-                    "mirror://sourceforge/vcftools/vcftools_"
-                     version ".tar.gz"))
+                    "https://github.com/vcftools/vcftools/releases/download/v"
+                    version "/vcftools-" version ".tar.gz"))
               (sha256
                (base32
-                "148al9h7f8g8my2qdnpax51kdd2yjrivlx6frvakf4lz5r8j88wx"))))
+                "10l5c07z9p4i9pr4gl54b2c9h6ndhqlbq1rashg2zcgwkbfrkmvn"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f ; no "check" target
@@ -3707,18 +3708,13 @@ Cuffdiff or Ballgown programs.")
                      "CFLAGS=-O2" ; override "-m64" flag
                      (string-append "PREFIX=" (assoc-ref %outputs "out"))
                      (string-append "MANDIR=" (assoc-ref %outputs "out")
-                                    "/share/man/man1"))
-       #:phases
-       (alist-cons-after
-        'unpack 'patch-manpage-install
-        (lambda _
-          (substitute* "Makefile"
-            (("cp \\$\\{PREFIX\\}/cpp/vcftools.1") "cp ./cpp/vcftools.1")))
-        (alist-delete 'configure %standard-phases))))
+                                    "/share/man/man1"))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
     (inputs
      `(("perl" ,perl)
        ("zlib" ,zlib)))
-    (home-page "http://vcftools.sourceforge.net/")
+    (home-page "https://vcftools.github.io/")
     (synopsis "Tools for working with VCF files")
     (description
      "VCFtools is a program package designed for working with VCF files, such
@@ -3726,7 +3722,7 @@ as those generated by the 1000 Genomes Project.  The aim of VCFtools is to
 provide easily accessible methods for working with complex genetic variation
 data in the form of VCF files.")
     ;; The license is declared as LGPLv3 in the README and
-    ;; at http://vcftools.sourceforge.net/license.html
+    ;; at https://vcftools.github.io/license.html
     (license license:lgpl3)))
 
 (define-public vsearch
@@ -3927,8 +3923,7 @@ barplots or heatmaps.")
                (base32
                 "0f16ryy5f012hvksrwlmm33bcl7lw97i2jvhbnwfwl03j4w7nhc1"))))
     (properties
-     `((upstream-name . "BiocGenerics")
-       (r-repository . bioconductor)))
+     `((upstream-name . "BiocGenerics")))
     (build-system r-build-system)
     (home-page "http://bioconductor.org/packages/BiocGenerics")
     (synopsis "S4 generic functions for Bioconductor")
@@ -3970,8 +3965,7 @@ abnormal copy number.")
                (base32
                 "12iibcs63m9iy7f45wgjcqsna2dnqwckphk682389grshz0g4x66"))))
     (properties
-     `((upstream-name . "S4Vectors")
-       (r-repository . bioconductor)))
+     `((upstream-name . "S4Vectors")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biocgenerics" ,r-biocgenerics)))
@@ -3998,8 +3992,7 @@ S4Vectors package itself.")
                (base32
                 "0hi5k1j5jm4xrg1l506g279qw1xkvp1gg1zgsjzpbng4vx4k4iyl"))))
     (properties
-     `((upstream-name . "IRanges")
-       (r-repository . bioconductor)))
+     `((upstream-name . "IRanges")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biocgenerics" ,r-biocgenerics)
@@ -4020,16 +4013,15 @@ possible.")
 (define-public r-genomeinfodb
   (package
     (name "r-genomeinfodb")
-    (version "1.6.1")
+    (version "1.6.3")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomeInfoDb" version))
               (sha256
                (base32
-                "1j2n1v1mrw1fxn7cyffz112pm76wd6gy9q9qwlsfv3brbsqbvdbf"))))
+                "1ggp005n2rlkad00ilzn95y4rd484yr1chdhnd6fwg45rbi94d63"))))
     (properties
-     `((upstream-name . "GenomeInfoDb")
-       (r-repository . bioconductor)))
+     `((upstream-name . "GenomeInfoDb")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biocgenerics" ,r-biocgenerics)
@@ -4055,8 +4047,7 @@ names in their natural, rather than lexicographic, order.")
                (base32
                 "0havwyr6xqk7w0rmbwfj9jq1djz7wzdz7w39adhklwzwz9l4ih3a"))))
     (properties
-     `((upstream-name . "XVector")
-       (r-repository . bioconductor)))
+     `((upstream-name . "XVector")))
     (build-system r-build-system)
     (arguments
      `(#:phases
@@ -4084,16 +4075,15 @@ names in their natural, rather than lexicographic, order.")
 (define-public r-genomicranges
   (package
     (name "r-genomicranges")
-    (version "1.22.2")
+    (version "1.22.4")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicRanges" version))
               (sha256
                (base32
-                "1jffvcs0jsi7q4l3pvjj6r73vll80csgkljvhqp0g2ixc43jjng9"))))
+                "02df5683nrpn9d10ws8jz9b55nr9055hh882xp2i154xdddir0k0"))))
     (properties
-     `((upstream-name . "GenomicRanges")
-       (r-repository . bioconductor)))
+     `((upstream-name . "GenomicRanges")))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biocgenerics" ,r-biocgenerics)
@@ -4215,13 +4205,13 @@ objects.")
 (define-public r-biostrings
   (package
     (name "r-biostrings")
-    (version "2.38.2")
+    (version "2.38.4")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "Biostrings" version))
               (sha256
                (base32
-                "1afp9szc8ci6jn0m3hrrqh6df65cpw3v1dcnl6xir3d3m3lwwmk4"))))
+                "0cjd7i4bdwabzb02gm753aji5xaihkj5ak8nb0d32cclxbj0hp33"))))
     (properties
      `((upstream-name . "Biostrings")))
     (build-system r-build-system)
@@ -4285,13 +4275,13 @@ files.")
 (define-public r-summarizedexperiment
   (package
     (name "r-summarizedexperiment")
-    (version "1.0.1")
+    (version "1.0.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "SummarizedExperiment" version))
               (sha256
                (base32
-                "0w1dwp99p6i7sc3cn0ir3dr8ksgxwjf16675h5i8n6gbv4rl9lz6"))))
+                "1gpmh1mi70m5k5qnyjs1h0qn8ajrzalzic7k3762xchxsmmdvxn4"))))
     (properties
      `((upstream-name . "SummarizedExperiment")))
     (build-system r-build-system)
@@ -4314,13 +4304,13 @@ samples.")
 (define-public r-genomicalignments
   (package
     (name "r-genomicalignments")
-    (version "1.6.1")
+    (version "1.6.3")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicAlignments" version))
               (sha256
                (base32
-                "03pxzkmwcpl0d7a09ahan0nllfv7qw2i7w361w6af2s4n3xwrniz"))))
+                "02b9j1pfd39bkvb623k5k0ziq9rpw093hifqw65vb954dwj29jhd"))))
     (properties
      `((upstream-name . "GenomicAlignments")))
     (build-system r-build-system)
@@ -4347,13 +4337,13 @@ alignments.")
 (define-public r-rtracklayer
   (package
     (name "r-rtracklayer")
-    (version "1.30.1")
+    (version "1.30.4")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "rtracklayer" version))
               (sha256
                (base32
-                "1if31hg56islx5vwydpgs5gkyas26kyvv2ljv1c7jikpm62w14qv"))))
+                "0knjnwywh9k726mq28s3sy013zhw6d6nfa8hfw670720nq18i2p0"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
@@ -4392,13 +4382,13 @@ as well as query and modify the browser state, such as the current viewport.")
 (define-public r-genomicfeatures
   (package
     (name "r-genomicfeatures")
-    (version "1.22.7")
+    (version "1.22.13")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "GenomicFeatures" version))
               (sha256
                (base32
-                "1jb4s49ar5j9qslpd3kfdg2wrl4q7ciysd55h9a7zvspymxcngq8"))))
+                "0n3rkj66la6wizgcsf2rmwcsyfxz9kv5zak337lmk1raqfnancz4"))))
     (properties
      `((upstream-name . "GenomicFeatures")))
     (build-system r-build-system)
@@ -4582,13 +4572,13 @@ reference point and sorted by a user defined feature.")
 (define-public r-genomation
   (package
     (name "r-genomation")
-    (version "1.2.1")
+    (version "1.2.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "genomation" version))
               (sha256
                (base32
-                "1mzs995snwim13qk9kz4q3nczpnbsy1allwp4whfq0cflg2mndfr"))))
+                "0kvzwc21zsh2c8d34yn935ncn38bfkpzmknycd8h7b0521x20mi9"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-biostrings" ,r-biostrings)
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index a930eabaf6..26b0fc6fdc 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
@@ -73,7 +73,12 @@
                      (mkdir-p (string-append gui "/bin"))
                      (rename-file (string-append out "/bin/transmission-gtk")
                                   (string-append gui
-                                                 "/bin/transmission-gtk"))))
+                                                 "/bin/transmission-gtk"))
+
+                     ;; Move the '.desktop' file as well.
+                     (mkdir (string-append gui "/share"))
+                     (rename-file (string-append out "/share/applications")
+                                  (string-append gui "/share/applications"))))
                  %standard-phases)))
     (inputs
      `(("inotify-tools" ,inotify-tools)
diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm
index 2e4481f94b..5ef5ec9271 100644
--- a/gnu/packages/calendar.scm
+++ b/gnu/packages/calendar.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -79,12 +79,25 @@ data units.")
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
-        ;; Bug reported: https://github.com/geier/khal/issues/309
-        (add-after 'unpack 'disable-test
+        (add-after 'unpack 'disable-tests
           (lambda _
+            ;; Bug reported for test_only_update_old_event:
+            ;; https://github.com/geier/khal/issues/309
             (substitute* "tests/khalendar_test.py"
                          (("test_only_update_old_event")
-                          "disabled_only_update_old_event"))))
+                           "disabled_only_update_old_event"))
+
+            ;; Bug reported for test_dt_two_tz:
+            ;; https://github.com/pimutils/khal/issues/382
+            (substitute* "tests/event_test.py"
+                         (("test_dt_two_tz")
+                           "disabled_dt_two_tz"))
+            ;; Another timezone / DST issue:
+            ;; https://github.com/pimutils/khal/issues/146
+            (substitute* "tests/event_test.py"
+                         (("test_raw_dt")
+                           "disabled_raw_dt"))))
+
         ;; Building the manpage requires khal to be installed.
         (add-after 'install 'manpage
           (lambda* (#:key outputs #:allow-other-keys)
@@ -95,6 +108,7 @@ data units.")
             (install-file
               "doc/build/man/khal.1"
               (string-append (assoc-ref outputs "out") "/share/man/man1"))))
+
         ;; The tests require us to choose a timezone.
         (replace 'check
           (lambda* (#:key inputs #:allow-other-keys)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 050f8c68ac..46a5b234aa 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -233,13 +233,14 @@ capacity is user-selectable.")
     (version "1.4.0")
     (source (origin
              (method url-fetch)
-             (uri (string-append "https://github.com/lipnitsk/libcue/archive/v"
+             (uri (string-append "https://github.com/lipnitsk/libcue/releases/"
+                                 "download/v" version "/libcue-"
                                  version ".tar.bz2"))
              (sha256
               (base32
                "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb"))))
     (build-system gnu-build-system)
-    (home-page "http://libcue.sourceforge.net/")
+    (home-page "https://github.com/lipnitsk/libcue")
     (synopsis "C library to parse cue sheets")
     (description "Libcue is a C library to parse so-called @dfn{cue sheets}
 which contain meta-data for CD/DVD tracks.  It provides an API to manipulate
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 0bc1a7d33b..af671d5780 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -92,14 +92,14 @@ highlighting your own code that seemed comprehensible when you wrote it.")
 (define-public global                             ; a global variable
   (package
     (name "global")
-    (version "6.5.2")
+    (version "6.5.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/global/global-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "07qx3dbjwkbd1dn42qs7zgj77rxdj2psfrf7bx7yx9al38f87z60"))))
+               "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg"))))
     (build-system gnu-build-system)
     (inputs `(("ncurses" ,ncurses)
               ("libltdl" ,libltdl)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 71ad77b9be..0ca6fd8986 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -274,15 +274,25 @@ as a drop-in replacement of MySQL.")
 (define-public postgresql
   (package
     (name "postgresql")
-    (version "9.5.1")
+    (version "9.5.2")
     (source (origin
               (method url-fetch)
-              (uri (string-append "http://ftp.postgresql.org/pub/source/v"
+              (uri (string-append "https://ftp.postgresql.org/pub/source/v"
                                   version "/postgresql-" version ".tar.bz2"))
               (sha256
                (base32
-                "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b"))))
+                "0hbwwhh0pz0a6vf8j5bskiq7gmz9rwc9ywcqyhg5asshckj35lgq"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'patch-/bin/sh
+                     (lambda _
+                       ;; Refer to the actual shell.
+                       (substitute* '("src/bin/pg_ctl/pg_ctl.c"
+                                      "src/bin/psql/command.c")
+                         (("/bin/sh") (which "sh")))
+                       #t)))))
     (inputs
      `(("readline" ,readline)
        ("zlib" ,zlib)))
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 215061a67a..db5668e1fc 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -370,7 +370,7 @@ on stdout instead of using a socket as the Emacsclient does.")
 (define-public magit
   (package
     (name "magit")
-    (version "2.5.0")
+    (version "2.6.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -378,7 +378,7 @@ on stdout instead of using a socket as the Emacsclient does.")
                    version "/" name "-" version ".tar.gz"))
              (sha256
               (base32
-               "0i6qpx5szzc4kyfcdhaic8gif0sqdqcya1niyj93lpvw66jcxsxa"))))
+               "04km5j6118yqz7h3dyfd4ijjd6w3pb76pjlaj25wh1bchf1yilir"))))
     (build-system gnu-build-system)
     (native-inputs `(("texinfo" ,texinfo)
                      ("emacs" ,emacs-no-x)))
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 8aa5a0dc33..65d53896e8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -33,10 +33,12 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages base)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages zip)
+  #:use-module (gnu packages fontutils)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages xorg)
-  #:use-module (gnu packages pkg-config))
+  #:use-module (gnu packages zip))
 
 (define-public font-inconsolata
   (package
@@ -260,47 +262,44 @@ sans-serif designed for on-screen reading.  It is used by GNOME@tie{}3.")
 (define-public font-gnu-freefont-ttf
   (package
     (name "font-gnu-freefont-ttf")
-    (version "20100919")
+    (version "20120503")
     (source (origin
              (method url-fetch)
-             (uri (string-append "mirror://gnu/freefont/freefont-ttf-"
+             (uri (string-append "mirror://gnu/freefont/freefont-src-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1q3h5jp1mbdkinkwxy0lfd0a1q7azlbagraydlzaa2ng82836wg4"))))
-    (build-system trivial-build-system)
+               "0yk58blhcd4hm7nyincmqq4jrzjjk82wif2zmk1l3y2m4vif4qhd"))))
+    (build-system gnu-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder (begin
-                   (use-modules (guix build utils)
-                                (srfi srfi-26))
-
-                   (let ((tar      (string-append (assoc-ref %build-inputs
-                                                             "tar")
-                                                  "/bin/tar"))
-                         (PATH     (string-append (assoc-ref %build-inputs
-                                                             "gzip")
-                                                  "/bin"))
-                         (font-dir (string-append %output
-                                                  "/share/fonts/truetype"))
-                         (doc-dir  (string-append %output "/share/doc/"
-                                                  ,name "-" ,version)))
-                     (setenv "PATH" PATH)
-                     (system* tar "xvf" (assoc-ref %build-inputs "source"))
-
-                     (mkdir-p font-dir)
-                     (mkdir-p doc-dir)
-                     (chdir (string-append "freefont-" ,version))
-                     (for-each (lambda (file)
-                                 (let ((dir (if (string-suffix? "ttf" file)
-                                                font-dir
-                                                doc-dir)))
+     `(#:phases (modify-phases %standard-phases
+                  (delete 'configure)
+                  (replace 'install
+                   (lambda _
+                     (let ((doc-dir  (string-append %output "/share/doc/"
+                                                    ,name "-" ,version))
+                           (font-dir (string-append %output
+                                                    "/share/fonts/truetype")))
+                       (mkdir-p doc-dir)
+                       (substitute* "Makefile"
+                         (("\\$\\(TMPDIR\\)") doc-dir)
+                         (("sfd/\\*.ttf") ""))
+                       (system* "make" "ttftar")
+                       (mkdir-p font-dir)
+                       (for-each (lambda (file)
                                    (copy-file file
-                                              (string-append dir "/" file))))
-                               (find-files "." ""))))))
-    (native-inputs `(("source" ,source)
-                     ("tar" ,tar)
-                     ("gzip" ,gzip)))
+                                              (string-append font-dir "/"
+                                                             (basename file))))
+                                 (filter
+                                   (lambda (file) (string-suffix? "ttf" file))
+                                   (find-files "." "")))))))
+       #:test-target "tests"))
+    ;; replace python 3 with python 2
+    ;; python 3 support commits aren't yet released in 20120503
+    ;; so freefont needs python 2 support in fontforge
+    (native-inputs `(("fontforge" ,(package (inherit fontforge)
+                                     (inputs `(("python-2" ,python-2)
+                                     ,@(package-inputs fontforge)))))))
     (home-page "http://www.gnu.org/software/freefont/")
     (synopsis "Unicode-encoded outline fonts")
     (description
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index 2912ce2366..8d33211fb6 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -208,9 +208,8 @@ applications should be.")
 
 (define-public graphite2
   (package
-   (replacement graphite2-1.3.6)
    (name "graphite2")
-   (version "1.3.5")
+   (version "1.3.6")
    (source
      (origin
        (method url-fetch)
@@ -218,8 +217,8 @@ applications should be.")
                            version ".tar.gz"))
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
-         (base32
-           "0jrjb56zim57xg2pckfdyrw46c624mqz9zywgwza0g1bxg26940w"))))
+        (base32
+         "1frd9mjaqzvh9gs74ngc43igi53vzjzlwr5chbrs6ii1hc4aa23s"))))
    (build-system cmake-build-system)
    (native-inputs
     `(("python" ,python-2) ; because of "import imap" in tests
@@ -235,21 +234,6 @@ and returns a sequence of positioned glyphids from the font.")
    (license license:lgpl2.1+)
    (home-page "https://github.com/silnrsi/graphite")))
 
-(define graphite2-1.3.6
-  (package
-    (inherit graphite2)
-    (replacement #f)
-    (source
-     (let ((name "graphite2") (version "1.3.6"))
-       (origin
-         (method url-fetch)
-         (uri (string-append "https://github.com/silnrsi/graphite/archive/"
-                             version ".tar.gz"))
-         (file-name (string-append name "-" version ".tar.gz"))
-         (sha256
-          (base32
-           "1frd9mjaqzvh9gs74ngc43igi53vzjzlwr5chbrs6ii1hc4aa23s")))))))
-
 (define-public potrace
   (package
     (name "potrace")
@@ -367,14 +351,20 @@ definitions.")
                      "0gfcm8yn1d30giqhdwbchnfnspcqypqdzrxlhqhwy1i18wgl0v2v"))
             (modules '((guix build utils)))
             (snippet
-             ;; Make builds bit-reproducible by using fixed date strings.
-             '(substitute* "configure"
-                (("^FONTFORGE_MODTIME=.*$")
-                 "FONTFORGE_MODTIME=\"1458399002\"\n")
-                (("^FONTFORGE_MODTIME_STR=.*$")
-                 "FONTFORGE_MODTIME_STR=\"15:50 CET 19-Mar-2016\"\n")
-                (("^FONTFORGE_VERSIONDATE=.*$")
-                 "FONTFORGE_VERSIONDATE=\"20160319\"\n")))))
+             '(begin
+               ;; Make builds bit-reproducible by using fixed date strings.
+               (substitute* "configure"
+                 (("^FONTFORGE_MODTIME=.*$")
+                  "FONTFORGE_MODTIME=\"1458399002\"\n")
+                 (("^FONTFORGE_MODTIME_STR=.*$")
+                  "FONTFORGE_MODTIME_STR=\"15:50 CET 19-Mar-2016\"\n")
+                 (("^FONTFORGE_VERSIONDATE=.*$")
+                  "FONTFORGE_VERSIONDATE=\"20160319\"\n"))
+
+               ;; Make TTF builds bit-reproducible by clearing the timestamp
+               ;; that goes in TTF files.
+               (substitute* "fontforge/tottf.c"
+                 (("cvt_unix_to_1904\\(now") "cvt_unix_to_1904(0"))))))
    (build-system gnu-build-system)
    (native-inputs
     `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 972eafc669..24c4564689 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -508,7 +508,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
 (define-public modem-manager
   (package
     (name "modem-manager")
-    (version "1.4.12")
+    (version "1.4.14")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -516,7 +516,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
                     "ModemManager-" version ".tar.xz"))
               (sha256
                (base32
-                "1cvhpkbdch9a77sdir0wcks45m2zlvq1sna2ly2v4lx9fm9h7xby"))))
+                "18hvffwcncwz14kdzk42jbkh362n0kjv3kgx7axbqx572pawvrmb"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index d2eb066817..88f24209c8 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -64,7 +64,10 @@ Consortium standard (ICC), approved as ISO 15076-1.")
    (source (origin
             (method url-fetch)
             (uri (string-append
-                   "http://ftp.de.debian.org/debian/pool/main/libp/libpaper/libpaper_"
+                   ;; Debian moved their libpaper-1.1.24 to archive.debian.net
+                   ;; but in the move the hash of their tarball changed.
+                   "http://pkgs.fedoraproject.org/repo/pkgs/libpaper/libpaper_"
+                   version ".tar.gz/5bc87d494ba470aba54f6d2d51471834/libpaper_"
                    version ".tar.gz"))
             (sha256 (base32
                      "0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"))))
@@ -75,7 +78,7 @@ Consortium standard (ICC), approved as ISO 15076-1.")
 way for applications to take actions based on a system- or user-specified
 paper size.")
    (license license:gpl2)
-   (home-page "http://packages.qa.debian.org/libp/libpaper.html")))
+   (home-page "https://packages.qa.debian.org/libp/libpaper.html")))
 
 (define-public psutils
   (package
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index eebb547de3..5c2cf0197e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;; Copyright © 2016 Jochem Raat <jchmrt@riseup.net>
+;;; Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -4208,7 +4209,7 @@ users.")
 (define-public network-manager
   (package
     (name "network-manager")
-    (version "1.0.10")
+    (version "1.0.12")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -4216,7 +4217,7 @@ users.")
                                   "NetworkManager-" version ".tar.xz"))
               (sha256
                (base32
-                "1g4z2wg036n0njqp8fycrisj46l3yda6pl00l4rg9nfz862cxkqv"))))
+                "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"))))
     (build-system gnu-build-system)
     (outputs '("out"
                "doc")) ; 8 MiB of gtk-doc HTML
@@ -4928,3 +4929,31 @@ command-line interface.  It can record part or all of an X display for a
 specified duration and save it as a GIF encoded animated image file.")
       (home-page "https://git.gnome.org/browse/byzanz")
       (license license:gpl2+))))
+
+(define-public libzapojit
+  (package
+    (name "libzapojit")
+    (version "0.0.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("gobject-introspection" ,gobject-introspection)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gnome-online-accounts" ,gnome-online-accounts)
+       ("json-glib" ,json-glib)
+       ("rest" ,rest)))
+    (home-page "https://wiki.gnome.org/Projects/Zapojit")
+    (synopsis "Library for accessing SkyDrive and Hotmail")
+    (description
+     "Libzapojit is a GLib-based library for accessing online service APIs of
+Microsoft SkyDrive and Hotmail, using their REST protocols.")
+    (license license:lgpl2.1+)))
diff --git a/gnu/packages/gnu-doc.scm b/gnu/packages/gnu-doc.scm
new file mode 100644
index 0000000000..3daa54ff12
--- /dev/null
+++ b/gnu/packages/gnu-doc.scm
@@ -0,0 +1,101 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 John Darrington <jmd@gnu.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages gnu-doc)
+  #:use-module (gnu packages base)
+  #:use-module (gnu packages compression)
+  #:use-module (gnu packages texinfo)
+
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system trivial)
+  #:use-module (guix cvs-download)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix packages))
+
+(define-public miscfiles
+  (package
+    (name "miscfiles")
+    (version "1.5")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/" name "/" name "-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"))))
+    (build-system gnu-build-system)
+    (home-page "https://www.gnu.org/software/miscfiles/")
+    (synopsis
+     "Data files for airport codes, zip codes, a dictionary, and more")
+    (description
+     "GNU Miscfiles is a collection of common data files.  They include, for
+example, country abbreviations, names and capital cities; currency
+abbreviations and names; a Best Current Practices index; a map of the ASCII
+character set; a list of three-letter airport codes; and an English word
+list.")
+    (license gpl2+)))
+
+(define-public gnu-standards
+  (package
+    (name "gnu-standards")
+    (version "2016-03-25")
+    (source
+     (origin
+       (method cvs-fetch)
+       (uri (cvs-reference
+             (root-directory
+              ":pserver:anonymous@cvs.savannah.gnu.org:/sources/gnustandards")
+             (module "gnustandards")
+             (revision "2016-03-25")))
+       (sha256
+        (base32
+         "0qn7mzdjqwc6h9prin22x6kj9iqipxpbzldzhmis7q4x4hpi61vj"))))
+    (build-system trivial-build-system)
+    (native-inputs `(("gzip" ,gzip)
+                     ("source" ,source)
+                     ("texinfo" ,texinfo)))
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+        (begin
+          (use-modules (guix build utils))
+          (let ((gzip (assoc-ref %build-inputs "gzip"))
+                (source (assoc-ref %build-inputs "source"))
+                (texinfo (assoc-ref %build-inputs "texinfo"))
+                (info-dir (string-append %output "/share/info")))
+            (setenv "PATH" (string-append gzip "/bin"
+                                          ":" texinfo "/bin"))
+            (mkdir-p info-dir)
+            (system* "makeinfo" "--output" info-dir
+                     (string-append source "/maintain.texi"))
+            (system* "makeinfo" "--output" info-dir
+                     (string-append source "/standards.texi"))
+            (system* "gzip" (string-append info-dir "/maintain.info"))
+            (system* "gzip" (string-append info-dir "/standards.info"))))))
+    (home-page "http://www.gnu.org/prep/standards/")
+    (synopsis "GNU coding standards and maintainer information")
+    (description "The GNU Coding Standards were written by Richard Stallman
+and other GNU Project volunteers.  Their purpose is to make the GNU system
+clean, consistent, and easy to install.
+
+The information for maintainers of GNU software has guidelines and advice for
+someone who is the maintainer of a GNU program on behalf of the GNU Project.")
+    (license fdl1.3+)))
diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm
index e252f98f94..58d3bda561 100644
--- a/gnu/packages/gnucash.scm
+++ b/gnu/packages/gnucash.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,7 +38,7 @@
 (define-public gnucash
   (package
     (name "gnucash")
-    (version "2.6.9")
+    (version "2.6.12")
     (source
      (origin
       (method url-fetch)
@@ -45,7 +46,7 @@
                           version ".tar.bz2"))
       (sha256
        (base32
-        "0iw25l1kv60cg6fd2vg11mcvzmjqnc5p9lp3rjy06ghkjfrn3and"))
+        "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp"))
       (patches (list (search-patch "gnucash-price-quotes-perl.patch")))))
     (build-system gnu-build-system)
     (inputs
@@ -97,7 +98,7 @@
                         "gnc-fq-check"
                         "gnc-fq-helper"
                         "gnc-fq-dump")))))))
-    (home-page "https://gnu.org/software/gnucash")
+    (home-page "http://www.gnucash.org/")
     (synopsis "Personal and small business financial accounting software")
     (description
      "GnuCash is personal and professional financial-accounting software.
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index eb0c4cbe83..471f383b85 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Ni* Gillmann <ng@niasterisk.space>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -66,6 +67,7 @@
             (sha256
              (base32
               "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6"))
+            (patches (list (search-patch "libextractor-ffmpeg-3.patch")))
             (modules '((guix build utils)))
             (snippet
              ;; Nowadays libmagic (from 'file') returns 'audio/ogg' and not
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 350865addb..c3b859b7a2 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -248,14 +248,14 @@ libskba (working with X.509 certificates and CMS data).")
 
 (define-public gnupg-2.0
   (package (inherit gnupg)
-    (version "2.0.29")
+    (version "2.0.30")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8"))))
+                "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3"))))
     (native-inputs '())
     (inputs
      `(("adns" ,adns)
diff --git a/gnu/packages/gnustep.scm b/gnu/packages/gnustep.scm
index edd159d262..ae97eb7936 100644
--- a/gnu/packages/gnustep.scm
+++ b/gnu/packages/gnustep.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,6 +23,10 @@
   #:use-module (guix build-system gnu)
   #:use-module (guix licenses)
   #:use-module (gnu packages xorg)
+  #:use-module (gnu packages gnome)
+  #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages image)
   #:use-module (gnu packages pkg-config))
@@ -83,3 +88,42 @@ interface.  It is fast, feature rich, easy to configure, and easy to use.")
 
     ;; Artwork is distributed under the WTFPL.
     (license gpl2+)))
+
+(define-public wmbattery
+  (package
+    (name "wmbattery")
+    (version "2.50")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://debian/pool/main/w/wmbattery/wmbattery_"
+                    version ".orig.tar.gz"))
+              (sha256
+               (base32
+                "0hi6bivv3xd2k68w08krndfl68wdx7nmc2wjzsmcd4q3qgwgyk44"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f              ; no "check" target
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoconf
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
+    (inputs
+     `(("glib" ,glib)
+       ("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxpm" ,libxpm)
+       ("upower" ,upower)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://windowmaker.org/dockapps/?name=wmbattery")
+    (synopsis "Display laptop battery info")
+    (description
+     "Wmbattery displays the status of your laptop's battery in a small icon.
+This includes if it is plugged in, if the battery is charging, how many minutes
+of battery life remain, battery life remaining (with both a percentage and a
+graph), and battery status (high - green, low - yellow, or critical - red).")
+    (license gpl2)))
+
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 59b1076294..97900958c8 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,7 +97,7 @@ arrays of data.")
 (define-public gstreamer
   (package
     (name "gstreamer")
-    (version "1.6.3")
+    (version "1.8.0")
     (source
      (origin
       (method url-fetch)
@@ -105,7 +106,7 @@ arrays of data.")
             version ".tar.xz"))
       (sha256
        (base32
-        "093zldafh7xh3lrlwzm7j0vvjz6k9ca83wqil40gfz5qcy6mdy92"))))
+        "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (arguments
@@ -144,7 +145,7 @@ This package provides the core library and elements.")
 (define-public gst-plugins-base
   (package
     (name "gst-plugins-base")
-    (version "1.6.3")
+    (version "1.8.0")
     (source
      (origin
       (method url-fetch)
@@ -152,7 +153,7 @@ This package provides the core library and elements.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0xbskifk95rw7jd85sqjrmqh2kys1bpi0inrxyapx1x4vf7ly5dn"))))
+        "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (propagated-inputs
@@ -186,7 +187,7 @@ This package provides the core library and elements.")
            (lambda _
              (substitute* "tests/check/libs/pbutils.c"
                (("/bin/sh") (which "sh"))))))))
-    (home-page "http://gstreamer.freedesktop.org/")
+    (home-page "https://gstreamer.freedesktop.org/")
     (synopsis
      "Plugins for the GStreamer multimedia library")
     (description "This package provides an essential exemplary set of plug-ins
@@ -197,7 +198,7 @@ for the GStreamer multimedia library.")
 (define-public gst-plugins-good
   (package
     (name "gst-plugins-good")
-    (version "1.6.3")
+    (version "1.8.0")
     (source
      (origin
       (method url-fetch)
@@ -206,7 +207,7 @@ for the GStreamer multimedia library.")
             name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0xx16h0q63gs3pxlzdflnpyssba3vcrh1qnzplg4d0ra1fvrvc94"))))
+        "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362"))))
     (build-system gnu-build-system)
     (inputs
      `(("aalib" ,aalib)
@@ -237,16 +238,18 @@ for the GStreamer multimedia library.")
      `(#:phases
        (modify-phases %standard-phases
          (add-after
-          'unpack 'disable-failing-rtprtx-tests
+          'unpack 'disable-failing-tests
           (lambda _
-            ;; Disable rtprtx tests that frequently fail.
-            ;; XXX FIXME: Try removing this for version > 1.6.3.
+            ;; Disable tests that fail non-deterministically.
+            ;; XXX FIXME: Try removing this for version > 1.8.0.
             (substitute* "tests/check/elements/rtprtx.c"
-              (("tcase_add_test \\(tc_chain,\
- (test_rtxsender_max_size_packets|test_rtxreceive_data_reconstruction)\\);" all)
+              (("tcase_add_test \\(tc_chain, test_push_forward_seq\\);" all)
+               (string-append "/* " all " */")))
+            (substitute* "tests/check/elements/splitmux.c"
+              (("tcase_add_test \\(tc_chain, test_splitmuxsink\\);" all)
                (string-append "/* " all " */")))
             #t)))))
-    (home-page "http://gstreamer.freedesktop.org/")
+    (home-page "https://gstreamer.freedesktop.org/")
     (synopsis
      "Plugins for the GStreamer multimedia library")
     (description "GStreamer Good Plug-ins is a set of plug-ins for the
@@ -330,7 +333,7 @@ par compared to the rest.")
 (define-public gst-plugins-ugly
   (package
     (name "gst-plugins-ugly")
-    (version "1.6.3")
+    (version "1.8.0")
     (source
      (origin
        (method url-fetch)
@@ -338,7 +341,7 @@ par compared to the rest.")
                            name "/" name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0r6h3ys5n90jv3c06crxzcac561z07s4h04hy5i8ybw8qyvzgv1g"))))
+         "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak"))))
     (build-system gnu-build-system)
     (inputs
      `(("gst-plugins-base" ,gst-plugins-base)
@@ -358,7 +361,7 @@ par compared to the rest.")
      `(("glib:bin" ,glib "bin")
        ("pkg-config" ,pkg-config)
        ("python-wrapper" ,python-wrapper)))
-    (home-page "http://gstreamer.freedesktop.org/")
+    (home-page "https://gstreamer.freedesktop.org/")
     (synopsis "GStreamer plugins from the \"ugly\" set")
     (description "GStreamer Ugly Plug-ins.  This set contains those plug-ins
 which the developers consider to have good quality code but that might pose
@@ -368,7 +371,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
 (define-public gst-libav
   (package
     (name "gst-libav")
-    (version "1.6.3")
+    (version "1.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -376,7 +379,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1aylbg1xnm68c3wc49mzx813qhsjfg23hqnjqqwdwdq31839qyw5"))))
+                "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--with-system-libav")
@@ -405,7 +408,7 @@ compression formats through the use of the libav library.")
 (define-public python-gst
   (package
     (name "python-gst")
-    (version "1.6.2")
+    (version "1.8.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -413,7 +416,7 @@ compression formats through the use of the libav library.")
                     "gst-python-" version ".tar.xz"))
               (sha256
                (base32
-                "09ci5zvr7lms7mvgbjgsjwaxcl4nq45n1g9pdwnqmx3rf0qkwxjf"))))
+                "1spn49x7yaj69df6mxh9wwcs0y3abswkfpk84njs71lzqlbzyiff"))))
     (build-system gnu-build-system)
     (arguments
      ;; XXX: Factorize python-sitedir with python-build-system.
@@ -435,7 +438,7 @@ compression formats through the use of the libav library.")
     (propagated-inputs
      `(("gst-plugins-base" ,gst-plugins-base)
        ("python-pygobject" ,python-pygobject)))
-    (home-page "http://gstreamer.freedesktop.org/")
+    (home-page "https://gstreamer.freedesktop.org/")
     (synopsis "GStreamer GObject Introspection overrides for Python")
     (description
      "This package contains GObject Introspection overrides for Python that can
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 882a62d09f..fe043cba0b 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -275,14 +275,14 @@ without requiring the source code to be rewritten.")
 (define-public artanis
   (package
     (name "artanis")
-    (version "0.1.0")
+    (version "0.1.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "ftp://alpha.gnu.org/gnu/artanis/artanis-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1mc2zy6n9wnn4hzi3zp3jd6b5rlr0lv7fvh800xf4fyrxg0zia4g"))))
+                "19m3ak12cqk8js9d2mdg11kh4fjsq8frfpd10qw75h0zpr5cywpp"))))
     (build-system gnu-build-system)
     ;; TODO: Add guile-dbi and guile-dbd optional dependencies.
     (inputs `(("guile" ,guile-2.0)))
@@ -296,7 +296,8 @@ without requiring the source code to be rewritten.")
               (dir (string-append out "/share/guile/site/2.0")))
          ;; Don't use (%site-dir) for site paths.
          (list (string-append "MOD_PATH=" dir)
-               (string-append "MOD_COMPILED_PATH=" dir)))
+               (string-append "MOD_COMPILED_PATH=" dir)
+               (string-append "DESTDIR=" out)))
        #:test-target "test"
        #:phases
        (modify-phases %standard-phases
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index ba5b9e26ae..a17330ec63 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -92,7 +92,7 @@ irssi, but graphical.")
 (define-public irssi
   (package
     (name "irssi")
-    (version "0.8.18")
+    (version "0.8.19")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/irssi/irssi/"
@@ -100,7 +100,7 @@ irssi, but graphical.")
                                  version ".tar.xz"))
              (sha256
               (base32
-               "0h3q0p5rnm6h0hcv06m8vrs97kyr1l7snjdy3qbjsz3m97vpg8f0"))))
+               "1lz57v3nkki30lb883pipp5syyfkssvjlq3xxf9yl578902h982c"))))
     (build-system gnu-build-system)
     (arguments
      `(#:phases
diff --git a/gnu/packages/iso-codes.scm b/gnu/packages/iso-codes.scm
index be0b746796..0a9427cef2 100644
--- a/gnu/packages/iso-codes.scm
+++ b/gnu/packages/iso-codes.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,21 +29,21 @@
 (define-public iso-codes
   (package
     (name "iso-codes")
-    (version "3.49")
+    (version "3.67")
     (source (origin
              (method url-fetch)
              (uri (string-append
-                   "http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-"
+                   "https://pkg-isocodes.alioth.debian.org/downloads/iso-codes-"
                    version ".tar.xz"))
              (sha256
               (base32
-               "1ryk5i467p7xxrbrqynb35ci046yj9k9b4d3hfxzass962lz9q04"))))
+               "037hmfs5pk3g36psm378vap1mbrkk86vv8wsdnv65mzbnph52gv0"))))
     (build-system gnu-build-system)
     (inputs
      `(("gettext" ,gnu-gettext)
        ("perl" ,perl)
-       ("python-2" ,python-2)))
-    (home-page "http://pkg-isocodes.alioth.debian.org/")
+       ("python" ,python-wrapper)))
+    (home-page "https://pkg-isocodes.alioth.debian.org/")
     (synopsis "Various ISO standards")
     (description
      "This package provides lists of various ISO standards (e.g. country,
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 6975443646..0c30aa1977 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -80,6 +80,7 @@
                 (uri (git-reference
                       (url "https://github.com/graeme-hill/crossguid.git")
                       (commit commit)))
+                (file-name (string-append name "-" version "-checkout"))
                 (sha256
                  (base32
                   "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9"))))
diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm
index 266669061e..c3427e7f6f 100644
--- a/gnu/packages/libusb.scm
+++ b/gnu/packages/libusb.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -126,14 +127,14 @@ proposed for standardization.")
 (define-public gmtp
   (package
     (name "gmtp")
-    (version "1.3.9")
+    (version "1.3.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/gmtp/" version
                                   "/gmtp-" version ".tar.gz"))
               (sha256
                (base32
-                "0bdxvi0jf3q870a39xzsaj4qrjwc9b5bgvc95plc7xb6vf2m7zsv"))))
+                "0fyi3pdl2g57vr0p46ip2wwzyap3l0by7iqaqygv0yxfcs79l6xj"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      '(#:configure-flags
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 53d13d5b57..0eb379eb77 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2016 Raymond Nicholson <rain1@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -223,6 +224,10 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration."
   (let* ((version "4.5")
          (build-phase
           '(lambda* (#:key system inputs #:allow-other-keys #:rest args)
+             ;; Avoid introducing timestamps
+             (setenv "KCONFIG_NOTIMESTAMP" "1")
+             (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH"))
+
              ;; Apply the neat patch.
              (system* "patch" "-p1" "--force"
                       "-i" (assoc-ref inputs "patch/freedo+gnu"))
@@ -348,13 +353,13 @@ It has been modified to remove all non-free binary blobs.")
 (define-public linux-libre-4.1
   (package
     (inherit linux-libre)
-    (version "4.1.19")
+    (version "4.1.20")
     (source (origin
               (method url-fetch)
               (uri (linux-libre-urls version))
               (sha256
                (base32
-                "0xkj94xmnmxr768qp6n68r1g68ix1sds95nv6zfg4x8fc7fzn8km"))))
+                "0vwk6jh57djbwr29xvlgaf14409bq9vmwf6r6nq9jdl6dizfd110"))))
     (native-inputs
      (let ((conf (kernel-config (or (%current-target-system)
                                     (%current-system))
@@ -1581,7 +1586,6 @@ from the module-init-tools project.")
 
 (define-public eudev
   ;; The post-systemd fork, maintained by Gentoo.
-  ;; TODO: Merge with 'eudev-with-blkid' below at an opportune time.
   (package
     (name "eudev")
     (version "3.1.5")
@@ -1600,7 +1604,11 @@ from the module-init-tools project.")
        ("perl" ,perl)
        ("gperf" ,gperf)))
     (inputs
-     `(("kmod" ,kmod)))
+     ;; When linked against libblkid, eudev can populate /dev/disk/by-label
+     ;; and similar; it also installs the '60-persistent-storage.rules' file,
+     ;; which contains the rules to do that.
+     `(("util-linux" ,util-linux)                 ;for blkid
+       ("kmod" ,kmod)))
     (home-page "https://wiki.gentoo.org/wiki/Project:Eudev")
     (synopsis "Userspace device management")
     (description "Udev is a daemon which dynamically creates and removes
@@ -1608,18 +1616,6 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot
 time.")
     (license license:gpl2+)))
 
-(define-public eudev-with-blkid
-  ;; TODO: Merge with 'eudev' above at an opportune time.
-  (package
-    (inherit eudev)
-    (name "eudev-with-blkid")
-    (inputs
-     ;; When linked against libblkid, eudev can populate /dev/disk/by-label
-     ;; and similar; it also installs the '60-persistent-storage.rules' file,
-     ;; which contains the rules to do that.
-     `(("util-linux" ,util-linux)                 ;for blkid
-       ,@(package-inputs eudev)))))
-
 (define-public lvm2
   (package
     (name "lvm2")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 5bb633d66f..7bcb93cbc6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -177,18 +177,19 @@ aliasing facilities to work just as they would on normal mail.")
 (define-public mutt
   (package
     (name "mutt")
-    (version "1.5.24")
+    (version "1.6.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://ftp.mutt.org/pub/mutt/mutt-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "0012njrgxf1barjksqkx7ccid2l0xyikhna9mjs9vcfpbrvcm4m2"))
+               "06bc2drbgalkk68rzg7hq2v5m5qgjxff5357wg0419dpi8ivdbr9"))
              (patches (list (search-patch "mutt-store-references.patch")))))
     (build-system gnu-build-system)
     (inputs
      `(("cyrus-sasl" ,cyrus-sasl)
+       ("gdbm" ,gdbm)
        ("gpgme" ,gpgme)
        ("ncurses" ,ncurses)
        ("openssl" ,openssl)
@@ -198,6 +199,7 @@ aliasing facilities to work just as they would on normal mail.")
                            "--enable-imap"
                            "--enable-pop"
                            "--enable-gpgme"
+                           "--enable-hcache" ; for header caching
                            "--with-ssl"
                            "--with-sasl"
                            ;; so that mutt does not check whether the path
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 6d3d134c20..adebf09a32 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org>
@@ -52,7 +52,6 @@
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gd)
   #:use-module (gnu packages ghostscript)
-  #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages image)
   #:use-module (gnu packages less)
@@ -177,7 +176,7 @@ numbers.")
 (define-public glpk
   (package
     (name "glpk")
-    (version "4.59")
+    (version "4.60")
     (source
      (origin
       (method url-fetch)
@@ -185,7 +184,7 @@ numbers.")
                           version ".tar.gz"))
       (sha256
        (base32
-        "1bpbp5z0378kaj5bqmc5m2j5h9c7553p0s2j6a28badqghpbx673"))))
+        "15z2ymzqhxwss6wgdj5f7vkyqlqdsjgrvm0x871kmlx0n0664mhk"))))
     (build-system gnu-build-system)
     (inputs
      `(("gmp" ,gmp)))
@@ -201,45 +200,57 @@ translator for the language.  In addition to the C library, a stand-alone
 LP/MIP solver is included in the package.")
     (license license:gpl3+)))
 
-(define-public pspp
+(define-public 4ti2
   (package
-    (name "pspp")
-    (version "0.8.5")
+    (name "4ti2")
+    (version "1.6.7")
     (source
      (origin
       (method url-fetch)
-      (uri (string-append "mirror://gnu/pspp/pspp-"
-                          version ".tar.gz"))
+      (uri (string-append "http://www.4ti2.de/version_" version
+                          "/4ti2-" version ".tar.gz"))
       (sha256
        (base32
-        "0c8326yykidi94xi7jn27j8iqxc38vc07d4wf5zyk0l8lpzx5vz7"))))
+        "1frix3rnm9ffr93alqzw4cavxbfpf524l8rfbmcpyhwd3n1km0yl"))))
     (build-system gnu-build-system)
-    (inputs
-     `(("cairo" ,cairo)
-       ("fontconfig" ,fontconfig)
-       ("gettext" ,gnu-gettext)
-       ("gsl" ,gsl)
-       ("libxml2" ,libxml2)
-       ("pango" ,pango)
-       ("readline" ,readline)
-       ("gtk" ,gtk+-2)
-       ("gtksourceview" ,gtksourceview-2)
-       ("zlib" ,zlib)))
     (native-inputs
-     `(("glib" ,glib "bin")             ;for glib-genmarshal
-       ("perl" ,perl)
-       ("texinfo" ,texinfo)
-       ("pkg-config" ,pkg-config)))
-    (home-page "http://www.gnu.org/software/pspp/")
-    (synopsis "Statistical analysis")
+     `(("which" ,(@ (gnu packages base) which)))) ; for the tests
+    (inputs
+     `(("glpk" ,glpk)
+       ("gmp" ,gmp)))
+    (home-page "http://www.4ti2.de/")
+    (synopsis "Mathematical tool suite for problems on linear spaces")
     (description
-     "GNU PSPP is a statistical analysis program.  It can perform
-descriptive statistics, T-tests, linear regression and non-parametric tests.
-It features both a graphical interface as well as command-line input.  PSPP
-is designed to interoperate with Gnumeric, LibreOffice and OpenOffice.  Data
-can be imported from spreadsheets, text files and database sources and it can
-be output in text, PostScript, PDF or HTML.")
-    (license license:gpl3+)))
+     "4ti2 implements algorithms for solving algebraic, geometric and
+combinatorial problems on linear spaces.  Among others, it solves systems
+of linear equations, computes extreme rays of polyhedral cones, solves
+integer programming problems and computes Markov bases for statistics.")
+    (license license:gpl2+)))
+
+(define-public cddlib
+  (package
+    (name "cddlib")
+    (version "0.94h")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "ftp://ftp.ifor.math.ethz.ch/pub/fukuda/cdd/cddlib-"
+                          (string-delete #\. version) ".tar.gz"))
+      (sha256
+       (base32
+        "1dasasscwfg793q8fwzgwf64xwj7w62yfvszpr8x8g38jka08vgy"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("gmp" ,gmp)))
+    (home-page "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html")
+    (synopsis "Library for convex hulls and extreme rays of polyhedra")
+    (description
+     "The C-library cddlib implements the Double Description Method of
+Motzkin et al. for generating all vertices (i.e. extreme points) and extreme
+rays of a general convex polyhedron given by a system of linear inequalities
+in arbitrary dimension.  It can also be used for the converse operation of
+computing convex hulls.")
+    (license license:gpl2+)))
 
 (define-public arpack-ng
   (package
diff --git a/gnu/packages/mc.scm b/gnu/packages/mc.scm
index 6e3747c943..43dab8ff41 100644
--- a/gnu/packages/mc.scm
+++ b/gnu/packages/mc.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -33,7 +34,7 @@
 (define-public mc
   (package
     (name "mc")
-    (version "4.8.11")
+    (version "4.8.16")
     (source
      (origin
       (method url-fetch)
@@ -41,8 +42,7 @@
                           version ".tar.xz"))
       (sha256
        (base32
-        "0flrw5pq2mg2d39bh6dllndhpcfppjza6g70p4ry2wcx9y2flxqq"))
-      (patches (list (search-patch "mc-fix-ncurses-build.patch")))))
+        "083h5gwc0nny9b557way5dsmj71g2bzkiai4bn30y5nkjwqbxg5v"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("perl" ,perl)))
@@ -63,4 +63,4 @@ copying and moving, Midnight Commander also supports viewing the contents of
 RPM package files and other archives and managing files on other computers via
 FTP or FISH.  It also includes a powerful text editor for opening text
 files.")
-    (license gpl2)))
+    (license gpl3+)))
diff --git a/gnu/packages/miscfiles.scm b/gnu/packages/miscfiles.scm
deleted file mode 100644
index fd0fc7b8e2..0000000000
--- a/gnu/packages/miscfiles.scm
+++ /dev/null
@@ -1,47 +0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright 2014 John Darrington <jmd@gnu.org>
-;;;
-;;; This file is part of GNU Guix.
-;;;
-;;; GNU Guix is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or (at
-;;; your option) any later version.
-;;;
-;;; GNU Guix is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (gnu packages miscfiles)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu))
-
-(define-public miscfiles
-  (package
-    (name "miscfiles")
-    (version "1.5")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/" name "/" name "-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"))))
-    (build-system gnu-build-system)
-    (home-page "https://www.gnu.org/software/miscfiles/")
-    (synopsis
-     "Data files for airport codes, zip codes, a dictionary, and more")
-    (description
-     "GNU Miscfiles is a collection of common data files.  They include, for
-example, country abbreviations, names and capital cities; currency
-abbreviations and names; a Best Current Practices index; a map of the ASCII
-character set; a list of three-letter airport codes; and an English word
-list.")
-    (license gpl2+)))
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 55c09bc897..1af66e039c 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -72,7 +72,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
 (define-public mpd
   (package
     (name "mpd")
-    (version "0.19.12")
+    (version "0.19.14")
     (source (origin
               (method url-fetch)
               (uri
@@ -81,7 +81,7 @@ interfacing MPD in the C, C++ & Objective C languages.")
                               "/mpd-" version ".tar.xz"))
               (sha256
                (base32
-                "0xg8w5vn6xd0yfw55qj6wnav7v14nmr00s3d4w5gixbjrv3ycvvv"))))
+                "1rwr1qb9an1qylddf35xwdasyfkxghd00c29saj04l1f2c2kilig"))))
     (build-system gnu-build-system)
     (inputs `(("ao" ,ao)
               ("alsa-lib" ,alsa-lib)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ffee9d6245..1fa142120e 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2016 Al McElrath <hello@yrns.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Yamashita <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -78,6 +79,7 @@
   #:use-module (gnu packages rdf)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rsync)
+  #:use-module (gnu packages sdl)
   #:use-module (gnu packages tcl)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages texlive)
@@ -312,7 +314,10 @@ interface.  It is implemented as a frontend to @code{klick}.")
          (add-before 'configure 'prepare-configuration
           (lambda _
             (substitute* "configure"
-              (("SHELL=/bin/sh") "SHELL=sh"))
+              (("SHELL=/bin/sh") "SHELL=sh")
+              ;; When checking the fontforge version do not consider the
+              ;; version string that's part of the directory.
+              (("head -n") "tail -n"))
             (setenv "out" "www")
             (setenv "conf" "www")
             #t))
@@ -1068,14 +1073,14 @@ computer's keyboard.")
 (define-public qtractor
   (package
     (name "qtractor")
-    (version "0.7.3")
+    (version "0.7.5")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://downloads.sourceforge.net/qtractor/"
                                   "qtractor-" version ".tar.gz"))
               (sha256
                (base32
-                "1vy4297myyqk0k58nzybgvgklckhngpdcnmp98k0rq98dirclbl7"))))
+                "0drqzp1rbqmqiwdzc9n3307y8rm882fha3awy5qlvir5ma2mwl80"))))
     (build-system gnu-build-system)
     (arguments `(#:tests? #f)) ; no "check" target
     (inputs
@@ -1198,9 +1203,8 @@ MusicBrainz database.")
     (build-system python-build-system)
     (home-page "https://github.com/echonest/pyechonest")
     (synopsis "Python interface to The Echo Nest APIs")
-    (description "Pyechonest is an open source Python library for the Echo Nest
-API.  With Pyechonest you have Python access to the entire set of API methods
-including:
+    (description "Pyechonest is a Python library for the Echo Nest API.  With
+Pyechonest you have Python access to the entire set of API methods including:
 
 @enumerate
 @item artist - search for artists by name, description, or attribute, and get
@@ -1272,13 +1276,16 @@ websites such as Libre.fm.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'set-HOME
-           (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp")))))))
+           (lambda _ (setenv "HOME" (string-append (getcwd) "/tmp"))))
+         (replace 'check
+           (lambda _ (zero? (system* "nosetests" "-v")))))))
     (native-inputs
      `(("python2-beautifulsoup4" ,python2-beautifulsoup4)
        ("python2-flask" ,python2-flask)
        ("python2-setuptools" ,python2-setuptools)
        ("python2-mock" ,python2-mock)
        ("python2-mpd2" ,python2-mpd2)
+       ("python2-nose" ,python2-nose)
        ("python2-pathlib" ,python2-pathlib)
        ("python2-pyxdg" ,python2-pyxdg)
        ("python2-pyechonest" ,python2-pyechonest)
@@ -1301,3 +1308,33 @@ once and for all.  It catalogs your collection, automatically improving its
 metadata as it goes using the MusicBrainz database.  Then it provides a variety
 of tools for manipulating and accessing your music.")
     (license license:expat)))
+
+(define-public milkytracker
+  (package
+    (name "milkytracker")
+    (version "0.90.86")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://milkytracker.org/files/"
+                                  name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1v9vp8vi24lkagfpr92c128whvakwgrm9pq2zf6ijpl5sh7014zb"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:make-flags '("CXXFLAGS=-lasound")))
+    (inputs
+     `(("alsa-lib" ,alsa-lib)
+       ("jack" ,jack-1)
+       ("sdl" ,sdl)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (synopsis "Music tracker for working with .MOD/.XM module files")
+    (description "MilkyTracker is a music application for creating .MOD and .XM
+module files.  It attempts to recreate the module replay and user experience of
+the popular DOS program Fasttracker II, with special playback modes available
+for improved Amiga ProTracker 2/3 compatibility.")
+    (home-page "http://milkytracker.org/")
+    ;; 'src/milkyplay' is under Modified BSD, the rest is under GPL3 or later.
+    (license (list license:bsd-3 license:gpl3+))))
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index ac7e4e70e6..a4f431a0b1 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Stefan Reichör <stefan@xsteve.at>
 ;;; Copyright © 2016 Raimon Grau <raimonster@gmail.com>
+;;; Copyright © 2016 Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,7 +27,10 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages ncurses))
+  #:use-module (gnu packages ncurses)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages compression))
 
 (define-public miredo
   (package
@@ -210,3 +214,41 @@ bandwidth usage in real time.  It visualizes the in- and outgoing traffic using
 two graphs and provides additional info like total amount of transfered data
 and min/max network usage.")
     (license license:gpl2+)))
+
+(define-public iodine
+  (package
+    (name "iodine")
+    (version "0.7.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://code.kryo.se/" name "/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0gh17kcxxi37k65zm4gqsvbk3aw7yphcs3c02pn1c4s2y6n40axd"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (add-before 'check 'delete-failing-tests
+           ;; Avoid https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=802105
+           (lambda _
+             (substitute* "tests/common.c"
+               (("tcase_add_test\\(tc, \
+test_parse_format_ipv(4(|_listen_all|_mapped_ipv6)|6)\\);")
+                "")))))
+       #:make-flags (list "CC=gcc"
+                          (string-append "prefix=" (assoc-ref %outputs "out")))
+       #:test-target "test"))
+    (inputs `(("zlib" ,zlib)))
+    (native-inputs `(("check" ,check)
+                     ("pkg-config" ,pkg-config)))
+    (home-page "http://code.kryo.se/iodine/")
+    (synopsis "Tunnel IPv4 data through a DNS server")
+    (description "Iodine tunnels IPv4 data through a DNS server.  This
+can be useful in different situations where internet access is firewalled, but
+DNS queries are allowed.  The bandwidth is asymmetrical, with limited upstream
+and up to 1 Mbit/s downstream.")
+    ;; src/md5.[ch] is released under the zlib license
+    (license (list license:isc license:zlib))))
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index 0fa488f842..947abf31a4 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -20,7 +20,6 @@
 (define-module (gnu packages openstack)
   #:use-module (gnu packages python)
   #:use-module (gnu packages tls)
-  #:use-module (gnu packages version-control)
   #:use-module (guix build-system python)
   #:use-module (guix download)
   #:use-module ((guix licenses)
@@ -235,48 +234,6 @@ tested on Python version 3.2, 2.7 and 2.6.")
 (define-public python2-os-testr
   (package-with-python2 python-os-testr))
 
-(define-public python-pbr
-  (package
-    (name "python-pbr")
-    (version "1.8.1")
-    (source
-      (origin
-        (method url-fetch)
-        (uri (string-append
-               "https://pypi.python.org/packages/source/p/pbr/pbr-"
-               version
-               ".tar.gz"))
-        (sha256
-          (base32
-            "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2"))))
-    (build-system python-build-system)
-    (arguments
-     `(#:tests? #f)) ;; Most tests seem to use the Internet.
-    (propagated-inputs
-      `(("python-testrepository" ,python-testrepository)
-        ("git" ,git))) ;; pbr actually uses the "git" binary.
-    (inputs
-      `(("python-fixtures" ,python-fixtures)
-        ("python-mimeparse" ,python-mimeparse)
-        ("python-mock" ,python-mock)
-        ("python-setuptools" ,python-setuptools)
-        ("python-six" ,python-six)
-        ("python-sphinx" ,python-sphinx)
-        ("python-testrepository" ,python-testrepository)
-        ("python-testresources" ,python-testresources)
-        ("python-testscenarios" ,python-testscenarios)
-        ("python-testtools" ,python-testtools)
-        ("python-virtualenv" ,python-virtualenv)))
-    (home-page "https://launchpad.net/pbr")
-    (synopsis "Change the default behavior of Python’s setuptools")
-    (description
-      "Python Build Reasonableness (PBR) is a library that injects some useful
-and sensible default behaviors into your setuptools run.")
-    (license asl2.0)))
-
-(define-public python2-pbr
-  (package-with-python2 python-pbr))
-
 (define-public python-requests-mock
   (package
     (name "python-requests-mock")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 7a7dec3363..38c9bdb7d1 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -60,17 +60,17 @@
                      arch "-linux"
                      "/20131110/guile-2.0.9.tar.xz")))
 
-(define-public guix-0.9.0
+(define-public guix-0.10.0
   (package
     (name "guix")
-    (version "0.9.0")
+    (version "0.10.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "ftp://alpha.gnu.org/gnu/guix/guix-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "0h573z2br0bf43sxyzia9xlm03n3y43zg1snds3c2piq2m6kabrn"))))
+               "0d4afwy7bpqi4k4bzvwc4ga4shwssis1nrvdw53qjyg9bw1a8lbn"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list
@@ -140,9 +140,16 @@
                             (path   (string-append
                                      json "/share/guile/site/2.0:"
                                      gnutls "/share/guile/site/2.0")))
+
+                       ;; Ignore user settings so that a bogus
+                       ;; GUILE_LOAD_COMPILED_PATH does not prevent use of
+                       ;; 'guix', notably when it contains entries pointing to
+                       ;; incompatible .go files as reported at
+                       ;; <https://lists.gnu.org/archive/html/guix-devel/2016-03/msg01261.html>.
                        (wrap-program (string-append out "/bin/guix")
-                         `("GUILE_LOAD_PATH" ":" prefix (,path))
-                         `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,path)))
+                         `("GUILE_LOAD_PATH" ":" = (,path))
+                         `("GUILE_LOAD_COMPILED_PATH" ":" = (,path)))
+
                        #t))))))
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("emacs" ,emacs-no-x)))      ;for guix.el
@@ -193,11 +200,11 @@ the Nix package manager.")
 (define guix-devel
   ;; Development version of Guix.
   ;;
-  ;; Note: use a short commit id; when using the long one, the limit on socket
-  ;; file names is exceeded while running the tests.
-  (let ((commit "71e2065a38cf2641b7eb8c557b0f043f5a42a649"))
-    (package (inherit guix-0.9.0)
-      (version (string-append "0.9.0." (string-take commit 7)))
+  ;; Note: use a very short commit id; with a longer one, the limit on
+  ;; hash-bang lines would be exceeded while running the tests.
+  (let ((commit "761139354798303c605964b896c250a01486b00a"))
+    (package (inherit guix-0.10.0)
+      (version (string-append "0.10.0-0." (string-take commit 4)))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -205,10 +212,10 @@ the Nix package manager.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0wrrywfdc27yxjns55qdz5si49c8zcb9q5557g2kx48dbm7p0dzw"))
+                  "1wvy9kms3v6k7cybw6489mqk161lv8d03qgmmxbmdgiwjmjxbzbn"))
                 (file-name (string-append "guix-" version "-checkout"))))
       (arguments
-       (substitute-keyword-arguments (package-arguments guix-0.9.0)
+       (substitute-keyword-arguments (package-arguments guix-0.10.0)
          ((#:configure-flags flags)
           ;; Set 'DOT_USER_PROGRAM' to the empty string so we don't keep a
           ;; reference to Graphviz, whose closure is pretty big (too big for
@@ -232,7 +239,7 @@ the Nix package manager.")
          ("texinfo" ,texinfo)
          ("graphviz" ,graphviz)
          ("help2man" ,help2man)
-         ,@(package-native-inputs guix-0.9.0))))))
+         ,@(package-native-inputs guix-0.10.0))))))
 
 (define-public guix guix-devel)
 
@@ -389,13 +396,13 @@ transactions from C or Python.")
 (define-public diffoscope
   (package
     (name "diffoscope")
-    (version "49")
+    (version "51")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri name version))
               (sha256
                (base32
-                "1mf6b7j82ckn90ggz6bp6c2jydz87xj8r8jmfl4hg7jcmf7dxmim"))))
+                "18rn6rrwh586228vnaf1nq0wayh19zbvfc0qmnbys6ln2pv2v007"))))
     (build-system python-build-system)
     (arguments
      `(#:phases (modify-phases %standard-phases
diff --git a/gnu/packages/patches/libextractor-ffmpeg-3.patch b/gnu/packages/patches/libextractor-ffmpeg-3.patch
new file mode 100644
index 0000000000..d0f83f624c
--- /dev/null
+++ b/gnu/packages/patches/libextractor-ffmpeg-3.patch
@@ -0,0 +1,360 @@
+Fix build with ffmpeg-3, based on upstream revisions r35548 and r35549 by LRN
+and r36975 by Christian Grothoff, and backported to libextractor-1.3 by
+Mark H Weaver <mhw@netris.org>
+
+--- libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c.orig	2013-12-21 11:04:41.000000000 -0500
++++ libextractor-1.3/src/plugins/thumbnailffmpeg_extractor.c	2016-04-04 23:38:46.429041081 -0400
+@@ -59,6 +59,12 @@
+ #include <ffmpeg/swscale.h>
+ #endif
+ 
++#ifdef PIX_FMT_RGB24
++#define PIX_OUTPUT_FORMAT PIX_FMT_RGB24
++#else
++#define PIX_OUTPUT_FORMAT AV_PIX_FMT_RGB24
++#endif
++
+ /**
+  * Set to 1 to enable debug output.
+  */ 
+@@ -153,7 +159,7 @@
+ static size_t 
+ create_thumbnail (int src_width, int src_height, 
+ 		  int src_stride[],
+-		  enum PixelFormat src_pixfmt, 
++		  enum AVPixelFormat src_pixfmt,
+ 		  const uint8_t * const src_data[],
+ 		  int dst_width, int dst_height,
+ 		  uint8_t **output_data, 
+@@ -189,7 +195,8 @@
+   if (NULL == 
+       (scaler_ctx =
+        sws_getContext (src_width, src_height, src_pixfmt,
+-		       dst_width, dst_height, PIX_FMT_RGB24, 
++		       dst_width, dst_height,
++		       PIX_OUTPUT_FORMAT,
+ 		       SWS_BILINEAR, NULL, NULL, NULL)))
+     {
+ #if DEBUG
+@@ -199,7 +206,12 @@
+       return 0;
+     }
+ 
+-  if (NULL == (dst_frame = avcodec_alloc_frame ()))
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  dst_frame = av_frame_alloc ();
++#else
++  dst_frame = avcodec_alloc_frame();
++#endif
++  if (NULL == dst_frame)
+     {
+ #if DEBUG
+       fprintf (stderr,
+@@ -209,18 +221,24 @@
+       return 0;
+     }
+   if (NULL == (dst_buffer =
+-	       av_malloc (avpicture_get_size (PIX_FMT_RGB24, dst_width, dst_height))))
++	       av_malloc (avpicture_get_size (PIX_OUTPUT_FORMAT,
++					      dst_width, dst_height))))
+     {
+ #if DEBUG
+       fprintf (stderr,
+                "Failed to allocate the destination image buffer\n");
+ #endif
+-      av_free (dst_frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&dst_frame);
++#else
++      avcodec_free_frame (&dst_frame);
++#endif
+       sws_freeContext (scaler_ctx);
+       return 0;
+     }
+   avpicture_fill ((AVPicture *) dst_frame, dst_buffer,
+-                  PIX_FMT_RGB24, dst_width, dst_height);
++                  PIX_OUTPUT_FORMAT,
++                  dst_width, dst_height);
+   sws_scale (scaler_ctx,
+              src_data, 
+              src_stride,
+@@ -236,7 +254,11 @@
+                "Failed to allocate the encoder output buffer\n");
+ #endif
+       av_free (dst_buffer);
+-      av_free (dst_frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&dst_frame);
++#else
++      avcodec_free_frame (&dst_frame);
++#endif
+       sws_freeContext (scaler_ctx);
+       return 0;
+     }
+@@ -249,13 +271,17 @@
+ #endif
+       av_free (encoder_output_buffer);
+       av_free (dst_buffer);
+-      av_free (dst_frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&dst_frame);
++#else
++      avcodec_free_frame (&dst_frame);
++#endif
+       sws_freeContext (scaler_ctx);
+       return 0;
+     }
+   encoder_codec_ctx->width = dst_width;
+   encoder_codec_ctx->height = dst_height;
+-  encoder_codec_ctx->pix_fmt = PIX_FMT_RGB24;
++  encoder_codec_ctx->pix_fmt = PIX_OUTPUT_FORMAT;
+   opts = NULL;
+   if (avcodec_open2 (encoder_codec_ctx, encoder_codec, &opts) < 0)
+     {
+@@ -263,10 +289,14 @@
+       fprintf (stderr,
+                "Failed to open the encoder\n");
+ #endif
+-      av_free (encoder_codec_ctx);
++      avcodec_free_context (&encoder_codec_ctx);
+       av_free (encoder_output_buffer);
+       av_free (dst_buffer);
+-      av_free (dst_frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&dst_frame);
++#else
++      avcodec_free_frame (&dst_frame);
++#endif
+       sws_freeContext  (scaler_ctx);
+       return 0;
+     }
+@@ -295,9 +325,13 @@
+ cleanup:
+   av_dict_free (&opts);
+   avcodec_close (encoder_codec_ctx);
+-  av_free (encoder_codec_ctx);
++  avcodec_free_context (&encoder_codec_ctx);
+   av_free (dst_buffer);
+-  av_free (dst_frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  av_frame_free (&dst_frame);
++#else
++  avcodec_free_frame (&dst_frame);
++#endif
+   sws_freeContext (scaler_ctx);
+   *output_data = encoder_output_buffer;
+ 
+@@ -406,18 +440,23 @@
+       fprintf (stderr,
+ 	       "Failed to open image codec\n");
+ #endif
+-      av_free (codec_ctx);
++      avcodec_free_context (&codec_ctx);
+       return;
+     }
+   av_dict_free (&opts);
+-  if (NULL == (frame = avcodec_alloc_frame ()))
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  frame = av_frame_alloc ();
++#else
++  frame = avcodec_alloc_frame();
++#endif
++  if (NULL == frame)
+     {
+ #if DEBUG
+       fprintf (stderr,
+                "Failed to allocate frame\n");
+ #endif
+       avcodec_close (codec_ctx);
+-      av_free (codec_ctx);
++      avcodec_free_context (&codec_ctx);
+       return;
+     }
+ 
+@@ -441,9 +480,13 @@
+       fprintf (stderr,
+ 	       "Failed to decode a complete frame\n");
+ #endif
+-      av_free (frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&frame);
++#else
++      avcodec_free_frame (&frame);
++#endif
+       avcodec_close (codec_ctx);
+-      av_free (codec_ctx);
++      avcodec_free_context (&codec_ctx);
+       return;
+     }
+   calculate_thumbnail_dimensions (codec_ctx->width, codec_ctx->height,
+@@ -467,9 +510,13 @@
+ 		err);
+       av_free (encoded_thumbnail);
+     }
+-  av_free (frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  av_frame_free (&frame);
++#else
++  avcodec_free_frame (&frame);
++#endif
+   avcodec_close (codec_ctx);
+-  av_free (codec_ctx);
++  avcodec_free_context (&codec_ctx);
+ }
+ 
+ 
+@@ -563,7 +610,12 @@
+       return;
+     }
+ 
+-  if (NULL == (frame = avcodec_alloc_frame ()))
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  frame = av_frame_alloc ();
++#else
++  frame = avcodec_alloc_frame();
++#endif
++  if (NULL == frame)
+     {
+ #if DEBUG
+       fprintf (stderr,
+@@ -616,7 +668,11 @@
+       fprintf (stderr,
+ 	       "Failed to decode a complete frame\n");
+ #endif
+-      av_free (frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++      av_frame_free (&frame);
++#else
++      avcodec_free_frame (&frame);
++#endif
+       avcodec_close (codec_ctx);
+       avformat_close_input (&format_ctx);
+       av_free (io_ctx);
+@@ -643,7 +699,11 @@
+ 		err);
+       av_free (encoded_thumbnail);
+     }
+-  av_free (frame);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  av_frame_free (&frame);
++#else
++  avcodec_free_frame (&frame);
++#endif
+   avcodec_close (codec_ctx);
+   avformat_close_input (&format_ctx);
+   av_free (io_ctx);
+--- libextractor-1.3/src/plugins/previewopus_extractor.c.orig	2013-12-22 17:44:18.000000000 -0500
++++ libextractor-1.3/src/plugins/previewopus_extractor.c	2016-04-04 23:39:41.377720710 -0400
+@@ -296,8 +296,13 @@
+ /** Initialize one audio frame for reading from the input file */
+ static int init_input_frame(AVFrame **frame)
+ {
+-    if (!(*frame = avcodec_alloc_frame())) {
+- #if DEBUG
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++    *frame = av_frame_alloc ();
++#else
++    *frame = avcodec_alloc_frame();
++#endif
++    if (NULL == *frame) {
++#if DEBUG
+         fprintf(stderr, "Could not allocate input frame\n");
+ #endif
+         return AVERROR(ENOMEM);
+@@ -655,7 +660,11 @@
+         av_freep(&converted_input_samples[0]);
+         free(converted_input_samples);
+     }
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++    av_frame_free (&input_frame);
++#else
+     avcodec_free_frame(&input_frame);
++#endif
+ 
+     return ret;
+ }
+@@ -671,10 +680,15 @@
+     int error;
+ 
+     /** Create a new frame to store the audio samples. */
+-    if (!(*frame = avcodec_alloc_frame())) {
+-        #if DEBUG
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++    *frame = av_frame_alloc ();
++#else
++    *frame = avcodec_alloc_frame();
++#endif
++    if (NULL == *frame) {
++#if DEBUG
+ 		fprintf(stderr, "Could not allocate output frame\n");
+-		#endif
++#endif
+         return AVERROR_EXIT;
+     }
+ 
+@@ -699,10 +713,14 @@
+      * sure that the audio frame can hold as many samples as specified.
+      */
+     if ((error = av_frame_get_buffer(*frame, 0)) < 0) {
+-        #if DEBUG
++#if DEBUG
+ 		fprintf(stderr, "Could allocate output frame samples (error '%s')\n", get_error_text(error));
+-		#endif
++#endif
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++        av_frame_free (frame);
++#else
+         avcodec_free_frame(frame);
++#endif
+         return error;
+     }
+ 
+@@ -780,20 +798,32 @@
+      * The samples are stored in the frame temporarily.
+      */
+     if (av_audio_fifo_read(fifo, (void **)output_frame->data, frame_size) < frame_size) {
+-        #if DEBUG
++#if DEBUG
+ 		fprintf(stderr, "Could not read data from FIFO\n");
+-		#endif
++#endif
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++        av_frame_free (&output_frame);
++#else
+         avcodec_free_frame(&output_frame);
++#endif
+         return AVERROR_EXIT;
+     }
+ 
+     /** Encode one frame worth of audio samples. */
+     if (encode_audio_frame(output_frame, output_format_context,
+                            output_codec_context, &data_written)) {
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++        av_frame_free (&output_frame);
++#else
+         avcodec_free_frame(&output_frame);
++#endif
+         return AVERROR_EXIT;
+     }
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++    av_frame_free (&output_frame);
++#else
+     avcodec_free_frame(&output_frame);
++#endif
+     return 0;
+ }
+ /** Write the trailer of the output file container. */
+@@ -907,7 +937,12 @@
+       return;
+     }
+ 
+-  if (NULL == (frame = avcodec_alloc_frame ()))
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55,28,1)
++  frame = av_frame_alloc ();
++#else
++  frame = avcodec_alloc_frame();
++#endif
++  if (NULL == frame)
+     {
+ #if DEBUG
+       fprintf (stderr,
diff --git a/gnu/packages/patches/mc-fix-ncurses-build.patch b/gnu/packages/patches/mc-fix-ncurses-build.patch
deleted file mode 100644
index c583c92e10..0000000000
--- a/gnu/packages/patches/mc-fix-ncurses-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Patch cherry-picked from resolution of
-http://www.midnight-commander.org/ticket/3114
-
---- a/lib/tty/key.c	(revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
-+++ b/lib/tty/key.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
-@@ -1947,4 +1947,5 @@
- {
-     int c;
-+    int flag = 0;               /* Return value from select */
- #ifdef HAVE_LIBGPM
-     static struct Gpm_Event ev; /* Mouse event */
-@@ -1979,5 +1980,4 @@
-     {
-         int nfd;
--        static int flag = 0;    /* Return value from select */
-         fd_set select_set;
- 
---- a/lib/tty/tty-ncurses.c	(revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
-+++ b/lib/tty/tty-ncurses.c	(revision d870aedad1907773f8586fe818a89e6b5178b849)
-@@ -50,4 +50,5 @@
- #include "tty.h"
- #include "color-internal.h"
-+#include "key.h"
- #include "mouse.h"
- #include "win.h"
-@@ -531,4 +532,5 @@
-     {
-         int res;
-+        unsigned char str[UTF8_CHAR_LEN + 1];
- 
-         res = g_unichar_to_utf8 (c, (char *) str);
-@@ -541,5 +543,4 @@
-         else
-         {
--            unsigned char str[UTF8_CHAR_LEN + 1];
-             const char *s;
- 
diff --git a/gnu/packages/patches/openssl-c-rehash.patch b/gnu/packages/patches/openssl-c-rehash.patch
deleted file mode 100644
index f873a9af23..0000000000
--- a/gnu/packages/patches/openssl-c-rehash.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-This patch removes the explicit reference to the 'perl' binary,
-such that OpenSSL does not retain a reference to Perl.
-
-The 'c_rehash' program is seldom used, but it is used nonetheless
-to create symbolic links to certificates, for instance in the 'nss-certs'
-package.
-
---- openssl-1.0.2d/tools/c_rehash	2015-09-09 18:36:07.313316482 +0200
-+++ openssl-1.0.2d/tools/c_rehash	2015-09-09 18:36:28.965458458 +0200
-@@ -1,4 +1,6 @@
--#!/usr/bin/perl
-+eval '(exit $?0)' && eval 'exec perl -wS "$0" ${1+"$@"}'
-+  & eval 'exec perl -wS "$0" $argv:q'
-+    if 0;
- 
- # Perl c_rehash script, scan all files in a directory
- # and add symbolic links to their hash values.
diff --git a/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch b/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch
deleted file mode 100644
index 671b5fb910..0000000000
--- a/gnu/packages/patches/webkitgtk-2.4-sql-init-string.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Copied from Fedora.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1189303
-http://pkgs.fedoraproject.org/cgit/webkitgtk.git/commit/?id=e689e45d0cc2c50484e69d20371ba607af7326f3
-
-diff -up webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp
---- webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp.sql_initialize_string	2015-09-14 09:25:43.004200172 +0200
-+++ webkitgtk-2.4.9/Source/WebCore/platform/sql/SQLiteStatement.cpp	2015-09-14 09:25:57.852082368 +0200
-@@ -71,7 +71,7 @@ int SQLiteStatement::prepare()
-     // this lets SQLite avoid an extra string copy.
-     size_t lengthIncludingNullCharacter = query.length() + 1;
- 
--    const char* tail;
-+    const char* tail = nullptr;
-     int error = sqlite3_prepare_v2(m_database.sqlite3Handle(), query.data(), lengthIncludingNullCharacter, &m_statement, &tail);
- 
-     if (error != SQLITE_OK)
diff --git a/gnu/packages/patches/wicd-template-instantiation.patch b/gnu/packages/patches/wicd-template-instantiation.patch
deleted file mode 100644
index 16d8fa6e1d..0000000000
--- a/gnu/packages/patches/wicd-template-instantiation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Wicd 1.7.3 fails to instantiate template lines that have several
-variable references.  For instance, the line:
-
-  wep_key$_KEY_INDEX=$_KEY
-
-which is found in in the 'wep-hex' template, expands to these two
-lines:
-
-  wep_key0=$_KEY
-  wep_key0=123456789ab
-
-This patch fixes that by only emitting the fully substituted line.
-
-Patch by Ludovic Courtès <ludo@gnu.org>.
-
---- a/wicd/misc.py	2012-11-17 00:07:08 +0000
-+++ b/wicd/misc.py	2015-05-09 11:22:37 +0000
-@@ -321,11 +321,11 @@ def ParseEncryption(network):
-                                 rep_val = '0'
-                         if rep_val:
-                             line = line.replace("$_%s" % cur_val, str(rep_val))
--                            config_file = ''.join([config_file, line])
-                         else:
-                             print "Ignoring template line: '%s'" % line
-                     else:
-                         print "Weird parsing error occurred"
-+                config_file = ''.join([config_file, line])
-             else:  # Just a regular entry.
-                 config_file = ''.join([config_file, line])
diff --git a/gnu/packages/patches/wicd-wpa2-ttls.patch b/gnu/packages/patches/wicd-wpa2-ttls.patch
new file mode 100644
index 0000000000..9d80ee7ed2
--- /dev/null
+++ b/gnu/packages/patches/wicd-wpa2-ttls.patch
@@ -0,0 +1,38 @@
+Add a template for WPA2-TTLS, which is notably used by Eduroam.
+
+--- a/encryption/templates/active
++++ b/encryption/templates/active
+@@ -4,6 +4,7 @@ wpa-psk
+ wpa-psk-hex
+ wpa2-leap
+ wpa2-peap
++wpa2-ttls
+ wep-hex
+ wep-passphrase
+ wep-shared
+diff --git a/encryption/templates/wpa2-ttls b/encryption/templates/wpa2-ttls
+new file mode 100644
+index 0000000..4f66a1e
+--- /dev/null
++++ b/encryption/templates/wpa2-ttls
+@@ -0,0 +1,20 @@
++name = WPA2-TTLS (used notably by Eduroam)
++author = various contributors
++version = 1
++require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert
++protected password *Password
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++        ssid="$_ESSID"
++        scan_ssid=$_SCAN
++        proto=WPA2
++        key_mgmt=WPA-EAP
++        group=CCMP TKIP
++        eap=TTLS
++        identity="$_IDENTITY"
++        password="$_PASSWORD"
++        anonymous_identity="$_ANONYMOUS_IDENTITY"
++        ca_cert="$_CA_CERT"
++        phase2="auth=PAP"
++}
diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm
index fb42735495..9bbcc8ffa4 100644
--- a/gnu/packages/perl.scm
+++ b/gnu/packages/perl.scm
@@ -38,7 +38,6 @@
 (define-public perl
   ;; Yeah, Perl...  It is required early in the bootstrap process by Linux.
   (package
-    (replacement perl-fixed)
     (name "perl")
     (version "5.22.1")
     (source (origin
@@ -54,7 +53,8 @@
                              "perl-source-date-epoch.patch"
                              "perl-deterministic-ordering.patch"
                              "perl-no-build-time.patch"
-                             "perl-CVE-2015-8607.patch")))))
+                             "perl-CVE-2015-8607.patch"
+                             "perl-CVE-2016-2381.patch")))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f
@@ -116,28 +116,6 @@
     (home-page "http://www.perl.org/")
     (license gpl1+)))                          ; or "Artistic"
 
-(define perl-fixed
-  (package
-    (inherit perl)
-    (replacement #f)
-    (source
-      (let ((name "perl") (version "5.22.1"))
-        (origin
-          (method url-fetch)
-          (uri (string-append "http://www.cpan.org/src/5.0/perl-"
-                              version ".tar.gz"))
-          (sha256
-           (base32
-            "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb"))
-          (patches (map search-patch
-                        '("perl-no-sys-dirs.patch"
-                          "perl-autosplit-default-time.patch"
-                          "perl-source-date-epoch.patch"
-                          "perl-deterministic-ordering.patch"
-                          "perl-no-build-time.patch"
-                          "perl-CVE-2015-8607.patch"
-                          "perl-CVE-2016-2381.patch"))))))))
-
 (define-public perl-algorithm-c3
   (package
     (name "perl-algorithm-c3")
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index c2685f6055..1db749bff1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -16,7 +16,7 @@
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com>
-;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com>
+;;; Copyright © 2015, 2016 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -69,6 +69,7 @@
   #:use-module (gnu packages texlive)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
+  #:use-module (gnu packages version-control)
   #:use-module (gnu packages web)
   #:use-module (gnu packages base)
   #:use-module (gnu packages xml)
@@ -701,7 +702,7 @@ concepts.")
 (define-public python-lockfile
   (package
     (name "python-lockfile")
-    (version "0.9.1")
+    (version "0.12.2")
     (source
      (origin
        (method url-fetch)
@@ -709,18 +710,25 @@ concepts.")
                            "lockfile-" version ".tar.gz"))
        (sha256
         (base32
-         "0iwif7i84gwpvrnpv4brshdk8j6l77smvknm8k3bg77mj6f5ini3"))))
+         "16gpx5hm73ah5n1079ng0vy381hl802v606npkx4x8nb0gg05vba"))))
     (build-system python-build-system)
     (arguments '(#:test-target "check"))
+    (native-inputs
+     `(("python-pbr" ,python-pbr)))
     (home-page "http://code.google.com/p/pylockfile/")
     (synopsis "Platform-independent file locking module")
     (description
      "The lockfile package exports a LockFile class which provides a simple
 API for locking files.")
-    (license license:expat)))
+    (license license:expat)
+    (properties `((python2-variant . ,(delay python2-lockfile))))))
 
 (define-public python2-lockfile
-  (package-with-python2 python-lockfile))
+  (let ((base (package-with-python2 (strip-python2-variant python-lockfile))))
+    (package
+      (inherit base)
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs base))))))
 
 (define-public python-mock
   (package
@@ -967,20 +975,14 @@ datetime module, available in Python 2.3+.")
 (define-public python-pandas
   (package
     (name "python-pandas")
-    (version "0.16.2")
+    (version "0.18.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pandas" version))
        (sha256
-        (base32 "10agmrkps8bi5948vwpipfxds5kj1d076m9i0nhaxwqiw7gm6670"))))
+        (base32 "050qw0ap5bhyv5flp78x3lcq1dlminl3xaj6kbrm0jqmx0672xf9"))))
     (build-system python-build-system)
-    (arguments
-     `(;; Three tests fail:
-       ;; - test_read_google
-       ;; - test_read_yahoo
-       ;; - test_month_range_union_tz_dateutil
-       #:tests? #f))
     (propagated-inputs
      `(("python-numpy" ,python-numpy)
        ("python-pytz" ,python-pytz)
@@ -1519,7 +1521,7 @@ code introspection, and logging.")
 (define-public python-pytest
   (package
     (name "python-pytest")
-    (version "2.6.1")
+    (version "2.7.3")
     (source
      (origin
        (method url-fetch)
@@ -1528,7 +1530,7 @@ code introspection, and logging.")
              version ".tar.gz"))
        (sha256
         (base32
-         "0g2w4p0n42wvz8rq4k6gnzpkakgz3g8sfanxk8jrsra9675snkcr"))
+         "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm"))
        (modules '((guix build utils)))
        (snippet
         ;; One of the tests involves the /usr directory, so it fails.
@@ -1862,6 +1864,48 @@ and sensible default behaviors into your setuptools run.")
 (define-public python2-pbr-0.11
   (package-with-python2 python-pbr-0.11))
 
+(define-public python-pbr
+  (package
+    (name "python-pbr")
+    (version "1.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "https://pypi.python.org/packages/source/p/pbr/pbr-"
+               version
+               ".tar.gz"))
+        (sha256
+          (base32
+            "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ;; Most tests seem to use the Internet.
+    (propagated-inputs
+      `(("python-testrepository" ,python-testrepository)
+        ("git" ,git))) ;; pbr actually uses the "git" binary.
+    (inputs
+      `(("python-fixtures" ,python-fixtures)
+        ("python-mimeparse" ,python-mimeparse)
+        ("python-mock" ,python-mock)
+        ("python-setuptools" ,python-setuptools)
+        ("python-six" ,python-six)
+        ("python-sphinx" ,python-sphinx)
+        ("python-testrepository" ,python-testrepository)
+        ("python-testresources" ,python-testresources)
+        ("python-testscenarios" ,python-testscenarios)
+        ("python-testtools" ,python-testtools)
+        ("python-virtualenv" ,python-virtualenv)))
+    (home-page "https://launchpad.net/pbr")
+    (synopsis "Change the default behavior of Python’s setuptools")
+    (description
+      "Python Build Reasonableness (PBR) is a library that injects some useful
+and sensible default behaviors into your setuptools run.")
+    (license asl2.0)))
+
+(define-public python2-pbr
+  (package-with-python2 python-pbr))
+
 (define-public python-fixtures
   (package
     (name "python-fixtures")
@@ -5376,7 +5420,7 @@ should be stored on various operating systems.")
 (define-public python-llfuse
   (package
     (name "python-llfuse")
-    (version "0.41")
+    (version "1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -5384,7 +5428,7 @@ should be stored on various operating systems.")
                     "llfuse-" version ".tar.bz2"))
               (sha256
                (base32
-                "0yzy8ixpmxk00kdq6lx5vvwbs0n6s59qnja5q0js2ahbqyxiz2hb"))))
+                "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps"))))
     (build-system python-build-system)
     (inputs
      `(("fuse" ,fuse)
@@ -5396,34 +5440,54 @@ should be stored on various operating systems.")
     (description
      "Python-LLFUSE is a set of Python bindings for the low level FUSE API.")
     (home-page "https://bitbucket.org/nikratio/python-llfuse/")
-    ;; Python-LLFUSE includes underscore.js, which is MIT (expat) licensed.
-    ;; The rest of the package is licensed under LGPL2.0 or later.
-    (license (list license:expat lgpl2.0+))))
+    (license lgpl2.0+)
+    (properties `((python2-variant . ,(delay python2-llfuse))))))
 
 (define-public python2-llfuse
-  (package-with-python2 python-llfuse))
+  (package (inherit (package-with-python2
+                 (strip-python2-variant python-llfuse)))
+    (propagated-inputs `(("python2-contextlib2" ,python2-contextlib2)))))
+
+;; For attic-0.16
+(define-public python-llfuse-0.41
+  (package (inherit python-llfuse)
+    (version "0.41.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://bitbucket.org/nikratio/python-llfuse/downloads/"
+                    "llfuse-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "1imlqw9b73086y97izr036f58pgc5akv4ihc2rrf8j5h75jbrlaa"))))
+    ;; Python-LLFUSE < 0.42 includes underscore.js, which is MIT (expat)
+    ;; licensed.  The rest of the package is licensed under LGPL2.0 or later.
+    (license (list license:expat lgpl2.0+))))
 
 (define-public python-msgpack
   (package
     (name "python-msgpack")
-    (version "0.4.6")
+    (version "0.4.7")
     (source (origin
               (method url-fetch)
-              (uri (string-append
-                    "https://pypi.python.org/packages/source/m/"
-                    "msgpack-python/msgpack-python-" version ".tar.gz"))
+              (uri (pypi-uri "msgpack-python" version))
               (sha256
                (base32
-                "1527c76b6fn4zzkgfq5xvhh7x9a9686g7fjiz717rw5vklf5ik5z"))))
+                "0syd7bs83qs9qmxw540jbgsildbqk4yb57fmrlns1021llli402y"))))
     (build-system python-build-system)
-    (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
     (synopsis "MessagePack (de)serializer")
     (description "MessagePack is a fast, compact binary serialization format,
 suitable for similar data to JSON.  This package provides CPython bindings for
 reading and writing MessagePack data.")
     (home-page "https://pypi.python.org/pypi/msgpack-python/")
-    (license asl2.0)))
+    (license asl2.0)
+    (properties `((python2-variant . ,(delay python2-msgpack))))))
+
+(define-public python2-msgpack
+  (package (inherit (package-with-python2
+                     (strip-python2-variant python-msgpack)))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))))
 
 (define-public python2-msgpack
   (package-with-python2 python-msgpack))
@@ -5760,7 +5824,7 @@ responses, rather than doing any computation.")
 (define-public python-cryptography-vectors
   (package
     (name "python-cryptography-vectors")
-    (version "1.2.3")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
@@ -5769,7 +5833,7 @@ responses, rather than doing any computation.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki"))))
+         "1144l3ypz3bngxd59lb4y74xa401w92lhvvjgxzglmvbh8wzkcbb"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-setuptools" ,python-setuptools)))
@@ -5786,14 +5850,14 @@ responses, rather than doing any computation.")
 (define-public python-cryptography
   (package
     (name "python-cryptography")
-    (version "1.2.3")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography" version))
        (sha256
         (base32
-         "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf"))))
+         "1qjkrpfvxcyd0kal3zpm5y7f9p3y77ixn9jw8f4dqpgrw1sn3cxl"))))
     (build-system python-build-system)
     (inputs
      `(("openssl" ,openssl)))
@@ -5837,7 +5901,7 @@ message digests and key derivation functions.")
 (define-public python-pyopenssl
   (package
     (name "python-pyopenssl")
-    (version "0.15.1")
+    (version "16.0.0")
     (source
      (origin
        (method url-fetch)
@@ -5845,29 +5909,8 @@ message digests and key derivation functions.")
                            "pyOpenSSL/pyOpenSSL-" version ".tar.gz"))
        (sha256
         (base32
-         "0wnnq15rhj7fhdcd8ycwiw6r6g3w9f9lcy6cigg8226vsrq618ph"))))
+         "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-tests
-          (lambda* (#:key inputs #:allow-other-keys)
-            (substitute* "OpenSSL/test/test_ssl.py"
-              (("client\\.connect\\(\\('verisign\\.com', 443\\)\\)")
-               "return True")
-              ;; FIXME: disable broken test
-              (("test_set_tmp_ecdh") "disabled__set_tmp_ecdh"))
-            (substitute* "OpenSSL/test/test_crypto.py"
-              (("command = b\"openssl \"")
-               (string-append "command = b\""
-                              (assoc-ref inputs "openssl")
-                              "/bin/openssl" " \""))
-              ;; FIXME: disable four broken tests
-              (("test_der")             "disabled__der")
-              (("test_digest")          "disabled__digest")
-              (("test_get_extension")   "disabled__get_extension")
-              (("test_extension_count") "disabled__extension_count"))
-            #t)))))
     (propagated-inputs
      `(("python-cryptography" ,python-cryptography)
        ("python-six" ,python-six)))
@@ -6025,7 +6068,10 @@ Python's @code{ctypes} foreign function interface (FFI).")
                         #t))))))
     (inputs `(("file" ,file)))
     (self-native-input? #f)
-    (synopsis "Python bindings to the libmagic file type guesser")))
+    (synopsis "Python bindings to the libmagic file type guesser.  Note that
+this module and the python-magic module both provide a \"magic.py\" file;
+these two modules, which are different and were developed separately, both
+serve the same purpose: provide Python bindings for libmagic.")))
 
 (define-public python2-file
   (package-with-python2 python-file))
@@ -6736,13 +6782,13 @@ WebSocket usage in Python programs.")
 (define-public python-atomicwrites
   (package
     (name "python-atomicwrites")
-    (version "0.1.9")
+    (version "1.0.0")
     (source (origin
              (method url-fetch)
              (uri (pypi-uri "atomicwrites" version))
              (sha256
               (base32
-               "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw"))))
+               "019fa4771q7fb1167yfbh6msdzcqini6v7i59rmf72mzdjd7x5qv"))))
     (build-system python-build-system)
     (synopsis "Atomic file writes in Python")
     (description "Library for atomic file writes using platform dependent tools
@@ -7200,9 +7246,9 @@ authenticated session objects providing things like keep-alive.")
 3.2.3 for use with older versions of Python and PyPy.")
     (license license:expat)))
 
-(define-public python-futures
+(define-public python2-futures
   (package
-    (name "python-futures")
+    (name "python2-futures")
     (version "3.0.3")
     (source
       (origin
@@ -7212,8 +7258,9 @@ authenticated session objects providing things like keep-alive.")
          (base32
           "1vcb34dqhzkhbq1957vdjszhhm5y3j9ba88dgwhqx2zynhmk9qig"))))
     (build-system python-build-system)
+    (arguments `(#:python ,python-2))
     (native-inputs
-     `(("python-setuptools" ,python-setuptools)))
+     `(("python2-setuptools" ,python2-setuptools)))
     (home-page "https://github.com/agronholm/pythonfutures")
     (synopsis
      "Backport of the concurrent.futures package from Python 3.2")
@@ -7223,9 +7270,6 @@ asynchronously executing callables.  This package backports the
 concurrent.futures package from Python 3.2")
     (license bsd-3)))
 
-(define-public python2-futures
-  (package-with-python2 python-futures))
-
 (define-public python-urllib3
   (package
     (name "python-urllib3")
@@ -8459,3 +8503,103 @@ is made as zipfile like as possible.")
 
 (define-public python2-rarfile
   (package-with-python2 python-rarfile))
+
+(define-public python-magic
+  (package
+    (name "python-magic")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/ahupp/python-magic/archive/"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "17bgy92i7sb021f2s4mw1dcvpm6p1mi9jihridwy1pyn8mzvpjgk"))
+       (file-name (string-append name "-" version "-checkout"))))
+    (build-system python-build-system)
+    (arguments
+     ;; The tests are unreliable, so don't run them.  The tests fail
+     ;; under Python3 because they were written for Python2 and
+     ;; contain import statements that do not work in Python3.  One of
+     ;; the tests fails under Python2 because its assertions are
+     ;; overly stringent; it relies on comparing output strings which
+     ;; are brittle and can change depending on the version of
+     ;; libmagic being used and the system on which the test is
+     ;; running.  In my case, under GuixSD 0.10.0, only one test
+     ;; failed, and it seems to have failed only because the version
+     ;; of libmagic that is packaged in Guix outputs a slightly
+     ;; different (but not wrong) string than the one that the test
+     ;; expected.
+     '(#:tests? #f
+       #:phases (modify-phases %standard-phases
+         ;; Replace a specific method call with a hard-coded
+         ;; path to the necessary libmagic.so file in the
+         ;; store.  If we don't do this, then the method call
+         ;; will fail to find the libmagic.so file, which in
+         ;; turn will cause any application using
+         ;; python-magic to fail.
+         (add-before 'build 'hard-code-path-to-libmagic
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((file (assoc-ref inputs "file")))
+               (substitute* "magic.py"
+                 (("ctypes.util.find_library\\('magic'\\)")
+                  (string-append "'" file "/lib/libmagic.so'")))
+           #t))))))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (inputs
+     ;; python-magic needs to be able to find libmagic.so.
+     `(("file" ,file)))
+    (home-page "https://github.com/ahupp/python-magic")
+    (synopsis "File type identification using libmagic")
+    (description
+     "This module uses ctypes to access the libmagic file type
+identification library.  It makes use of the local magic database and
+supports both textual and MIME-type output.  Note that this module and
+the python-file module both provide a \"magic.py\" file; these two
+modules, which are different and were developed separately, both serve
+the same purpose: to provide Python bindings for libmagic.")
+    (license license:expat)))
+
+(define-public python2-magic
+  (package-with-python2 python-magic))
+
+(define-public python2-s3cmd
+  (package
+    (name "python2-s3cmd")
+    (version "1.6.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append "mirror://sourceforge/s3tools/"
+                            "s3cmd-" version ".tar.gz"))
+        (sha256
+          (base32
+            "0ki1rzhm5icvi9ry5jswi4b22yqwyj0d2wsqsgilwx6qhi7pjxa6"))))
+    (build-system python-build-system)
+    (arguments
+     ;; s3cmd is written for python2 only and contains no tests.
+     `(#:python ,python-2
+       #:tests? #f))
+    (native-inputs
+     `(("python2-setuptools" ,python2-setuptools)))
+    (inputs
+     `(("python2-dateutil" ,python2-dateutil)
+       ;; The python-file package also provides a magic.py module.
+       ;; This is an unfortunate state of affairs; however, s3cmd
+       ;; fails to install if it cannot find specifically the
+       ;; python-magic package.  Thus we include it, instead of using
+       ;; python-file.  Ironically, s3cmd sometimes works better
+       ;; without libmagic bindings at all:
+       ;; https://github.com/s3tools/s3cmd/issues/198
+       ("python2-magic" ,python2-magic)))
+    (home-page "http://s3tools.org/s3cmd")
+    (synopsis "Command line tool for S3-compatible storage services")
+    (description
+     "S3cmd is a command line tool for uploading, retrieving and managing data
+in storage services that are compatible with the Amazon Simple Storage
+Service (S3) protocol, including S3 itself.  It supports rsync-like backup,
+GnuPG encryption, and more.  It also supports management of Amazon's
+CloudFront content delivery network.")
+    (license gpl2+)))
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 2abb261a45..0ca3415a9f 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -121,7 +121,7 @@ a focus on simplicity and productivity.")
 
 (define-public ruby-2.1
   (package (inherit ruby)
-    (version "2.1.8")
+    (version "2.1.10")
     (source
      (origin
        (method url-fetch)
@@ -130,7 +130,7 @@ a focus on simplicity and productivity.")
                            "/ruby-" version ".tar.bz2"))
        (sha256
         (base32
-         "11rkbfc90cg9p9mzg32475alf3ddcn9q8a3ar3fwm5xskic0n395"))))
+         "1wglbd599mlwxfcb2xgqcxi2shr363pjn5dpbv11m04si9bpaim7"))))
     (arguments
      `(#:test-target "test"
        #:parallel-tests? #f
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 00b573fc0b..50533b9a29 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -2,6 +2,8 @@
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,6 +37,7 @@
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages avahi)
   #:use-module (gnu packages libphidget)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
@@ -309,14 +312,14 @@ mashups, office (web agendas, mail clients, ...), etc.")
 (define-public chicken
   (package
     (name "chicken")
-    (version "4.9.0.1")
+    (version "4.10.0")
     (source (origin
              (method url-fetch)
-             (uri (string-append "http://code.call-cc.org/releases/4.9.0/chicken-"
-                                 version ".tar.gz"))
+             (uri (string-append "http://code.call-cc.org/releases/"
+                                 version "/chicken-" version ".tar.gz"))
              (sha256
               (base32
-               "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4"))))
+               "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
@@ -325,11 +328,19 @@ mashups, office (web agendas, mail clients, ...), etc.")
 
        ;; No `configure' script; run "make check" after "make install" as
        ;; prescribed by README.
-       #:phases (alist-cons-after
-                 'install 'check
-                 (assoc-ref %standard-phases 'check)
-                 (fold alist-delete %standard-phases
-                       '(configure check)))
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'check)
+         (add-after 'install 'check
+           (assoc-ref %standard-phases 'check))
+         (add-after 'unpack 'disable-broken-tests
+           (lambda _
+             ;; The port tests fail with this error:
+             ;; Error: (line 294) invalid escape-sequence '\x o'
+             (substitute* "tests/runtests.sh"
+               (("\\$interpret -s port-tests\\.scm") ""))
+             #t)))
 
        #:make-flags (let ((out (assoc-ref %outputs "out")))
                       (list "PLATFORM=linux"
@@ -338,6 +349,12 @@ mashups, office (web agendas, mail clients, ...), etc.")
 
        ;; Parallel builds are not supported, as noted in README.
        #:parallel-build? #f))
+    ;; One of the tests ("testing direct invocation can detect calls of too
+    ;; many arguments...") times out when building with a more recent GCC.
+    ;; The problem was reported here:
+    ;; https://lists.gnu.org/archive/html/chicken-hackers/2015-04/msg00059.html
+    (native-inputs
+     `(("gcc" ,gcc-4.8)))
     (home-page "http://www.call-cc.org/")
     (synopsis "R5RS Scheme implementation that compiles native code via C")
     (description
@@ -349,14 +366,14 @@ language standard, and includes many enhancements and extensions.")
 (define-public scheme48
   (package
     (name "scheme48")
-    (version "1.9")
+    (version "1.9.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "http://s48.org/" version
                                  "/scheme48-" version ".tgz"))
              (sha256
               (base32
-               "0rw2lz5xgld0klvld292ds6hvfk5l12vskzgf1hhwjdpa38r3fnw"))
+               "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw"))
              (patches (list (search-patch "scheme48-tests.patch")))))
     (build-system gnu-build-system)
     (home-page "http://s48.org/")
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 825e7db5d9..458fdc599f 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -27,6 +27,7 @@
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system trivial)
+  #:use-module (gnu packages audio)
   #:use-module (gnu packages fontutils)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages image)
@@ -94,7 +95,7 @@ joystick, and graphics hardware.")
 (define sdl2
   (package (inherit sdl)
     (name "sdl2")
-    (version "2.0.3")
+    (version "2.0.4")
     (source (origin
              (method url-fetch)
              (uri
@@ -102,7 +103,7 @@ joystick, and graphics hardware.")
                              version ".tar.gz"))
              (sha256
               (base32
-               "0369ngvb46x6c26h8zva4x22ywgy6mvn0wx87xqwxg40pxm9m9m5"))))
+               "0jqp46mxxbh9lhpx1ih6sp93k752j2smhpc0ad0q4cb3px0famfs"))))
     (license bsd-3)))
 
 (define libmikmod
@@ -216,7 +217,8 @@ WEBP, XCF, XPM, and XV.")
     (inputs `(("libvorbis" ,libvorbis)
               ("libflac" ,flac)
               ("libmad" ,libmad)
-              ("libmikmod" ,libmikmod)))
+              ("libmikmod" ,libmikmod)
+              ("libmodplug" ,libmodplug)))
     ;; FIXME: Add libfluidsynth
     (propagated-inputs `(("sdl" ,sdl)))
     (synopsis "SDL multi-channel audio mixer library")
@@ -310,7 +312,7 @@ directory.")
 (define-public sdl2-image
   (package (inherit sdl-image)
     (name "sdl2-image")
-    (version "2.0.0")
+    (version "2.0.1")
     (source (origin
               (method url-fetch)
               (uri
@@ -318,37 +320,45 @@ directory.")
                               version ".tar.gz"))
               (sha256
                (base32
-                "0d3jlhkmr0j5a2dd5h6y29jfcsj7mkl16wghm6n3nqqp7g3ib65j"))))
+                "0r3z1l7fdn76qkpy7snpkcjqz8dkv2zp6lsqpq25q4m5xsyaygis"))))
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-image))))
 
 (define-public sdl2-mixer
   (package (inherit sdl-mixer)
     (name "sdl2-mixer")
-    (version "2.0.0")
+    (version "2.0.1")
     (source (origin
               (method url-fetch)
               (uri
                (string-append "http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-"
                               version ".tar.gz"))
+              (modules '((guix build utils)))
+              (snippet
+               ;; Remove bundled libraries.
+               '(delete-file-recursively "external"))
               (sha256
                (base32
-                "0nvjdxjchrajrn0jag877hdx9zb788hsd315zzg1lyck2wb0xkm8"))))
+                "0pv9jzjpcjlbiaybvwrb4avmv46qk7iqxlnqrd2dfj82c4mgc92s"))))
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-mixer))))
 
 (define-public sdl2-ttf
   (package (inherit sdl-ttf)
     (name "sdl2-ttf")
-    (version "2.0.12")
+    (version "2.0.14")
     (source (origin
              (method url-fetch)
              (uri
               (string-append "http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-"
                              version ".tar.gz"))
+             (modules '((guix build utils)))
+             (snippet
+              ;; Remove bundled libraries.
+              '(delete-file-recursively "external"))
              (sha256
               (base32
-               "0vkg6lyj278mdpd52map3rfi65fbq16w67ahmmfcl77a8da60a47"))))
+               "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"))))
     (propagated-inputs
      (propagated-inputs-with-sdl2 sdl-ttf))))
 
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 15c68238e2..9c197f4977 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -33,6 +33,8 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages gettext)
+  #:use-module (gnu packages glib)
   #:use-module (gnu packages haskell)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -53,6 +55,45 @@
   #:use-module (gnu packages zip)
   #:use-module (srfi srfi-1))
 
+
+(define-public pspp
+  (package
+    (name "pspp")
+    (version "0.10.1")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/pspp/pspp-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0xw61kq0hxh7f6a4yjhnqbhc0fj9r3wb3qnpq05qhdp79n30ik24"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("cairo" ,cairo)
+       ("gettext" ,gnu-gettext)
+       ("gsl" ,gsl)
+       ("libxml2" ,libxml2)
+       ("pango" ,pango)
+       ("readline" ,readline)
+       ("gtk" ,gtk+)
+       ("gtksourceview" ,gtksourceview)
+       ("zlib" ,zlib)))
+    (native-inputs
+     `(("glib" ,glib "bin")             ;for glib-genmarshal
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://www.gnu.org/software/pspp/")
+    (synopsis "Statistical analysis")
+    (description
+     "GNU PSPP is a statistical analysis program.  It can perform
+descriptive statistics, T-tests, linear regression and non-parametric tests.
+It features both a graphical interface as well as command-line input.  PSPP
+is designed to interoperate with Gnumeric, LibreOffice and OpenOffice.  Data
+can be imported from spreadsheets, text files and database sources and it can
+be output in text, PostScript, PDF or HTML.")
+    (license license:gpl3+)))
+
 (define-public r
   (package
     (name "r")
@@ -1234,13 +1275,13 @@ informative error messages when it's not available.")
 (define-public r-devtools
   (package
     (name "r-devtools")
-    (version "1.9.1")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "devtools" version))
               (sha256
                (base32
-                "10ycx3kkiz5x8nmgw31d9wa5hhlx2fhda2nqzxfrczqpz1jik6ci"))))
+                "11x51bqhjwypbxv5sfnrnxx06b92k8kzmmx7zrwk3537r072b6pa"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-curl" ,r-curl)
@@ -1253,13 +1294,33 @@ informative error messages when it's not available.")
        ("r-roxygen2" ,r-roxygen2)
        ("r-rstudioapi" ,r-rstudioapi)
        ("r-rversions" ,r-rversions)
-       ("r-whisker" ,r-whisker)))
+       ("r-whisker" ,r-whisker)
+       ("r-withr" ,r-withr)))
     (home-page "https://github.com/hadley/devtools")
     (synopsis "Tools to make developing R packages easier")
     (description "The devtools package is a collection of package development
 tools to simplify the devolpment of R packages.")
     (license license:gpl2+)))
 
+(define-public r-withr
+  (package
+    (name "r-withr")
+    (version "1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "withr" version))
+              (sha256
+               (base32
+                "0zbj3rd7dc0ycknmay7y7rm1qvnh9n05jw93gjggz46j2zfmy93y"))))
+    (build-system r-build-system)
+    (home-page "https://github.com/jimhester/withr")
+    (synopsis "Run code with temporarily modified global state")
+    (description
+     "This package provides a set of functions to run R code in an environment
+in which global state has been temporarily modified.  Many of these functions
+were originally a part of the r-devtools package.")
+    (license license:gpl2+)))
+
 (define-public r-readr
   (package
     (name "r-readr")
@@ -2026,3 +2087,24 @@ directly from R.  Once uploaded to a plotly account, plotly graphs (and the
 data behind them) can be viewed and modified in a web browser.")
     (license license:x11)))
 
+
+(define-public r-ztable
+  (package
+    (name "r-ztable")
+    (version "0.1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (cran-uri "ztable" version))
+              (sha256
+               (base32
+                "1jfqnqy9544gfvz3bsb48v4177nwp4b4n9l2743asq8sbq305b5r"))))
+    (build-system r-build-system)
+    (home-page "http://cran.r-project.org/web/packages/ztable")
+    (synopsis "Zebra-striped tables in LaTeX and HTML formats for R")
+    (description
+     "This package provides functions to make zebra-striped tables (tables
+with alternating row colors) in LaTeX and HTML formats easily from
+@code{data.frame}, @code{matrix}, @code{lm}, @code{aov}, @code{anova},
+@code{glm}, @code{coxph}, @code{nls}, @code{fitdistr}, @code{mytable} and
+@code{cbind.mytable} objects.")
+    (license license:gpl2+)))
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index 3f4ab56091..76e369a563 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -191,14 +191,14 @@ internet.")
 (define-public libsrtp
   (package
     (name "libsrtp")
-    (version "1.5.2")
+    (version "1.5.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/cisco/libsrtp/archive/v"
                                   version ".tar.gz"))
              (sha256
               (base32
-               "1njf62f6sazz2q7qc4j495v1pga385whkmxxyr8hfz1ragiyzqc6"))))
+               "1w2g623qkd7gdyydglx2hr4s2y237lg0nszjmy7z8d2iq8hvb9sn"))))
     (native-inputs
      `(("procps" ,procps)))
     (build-system gnu-build-system)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index 8b9ed00de7..51497030c2 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -89,6 +89,41 @@ is on expressing the content semantically, avoiding physical markup commands.")
     (native-inputs '())
     (inputs `(("ncurses" ,ncurses) ("xz" ,xz)))))
 
+(define-public info-reader
+  ;; The idea of this package is to have the standalone Info reader without
+  ;; the dependency on Perl that 'makeinfo' drags.
+  (package
+    (inherit texinfo-6.1)
+    (name "info-reader")
+    (arguments
+     `(#:disallowed-references ,(assoc-ref (package-inputs texinfo-6.1)
+                                           "perl")
+
+       #:modules ((ice-9 ftw) (srfi srfi-1)
+                  ,@%gnu-build-system-modules)
+
+       #:phases (modify-phases %standard-phases
+                  (add-after 'install 'keep-only-info-reader
+                    (lambda* (#:key outputs #:allow-other-keys)
+                      ;; Remove everything but 'bin/info' and associated
+                      ;; files.
+                      (define (files)
+                        (scandir "." (lambda (file)
+                                       (not (member file '("." ".."))))))
+
+                      (let ((out (assoc-ref outputs "out")))
+                        (with-directory-excursion out
+                          (for-each delete-file-recursively
+                                    (fold delete (files) '("bin" "share"))))
+                        (with-directory-excursion (string-append out "/bin")
+                          (for-each delete-file (delete "info" (files))))
+                        (with-directory-excursion (string-append out "/share")
+                          (for-each delete-file-recursively
+                                    (fold delete (files)
+                                          '("info" "locale"))))
+                        #t))))))
+    (synopsis "Standalone Info documentation reader")))
+
 (define-public texi2html
   (package
     (name "texi2html")
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 73a0532478..71cf25b224 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015, 2016 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015, 2016 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2015 Roel Janssen <roel@gnu.org>
+;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -271,3 +272,23 @@ Consequently, the computation has a flat performance characteristic,
 correlated with data variation rather than file size.  pfff can be as reliable
 as existing hashing techniques, with provably negligible risk of collisions.")
     (license license:bsd-3)))
+
+(define-public oniguruma
+  (package
+    (name "oniguruma")
+    (version "5.9.6")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/kkos/"
+                                  "oniguruma/releases/download/v" version
+                                  "/onig-" version ".tar.gz"))
+              (sha256
+               (base32
+                "19s79vsclqn170mw0ajwv7j37qsbn4f1yjz3yavnhvva6c820r6m"))))
+    (build-system gnu-build-system)
+    (home-page "https://github.com/kkos/oniguruma")
+    (synopsis "Regular expression library")
+    (description "Oniguruma is a regular expressions library.  The special
+characteristic of this library is that different character encoding for every
+regular expression object can be specified.")
+    (license license:bsd-2)))
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 8132ef2053..61fb651552 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Nils Gillmann <niasterisk@grrlz.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -179,22 +180,21 @@ required structures.")
 
 (define-public openssl
   (package
-   (replacement openssl-1.0.2g)
    (name "openssl")
-   (version "1.0.2f")
+   (version "1.0.2g")
    (source (origin
-            (method url-fetch)
-            (uri (list (string-append "ftp://ftp.openssl.org/source/"
-                                      name "-" version ".tar.gz")
-                       (string-append "ftp://ftp.openssl.org/source/old/"
-                                      (string-trim-right version char-set:letter)
-                                      "/" name "-" version ".tar.gz")))
-            (sha256
-             (base32
-              "171fkdg9v6j29d962nh6kb79kfm8kkhy7n9makw39d7jvvj4wawk"))
-            (patches (map search-patch
-                          '("openssl-runpath.patch"
-                            "openssl-c-rehash.patch")))))
+             (method url-fetch)
+             (uri (list (string-append "ftp://ftp.openssl.org/source/"
+                                       name "-" version ".tar.gz")
+                        (string-append "ftp://ftp.openssl.org/source/old/"
+                                       (string-trim-right version char-set:letter)
+                                       "/" name "-" version ".tar.gz")))
+             (sha256
+              (base32
+               "0cxajjayi859czi545ddafi24m9nwsnjsw4q82zrmqvwj2rv315p"))
+             (patches (map search-patch
+                           '("openssl-runpath.patch"
+                             "openssl-c-rehash-in.patch")))))
    (build-system gnu-build-system)
    (native-inputs `(("perl" ,perl)))
    (arguments
@@ -287,64 +287,10 @@ required structures.")
    (license license:openssl)
    (home-page "http://www.openssl.org/")))
 
-(define openssl-1.0.2g
-  (package
-    (inherit openssl)
-    (replacement #f)
-    (source
-     (let ((name "openssl") (version "1.0.2g"))
-       (origin
-         (method url-fetch)
-         (uri (list (string-append "ftp://ftp.openssl.org/source/"
-                                   name "-" version ".tar.gz")
-                    (string-append "ftp://ftp.openssl.org/source/old/"
-                                   (string-trim-right version char-set:letter)
-                                   "/" name "-" version ".tar.gz")))
-         (sha256
-          (base32
-           "0cxajjayi859czi545ddafi24m9nwsnjsw4q82zrmqvwj2rv315p"))
-         (patches (map search-patch
-                       '("openssl-runpath.patch"
-                         "openssl-c-rehash-in.patch"))))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments openssl)
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (replace 'configure
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out")))
-                 (zero?
-                  (system*
-                   "./config"
-
-                   ;; XXX TEMPORARY, FOR GRAFTING ONLY
-                   ;;     Enable ssl2 code to preserve
-                   ;;     ABI compatibility with 1.0.2f
-                   "enable-ssl2"
-
-                   "shared"             ;build shared libraries
-                   "--libdir=lib"
-
-                   ;; The default for this catch-all directory is
-                   ;; PREFIX/ssl.  Change that to something more
-                   ;; conventional.
-                   (string-append "--openssldir=" out
-                                  "/share/openssl-" ,(package-version openssl))
-
-                   (string-append "--prefix=" out)
-
-                   ;; XXX FIXME: Work around a code generation bug in GCC
-                   ;; 4.9.3 on ARM when compiled with -mfpu=neon.  See:
-                   ;; <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66917>
-                   ,@(if (and (not (%current-target-system))
-                              (string-prefix? "armhf" (%current-system)))
-                         '("-mfpu=vfpv3")
-                         '()))))))))))))
-
 (define-public libressl
   (package
     (name "libressl")
-    (version "2.2.6")
+    (version "2.3.3")
     (source
      (origin
       (method url-fetch)
@@ -352,7 +298,7 @@ required structures.")
              "http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-"
              version ".tar.gz"))
       (sha256 (base32
-               "0kynb15l5gq1qgp3p4ncn20sc65sbl8lk89vyr07s17xrya9kq8y"))))
+               "1a8anm8nsfyxds03csk738m2cmzjbsb867my1rz5ij3w31k32wvn"))))
     (build-system gnu-build-system)
     (native-search-paths
       ;; FIXME: These two variables must designate a single file or directory
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 7d7276abac..0b70d545b9 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -364,6 +364,67 @@ write native speed custom Git applications in any language with bindings.")
     ;; GPLv2 with linking exception
     (license gpl2)))
 
+(define-public cgit
+  (package
+    (name "cgit")
+    (version "0.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://git.zx2c4.com/cgit/snapshot/cgit-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:tests? #f ; XXX: fail to build the in-source git.
+       #:test-target "test"
+       #:make-flags '("CC=gcc" "SHELL_PATH=sh")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'unpack-git
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; Unpack the source of git into the 'git' directory.
+             (zero? (system*
+                     "tar" "--strip-components=1" "-C" "git" "-xf"
+                     (assoc-ref inputs "git:src")))))
+         (delete 'configure) ; no configure script
+         (add-after 'build 'build-man
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (zero? (apply system* `("make" ,@make-flags "doc-man")))))
+         (replace 'install
+           (lambda* (#:key make-flags outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (and (zero? (apply system*
+                                  `("make" ,@make-flags
+                                    ,(string-append "prefix=" out)
+                                    ,(string-append
+                                      "CGIT_SCRIPT_PATH=" out "/share/cgit")
+                                    "install" "install-man")))
+                    ;; Move the platform-dependent 'cgit.cgi' into lib
+                    ;; to get it stripped.
+                    (rename-file (string-append out "/share/cgit/cgit.cgi")
+                                 (string-append out "/lib/cgit/cgit.cgi"))
+                    #t)))))))
+    (native-inputs
+     ;; For building manpage.
+     `(("asciidoc" ,asciidoc)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("xmllint" ,libxml2)
+       ("xsltprot" ,libxslt)))
+    (inputs
+     `(("git:src" ,(package-source git))
+       ("openssl" ,openssl)
+       ("zlib" ,zlib)))
+    (home-page "https://git.zx2c4.com/cgit/")
+    (synopsis "Web frontend for git repositories")
+    (description
+     "CGit is an attempt to create a fast web interface for the Git SCM, using
+a built-in cache to decrease server I/O pressure.")
+    (license gpl2)))
+
 (define-public shflags
   (package
     (name "shflags")
@@ -545,14 +606,14 @@ control to Git repositories.")
 (define-public mercurial
   (package
     (name "mercurial")
-    (version "3.7.2")
+    (version "3.7.3")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://www.mercurial-scm.org/"
                                  "release/mercurial-" version ".tar.gz"))
              (sha256
               (base32
-               "0ykdvj7k4yxiwbfk0gnrq2flmdlf2cracsvqn3vr7nxhda6l7aav"))))
+               "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0"))))
     (build-system python-build-system)
     (arguments
      `(;; Restrict to Python 2, as Python 3 would require
@@ -1048,15 +1109,16 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.")
                (base32
                 "196g3jkaybjx11nbr51n0cjps3wjzb145ab76y717diqvvxp5v4r"))))
     (build-system python-build-system)
+    (arguments `(#:python ,python-2))
     (native-inputs
-     `(("python-setuptools" ,python-setuptools)
+     `(("python2-setuptools" ,python2-setuptools)
        ;; for the tests
-       ("python-six" ,python-six)))
+       ("python2-six" ,python2-six)))
     (propagated-inputs
-     `(("python-dateutil" ,python-dateutil-2)
-       ("python-futures" ,python-futures)
-       ("python-rauth" ,python-rauth)
-       ("python-swiftclient" ,python-swiftclient)))
+     `(("python2-dateutil" ,python2-dateutil-2)
+       ("python2-futures" ,python2-futures)
+       ("python2-rauth" ,python2-rauth)
+       ("python2-swiftclient" ,python2-swiftclient)))
     (home-page "https://github.com/Schnouki/git-annex-remote-hubic/")
     (synopsis "Use hubic as a git-annex remote")
     (description
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a870dd8ee1..8f93950e97 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -372,14 +372,14 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "2.8.6")
+    (version "3.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "1yh7dvm7zwdlsspdaq524s5qaggma5md9h95qc4kvb5dmyyyvg15"))))
+               "0w74b165l4ry4y72f4xmgd357pvbc7yr61y313v3ai6787p2rwqj"))))
     (build-system gnu-build-system)
     (inputs
      `(("fontconfig" ,fontconfig)
@@ -392,7 +392,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
        ("libbluray" ,libbluray)
        ("libcaca" ,libcaca)
        ("libcdio-paranoia" ,libcdio-paranoia)
-       ("libquvi" ,libquvi)
        ("libtheora" ,libtheora)
        ("libvdpau" ,libvdpau)
        ("libvorbis" ,libvorbis)
@@ -480,7 +479,6 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
          "--enable-libmp3lame"
          "--enable-libopus"
          "--enable-libpulse"
-         "--enable-libquvi"
          "--enable-libsoxr"
          "--enable-libspeex"
          "--enable-libtheora"
@@ -498,7 +496,7 @@ standards (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3).")
          ;; Runtime cpu detection is not implemented on
          ;; MIPS, so we disable some features.
          "--disable-mips32r2"
-         "--disable-mipsdspr1"
+         "--disable-mipsdsp"
          "--disable-mipsdspr2"
          "--disable-mipsfpu")
        #:phases
@@ -604,7 +602,7 @@ treaming protocols.")
 (define-public mplayer
   (package
     (name "mplayer")
-    (version "1.2.1")
+    (version "1.3.0")
     (source (origin
              (method url-fetch)
              (uri (string-append
@@ -612,7 +610,7 @@ treaming protocols.")
                    version ".tar.xz"))
              (sha256
               (base32
-               "0prbqnsl6s7fbpp6nc6babx7gzwdrhrhzf0cmp6xz6w9gl4sy6w3"))))
+               "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s"))))
     (build-system gnu-build-system)
     ;; FIXME: Add additional inputs once available.
     (native-inputs
diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm
index 241896323c..73433e955f 100644
--- a/gnu/packages/vim.scm
+++ b/gnu/packages/vim.scm
@@ -44,14 +44,13 @@
      `(#:test-target "test"
        #:parallel-tests? #f
        #:phases
-        (alist-cons-after
-         'configure 'patch-config-files
-         (lambda _
-           (substitute* "runtime/tools/mve.awk"
-             (("/usr/bin/nawk") (which "gawk")))
-           (substitute* "src/testdir/Makefile"
-             (("/bin/sh") (which "sh"))))
-          %standard-phases)))
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-config-files
+           (lambda _
+             (substitute* "runtime/tools/mve.awk"
+               (("/usr/bin/nawk") (which "gawk")))
+             (substitute* "src/testdir/Makefile"
+               (("/bin/sh") (which "sh"))))))))
     (inputs
      `(("gawk" ,gawk)
        ("inetutils" ,inetutils)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 516e623f10..1f13474e95 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7,6 +7,9 @@
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015, 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
+;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2016 Jelle Licht <jlicht@fsfe.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -52,10 +55,12 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages valgrind)
   #:use-module (gnu packages xml)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages texinfo)
+  #:use-module (gnu packages textutils)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages statistics))
 
@@ -351,29 +356,19 @@ for efficient socket-like bidirectional reliable communication channels.")
 (define-public libpsl
   (package
     (name "libpsl")
-    (version "0.7.1")
+    (version "0.13.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/rockdaboot/libpsl/"
-                                  "archive/libpsl-" version ".tar.gz"))
+                                  "releases/download/libpsl-" version
+                                  "/libpsl-" version ".tar.gz"))
               (sha256
                (base32
-                "1k0klj668c9v0r4993vfs3kq773mzdz61vsigqw6v1mjcwnf1si3"))))
+                "0afn2c4s2m65xifa5sfdll0s2gyqbh2q9k9nq4nsmx1b6c2i3i7x"))))
     (build-system gnu-build-system)
-    (inputs `(("icu4c" ,icu4c)))
-    ;; The release tarball lacks the generated files.
-    (native-inputs `(("autoconf" ,autoconf)
-                     ("automake" ,automake)
-                     ("gettext"  ,gnu-gettext)
-                     ("which"    ,which)
-                     ("libtool"  ,libtool)
-                     ("pkg-config" ,pkg-config)))
-    (arguments
-     `(#:phases (alist-cons-after
-                 'unpack 'bootstrap
-                 (lambda _
-                   (zero? (system* "sh" "autogen.sh")))
-                 %standard-phases)))
+    (inputs
+     `(("icu4c" ,icu4c)
+       ("python-2" ,python-2)))
     (home-page "https://github.com/rockdaboot/libpsl")
     (synopsis "C library for the Publix Suffix List")
     (description
@@ -3109,3 +3104,107 @@ callback or connection interfaces.")
      "Gumbo is an implementation of the HTML5 parsing algorithm implemented as
 a pure C99 library.")
     (license l:asl2.0)))
+
+(define-public uwsgi
+  (package
+    (name "uwsgi")
+    (version "2.0.12")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://projects.unbit.it/downloads/uwsgi-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "02g46dnw5j1iw8fsq392bxbk8d21b9pdgb3ypcinv3b4jzdm2srh"))))
+    (build-system gnu-build-system)
+    (outputs '("out" "python"))
+    (arguments
+     '(;; XXX: The 'check' target runs cppcheck to do static code analysis.
+       ;;      But there is no obvious way to run the real tests.
+       #:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           ;; Configuration is done by writing an ini file.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out       (assoc-ref outputs "out"))
+                    (bindir    (string-append out "/bin"))
+                    (plugindir (string-append out "/lib/uwsgi")))
+               ;; The build phase outputs files to these directories directly.
+               (mkdir-p bindir)
+               (mkdir-p plugindir)
+               ;; XXX: Enable other plugins.
+               (call-with-output-file "buildconf/guix.ini"
+                 (lambda (port)
+                   (format port "[uwsgi]
+yaml = libyaml
+bin_name = ~a/uwsgi
+plugin_dir = ~a
+
+inherit = base
+plugins = cgi,python
+embedded_plugins =
+" bindir plugindir))))
+             (setenv "PROFILE" "guix")
+             #t))
+         (replace 'install
+           ;; Move plugins into their own output.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out           (assoc-ref outputs "out"))
+                    (plugindir     (string-append out "/lib/uwsgi"))
+                    (python-plugin (string-append
+                                    plugindir "/python_plugin.so")))
+               (install-file python-plugin
+                             (string-append
+                              (assoc-ref outputs "python") "/lib/uwsgi"))
+               (delete-file python-plugin)
+               #t))))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python" ,python-wrapper)))
+    (inputs
+     `(("jansson" ,jansson)
+       ("libxml2" ,libxml2)
+       ("libyaml" ,libyaml)
+       ("openssl" ,openssl)
+       ("pcre" ,pcre)
+       ("zlib" ,zlib)
+       ;; For plugins.
+       ("python" ,python)))
+    (home-page "https://uwsgi-docs.readthedocs.org/")
+    (synopsis "Application container server")
+    (description
+     "uWSGI presents a complete stack for networked/clustered web applications,
+implementing message/object passing, caching, RPC and process management.
+It uses the uwsgi protocol for all the networking/interprocess communications.")
+    (license l:gpl2+))) ; with linking exception
+
+(define-public jq
+  (package
+    (name "jq")
+    (version "1.5")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/stedolan/" name
+                                  "/releases/download/" name "-" version
+                                  "/" name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"))))
+    (inputs
+     `(("oniguruma" ,oniguruma)))
+    (native-inputs
+     `(;; TODO fix gems to generate documentation
+       ;;("ruby" ,ruby)
+       ;;("bundler" ,bundler)
+       ("valgrind" ,valgrind)))
+    (build-system gnu-build-system)
+    (home-page "http://stedolan.github.io/jq/")
+    (synopsis "Command-line JSON processor")
+    (description "jq is like sed for JSON data – you can use it to slice and
+filter and map and transform structured data with the same ease that sed, awk,
+grep and friends let you play with text.  It is written in portable C.  jq can
+mangle the data format that you have into the one that you want with very
+little effort, and the program to do so is often shorter and simpler than
+you'd expect.")
+    (license (list l:expat l:cc-by3.0))))
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 3f2d11e70c..473d2e7cdc 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -53,14 +53,14 @@
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-    (version "2.10.8")
+    (version "2.12.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1a98z7fa8vxk7y2hlbnkl767908anyyxbwkyiar5gi037yr84dii"))))
+                "19jyvyw8ss4bacq3f7ybdb0r16r84q12j2bpciyj9jqvzpw091m6"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f ; no tests
@@ -136,16 +136,14 @@ HTML/CSS applications to full-fledged web browsers.")
 (define-public webkitgtk-2.4
   (package (inherit webkitgtk)
     (name "webkitgtk")
-    (version "2.4.9")
+    (version "2.4.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0r651ar3p0f8zwl7764kyimxk5hy88cwy116pv8cl5l8hbkjkpxg"))
-              (patches
-               (list (search-patch "webkitgtk-2.4-sql-init-string.patch")))))
+                "0566yx5lxi40g0wpvmwbc8y76akd7zph7flrjdp2vv3z1nra9z9k"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no tests
diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm
index cad078e061..350baf7373 100644
--- a/gnu/packages/wicd.scm
+++ b/gnu/packages/wicd.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Pierre-Antoine Rault <par@rigelk.eu>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -36,7 +37,7 @@
 (define-public wicd
   (package
     (name "wicd")
-    (version "1.7.3")
+    (version "1.7.4")
     (source
      (origin
        (method url-fetch)
@@ -44,12 +45,12 @@
                            (version-major+minor version) "/" version
                            "/+download/wicd-" version ".tar.gz"))
        (sha256
-        (base32 "00c4rq753bhg64rv1v9yl834ssq7igyy7cz3swp287b5n5bqiqwi"))
+        (base32 "0qpbwwsrqdp40mm3a8djpn2d055rxxspdhwijwsdnws700a9d637"))
        (patches (map search-patch
                      '("wicd-bitrate-none-fix.patch"
                        "wicd-get-selected-profile-fix.patch"
                        "wicd-urwid-1.3.patch"
-                       "wicd-template-instantiation.patch")))))
+                       "wicd-wpa2-ttls.patch")))))
     (build-system python-build-system)
     (native-inputs `(("gettext" ,gnu-gettext)))
     (inputs `(("dbus-glib" ,dbus-glib)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 53259dcb29..a63e597599 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 xd1le <elisp.vim@gmail.com>
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -144,14 +145,14 @@ commands would.")
 (define-public i3-wm
   (package
     (name "i3-wm")
-    (version "4.10.3")
+    (version "4.12")
     (source (origin
               (method url-fetch)
               (uri (string-append "http://i3wm.org/downloads/i3-"
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "1lq7h4w7m0hi31iva8g7yf1sc11ispnknxjdaj9agld4smxqb44j"))))
+                "1d3q3lgpjbkmcwzjhp0dfr0jq847silcfg087slcnj95ikh1r7p1"))))
     (build-system gnu-build-system)
     (arguments
      `(#:make-flags (list "CC=gcc" (string-append "PREFIX=" %output))
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 04dfd70c5a..1e157a4c96 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -378,7 +378,7 @@ windows systems.")
 (define-public icecast
   (package
     (name "icecast")
-    (version "2.4.1")
+    (version "2.4.3")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -386,7 +386,7 @@ windows systems.")
                     version ".tar.gz"))
               (sha256
                (base32
-                "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"))))
+                "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 9b3dc73831..b168543a65 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -29,7 +29,7 @@
   #:use-module (gnu system file-systems)          ; 'file-system', etc.
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (eudev-with-blkid kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
+                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils crda gpm))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -733,9 +733,7 @@ the tty to run, among other things."
                                                   (string-append dir "/lib"))
                                                 (list #$@name-services))
                                            ":")))))
-           (stop #~(make-kill-destructor))
-
-           (respawn? #f)))))
+           (stop #~(make-kill-destructor))))))
 
 (define nscd-activation
   ;; Actions to take before starting nscd.
@@ -1170,7 +1168,7 @@ item of @var{packages}."
                               (udev udev)
                               (rules (append initial-rules rules)))))))))
 
-(define* (udev-service #:key (udev eudev-with-blkid) (rules '()))
+(define* (udev-service #:key (udev eudev) (rules '()))
   "Run @var{udev}, which populates the @file{/dev} directory dynamically.  Get
 extra rules from the packages listed in @var{rules}."
   (service udev-service-type
diff --git a/gnu/services/databases.scm b/gnu/services/databases.scm
index 6c3b829df7..690375eb09 100644
--- a/gnu/services/databases.scm
+++ b/gnu/services/databases.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -56,6 +56,7 @@ host	all	all	::1/128 	trust"))
 
 (define %default-postgres-config
   (mixed-text-file "postgresql.conf"
+                   "log_destination = 'syslog'\n"
                    "hba_file = '" %default-postgres-hba "'\n"
                    "ident_file = '" %default-postgres-ident "'\n"))
 
@@ -116,7 +117,7 @@ host	all	all	::1/128 	trust"))
        (list (shepherd-service
               (provision '(postgres))
               (documentation "Run the PostgreSQL daemon.")
-              (requirement '(user-processes loopback))
+              (requirement '(user-processes loopback syslogd))
               (start #~(make-forkexec-constructor #$start-script))
               (stop #~(make-kill-destructor))))))))
 
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index cd1b5f4b8a..9a4a13d41d 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index e16247b3b8..9908b9526b 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -250,7 +250,7 @@ which should be passed to this script as the first argument.  If not, the
                                 ((_ x ..1) x))))
           (if (file-exists? xsession-file)
               ;; Run ~/.xsession when it exists.
-              (exec-from-login-shell xsession-file session)
+              (apply exec-from-login-shell xsession-file session)
               ;; Otherwise, start the specified session.
               (apply exec-from-login-shell session)))))
 
diff --git a/gnu/system.scm b/gnu/system.scm
index 5be24ba586..a4259fb61b 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -365,7 +365,7 @@ explicitly appear in OS."
          iproute
          net-tools                        ; XXX: remove when Inetutils suffices
          man-db
-         texinfo                               ;for the standalone Info reader
+         info-reader                     ;the standalone Info reader (no Perl)
 
          ;; The 'sudo' command is already in %SETUID-PROGRAMS, but we also
          ;; want the other commands and the man pages (notably because
@@ -374,7 +374,7 @@ explicitly appear in OS."
 
          ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
          ;; already depends on it anyway.
-         kmod eudev-with-blkid
+         kmod eudev
 
          e2fsprogs kbd
 
@@ -400,37 +400,11 @@ This is the GNU system.  Welcome.\n")
   "Return the default /etc/hosts file."
   (plain-file "hosts" (local-host-aliases host-name)))
 
-(define (emacs-site-file)
-  "Return the Emacs 'site-start.el' file.  That file contains the necessary
-settings for 'guix.el' to work out-of-the-box."
-  (scheme-file "site-start.el"
-               #~(progn
-                  ;; Add the "normal" elisp directory to the search path;
-                  ;; guix.el may be there.
-                  (add-to-list
-                   'load-path
-                   "/run/current-system/profile/share/emacs/site-lisp")
-
-                  ;; Attempt to load guix.el.
-                  (require 'guix-init nil t)
-
-                  ;; Attempt to load geiser.
-                  (require 'geiser-install nil t))))
-
-(define (emacs-site-directory)
-  "Return the Emacs site directory, aka. /etc/emacs."
-  (computed-file "emacs"
-                 #~(begin
-                     (mkdir #$output)
-                     (chdir #$output)
-                     (symlink #$(emacs-site-file) "site-start.el"))))
-
 (define* (operating-system-etc-service os)
   "Return a <service> that builds containing the static part of the /etc
 directory."
   (let ((login.defs (plain-file "login.defs" "# Empty for now.\n"))
 
-        (emacs      (emacs-site-directory))
         (issue      (plain-file "issue" (operating-system-issue os)))
         (nsswitch   (plain-file "nsswitch.conf"
                                 (name-service-switch->string
@@ -507,7 +481,6 @@ fi\n")))
      `(("services" ,#~(string-append #$net-base "/etc/services"))
        ("protocols" ,#~(string-append #$net-base "/etc/protocols"))
        ("rpc" ,#~(string-append #$net-base "/etc/rpc"))
-       ("emacs" ,#~#$emacs)
        ("login.defs" ,#~#$login.defs)
        ("issue" ,#~#$issue)
        ("nsswitch.conf" ,#~#$nsswitch)
@@ -587,10 +560,11 @@ use 'plain-file' instead~%")
     ("SSL_CERT_DIR" . "/etc/ssl/certs")
     ("SSL_CERT_FILE" . "/etc/ssl/certs/ca-certificates.crt")
     ("GIT_SSL_CAINFO" . "/etc/ssl/certs/ca-certificates.crt")
-    ;; Prepend the directory of 'site-start.el' to the search path, so
-    ;; that it has higher precedence than the 'site-start.el' file our
-    ;; Emacs package provides.
-    ("EMACSLOADPATH" . "/etc/emacs:")
+
+    ;; 'GTK_DATA_PREFIX' must name one directory where GTK+ themes are
+    ;; searched for.
+    ("GTK_DATA_PREFIX" . "/run/current-system/profile")
+
     ;; By default, applications that use D-Bus, such as Emacs, abort at startup
     ;; when /etc/machine-id is missing.  Make sure these warnings are non-fatal.
     ("DBUS_FATAL_WARNINGS" . "0")))
diff --git a/gnu/system/examples/desktop.tmpl b/gnu/system/examples/desktop.tmpl
index 07183a533b..2fcf90f8b1 100644
--- a/gnu/system/examples/desktop.tmpl
+++ b/gnu/system/examples/desktop.tmpl
@@ -1,9 +1,9 @@
 ;; This is an operating system configuration template
-;; for a "desktop" setup with X11.
+;; for a "desktop" setup with GNOME and Xfce.
 
 (use-modules (gnu) (gnu system nss))
 (use-service-modules desktop)
-(use-package-modules xfce ratpoison certs)
+(use-package-modules certs)
 
 (operating-system
   (host-name "antelope")
@@ -29,15 +29,17 @@
                 (home-directory "/home/bob"))
                %base-user-accounts))
 
-  ;; Add Xfce and Ratpoison; that allows us to choose
-  ;; sessions using either of these at the log-in screen.
-  (packages (cons* xfce ratpoison    ;desktop environments
-                   nss-certs         ;for HTTPS access
+  ;; This is where we specify system-wide packages.
+  (packages (cons* nss-certs         ;for HTTPS access
                    %base-packages))
 
-  ;; Use the "desktop" services, which include the X11
-  ;; log-in service, networking with Wicd, and more.
-  (services %desktop-services)
+  ;; Add GNOME and/or Xfce---we can choose at the log-in
+  ;; screen with F1.  Use the "desktop" services, which
+  ;; include the X11 log-in service, networking with Wicd,
+  ;; and more.
+  (services (cons* (gnome-desktop-service)
+                   (xfce-desktop-service)
+                   %desktop-services))
 
   ;; Allow resolution of '.local' host names with mDNS.
   (name-service-switch %mdns-host-lookup-nss))
diff --git a/gnu/system/examples/lightweight-desktop.tmpl b/gnu/system/examples/lightweight-desktop.tmpl
new file mode 100644
index 0000000000..7cb461f2b9
--- /dev/null
+++ b/gnu/system/examples/lightweight-desktop.tmpl
@@ -0,0 +1,45 @@
+;; This is an operating system configuration template
+;; for a "desktop" setup without full-blown desktop
+;; environments.
+
+(use-modules (gnu) (gnu system nss))
+(use-service-modules desktop)
+(use-package-modules wm ratpoison certs)
+
+(operating-system
+  (host-name "antelope")
+  (timezone "Europe/Paris")
+  (locale "en_US.UTF-8")
+
+  ;; Assuming /dev/sdX is the target hard disk, and "my-root"
+  ;; is the label of the target root file system.
+  (bootloader (grub-configuration (device "/dev/sdX")))
+
+  (file-systems (cons (file-system
+                        (device "my-root")
+                        (title 'label)
+                        (mount-point "/")
+                        (type "ext4"))
+                      %base-file-systems))
+
+  (users (cons (user-account
+                (name "alice")
+                (comment "Bob's brother")
+                (group "users")
+                (supplementary-groups '("wheel" "netdev"
+                                        "audio" "video"))
+                (home-directory "/home/alice"))
+               %base-user-accounts))
+
+  ;; Add a bunch of window managers; we can choose one at
+  ;; the log-in screen with F1.
+  (packages (cons* ratpoison i3-wm xmonad  ;window managers
+                   nss-certs               ;for HTTPS access
+                   %base-packages))
+
+  ;; Use the "desktop" services, which include the X11
+  ;; log-in service, networking with Wicd, and more.
+  (services %desktop-services)
+
+  ;; Allow resolution of '.local' host names with mDNS.
+  (name-service-switch %mdns-host-lookup-nss))
diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index b380716b69..a94e3ab2d5 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -111,7 +111,7 @@ manual."
                     ;; 'gunzip' is needed to decompress the doc.
                     (setenv "PATH" (string-append #$gzip "/bin"))
 
-                    (execl (string-append #$texinfo-4 "/bin/info") "info"
+                    (execl (string-append #$info-reader "/bin/info") "info"
                            "-d" "/run/current-system/profile/share/info"
                            "-f" (string-append #$guix "/share/info/guix.info")
                            "-n" "System Installation"))))
@@ -215,9 +215,11 @@ the user's target storage device rather than on the RAM disk."
                                               (string-append #$output "/"
                                                              target)))
                                  '(#$(file "bare-bones.tmpl")
-                                   #$(file "desktop.tmpl"))
+                                   #$(file "desktop.tmpl")
+                                   #$(file "lightweight-desktop.tmpl"))
                                  '("bare-bones.scm"
-                                   "desktop.scm"))
+                                   "desktop.scm"
+                                   "lightweight-desktop.scm"))
                        #t)
                    #:modules '((guix build utils))))
 
@@ -338,17 +340,33 @@ Use Alt-F2 for documentation.
     (file-systems
      ;; Note: the disk image build code overrides this root file system with
      ;; the appropriate one.
-     (cons (file-system
-             (mount-point "/")
-             (device "gnu-disk-image")
-             (title 'label)
-             (type "ext4"))
-           %base-file-systems))
+     (cons* (file-system
+              (mount-point "/")
+              (device "gnu-disk-image")
+              (title 'label)
+              (type "ext4"))
+
+            ;; Make /tmp a tmpfs instead of keeping the unionfs.  This is
+            ;; because FUSE creates '.fuse_hiddenXYZ' files for each open file,
+            ;; and this confuses Guix's test suite, for instance.  See
+            ;; <http://bugs.gnu.org/23056>.
+            (file-system
+              (mount-point "/tmp")
+              (device "none")
+              (title 'device)
+              (type "tmpfs")
+              (check? #f))
+
+            ;; XXX: This should be %BASE-FILE-SYSTEMS but we don't need
+            ;; elogind's cgroup file systems.
+            (list %pseudo-terminal-file-system
+                  %shared-memory-file-system
+                  %immutable-store)))
 
     (users (list (user-account
                   (name "guest")
                   (group "users")
-                  (supplementary-groups '("wheel"))  ; allow use of sudo
+                  (supplementary-groups '("wheel")) ; allow use of sudo
                   (password "")
                   (comment "Guest of GNU")
                   (home-directory "/home/guest"))))
@@ -366,7 +384,6 @@ Use Alt-F2 for documentation.
      (base-pam-services #:allow-empty-passwords? #t))
 
     (packages (cons* (canonical-package glibc) ;for 'tzselect' & co.
-                     texinfo-4                 ;for the standalone Info reader
                      parted ddrescue
                      grub                  ;mostly so xrefs to its manual work
                      cryptsetup
diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm
index d3054e5ffa..f333aa5ae8 100644
--- a/guix/build-system/ant.scm
+++ b/guix/build-system/ant.scm
@@ -54,15 +54,22 @@
   (let ((jdk-mod (resolve-interface '(gnu packages java))))
     (module-ref jdk-mod 'ant)))
 
+(define (default-zip)
+  "Return the default ZIP package."
+  ;; Lazily resolve the binding to avoid a circular dependency.
+  (let ((zip-mod (resolve-interface '(gnu packages zip))))
+    (module-ref zip-mod 'zip)))
+
 (define* (lower name
                 #:key source inputs native-inputs outputs system target
                 (jdk (default-jdk))
                 (ant (default-ant))
+                (zip (default-zip))
                 #:allow-other-keys
                 #:rest arguments)
   "Return a bag for NAME."
   (define private-keywords
-    '(#:source #:target #:jdk #:ant #:inputs #:native-inputs))
+    '(#:source #:target #:jdk #:ant #:zip #:inputs #:native-inputs))
 
   (and (not target)                               ;XXX: no cross-compilation
        (bag
@@ -77,6 +84,7 @@
                         ,@(standard-packages)))
          (build-inputs `(("jdk" ,jdk "jdk")
                          ("ant" ,ant)
+                         ("zip" ,zip)
                          ,@native-inputs))
          (outputs outputs)
          (build ant-build)
diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm
index a8ca354227..e8269fdeb1 100644
--- a/guix/build-system/r.scm
+++ b/guix/build-system/r.scm
@@ -101,6 +101,7 @@ release corresponding to NAME and VERSION."
                   (search-paths '())
                   (system (%current-system))
                   (guile #f)
+                  (substitutable? #t)
                   (imported-modules %r-build-system-modules)
                   (modules '((guix build r-build-system)
                              (guix build utils))))
@@ -140,7 +141,8 @@ release corresponding to NAME and VERSION."
                                 #:system system
                                 #:modules imported-modules
                                 #:outputs outputs
-                                #:guile-for-build guile-for-build))
+                                #:guile-for-build guile-for-build
+                                #:substitutable? substitutable?))
 
 (define r-build-system
   (build-system
diff --git a/guix/build/ant-build-system.scm b/guix/build/ant-build-system.scm
index d302b948b5..27277af34b 100644
--- a/guix/build/ant-build-system.scm
+++ b/guix/build/ant-build-system.scm
@@ -65,13 +65,8 @@
                  (target (@ (name "jar")
                             (depends "compile"))
                          (mkdir (@ (dir "${jar.dir}")))
-                         ;; We cannot use the simpler "jar" task here, because
-                         ;; there is no way to disable generation of a
-                         ;; manifest.  We do not include a generated manifest
-                         ;; to ensure determinism, because we cannot easily
-                         ;; reset the ctime/mtime before creating the archive.
                          (exec (@ (executable "jar"))
-                               (arg (@ (line ,(string-append "-Mcf ${jar.dir}/" jar-name
+                               (arg (@ (line ,(string-append "-cf ${jar.dir}/" jar-name
                                                              " -C ${classes.dir} ."))))))
 
                  (target (@ (name "install"))
@@ -105,16 +100,15 @@ INPUTS."
   (zero? (apply system* `("ant" ,build-target ,@make-flags))))
 
 (define* (strip-jar-timestamps #:key outputs
-                 #:allow-other-keys)
+                               #:allow-other-keys)
   "Unpack all jar archives, reset the timestamp of all contained files, and
 repack them.  This is necessary to ensure that archives are reproducible."
   (define (repack-archive jar)
     (format #t "repacking ~a\n" jar)
-    (let ((dir (mkdtemp! "jar-contents.XXXXXX")))
+    (let* ((dir (mkdtemp! "jar-contents.XXXXXX"))
+           (manifest (string-append dir "/META-INF/MANIFEST.MF")))
       (and (with-directory-excursion dir
              (zero? (system* "jar" "xf" jar)))
-           ;; The manifest file contains timestamps
-           (for-each delete-file (find-files dir "MANIFEST.MF"))
            (delete-file jar)
            ;; XXX: copied from (gnu build install)
            (for-each (lambda (file)
@@ -122,8 +116,19 @@ repack them.  This is necessary to ensure that archives are reproducible."
                          (unless (eq? (stat:type s) 'symlink)
                            (utime file 0 0 0 0))))
                      (find-files dir #:directories? #t))
-           (unless (zero? (system* "jar" "-Mcf" jar "-C" dir "."))
-             (error "'jar' failed"))
+
+           ;; The jar tool will always set the timestamp on the manifest file
+           ;; and the containing directory to the current time, even when we
+           ;; reuse an existing manifest file.  To avoid this we use "zip"
+           ;; instead of "jar".  It is important that the manifest appears
+           ;; first.
+           (with-directory-excursion dir
+             (let* ((files (find-files "." ".*" #:directories? #t))
+                    (command (if (file-exists? manifest)
+                                 `("zip" "-X" ,jar ,manifest ,@files)
+                                 `("zip" "-X" ,jar ,@files))))
+               (unless (zero? (apply system* command))
+                 (error "'zip' failed"))))
            (utime jar 0 0)
            #t)))
 
diff --git a/guix/build/cvs.scm b/guix/build/cvs.scm
index bd5c50a51a..9976e624b3 100644
--- a/guix/build/cvs.scm
+++ b/guix/build/cvs.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -51,14 +52,20 @@
   "Fetch REVISION from MODULE of CVS-ROOT-DIRECTORY into DIRECTORY.  REVISION
 must either be a date in ISO-8601 format (e.g. \"2012-12-21\") or a CVS tag.
 Return #t on success, #f otherwise."
-  (and (zero? (system* cvs-command "-z3"
+  ;; Use "-z0" because enabling compression leads to hangs during checkout on
+  ;; certain repositories, such as
+  ;; ":pserver:anonymous@cvs.savannah.gnu.org:/sources/gnustandards".
+  (and (zero? (system* cvs-command "-z0"
                        "-d" cvs-root-directory
                        "checkout"
                        (if (string-match "^[0-9]{4}-[0-9]{2}-[0-9]{2}$" revision)
                            "-D" "-r")
                        revision
                        module))
-       (rename-file module directory)
+       ;; Copy rather than rename in case MODULE and DIRECTORY are on
+       ;; different devices.
+       (copy-recursively module directory)
+
        (with-directory-excursion directory
          (for-each delete-file-recursively (find-cvs-directories)))
        #t))
diff --git a/guix/build/syscalls.scm b/guix/build/syscalls.scm
index ea68b22bb7..69a507def8 100644
--- a/guix/build/syscalls.scm
+++ b/guix/build/syscalls.scm
@@ -767,10 +767,14 @@ the same type as that returned by 'make-socket-address'."
      (format port "#<interface ~s " name)
      (unless (zero? (logand IFF_UP flags))
        (display "up " port))
-     (if (member (sockaddr:fam address) (list AF_INET AF_INET6))
-         (format port "~a " (inet-ntop (sockaddr:fam address)
-                                       (sockaddr:addr address)))
-         (format port "family:~a " (sockaddr:fam address)))
+
+     ;; Check whether ADDRESS really is a sockaddr.
+     (when address
+       (if (member (sockaddr:fam address) (list AF_INET AF_INET6))
+           (format port "~a " (inet-ntop (sockaddr:fam address)
+                                         (sockaddr:addr address)))
+           (format port "family:~a " (sockaddr:fam address))))
+
      (format port "~a>" (number->string (object-address interface) 16)))))
 
 (set-record-type-printer! <interface> write-interface)
diff --git a/guix/derivations.scm b/guix/derivations.scm
index f24e3c6f92..2d8584e72d 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -90,7 +90,12 @@
             build-derivations
             built-derivations
 
+            file-search-error?
+            file-search-error-file-name
+            file-search-error-search-path
 
+            search-path*
+            module->source-file-name
             build-expression->derivation)
 
   ;; Re-export it from here for backward compatibility.
@@ -1035,10 +1040,28 @@ system, imported, and appears under FINAL-PATH in the resulting store path."
                                   #:guile-for-build guile
                                   #:local-build? #t)))
 
+;; The "file not found" error condition.
+(define-condition-type &file-search-error &error
+  file-search-error?
+  (file     file-search-error-file-name)
+  (path     file-search-error-search-path))
+
 (define search-path*
   ;; A memoizing version of 'search-path' so 'imported-modules' does not end
   ;; up looking for the same files over and over again.
-  (memoize search-path))
+  (memoize (lambda (path file)
+             "Search for FILE in PATH and memoize the result.  Raise a
+'&file-search-error' condition if it could not be found."
+             (or (search-path path file)
+                 (raise (condition
+                         (&file-search-error (file file)
+                                             (path path))))))))
+
+(define (module->source-file-name module)
+  "Return the file name corresponding to MODULE, a Guile module name (a list
+of symbols.)"
+  (string-append (string-join (map symbol->string module) "/")
+                 ".scm"))
 
 (define* (%imported-modules store modules         ;deprecated
                             #:key (name "module-import")
@@ -1051,9 +1074,7 @@ search path."
   ;; TODO: Determine the closure of MODULES, build the `.go' files,
   ;; canonicalize the source files through read/write, etc.
   (let ((files (map (lambda (m)
-                      (let ((f (string-append
-                                (string-join (map symbol->string m) "/")
-                                ".scm")))
+                      (let ((f (module->source-file-name m)))
                         (cons f (search-path* module-path f))))
                     modules)))
     (imported-files store files #:name name #:system system
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 7cbc79c31c..b4d737ecae 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -902,11 +902,6 @@ system, imported, and appears under FINAL-PATH in the resulting store path."
                       #:guile-for-build guile
                       #:local-build? #t)))
 
-(define search-path*
-  ;; A memoizing version of 'search-path' so 'imported-modules' does not end
-  ;; up looking for the same files over and over again.
-  (memoize search-path))
-
 (define* (imported-modules modules
                            #:key (name "module-import")
                            (system (%current-system))
@@ -918,9 +913,7 @@ search path."
   ;; TODO: Determine the closure of MODULES, build the `.go' files,
   ;; canonicalize the source files through read/write, etc.
   (let ((files (map (lambda (m)
-                      (let ((f (string-append
-                                (string-join (map symbol->string m) "/")
-                                ".scm")))
+                      (let ((f (module->source-file-name m)))
                         (cons f (search-path* module-path f))))
                     modules)))
     (imported-files files #:name name #:system system
diff --git a/guix/graph.scm b/guix/graph.scm
index a39208e7f9..1a8f2d55b3 100644
--- a/guix/graph.scm
+++ b/guix/graph.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -131,6 +131,16 @@ typically returned by 'node-edges' or 'node-back-edges'."
   (node     graph-backend-node)
   (edge     graph-backend-edge))
 
+(define %colors
+  ;; See colortbl.h in Graphviz.
+  #("red" "magenta" "blue" "cyan3" "darkseagreen"
+    "peachpuff4" "darkviolet" "dimgrey" "darkgoldenrod"))
+
+(define (pop-color hint)
+  "Return a Graphviz color based on HINT, an arbitrary object."
+  (let ((index (hash hint (vector-length %colors))))
+    (vector-ref %colors index)))
+
 (define (emit-prologue name port)
   (format port "digraph \"Guix ~a\" {\n"
           name))
@@ -140,8 +150,8 @@ typically returned by 'node-edges' or 'node-back-edges'."
   (format port "  \"~a\" [label = \"~a\", shape = box, fontname = Helvetica];~%"
           id label))
 (define (emit-edge id1 id2 port)
-  (format port "  \"~a\" -> \"~a\" [color = red];~%"
-          id1 id2))
+  (format port "  \"~a\" -> \"~a\" [color = ~a];~%"
+          id1 id2 (pop-color id1)))
 
 (define %graphviz-backend
   (graph-backend emit-prologue emit-epilogue
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index f36e9482cf..562917c0a0 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -227,7 +227,7 @@ s-expression corresponding to that package, or #f on failure."
         (match (package-source package)
           ((? origin? origin)
            (match (origin-uri origin)
-             ((url rest ...)
+             ((or (? string? url) (url _ ...))
               (let ((end   (string-rindex url #\_))
                     (start (string-rindex url #\/)))
                 ;; The URL ends on
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 8725ffa0df..640ead24f3 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
+;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -18,19 +19,25 @@
 
 (define-module (guix import hackage)
   #:use-module (ice-9 match)
+  #:use-module (ice-9 regex)
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-11)
   #:use-module (srfi srfi-1)
-  #:use-module ((guix download) #:select (download-to-store))
+  #:use-module (gnu packages)
+  #:use-module ((guix download) #:select (download-to-store url-fetch))
   #:use-module ((guix utils) #:select (package-name->name+version
                                        canonical-newline-port))
-  #:use-module (guix import utils)
+  #:use-module (guix http-client)
+  #:use-module ((guix import utils) #:select (factorize-uri))
   #:use-module (guix import cabal)
   #:use-module (guix store)
   #:use-module (guix hash)
   #:use-module (guix base32)
+  #:use-module (guix upstream)
+  #:use-module (guix packages)
   #:use-module ((guix utils) #:select (call-with-temporary-output-file))
-  #:export (hackage->guix-package))
+  #:export (hackage->guix-package
+            %hackage-updater))
 
 (define ghc-standard-libraries
   ;; List of libraries distributed with ghc (7.10.2). We include GHC itself as
@@ -65,28 +72,49 @@
 
 (define package-name-prefix "ghc-")
 
+(define (hackage-source-url name version)
+  "Given a Hackage package NAME and VERSION, return a url to the source
+tarball."
+  (string-append "http://hackage.haskell.org/package/" name
+                 "/" name "-" version ".tar.gz"))
+
+(define* (hackage-cabal-url name #:optional version)
+  "Given a Hackage package NAME and VERSION, return a url to the corresponding
+.cabal file on Hackage.  If VERSION is #f or missing, the url for the latest
+version is returned."
+  (if version
+      (string-append "http://hackage.haskell.org/package/"
+                     name "-" version "/" name ".cabal")
+      (string-append "http://hackage.haskell.org/package/"
+                     name "/" name ".cabal")))
+
 (define (hackage-name->package-name name)
   "Given the NAME of a Cabal package, return the corresponding Guix name."
   (if (string-prefix? package-name-prefix name)
       (string-downcase name)
       (string-append package-name-prefix (string-downcase name))))
 
+(define guix-package->hackage-name
+  (let ((uri-rx (make-regexp "https?://hackage.haskell.org/package/([^/]+)/.*"))
+        (name-rx (make-regexp "(.*)-[0-9\\.]+")))
+    (lambda (package)
+      "Given a Guix package name, return the corresponding Hackage name."
+      (let* ((source-url (and=> (package-source package) origin-uri))
+             (name (match:substring (regexp-exec uri-rx source-url) 1)))
+        (match (regexp-exec name-rx name)
+          (#f name)
+          (m (match:substring m 1)))))))
+
 (define (hackage-fetch name-version)
   "Return the Cabal file for the package NAME-VERSION, or #f on failure.  If
 the version part is omitted from the package name, then return the latest
 version."
-  (let*-values (((name version) (package-name->name+version name-version))
-                ((url)
-                 (if version
-                     (string-append "http://hackage.haskell.org/package/"
-                                    name "-" version "/" name ".cabal")
-                     (string-append "http://hackage.haskell.org/package/"
-                                    name "/" name ".cabal"))))
-    (call-with-temporary-output-file
-     (lambda (temp port)
-       (and (url-fetch url temp)
-            (call-with-input-file temp
-              (compose read-cabal canonical-newline-port)))))))
+  (let-values (((name version) (package-name->name+version name-version)))
+    (let* ((url (hackage-cabal-url name version))
+           (port (http-fetch url))
+           (result (read-cabal (canonical-newline-port port))))
+      (close-port port)
+      result)))
 
 (define string->license
   ;; List of valid values from
@@ -154,8 +182,7 @@ representation of a Cabal file as produced by 'read-cabal'."
     (cabal-package-version cabal))
   
   (define source-url
-    (string-append "http://hackage.haskell.org/package/" name
-                   "/" name "-" version ".tar.gz"))
+    (hackage-source-url name version))
 
   (define dependencies
     (let ((names
@@ -225,4 +252,46 @@ respectively."
                                     include-test-dependencies?)
                                (cut eval-cabal <> cabal-environment)))))
 
+(define (hackage-package? package)
+  "Return #t if PACKAGE is a Haskell package from Hackage."
+
+  (define haskell-url?
+    (let ((hackage-rx (make-regexp "https?://hackage.haskell.org")))
+      (lambda (url)
+        (regexp-exec hackage-rx url))))
+
+  (let ((source-url (and=> (package-source package) origin-uri))
+        (fetch-method (and=> (package-source package) origin-method)))
+    (and (eq? fetch-method url-fetch)
+         (match source-url
+           ((? string?)
+            (haskell-url? source-url))
+           ((source-url ...)
+            (any haskell-url? source-url))))))
+
+(define (latest-release guix-package)
+  "Return an <upstream-source> for the latest release of GUIX-PACKAGE."
+  (let* ((hackage-name (guix-package->hackage-name
+                        (specification->package guix-package)))
+         (cabal-meta (hackage-fetch hackage-name)))
+    (match cabal-meta
+      (#f
+       (format (current-error-port)
+               "warning: failed to parse ~a~%"
+               (hackage-cabal-url hackage-name))
+       #f)
+      ((_ *** ("version" (version)))
+       (let ((url (hackage-source-url hackage-name version)))
+         (upstream-source
+          (package guix-package)
+          (version version)
+          (urls (list url))))))))
+
+(define %hackage-updater
+  (upstream-updater
+   (name 'hackage)
+   (description "Updater for Hackage packages")
+   (pred hackage-package?)
+   (latest latest-release)))
+
 ;;; cabal.scm ends here
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 71c0736223..265f048278 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -57,6 +57,7 @@
             mpl1.0 mpl1.1 mpl2.0
             ms-pl
             ncsa
+            nmap
             openldap2.8 openssl
             psfl public-domain
             qpl
@@ -360,6 +361,11 @@ at URI, which may be a file:// URI pointing the package's tree."
            "http://directory.fsf.org/wiki/License:IllinoisNCSA"
            "https://www.gnu.org/licenses/license-list#NCSA"))
 
+(define nmap
+  (license "Nmap license"
+           "https://svn.nmap.org/nmap/COPYING"
+           "https://fedoraproject.org/wiki/Licensing/Nmap"))
+
 (define openssl
   (license "OpenSSL"
            "http://directory.fsf.org/wiki/License:OpenSSL"
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 1c53c8047a..a3277cef71 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -21,7 +21,9 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix profiles)
-  #:use-module (guix utils)
+  #:use-module ((guix utils) #:hide (package-name->name+version))
+  #:use-module ((guix build utils)
+                #:select (package-name->name+version))
   #:use-module (guix records)
   #:use-module (guix packages)
   #:use-module (guix derivations)
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index b25bf50d2b..9a6b427fc5 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -24,7 +24,11 @@
   #:use-module (guix derivations)
   #:use-module (guix packages)
   #:use-module (guix grafts)
-  #:use-module (guix utils)
+
+  ;; Use the procedure that destructures "NAME-VERSION" forms.
+  #:use-module ((guix utils) #:hide (package-name->name+version))
+  #:use-module ((guix build utils) #:select (package-name->name+version))
+
   #:use-module (guix monads)
   #:use-module (guix gexp)
   #:autoload   (guix http-client) (http-fetch http-get-error?)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index b122b4cd40..0ec2c5d3cb 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -358,8 +358,22 @@ and suitable for 'exit'."
   "Run COMMAND in a new environment containing INPUTS, using the native search
 paths defined by the list PATHS.  When PURE?, pre-existing environment
 variables are cleared before setting the new ones."
+  ;; Properly handle SIGINT, so pressing C-c in an interactive terminal
+  ;; application works.
+  (sigaction SIGINT SIG_DFL)
   (create-environment inputs paths pure?)
-  (apply system* command))
+  (match command
+    ((program . args)
+     (apply execlp program program args))))
+
+(define (launch-environment/fork command inputs paths pure?)
+  "Run COMMAND in a new process with an environment containing INPUTS, using
+the native search paths defined by the list PATHS.  When PURE?, pre-existing
+environment variables are cleared before setting the new ones."
+  (match (primitive-fork)
+    (0 (launch-environment command inputs paths pure?))
+    (pid (match (waitpid pid)
+           ((_ . status) status)))))
 
 (define* (launch-environment/container #:key command bash user-mappings
                                        profile paths network?)
@@ -373,6 +387,7 @@ host file systems to mount inside the container."
                              (list (direct-store-path bash) profile))))
     (return
      (let* ((cwd (getcwd))
+            (passwd (getpwuid (getuid)))
             ;; Bind-mount all requisite store items, user-specified mappings,
             ;; /bin/sh, the current working directory, and possibly networking
             ;; configuration files within the container.
@@ -410,6 +425,9 @@ host file systems to mount inside the container."
             (mkdir-p "/bin")
             (symlink bash "/bin/sh")
 
+            ;; Set a reasonable default PS1.
+            (setenv "PS1" "\\u@\\h \\w [env]\\$ ")
+
             ;; Setup directory for temporary files.
             (mkdir-p "/tmp")
             (for-each (lambda (var)
@@ -417,16 +435,26 @@ host file systems to mount inside the container."
                       ;; The same variables as in Nix's 'build.cc'.
                       '("TMPDIR" "TEMPDIR" "TMP" "TEMP"))
 
-            ;; From Nix build.cc:
-            ;;
-            ;; Set HOME to a non-existing path to prevent certain
-            ;; programs from using /etc/passwd (or NIS, or whatever)
-            ;; to locate the home directory (for example, wget looks
-            ;; for ~/.wgetrc).  I.e., these tools use /etc/passwd if
-            ;; HOME is not set, but they will just assume that the
-            ;; settings file they are looking for does not exist if
-            ;; HOME is set but points to some non-existing path.
-            (setenv "HOME" "/homeless-shelter")
+            ;; Create a dummy home directory under the same name as on the
+            ;; host.
+            (mkdir-p (passwd:dir passwd))
+            (setenv "HOME" (passwd:dir passwd))
+
+            ;; Create a dummy /etc/passwd to satisfy applications that demand
+            ;; to read it, such as 'git clone' over SSH, a valid use-case when
+            ;; sharing the host's network namespace.
+            (mkdir-p "/etc")
+            (call-with-output-file "/etc/passwd"
+              (lambda (port)
+                (display (string-join (list (passwd:name passwd)
+                                            "x" ; but there is no shadow
+                                            "0" "0" ; user is now root
+                                            (passwd:gecos passwd)
+                                            (passwd:dir passwd)
+                                            bash)
+                                      ":")
+                         port)
+                (newline port)))
 
             ;; For convenience, start in the user's current working
             ;; directory rather than the root directory.
@@ -571,4 +599,5 @@ message if any test fails."
                  (else
                   (return
                    (exit/status
-                    (launch-environment command profile paths pure?)))))))))))))
+                    (launch-environment/fork command profile
+                                             paths pure?)))))))))))))
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm
index 1d88b33996..697afc17c3 100644
--- a/guix/scripts/package.scm
+++ b/guix/scripts/package.scm
@@ -47,7 +47,8 @@
   #:autoload   (gnu packages base) (canonical-package)
   #:autoload   (gnu packages guile) (guile-2.0)
   #:autoload   (gnu packages bootstrap) (%bootstrap-guile)
-  #:export (delete-generations
+  #:export (build-and-use-profile
+            delete-generations
             display-search-paths
             guix-package))
 
diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index e541138682..0efc190b22 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -35,6 +35,7 @@
                 #:select (%gnu-updater %gnome-updater %xorg-updater))
   #:use-module (guix import elpa)
   #:use-module (guix import cran)
+  #:use-module (guix import hackage)
   #:use-module (guix gnupg)
   #:use-module (gnu packages)
   #:use-module ((gnu packages commencement) #:select (%final-inputs))
@@ -198,6 +199,7 @@ unavailable optional dependencies such as Guile-JSON."
                  %elpa-updater
                  %cran-updater
                  %bioconductor-updater
+                 %hackage-updater
                  ((guix import pypi) => %pypi-updater)
                  ((guix import gem) => %gem-updater)
                  ((guix import github) => %github-updater)))
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 4563f3df0f..82ce069598 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -780,16 +780,24 @@ PORT.  REPORT-PROGRESS is a two-argument procedure such as that returned by
 
 (define-syntax with-networking
   (syntax-rules ()
-    "Catch DNS lookup errors and gracefully exit."
+    "Catch DNS lookup errors and TLS errors and gracefully exit."
     ;; Note: no attempt is made to catch other networking errors, because DNS
     ;; lookup errors are typically the first one, and because other errors are
     ;; a subset of `system-error', which is harder to filter.
     ((_ exp ...)
-     (catch 'getaddrinfo-error
+     (catch #t
        (lambda () exp ...)
-       (lambda (key error)
-         (leave (_ "host name lookup error: ~a~%")
-                (gai-strerror error)))))))
+       (match-lambda*
+         (('getaddrinfo-error error)
+          (leave (_ "host name lookup error: ~a~%")
+                 (gai-strerror error)))
+         (('gnutls-error error proc . rest)
+          (let ((error->string (module-ref (resolve-interface '(gnutls))
+                                           'error->string)))
+            (leave (_ "TLS error in procedure '~a': ~a~%")
+                   proc (error->string error))))
+         (args
+          (apply throw args)))))))
 
 
 ;;;
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 8ebeb4d595..566e7e8768 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -482,6 +482,21 @@ PATTERN, a string.  When PATTERN is #f, display all the system generations."
     ((disk-image)
      (system-disk-image os #:disk-image-size image-size))))
 
+(define (maybe-suggest-running-guix-pull)
+  "Suggest running 'guix pull' if this has never been done before."
+  ;; The reason for this is that the 'guix' binding that we see here comes
+  ;; from either ~/.config/latest or, if it's missing, from the
+  ;; globally-installed Guix, which is necessarily older.  See
+  ;; <http://lists.gnu.org/archive/html/guix-devel/2014-08/msg00057.html> for
+  ;; a discussion.
+  (define latest
+    (string-append (config-directory) "/latest"))
+
+  (unless (file-exists? latest)
+    (warning (_ "~a not found: 'guix pull' was never run~%") latest)
+    (warning (_ "Consider running 'guix pull' before 'reconfigure'.~%"))
+    (warning (_ "Failing to do that may downgrade your system!~%"))))
+
 (define* (perform-action action os
                          #:key grub? dry-run? derivations-only?
                          use-substitutes? device target
@@ -498,6 +513,9 @@ building anything."
   (define println
     (cut format #t "~a~%" <>))
 
+  (when (eq? action 'reconfigure)
+    (maybe-suggest-running-guix-pull))
+
   (mlet* %store-monad
       ((sys       (system-derivation-for-action os action
                                                 #:image-size image-size
diff --git a/guix/store.scm b/guix/store.scm
index ae52628545..906611658e 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -504,12 +504,13 @@ encoding conversion errors."
                               (status   k))))))))
 
 (define %default-substitute-urls
-  ;; Default list of substituters.  This is *not* the list used by
-  ;; 'guix-daemon', and few clients use it ('guix build --log-file' uses it.)
+  ;; Default list of substituters.  This is *not* the list baked in
+  ;; 'guix-daemon', but it is used by 'guix-service-type' and and a couple of
+  ;; clients ('guix build --log-file' uses it.)
   (map (if (false-if-exception (resolve-interface '(gnutls)))
            (cut string-append "https://" <>)
            (cut string-append "http://" <>))
-       '("hydra.gnu.org")))
+       '("mirror.hydra.gnu.org" "hydra.gnu.org")))
 
 (define* (set-build-options server
                             #:key keep-failed? keep-going? fallback?
diff --git a/guix/ui.scm b/guix/ui.scm
index 7b7bee0ac8..f95c63a81b 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -461,6 +461,11 @@ interpreted."
              (leave (_ "reference to invalid output '~a' of derivation '~a'~%")
                     (derivation-missing-output c)
                     (derivation-file-name (derivation-error-derivation c))))
+            ((file-search-error? c)
+             (leave (_ "file '~a' could not be found in these \
+directories:~{ ~a~}~%")
+                    (file-search-error-file-name c)
+                    (file-search-error-search-path c)))
             ((message-condition? c)
              ;; Normally '&message' error conditions have an i18n'd message.
              (leave (_ "~a~%")
@@ -1043,6 +1048,9 @@ DURATION-RELATION with the current time."
                            "~b ~d ~Y ~T")))
           (current (generation-number profile)))
       (if (= number current)
+          ;; TRANSLATORS: The word "current" here is an adjective for
+          ;; "Generation", as in "current generation".  Use the appropriate
+          ;; gender where applicable.
           (format #t (_ "~a\t(current)~%") header)
           (format #t "~a~%" header)))))
 
diff --git a/po/guix/da.po b/po/guix/da.po
index e9be5e985c..c494ea6b96 100644
--- a/po/guix/da.po
+++ b/po/guix/da.po
@@ -1,16 +1,16 @@
 # Danish translation guix.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the guix package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016.
 #
 # garbage -> affald (spild, bedre forslag?)
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: guix 0.9.0\n"
+"Project-Id-Version: guix 0.9.1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2015-10-28 16:31+0100\n"
-"PO-Revision-Date: 2015-10-31 19:30+01:00\n"
+"POT-Creation-Date: 2016-03-04 16:52+0100\n"
+"PO-Revision-Date: 2016-03-27 19:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -19,95 +19,96 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: gnu/packages.scm:80
+#: gnu/packages.scm:73
 #, scheme-format
 msgid "~a: patch not found"
 msgstr "~a: rettelse blev ikke fundet"
 
-#: gnu/packages.scm:91
+#: gnu/packages.scm:84
 #, scheme-format
 msgid "could not find bootstrap binary '~a' for system '~a'"
 msgstr "kunne ikke finde bootstraps binære »~a« for system »~a«"
 
-#: gnu/packages.scm:143
+#: gnu/packages.scm:136
 #, scheme-format
 msgid "cannot access `~a': ~a~%"
 msgstr "kan ikke tilgå »~a«: ~a~%"
 
-#: gnu/packages.scm:388
-#, scheme-format
-msgid "looking for the latest release of GNU ~a..."
-msgstr "kigger efter den seneste udgivelse af GNU ~a..."
-
-#: gnu/packages.scm:395
-#, scheme-format
-msgid "~a: note: using ~a but ~a is available upstream~%"
-msgstr "~a: bemærk: bruger ~a men ~a er tilgængelig opstrøm~%"
-
-#: gnu/packages.scm:417 gnu/packages.scm:452
+#: gnu/packages.scm:289
 #, scheme-format
 msgid "ambiguous package specification `~a'~%"
 msgstr "tvetydig pakkespecifikation »~a«~%"
 
-#: gnu/packages.scm:418 gnu/packages.scm:454
+#: gnu/packages.scm:290
 #, scheme-format
 msgid "choosing ~a from ~a~%"
 msgstr "vælger ~a fra ~a~%"
 
-#: gnu/packages.scm:424
+#: gnu/packages.scm:294
+#, scheme-format
+msgid "deprecated NAME-VERSION syntax.~%"
+msgstr "forældet NAVN-VERSION-syntaks.~%"
+
+#: gnu/packages.scm:298
 #, scheme-format
 msgid "~A: package not found for version ~a~%"
 msgstr "~A: pakke ikke fundet for version ~a~%"
 
-#: gnu/packages.scm:426
+#: gnu/packages.scm:305
 #, scheme-format
 msgid "~A: unknown package~%"
 msgstr "~A: ukendt pakke~%"
 
-#: gnu/packages.scm:442
+#: gnu/packages.scm:333
 #, scheme-format
 msgid "package `~a' lacks output `~a'~%"
 msgstr "pakke »~a« mangler uddata »~a«~%"
 
-#: gnu/packages.scm:459
-#, scheme-format
-msgid "~a: package not found~%"
-msgstr "~a: pakken blev ikke fundet~%"
-
-#: gnu/services.scm:376
+#: gnu/services.scm:527
 #, scheme-format
 msgid "no target of type '~a' for service ~s"
 msgstr "intet mål af typen »~a« for tjeneste ~s"
 
-#: gnu/services.scm:387 gnu/services.scm:447
+#: gnu/services.scm:538 gnu/services.scm:599
 #, scheme-format
 msgid "more than one target service of type '~a'"
 msgstr "mere end en måltjeneste af typen »~a«"
 
-#: gnu/services.scm:437
+#: gnu/services.scm:589
 #, scheme-format
 msgid "service of type '~a' not found"
 msgstr "tjenste af typen »~a« blev ikke fundet"
 
-#: gnu/system.scm:547
+#: gnu/system.scm:546
 #, scheme-format
 msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%"
 msgstr "brug af en streng for filen »~a« er forældet; brug »plain-file« i stedet~%"
 
-#: gnu/system.scm:563
+#: gnu/system.scm:562
 #, scheme-format
 msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%"
 msgstr "brug af en unik værdi for »~a« er forældet; brug »plain-file« i stedet~%"
 
-#: gnu/system.scm:646
-msgid "system locale lacks a definition"
-msgstr "systemsprog mangler en definition"
+#: gnu/system.scm:679
+#, scheme-format
+msgid "~a: invalid locale name"
+msgstr "~a: ugyldigt sprognavn"
 
-#: gnu/services/dmd.scm:131
+#: gnu/system.scm:798
+#, scheme-format
+msgid "unrecognized boot parameters for '~a'~%"
+msgstr "ikke genkendte opstartsparametre for »~a«~%"
+
+#: gnu/services/shepherd.scm:166
 #, scheme-format
 msgid "service '~a' provided more than once"
 msgstr "tjeneste »~a« tilbudt mere end en gang"
 
+#: gnu/services/shepherd.scm:181
+#, scheme-format
+msgid "service '~a' requires '~a', which is undefined"
+msgstr "tjeneste »~a« kræver »~a«, som ikke er defineret"
+
 #: gnu/system/shadow.scm:213
 #, scheme-format
 msgid "supplementary group '~a' of user '~a' is undeclared"
@@ -124,19 +125,49 @@ msgid "invalid argument: ~a~%"
 msgstr "ugyldigt argument: ~a~%"
 
 #: guix/scripts.scm:78 guix/scripts/download.scm:97 guix/scripts/gc.scm:157
-#: guix/scripts/import/cran.scm:72 guix/scripts/import/elpa.scm:77
-#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:792
-#: guix/scripts/publish.scm:355
+#: guix/scripts/import/cran.scm:78 guix/scripts/import/elpa.scm:77
+#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:874
+#: guix/scripts/publish.scm:354 guix/scripts/graph.scm:346
 #, scheme-format
 msgid "~A: unrecognized option~%"
 msgstr "~A: ikke genkendt tilvalg~%"
 
-#: guix/scripts/build.scm:107
+#: guix/scripts/build.scm:112
 #, scheme-format
 msgid "failed to create GC root `~a': ~a~%"
 msgstr "kunne ikke oprette GC-root »~a«: ~a~%"
 
-#: guix/scripts/build.scm:151
+#: guix/scripts/build.scm:189
+#, scheme-format
+msgid "invalid replacement specification: ~s~%"
+msgstr "ugyldig erstatningsspecifikation: ~s~%"
+
+#: guix/scripts/build.scm:237
+msgid ""
+"\n"
+"      --with-source=SOURCE\n"
+"                         use SOURCE when building the corresponding package"
+msgstr ""
+"\n"
+"      --with-source=KILDE\n"
+"                         brug KILDE når den tilsvarende pakke bygges"
+
+#: guix/scripts/build.scm:240
+msgid ""
+"\n"
+"      --with-input=PACKAGE=REPLACEMENT\n"
+"                         replace dependency PACKAGE by REPLACEMENT"
+msgstr ""
+"\n"
+"      --with-input=PAKKE=ERSTATNING\n"
+"                         erstat afhængighedsPAKKE med ERSTATNING"
+
+#: guix/scripts/build.scm:265
+#, scheme-format
+msgid "transformation '~a' had no effect on ~a~%"
+msgstr "transformation »~a« havde ingen effekt på ~a~%"
+
+#: guix/scripts/build.scm:283
 msgid ""
 "\n"
 "  -L, --load-path=DIR    prepend DIR to the package module search path"
@@ -144,7 +175,7 @@ msgstr ""
 "\n"
 "  -L, --load-path=MAPPE  foranstil MAPPE til pakkemodulets søgesti"
 
-#: guix/scripts/build.scm:153
+#: guix/scripts/build.scm:285
 msgid ""
 "\n"
 "  -K, --keep-failed      keep build tree of failed builds"
@@ -152,7 +183,15 @@ msgstr ""
 "\n"
 "  -K, --keep-failed      bevar byggetræ for mislykkede bygninger"
 
-#: guix/scripts/build.scm:155
+#: guix/scripts/build.scm:287
+msgid ""
+"\n"
+"  -k, --keep-going       keep going when some of the derivations fail"
+msgstr ""
+"\n"
+"  -k, --keep-going       fortsæt når nogle af derivationerne fejler"
+
+#: guix/scripts/build.scm:289
 msgid ""
 "\n"
 "  -n, --dry-run          do not build the derivations"
@@ -160,7 +199,7 @@ msgstr ""
 "\n"
 "  -n, --dry-run          byg ikke derivationerne"
 
-#: guix/scripts/build.scm:157
+#: guix/scripts/build.scm:291
 msgid ""
 "\n"
 "      --fallback         fall back to building when the substituter fails"
@@ -168,7 +207,7 @@ msgstr ""
 "\n"
 "      --fallback         fald tilbage til bygning når erstatningen fejler"
 
-#: guix/scripts/build.scm:159
+#: guix/scripts/build.scm:293
 msgid ""
 "\n"
 "      --no-substitutes   build instead of resorting to pre-built substitutes"
@@ -176,7 +215,7 @@ msgstr ""
 "\n"
 "      --no-substitutes   byg i stedet for en ny sortering af præbyggede substitutter"
 
-#: guix/scripts/build.scm:161 guix/scripts/size.scm:215
+#: guix/scripts/build.scm:295 guix/scripts/size.scm:215
 msgid ""
 "\n"
 "      --substitute-urls=URLS\n"
@@ -186,7 +225,15 @@ msgstr ""
 "      --substitute-urls=ADRESSER\n"
 "                         hent substitut fra ADRESSER hvis de er godkendt"
 
-#: guix/scripts/build.scm:164
+#: guix/scripts/build.scm:298
+msgid ""
+"\n"
+"      --no-grafts        do not graft packages"
+msgstr ""
+"\n"
+"      --no-grafts        pod ikke pakker"
+
+#: guix/scripts/build.scm:300
 msgid ""
 "\n"
 "      --no-build-hook    do not attempt to offload builds via the build hook"
@@ -194,7 +241,7 @@ msgstr ""
 "\n"
 "      --no-build-hook    forsøg ikke at aflaste bygninger via byggekrogen"
 
-#: guix/scripts/build.scm:166
+#: guix/scripts/build.scm:302
 msgid ""
 "\n"
 "      --max-silent-time=SECONDS\n"
@@ -204,7 +251,7 @@ msgstr ""
 "      --max-silent-time=SEKUNDER\n"
 "                         marker bygningen som mislykket efter SEKUNDER af stilhed"
 
-#: guix/scripts/build.scm:169
+#: guix/scripts/build.scm:305
 msgid ""
 "\n"
 "      --timeout=SECONDS  mark the build as failed after SECONDS of activity"
@@ -212,7 +259,7 @@ msgstr ""
 "\n"
 "      --timeout=SEKUNDER marker bygningen som mislykket efter SEKUNDER af aktivitet"
 
-#: guix/scripts/build.scm:171
+#: guix/scripts/build.scm:307
 msgid ""
 "\n"
 "      --verbosity=LEVEL  use the given verbosity LEVEL"
@@ -220,7 +267,15 @@ msgstr ""
 "\n"
 "      --verbosity=NIVEAU brug det angivne uddybnings-NIVEAU"
 
-#: guix/scripts/build.scm:173
+#: guix/scripts/build.scm:309
+msgid ""
+"\n"
+"      --rounds=N         build N times in a row to detect non-determinism"
+msgstr ""
+"\n"
+"      --rounds=N         byg N gange i en række for at detektere ikkedeterminisme"
+
+#: guix/scripts/build.scm:311
 msgid ""
 "\n"
 "  -c, --cores=N          allow the use of up to N CPU cores for the build"
@@ -228,7 +283,7 @@ msgstr ""
 "\n"
 "  -c, --cores=N          tillad brugen af op til N CPU-kerner til bygningen"
 
-#: guix/scripts/build.scm:175
+#: guix/scripts/build.scm:313
 msgid ""
 "\n"
 "  -M, --max-jobs=N       allow at most N build jobs"
@@ -236,12 +291,12 @@ msgstr ""
 "\n"
 "  -M, --max-jobs=N       tillad højest N-byggejob"
 
-#: guix/scripts/build.scm:261 guix/scripts/build.scm:268
+#: guix/scripts/build.scm:419 guix/scripts/build.scm:426
 #, scheme-format
 msgid "not a number: '~a' option argument: ~a~%"
 msgstr "ikke et nummer: »~a« tilvalgsparameter: ~a~%"
 
-#: guix/scripts/build.scm:287
+#: guix/scripts/build.scm:446
 msgid ""
 "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n"
 "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"
@@ -249,7 +304,7 @@ msgstr ""
 "Brug: guix build [TILVALG]... PAKKE-ELLER-AFLEDNING...\n"
 "Byg den angivne PAKKE-ELLER-AFLEDNING og returner deres uddatastier.\n"
 
-#: guix/scripts/build.scm:289
+#: guix/scripts/build.scm:448
 msgid ""
 "\n"
 "  -e, --expression=EXPR  build the package or derivation EXPR evaluates to"
@@ -258,7 +313,7 @@ msgstr ""
 "  -e, --expression=UDTRYK\n"
 "                         byg pakken eller derivationen UDTRYK evaluerer til"
 
-#: guix/scripts/build.scm:291
+#: guix/scripts/build.scm:450
 msgid ""
 "\n"
 "  -f, --file=FILE        build the package or derivation that the code within\n"
@@ -268,7 +323,7 @@ msgstr ""
 "  -f, --file=FIL         byg pakken eller derivationen som koden i FIL evaluerer\n"
 "                         til"
 
-#: guix/scripts/build.scm:294
+#: guix/scripts/build.scm:453
 msgid ""
 "\n"
 "  -S, --source           build the packages' source derivations"
@@ -276,7 +331,7 @@ msgstr ""
 "\n"
 "  -S, --source           byg pakkernes kildederivationer"
 
-#: guix/scripts/build.scm:296
+#: guix/scripts/build.scm:455
 msgid ""
 "\n"
 "      --sources[=TYPE]   build source derivations; TYPE may optionally be one\n"
@@ -286,7 +341,7 @@ msgstr ""
 "      --sources[=TYPE]   bygningskildeafledninger; TYPE kan valgfrit være\n"
 "                         »package«, »all« (standard) eller »transitive«"
 
-#: guix/scripts/build.scm:299
+#: guix/scripts/build.scm:458
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""
@@ -294,7 +349,7 @@ msgstr ""
 "\n"
 "  -s, --system=SYSTEM    forsøger at bygge for SYSTEM--f.eks., »i686-linux«"
 
-#: guix/scripts/build.scm:301
+#: guix/scripts/build.scm:460
 msgid ""
 "\n"
 "      --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""
@@ -302,33 +357,23 @@ msgstr ""
 "\n"
 "      --target=TRIPLET   krydsbyg for TRIPLET--f.eks., »armel-linux-gnu«"
 
-#: guix/scripts/build.scm:303
-msgid ""
-"\n"
-"      --with-source=SOURCE\n"
-"                         use SOURCE when building the corresponding package"
-msgstr ""
-"\n"
-"      --with-source=KILDE\n"
-"                         brug KILDE når den tilsvarende pakke bygges"
-
-#: guix/scripts/build.scm:306
+#: guix/scripts/build.scm:462
 msgid ""
 "\n"
-"      --no-grafts        do not graft packages"
+"  -d, --derivations      return the derivation paths of the given packages"
 msgstr ""
 "\n"
-"      --no-grafts        pod ikke pakker"
+"  -d, --derivations      returner de afledte stier for de givne pakker"
 
-#: guix/scripts/build.scm:308
+#: guix/scripts/build.scm:464
 msgid ""
 "\n"
-"  -d, --derivations      return the derivation paths of the given packages"
+"      --check            rebuild items to check for non-determinism issues"
 msgstr ""
 "\n"
-"  -d, --derivations      returner de afledte stier for de givne pakker"
+"      --check            byg elementer igen for at kontrollere problemstillinger med ikkedeterminisme"
 
-#: guix/scripts/build.scm:310
+#: guix/scripts/build.scm:466
 msgid ""
 "\n"
 "  -r, --root=FILE        make FILE a symlink to the result, and register it\n"
@@ -338,7 +383,7 @@ msgstr ""
 "  -r, --root=FIL         gør FIL til en symbolsk henvisning for resultatet, og\n"
 "                         registrer den som en affaldsindsamlerroot"
 
-#: guix/scripts/build.scm:313
+#: guix/scripts/build.scm:469
 msgid ""
 "\n"
 "      --log-file         return the log file names for the given derivations"
@@ -346,14 +391,15 @@ msgstr ""
 "\n"
 "      --log-file         returner logfilnavnen for de givne afledninger"
 
-#: guix/scripts/build.scm:318 guix/scripts/download.scm:54
-#: guix/scripts/package.scm:292 guix/scripts/gc.scm:70
+#: guix/scripts/build.scm:476 guix/scripts/download.scm:54
+#: guix/scripts/package.scm:386 guix/scripts/gc.scm:70
 #: guix/scripts/hash.scm:56 guix/scripts/import.scm:91
-#: guix/scripts/import/cran.scm:44 guix/scripts/pull.scm:83
-#: guix/scripts/substitute.scm:752 guix/scripts/system.scm:556
-#: guix/scripts/lint.scm:741 guix/scripts/publish.scm:63
-#: guix/scripts/edit.scm:43 guix/scripts/size.scm:223
-#: guix/scripts/graph.scm:398 guix/scripts/challenge.scm:181
+#: guix/scripts/import/cran.scm:46 guix/scripts/pull.scm:83
+#: guix/scripts/substitute.scm:758 guix/scripts/system.scm:631
+#: guix/scripts/lint.scm:823 guix/scripts/publish.scm:63
+#: guix/scripts/edit.scm:44 guix/scripts/size.scm:223
+#: guix/scripts/graph.scm:327 guix/scripts/challenge.scm:181
+#: guix/scripts/container.scm:33 guix/scripts/container/exec.scm:43
 msgid ""
 "\n"
 "  -h, --help             display this help and exit"
@@ -361,14 +407,15 @@ msgstr ""
 "\n"
 "  -h, --help             vis denne hjælpetekst og afslut"
 
-#: guix/scripts/build.scm:320 guix/scripts/download.scm:56
-#: guix/scripts/package.scm:294 guix/scripts/gc.scm:72
+#: guix/scripts/build.scm:478 guix/scripts/download.scm:56
+#: guix/scripts/package.scm:388 guix/scripts/gc.scm:72
 #: guix/scripts/hash.scm:58 guix/scripts/import.scm:93
-#: guix/scripts/import/cran.scm:46 guix/scripts/pull.scm:85
-#: guix/scripts/substitute.scm:754 guix/scripts/system.scm:558
-#: guix/scripts/lint.scm:745 guix/scripts/publish.scm:65
-#: guix/scripts/edit.scm:45 guix/scripts/size.scm:225
-#: guix/scripts/graph.scm:400 guix/scripts/challenge.scm:183
+#: guix/scripts/import/cran.scm:48 guix/scripts/pull.scm:85
+#: guix/scripts/substitute.scm:760 guix/scripts/system.scm:633
+#: guix/scripts/lint.scm:827 guix/scripts/publish.scm:65
+#: guix/scripts/edit.scm:46 guix/scripts/size.scm:225
+#: guix/scripts/graph.scm:329 guix/scripts/challenge.scm:183
+#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:45
 msgid ""
 "\n"
 "  -V, --version          display version information and exit"
@@ -376,7 +423,7 @@ msgstr ""
 "\n"
 "  -V, --version          vis versioninformation og afslut"
 
-#: guix/scripts/build.scm:347
+#: guix/scripts/build.scm:505
 #, scheme-format
 msgid ""
 "invalid argument: '~a' option argument: ~a, ~\n"
@@ -385,12 +432,12 @@ msgstr ""
 "ugyldigt argument: »~a« tilvalgsargumentet: ~a, ~\n"
 "skal være »package«, »all« eller »transitive«~%"
 
-#: guix/scripts/build.scm:478
+#: guix/scripts/build.scm:549
 #, scheme-format
-msgid "sources do not match any package:~{ ~a~}~%"
-msgstr "kilder matcher ikke nogen pakke:~{ ~a~}~%"
+msgid "~s: not something we can build~%"
+msgstr "~s: ikke noget vi kan bygge~%"
 
-#: guix/scripts/build.scm:536
+#: guix/scripts/build.scm:629
 #, scheme-format
 msgid "no build log for '~a'~%"
 msgstr "ingen byggelog for »~a«~%"
@@ -424,38 +471,86 @@ msgstr ""
 msgid "unsupported hash format: ~a~%"
 msgstr "ikke understøttet hash-format: ~a~%"
 
-#: guix/scripts/download.scm:107
+#: guix/scripts/download.scm:100 guix/scripts/package.scm:836
+#: guix/scripts/publish.scm:356
+#, scheme-format
+msgid "~A: extraneous argument~%"
+msgstr "~A: uvedkommende argument~%"
+
+#: guix/scripts/download.scm:109
+#, scheme-format
+msgid "no download URI was specified~%"
+msgstr "ingen overførselsadresse var angivet~%"
+
+#: guix/scripts/download.scm:111
 #, scheme-format
 msgid "~a: failed to parse URI~%"
 msgstr "~a: kunne ikke fortolke URI~%"
 
-#: guix/scripts/download.scm:118
+#: guix/scripts/download.scm:122
 #, scheme-format
 msgid "~a: download failed~%"
 msgstr "~a: overførsel mislykkede~%"
 
-#: guix/scripts/package.scm:128
+#: guix/scripts/package.scm:103
+#, scheme-format
+msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
+msgstr "Prøv »info '(guix) Invoking guix package'« for yderligere information.~%"
+
+#: guix/scripts/package.scm:125
+#, scheme-format
+msgid "error: while creating directory `~a': ~a~%"
+msgstr "fejl: under oprettelse af mappe »~a«: ~a~%"
+
+#: guix/scripts/package.scm:129
+#, scheme-format
+msgid "Please create the `~a' directory, with you as the owner.~%"
+msgstr "Opret venligst mappen »~a«, med dig som ejer.~%"
+
+#: guix/scripts/package.scm:136
+#, scheme-format
+msgid "error: directory `~a' is not owned by you~%"
+msgstr "fejl: mappen »~a« er ikke ejet af dig~%"
+
+#: guix/scripts/package.scm:139
+#, scheme-format
+msgid "Please change the owner of `~a' to user ~s.~%"
+msgstr "Ændr venligst ejeren af »~a« til brugeren ~s.~%"
+
+#: guix/scripts/package.scm:174
 #, scheme-format
 msgid "not removing generation ~a, which is current~%"
 msgstr "fjerner ikke generation ~a, som er nuværende~%"
 
-#: guix/scripts/package.scm:135
+#: guix/scripts/package.scm:181
 #, scheme-format
 msgid "no matching generation~%"
 msgstr "ingen matchende generation~%"
 
-#: guix/scripts/package.scm:138 guix/scripts/package.scm:734
-#: guix/scripts/system.scm:396
+#: guix/scripts/package.scm:184 guix/scripts/package.scm:657
+#: guix/scripts/system.scm:459
 #, scheme-format
 msgid "invalid syntax: ~a~%"
 msgstr "ugyldig syntaks: ~a~%"
 
-#: guix/scripts/package.scm:219
+#: guix/scripts/package.scm:209
+#, scheme-format
+msgid "nothing to be done~%"
+msgstr "intet at udføre~%"
+
+#: guix/scripts/package.scm:223
+#, scheme-format
+msgid "~a package in profile~%"
+msgid_plural "~a packages in profile~%"
+msgstr[0] "~a pakke i profil~%"
+msgstr[1] "~a pakker i profil~%"
+
+#: guix/scripts/package.scm:311
 #, scheme-format
 msgid "The following environment variable definitions may be needed:~%"
 msgstr "De følgende miljøvariabeldefinitioner kan være krævet:~%"
 
-#: guix/scripts/package.scm:235
+#: guix/scripts/package.scm:327
 msgid ""
 "Usage: guix package [OPTION]...\n"
 "Install, remove, or upgrade packages in a single transaction.\n"
@@ -463,7 +558,7 @@ msgstr ""
 "Brug: guix-pakke [TILVALG] ... \n"
 "Installer, fjern eller opgrader pakker i en enkel transaktion.\n"
 
-#: guix/scripts/package.scm:237
+#: guix/scripts/package.scm:329
 msgid ""
 "\n"
 "  -i, --install PACKAGE ...\n"
@@ -473,7 +568,7 @@ msgstr ""
 "  -i, --install PAKKE ...\n"
 "                         installer PAKKER"
 
-#: guix/scripts/package.scm:240
+#: guix/scripts/package.scm:332
 msgid ""
 "\n"
 "  -e, --install-from-expression=EXP\n"
@@ -483,7 +578,7 @@ msgstr ""
 "  -e, --install-from-expression=UDTRYK\n"
 "                         installer pakken UDTRYK evaluerer til"
 
-#: guix/scripts/package.scm:243
+#: guix/scripts/package.scm:335
 msgid ""
 "\n"
 "  -f, --install-from-file=FILE\n"
@@ -495,7 +590,7 @@ msgstr ""
 "                         installer pakken som koden i FIL evaluerer\n"
 "                         til"
 
-#: guix/scripts/package.scm:247
+#: guix/scripts/package.scm:339
 msgid ""
 "\n"
 "  -r, --remove PACKAGE ...\n"
@@ -505,7 +600,7 @@ msgstr ""
 "  -r, --remove PAKKE ...\n"
 "                         fjern PAKKER"
 
-#: guix/scripts/package.scm:250
+#: guix/scripts/package.scm:342
 msgid ""
 "\n"
 "  -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP"
@@ -515,7 +610,7 @@ msgstr ""
 "                         opgrader alle de installerede pakker der matcher\n"
 "                         REGUDTRYK"
 
-#: guix/scripts/package.scm:252
+#: guix/scripts/package.scm:344
 msgid ""
 "\n"
 "  -m, --manifest=FILE    create a new profile generation with the manifest\n"
@@ -525,7 +620,7 @@ msgstr ""
 "  -m, --manifest=FIL     opret en ny profiloprettelse med manifestet fra\n"
 "                         FIL"
 
-#: guix/scripts/package.scm:255
+#: guix/scripts/package.scm:347
 msgid ""
 "\n"
 "      --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP"
@@ -533,7 +628,7 @@ msgstr ""
 "\n"
 "      --do-not--upgrade[=REGUDTRYK] opgrader ikke pakker der matcher REGUDTRYK"
 
-#: guix/scripts/package.scm:257
+#: guix/scripts/package.scm:349
 msgid ""
 "\n"
 "      --roll-back        roll back to the previous generation"
@@ -541,7 +636,7 @@ msgstr ""
 "\n"
 "      --roll-back        rul tilbage til den forrige generation"
 
-#: guix/scripts/package.scm:259
+#: guix/scripts/package.scm:351
 msgid ""
 "\n"
 "      --search-paths[=KIND]\n"
@@ -551,7 +646,7 @@ msgstr ""
 "      --search-paths[=KIND]\n"
 "                         vis krævede miljøvariabeldefinitioner"
 
-#: guix/scripts/package.scm:262
+#: guix/scripts/package.scm:354
 msgid ""
 "\n"
 "  -l, --list-generations[=PATTERN]\n"
@@ -561,7 +656,7 @@ msgstr ""
 "  -l, --list-generations[=MØNSTER]\n"
 "                         vis generationer der matcher MØNSTER"
 
-#: guix/scripts/package.scm:265
+#: guix/scripts/package.scm:357
 msgid ""
 "\n"
 "  -d, --delete-generations[=PATTERN]\n"
@@ -571,7 +666,7 @@ msgstr ""
 "  -d, --delete-generations[=MØNSTER]\n"
 "                         slet generationer der matcher MØNSTER"
 
-#: guix/scripts/package.scm:268
+#: guix/scripts/package.scm:360
 msgid ""
 "\n"
 "  -S, --switch-generation=PATTERN\n"
@@ -581,7 +676,7 @@ msgstr ""
 "  -S, --switch-generation=MØNSTER\n"
 "                         skift til et generationsmatchende MØNSTER"
 
-#: guix/scripts/package.scm:271
+#: guix/scripts/package.scm:363
 msgid ""
 "\n"
 "  -p, --profile=PROFILE  use PROFILE instead of the user's default profile"
@@ -589,7 +684,7 @@ msgstr ""
 "\n"
 "  -p, --profile=PROFIL   brug PROFIL i stedet for brugerens standardprofil"
 
-#: guix/scripts/package.scm:274
+#: guix/scripts/package.scm:366
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap Guile to build the profile"
@@ -597,7 +692,7 @@ msgstr ""
 "\n"
 "      --bootstrap        brug bootstrap Guile til at bygge profilen"
 
-#: guix/scripts/package.scm:276 guix/scripts/pull.scm:76
+#: guix/scripts/package.scm:368 guix/scripts/pull.scm:76
 msgid ""
 "\n"
 "      --verbose          produce verbose output"
@@ -605,7 +700,7 @@ msgstr ""
 "\n"
 "      --verbose          lav uddybende uddata"
 
-#: guix/scripts/package.scm:279
+#: guix/scripts/package.scm:371
 msgid ""
 "\n"
 "  -s, --search=REGEXP    search in synopsis and description using REGEXP"
@@ -613,7 +708,7 @@ msgstr ""
 "\n"
 "  -s, --search=REGUDTRYK søg i synopsis og beskrivelse via REGUDTRYK"
 
-#: guix/scripts/package.scm:281
+#: guix/scripts/package.scm:373
 msgid ""
 "\n"
 "  -I, --list-installed[=REGEXP]\n"
@@ -623,7 +718,7 @@ msgstr ""
 "  -I, --list-installed[=REGUDTRYK]\n"
 "                         vis installerede pakker der matcher REGUDTRYK"
 
-#: guix/scripts/package.scm:284
+#: guix/scripts/package.scm:376
 msgid ""
 "\n"
 "  -A, --list-available[=REGEXP]\n"
@@ -633,7 +728,7 @@ msgstr ""
 "  -A, --list-available[=REGUDTRYK]\n"
 "                         vis tilgængelige pakker der matcher REGUDTRYK"
 
-#: guix/scripts/package.scm:287
+#: guix/scripts/package.scm:379
 msgid ""
 "\n"
 "      --show=PACKAGE     show details about PACKAGE"
@@ -641,64 +736,22 @@ msgstr ""
 "\n"
 "      --show=PACKAGE     vis detaljer om PAKKE"
 
-#: guix/scripts/package.scm:380
+#: guix/scripts/package.scm:474
 #, scheme-format
 msgid "~a: unsupported kind of search path~%"
 msgstr "~a: ikke understøttet type af søgesti%"
 
-#: guix/scripts/package.scm:550 guix/scripts/publish.scm:357
-#, scheme-format
-msgid "~A: extraneous argument~%"
-msgstr "~A: uvedkommende argument~%"
-
-#: guix/scripts/package.scm:558
-#, scheme-format
-msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
-msgstr "Prøv »info '(guix) Invoking guix package'« for yderligere information.~%"
-
-#: guix/scripts/package.scm:580
-#, scheme-format
-msgid "error: while creating directory `~a': ~a~%"
-msgstr "fejl: under oprettelse af mappe »~a«: ~a~%"
-
-#: guix/scripts/package.scm:584
-#, scheme-format
-msgid "Please create the `~a' directory, with you as the owner.~%"
-msgstr "Opret venligst mappen »~a«, med dig som ejer.~%"
-
-#: guix/scripts/package.scm:591
-#, scheme-format
-msgid "error: directory `~a' is not owned by you~%"
-msgstr "fejl: mappen »~a« er ikke ejet af dig~%"
-
-#: guix/scripts/package.scm:594
-#, scheme-format
-msgid "Please change the owner of `~a' to user ~s.~%"
-msgstr "Ændr venligst ejeren af »~a« til brugeren ~s.~%"
-
-#: guix/scripts/package.scm:628
-#, scheme-format
-msgid "nothing to be done~%"
-msgstr "intet at udføre~%"
-
-#: guix/scripts/package.scm:644
-#, scheme-format
-msgid "~a package in profile~%"
-msgid_plural "~a packages in profile~%"
-msgstr[0] "~a pakke i profil~%"
-msgstr[1] "~a pakker i profil~%"
-
-#: guix/scripts/package.scm:668
+#: guix/scripts/package.scm:753
 #, scheme-format
 msgid "cannot switch to generation '~a'~%"
 msgstr "kan ikke skifte til generation »~a«~%"
 
-#: guix/scripts/package.scm:690
+#: guix/scripts/package.scm:769
 #, scheme-format
 msgid "would install new manifest from '~a' with ~d entries~%"
 msgstr "vil installere nyt manifest fra »~a« med ~d poster~%"
 
-#: guix/scripts/package.scm:692
+#: guix/scripts/package.scm:771
 #, scheme-format
 msgid "installing new manifest from '~a' with ~d entries~%"
 msgstr "installerer nyt manifest fra »~a« med ~d poster~%"
@@ -810,6 +863,11 @@ msgstr ""
 msgid "invalid amount of storage: ~a~%"
 msgstr "ugyldig lagermængde: ~a~%"
 
+#: guix/scripts/gc.scm:187
+#, scheme-format
+msgid "extraneous arguments: ~{~a ~}~%"
+msgstr "uvedkommende argumenter: ~{~a ~}~%"
+
 #: guix/scripts/hash.scm:46
 msgid ""
 "Usage: guix hash [OPTION] FILE\n"
@@ -837,12 +895,12 @@ msgstr ""
 msgid "unrecognized option: ~a~%"
 msgstr "tilvalg blev ikke genkendt: ~a~%"
 
-#: guix/scripts/hash.scm:135 guix/ui.scm:458
+#: guix/scripts/hash.scm:135 guix/ui.scm:460
 #, scheme-format
 msgid "~a~%"
 msgstr "~a~%"
 
-#: guix/scripts/hash.scm:138 guix/scripts/system.scm:685
+#: guix/scripts/hash.scm:138 guix/scripts/system.scm:761
 #, scheme-format
 msgid "wrong number of arguments~%"
 msgstr "forkert antal argumenter~%"
@@ -877,17 +935,25 @@ msgstr ""
 "Usage: guix import cran PAKKENAVN\n"
 "Importer og konverter pakken CRAN for PAKKENAVN.\n"
 
-#: guix/scripts/import/cran.scm:87
+#: guix/scripts/import/cran.scm:44
+msgid ""
+"\n"
+"  -a, --archive=ARCHIVE  specify the archive repository"
+msgstr ""
+"\n"
+"  -a, --archive=ARKIV    specificer arkivet"
+
+#: guix/scripts/import/cran.scm:94
 #, scheme-format
 msgid "failed to download description for package '~a'~%"
 msgstr "kunne ikke hente beskrivelse for pakke »~a«:~%"
 
-#: guix/scripts/import/cran.scm:91 guix/scripts/import/elpa.scm:95
+#: guix/scripts/import/cran.scm:98 guix/scripts/import/elpa.scm:95
 #, scheme-format
 msgid "too few arguments~%"
 msgstr "for få argumenter~%"
 
-#: guix/scripts/import/cran.scm:93 guix/scripts/import/elpa.scm:97
+#: guix/scripts/import/cran.scm:100 guix/scripts/import/elpa.scm:97
 #, scheme-format
 msgid "too many arguments~%"
 msgstr "for mange argumenter~%"
@@ -1059,17 +1125,22 @@ msgstr "substitut på »~a« mangler en signatur~%"
 msgid "updating list of substitutes from '~a'... ~5,1f%"
 msgstr "opdaterer liste af substitutter fra »~a«... ~5,1f%"
 
-#: guix/scripts/substitute.scm:591
+#: guix/scripts/substitute.scm:585
 #, scheme-format
 msgid "~s: unsupported server URI scheme~%"
 msgstr "~s: ikke understøttet server-URI-skema~%"
 
-#: guix/scripts/substitute.scm:733
+#: guix/scripts/substitute.scm:596
+#, scheme-format
+msgid "'~a' uses different store '~a'; ignoring it~%"
+msgstr "»~a« bruger et andet lager »~a«; ignorerer~%"
+
+#: guix/scripts/substitute.scm:739
 #, scheme-format
 msgid "host name lookup error: ~a~%"
 msgstr "opslagsfejl for værtsnavn: ~a~%"
 
-#: guix/scripts/substitute.scm:742
+#: guix/scripts/substitute.scm:748
 msgid ""
 "Usage: guix substitute [OPTION]...\n"
 "Internal tool to substitute a pre-built binary to a local build.\n"
@@ -1077,7 +1148,7 @@ msgstr ""
 "Brug: guix substitute [TILVALG] ...\n"
 "Internt værktøj til at erstatte en præbygget binær fil med en lokal bygning.\n"
 
-#: guix/scripts/substitute.scm:744
+#: guix/scripts/substitute.scm:750
 msgid ""
 "\n"
 "      --query            report on the availability of substitutes for the\n"
@@ -1087,7 +1158,7 @@ msgstr ""
 "      --query            rapport om tilgængeligheden for substitutter for\n"
 "                         lagerfilnavnene sendt til standardind"
 
-#: guix/scripts/substitute.scm:747
+#: guix/scripts/substitute.scm:753
 msgid ""
 "\n"
 "      --substitute STORE-FILE DESTINATION\n"
@@ -1099,11 +1170,11 @@ msgstr ""
 "                         hent LAGER-FIL og lagr den som en Nar i filen\n"
 "                         DESTINATION"
 
-#: guix/scripts/substitute.scm:872
+#: guix/scripts/substitute.scm:878
 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n"
 msgstr "ACL for arkivimporter ser ikke ud til at være initialiseret, substitutter kan være utilgængelige\n"
 
-#: guix/scripts/substitute.scm:954
+#: guix/scripts/substitute.scm:960
 #, scheme-format
 msgid "~a: unrecognized options~%"
 msgstr "~a: ikke genkendte tilvalg~%"
@@ -1142,76 +1213,86 @@ msgstr ""
 msgid "wrong arguments"
 msgstr "forkerte argumenter"
 
-#: guix/scripts/system.scm:105
+#: guix/scripts/system.scm:111
 #, scheme-format
 msgid "failed to register '~a' under '~a'~%"
 msgstr "kunne ikke registrere »~a« under »~a«~%"
 
-#: guix/scripts/system.scm:137
+#: guix/scripts/system.scm:143
 #, scheme-format
 msgid "failed to install GRUB on device '~a'~%"
 msgstr "kunne ikke installere GRUB på enhed »~a«~%"
 
-#: guix/scripts/system.scm:155
+#: guix/scripts/system.scm:161
 #, scheme-format
 msgid "initializing the current root file system~%"
 msgstr "initialiserer det nuværende root-filsystem~%"
 
-#: guix/scripts/system.scm:169
+#: guix/scripts/system.scm:175
 #, scheme-format
 msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%"
 msgstr "kører ikke som »root«, så ejerskabet af »~a« kan være forkert!~%"
 
-#: guix/scripts/system.scm:219
+#: guix/scripts/system.scm:233
 #, scheme-format
-msgid "unrecognized boot parameters for '~a'~%"
-msgstr "ikke genkendte opstartsparametre for »~a«~%"
+msgid "while talking to shepherd: ~a~%"
+msgstr "under kommunikation med shepherd: ~a~%"
+
+#: guix/scripts/system.scm:279
+#, scheme-format
+msgid "unloading service '~a'...~%"
+msgstr "udlæser tjeneste »~a« ...~%"
 
-#: guix/scripts/system.scm:254
+#: guix/scripts/system.scm:287
+#, scheme-format
+msgid "loading new services:~{ ~a~}...~%"
+msgstr "indlæser nye tjenester:~{ ~a~}...~%"
+
+#: guix/scripts/system.scm:311
 #, scheme-format
 msgid "activating system...~%"
 msgstr "aktiverer system ...~%"
 
-#: guix/scripts/system.scm:338
+#: guix/scripts/system.scm:402
 msgid "the DAG of services"
 msgstr "DAG'en for tjenester"
 
-#: guix/scripts/system.scm:351
-msgid "the dependency graph of dmd services"
-msgstr "afhængighedsgrafen for dmd-tjenester"
+#: guix/scripts/system.scm:415
+msgid "the dependency graph of shepherd services"
+msgstr "afhængighedsgrafen for shepherd-tjenester"
 
-#: guix/scripts/system.scm:369
+#: guix/scripts/system.scm:436
 #, scheme-format
 msgid "  file name: ~a~%"
 msgstr "  filnavn: ~a~%"
 
-#: guix/scripts/system.scm:370
+#: guix/scripts/system.scm:437
 #, scheme-format
 msgid "  canonical file name: ~a~%"
 msgstr "  kanonisk filnavn: ~a~%"
 
 #. TRANSLATORS: Please preserve the two-space indentation.
-#: guix/scripts/system.scm:374
+#: guix/scripts/system.scm:439
 #, scheme-format
 msgid "  label: ~a~%"
 msgstr "  etikelt: ~a~%"
 
-#: guix/scripts/system.scm:375
+#: guix/scripts/system.scm:440
 #, scheme-format
 msgid "  root device: ~a~%"
 msgstr "  root-enhed: ~a~%"
 
-#: guix/scripts/system.scm:376
+#: guix/scripts/system.scm:441
 #, scheme-format
 msgid "  kernel: ~a~%"
 msgstr "  kerne: ~a~%"
 
-#: guix/scripts/system.scm:476
+#: guix/scripts/system.scm:549
 #, scheme-format
 msgid "initializing operating system under '~a'...~%"
 msgstr "initialiserer operativsystem under »~a«...~%"
 
-#: guix/scripts/system.scm:515
+#: guix/scripts/system.scm:588
 msgid ""
 "Usage: guix system [OPTION] ACTION [FILE]\n"
 "Build the operating system declared in FILE according to ACTION.\n"
@@ -1219,47 +1300,51 @@ msgstr ""
 "Brug: guix system [TILVALG] HANDLING [FIL]\n"
 "Byg operativsystemet deklæret i FIL jævnfør HANDLING.\n"
 
-#: guix/scripts/system.scm:518
+#: guix/scripts/system.scm:591 guix/scripts/container.scm:28
 msgid "The valid values for ACTION are:\n"
 msgstr "De gyldige værdier for HANDLING er:\n"
 
-#: guix/scripts/system.scm:520
+#: guix/scripts/system.scm:593
 msgid "   reconfigure      switch to a new operating system configuration\n"
 msgstr "   reconfigure      skift til en ny operativsystemkonfiguration\n"
 
-#: guix/scripts/system.scm:522
+#: guix/scripts/system.scm:595
 msgid "   list-generations list the system generations\n"
 msgstr "   list-generations viser systemoprettelserne\n"
 
-#: guix/scripts/system.scm:524
+#: guix/scripts/system.scm:597
 msgid "   build            build the operating system without installing anything\n"
 msgstr "   build            byg operativsystemet uden at installere noget\n"
 
-#: guix/scripts/system.scm:526
+#: guix/scripts/system.scm:599
+msgid "   container        build a container that shares the host's store\n"
+msgstr "   container        byg en container som deler værtens lager\n"
+
+#: guix/scripts/system.scm:601
 msgid "   vm               build a virtual machine image that shares the host's store\n"
 msgstr "   vm               byg et virtuelt maskinaftryk som deler værtens lager\n"
 
-#: guix/scripts/system.scm:528
+#: guix/scripts/system.scm:603
 msgid "   vm-image         build a freestanding virtual machine image\n"
 msgstr "   vm-image         byg et fritstående virtuelt maskinaftryk\n"
 
-#: guix/scripts/system.scm:530
+#: guix/scripts/system.scm:605
 msgid "   disk-image       build a disk image, suitable for a USB stick\n"
 msgstr "   disk-image       byg et diskaftryk, egnet for et USB-drev\n"
 
-#: guix/scripts/system.scm:532
+#: guix/scripts/system.scm:607
 msgid "   init             initialize a root file system to run GNU\n"
 msgstr "   init             initialiser et rootfilsystem til at køre GNU.\n"
 
-#: guix/scripts/system.scm:534
+#: guix/scripts/system.scm:609
 msgid "   extension-graph  emit the service extension graph in Dot format\n"
 msgstr "   extension-graph  udsend tjenesteudvidelsesgrafen i Dot-format\n"
 
-#: guix/scripts/system.scm:536
-msgid "   dmd-graph        emit the graph of dmd services in Dot format\n"
-msgstr "   dmd-graph        udsend grafen for dmd-tjenester i Dot-format\n"
+#: guix/scripts/system.scm:611
+msgid "   shepherd-graph   emit the graph of shepherd services in Dot format\n"
+msgstr "   shepherd-graph   udsend grafen for shepherd-tjenester i Dot-format\n"
 
-#: guix/scripts/system.scm:540
+#: guix/scripts/system.scm:615
 msgid ""
 "\n"
 "  -d, --derivation       return the derivation of the given system"
@@ -1267,7 +1352,7 @@ msgstr ""
 "\n"
 "  -d, --derivation       returner de afledte stier for det givne system"
 
-#: guix/scripts/system.scm:542
+#: guix/scripts/system.scm:617
 msgid ""
 "\n"
 "      --on-error=STRATEGY\n"
@@ -1277,7 +1362,7 @@ msgstr ""
 "      --on-error=STRATEGI\n"
 "                         brug STRATEGI når den opstår en fejl under læsning af FIL"
 
-#: guix/scripts/system.scm:545
+#: guix/scripts/system.scm:620
 msgid ""
 "\n"
 "      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
@@ -1285,7 +1370,7 @@ msgstr ""
 "\n"
 "      --image-size=STR   for »vm-image«, lav et aftryk af STR"
 
-#: guix/scripts/system.scm:547
+#: guix/scripts/system.scm:622
 msgid ""
 "\n"
 "      --no-grub          for 'init', do not install GRUB"
@@ -1293,7 +1378,7 @@ msgstr ""
 "\n"
 "      --no-grub          for »init«, installer ikke GRUB"
 
-#: guix/scripts/system.scm:549
+#: guix/scripts/system.scm:624
 msgid ""
 "\n"
 "      --share=SPEC       for 'vm', share host file system according to SPEC"
@@ -1301,7 +1386,7 @@ msgstr ""
 "\n"
 "      --share=SPEC       for »vm«, del værtsfilsystem jævnfør SPEC"
 
-#: guix/scripts/system.scm:551
+#: guix/scripts/system.scm:626
 msgid ""
 "\n"
 "      --expose=SPEC      for 'vm', expose host file system according to SPEC"
@@ -1309,7 +1394,7 @@ msgstr ""
 "\n"
 "      --expose=SPEC      for »vm«, fremvis værtsfilsystem jævnfør SPEC"
 
-#: guix/scripts/system.scm:553
+#: guix/scripts/system.scm:628
 msgid ""
 "\n"
 "      --full-boot        for 'vm', make a full boot sequence"
@@ -1317,50 +1402,50 @@ msgstr ""
 "\n"
 "      --full-boot        for »vm«, lav en fuld opstartssekvens"
 
-#: guix/scripts/system.scm:637
+#: guix/scripts/system.scm:713
 #, scheme-format
 msgid "no configuration file specified~%"
 msgstr "ingen konfigurationsfil angivet~%"
 
-#: guix/scripts/system.scm:700
+#: guix/scripts/system.scm:776
 #, scheme-format
 msgid "~a: unknown action~%"
 msgstr "~a: ukendt handling~%"
 
-#: guix/scripts/system.scm:715
+#: guix/scripts/system.scm:791
 #, scheme-format
 msgid "wrong number of arguments for action '~a'~%"
 msgstr "forkert antal argumenter for handling »~a«~%"
 
-#: guix/scripts/system.scm:720
+#: guix/scripts/system.scm:796
 #, scheme-format
 msgid "guix system: missing command name~%"
 msgstr "guix system: mangler kommandonavn~%"
 
-#: guix/scripts/system.scm:722
+#: guix/scripts/system.scm:798
 #, scheme-format
 msgid "Try 'guix system --help' for more information.~%"
 msgstr "Prøv »guix system --help« for yderligere information.~%"
 
-#: guix/scripts/lint.scm:124
+#: guix/scripts/lint.scm:127
 #, scheme-format
 msgid "Available checkers:~%"
 msgstr "Tilgængelige kontrolprogrammer:~%"
 
-#: guix/scripts/lint.scm:144
+#: guix/scripts/lint.scm:147
 msgid "description should not be empty"
 msgstr "beskrivelse skal være udfyldt"
 
-#: guix/scripts/lint.scm:154
+#: guix/scripts/lint.scm:157
 msgid "Texinfo markup in description is invalid"
 msgstr "Texinfo-opmærkning i beskrivelse er ugyldig"
 
-#: guix/scripts/lint.scm:162
+#: guix/scripts/lint.scm:165
 msgid "description should start with an upper-case letter or digit"
 msgstr "beskrivelse skal starte med et stort bogstav eller et tal"
 
 # arg, hvad foregår der her
-#: guix/scripts/lint.scm:178
+#: guix/scripts/lint.scm:181
 #, scheme-format
 msgid ""
 "sentences in description should be followed ~\n"
@@ -1369,59 +1454,59 @@ msgstr ""
 "sætninger i beskrivelsen skal efterfølges ~\n"
 "af to mellemrum; mulig infraction~p ved ~{~a~^, ~}"
 
-#: guix/scripts/lint.scm:202
+#: guix/scripts/lint.scm:205
 msgid "pkg-config should probably be a native input"
 msgstr "pkg-config skal sandsynligvis være standarddata"
 
-#: guix/scripts/lint.scm:217
+#: guix/scripts/lint.scm:220
 msgid "synopsis should not be empty"
 msgstr "synopsis skal være udfyldt"
 
-#: guix/scripts/lint.scm:225
+#: guix/scripts/lint.scm:228
 msgid "no period allowed at the end of the synopsis"
 msgstr "ingen periode er tilladt i slutningen af synopsen"
 
-#: guix/scripts/lint.scm:237
+#: guix/scripts/lint.scm:240
 msgid "no article allowed at the beginning of the synopsis"
 msgstr "ingen artikel er tilladt i begyndelsen af synopsen"
 
-#: guix/scripts/lint.scm:244
+#: guix/scripts/lint.scm:247
 msgid "synopsis should be less than 80 characters long"
 msgstr "synopsis skal være mindre end 80 tegn lang"
 
-#: guix/scripts/lint.scm:250
+#: guix/scripts/lint.scm:253
 msgid "synopsis should start with an upper-case letter or digit"
 msgstr "synopsis skal starte med et stort bogstav eller et tal"
 
-#: guix/scripts/lint.scm:257
+#: guix/scripts/lint.scm:260
 msgid "synopsis should not start with the package name"
 msgstr "synopsis skal ikke starte med pakkenavnet"
 
-#: guix/scripts/lint.scm:348 guix/scripts/lint.scm:360
+#: guix/scripts/lint.scm:354 guix/scripts/lint.scm:366
 #, scheme-format
 msgid "URI ~a not reachable: ~a (~s)"
 msgstr "URI ~a kan ikke nås: ~a (~s)"
 
-#: guix/scripts/lint.scm:367
+#: guix/scripts/lint.scm:373
 #, scheme-format
 msgid "URI ~a domain not found: ~a"
 msgstr "URI ~a domæne blev ikke fundet: ~a"
 
-#: guix/scripts/lint.scm:375
+#: guix/scripts/lint.scm:381
 #, scheme-format
 msgid "URI ~a unreachable: ~a"
 msgstr "URI ~a kan ikke nås: ~a"
 
-#: guix/scripts/lint.scm:401
+#: guix/scripts/lint.scm:407
 msgid "invalid value for home page"
 msgstr "ugyldig værdi for hjemmeside"
 
-#: guix/scripts/lint.scm:404
+#: guix/scripts/lint.scm:410
 #, scheme-format
 msgid "invalid home page URL: ~s"
 msgstr "ugyldig hjemmesideadresse: ~s"
 
-#: guix/scripts/lint.scm:429
+#: guix/scripts/lint.scm:430
 msgid "file names of patches should start with the package name"
 msgstr "filnavn for rettelser skal starte med pakkenavnet"
 
@@ -1448,82 +1533,106 @@ msgstr "kildefilnavnet skal indeholde pakkenavnet"
 msgid "failed to create derivation: ~a"
 msgstr "kunne ikke oprette afledning: ~a"
 
-#: guix/scripts/lint.scm:558
+#: guix/scripts/lint.scm:566
 #, scheme-format
 msgid "failed to create derivation: ~s~%"
 msgstr "kunne ikke oprette afledning: ~s~%"
 
-#: guix/scripts/lint.scm:568
+#: guix/scripts/lint.scm:576
 msgid "invalid license field"
 msgstr "ugyldigt licensfelt"
 
-#: guix/scripts/lint.scm:582
+#: guix/scripts/lint.scm:602
+#, scheme-format
+msgid "failed to retrieve CVE vulnerabilities from ~s: ~a (~s)~%"
+msgstr "kunne ikke indhente CVE-sårbarheder fra ~s: ~a (~s)~%"
+
+#: guix/scripts/lint.scm:607 guix/scripts/lint.scm:615
+#, scheme-format
+msgid "assuming no CVE vulnerabilities~%"
+msgstr "antager ingen CVE-sårbarheder~%"
+
+#: guix/scripts/lint.scm:613
+#, scheme-format
+msgid "failed to lookup NIST host: ~a~%"
+msgstr "kunne ikke slå NIST-vært op: ~a~%"
+
+#: guix/scripts/lint.scm:644
+#, scheme-format
+msgid "probably vulnerable to ~a"
+msgstr "sandsynligvis sårbar for ~a"
+
+#: guix/scripts/lint.scm:659
 #, scheme-format
 msgid "tabulation on line ~a, column ~a"
 msgstr "tabulering på linje ~a, kolonne ~a"
 
-#: guix/scripts/lint.scm:591
+#: guix/scripts/lint.scm:668
 #, scheme-format
 msgid "trailing white space on line ~a"
 msgstr "efterstillet mellemrum på linje ~a"
 
-#: guix/scripts/lint.scm:601
+#: guix/scripts/lint.scm:678
 #, scheme-format
 msgid "line ~a is way too long (~a characters)"
 msgstr "linjen ~a er alt for lang (~a tegn)"
 
-#: guix/scripts/lint.scm:612
+#: guix/scripts/lint.scm:689
 #, scheme-format
 msgid "line ~a: parentheses feel lonely, move to the previous or next line"
 msgstr "linjen ~a: parenteser er ensomme, flyt til den forrige eller næste linje"
 
-#: guix/scripts/lint.scm:667
+#: guix/scripts/lint.scm:744
 msgid "Validate package descriptions"
 msgstr "Valider pakkebeskrivelser"
 
-#: guix/scripts/lint.scm:671
+#: guix/scripts/lint.scm:748
 msgid "Validate synopsis & description of GNU packages"
 msgstr "Valider synopsis og beskrivelse for GNU-pakker"
 
-#: guix/scripts/lint.scm:675
+#: guix/scripts/lint.scm:752
 msgid "Identify inputs that should be native inputs"
 msgstr "Identificer inddata som skal være standarddata"
 
-#: guix/scripts/lint.scm:679
+#: guix/scripts/lint.scm:756
 msgid "Validate file names and availability of patches"
 msgstr "Valider filnavne og tilgængelighed for rettelser"
 
-#: guix/scripts/lint.scm:683
+#: guix/scripts/lint.scm:760
 msgid "Validate home-page URLs"
 msgstr "Valider hjemmesiders adresser"
 
 #. TRANSLATORS: <license> is the name of a data type and must not be
 #. translated.
-#: guix/scripts/lint.scm:689
+#: guix/scripts/lint.scm:766
 msgid "Make sure the 'license' field is a <license> or a list thereof"
 msgstr "Sikr at feltet »license« er en <license> eller en liste deraf"
 
-#: guix/scripts/lint.scm:694
+#: guix/scripts/lint.scm:771
 msgid "Validate source URLs"
 msgstr "Valider kildeadresser"
 
-#: guix/scripts/lint.scm:698
+#: guix/scripts/lint.scm:775
 msgid "Validate file names of sources"
 msgstr "Valider filnavne for kilder"
 
-#: guix/scripts/lint.scm:702
+#: guix/scripts/lint.scm:779
 msgid "Report failure to compile a package to a derivation"
 msgstr "Rapporter mislykket kompilering af en pakke til en afledning"
 
-#: guix/scripts/lint.scm:706
+#: guix/scripts/lint.scm:783
 msgid "Validate package synopses"
 msgstr "Valider pakkesynopser"
 
-#: guix/scripts/lint.scm:710
+#: guix/scripts/lint.scm:787
+msgid "Check the Common Vulnerabilities and Exposures (CVE) database"
+msgstr "Kontroller databasen Common Vulnerabilities and Exposures (CVE)"
+
+#: guix/scripts/lint.scm:792
 msgid "Look for formatting issues in the source"
 msgstr "Kig efter formateringsproblemstillinger i kilden"
 
-#: guix/scripts/lint.scm:735
+#: guix/scripts/lint.scm:817
 msgid ""
 "Usage: guix lint [OPTION]... [PACKAGE]...\n"
 "Run a set of checkers on the specified package; if none is specified,\n"
@@ -1533,7 +1642,7 @@ msgstr ""
 "Kør et sæt af kontroller på den specificerede pakke; hvis ingen er specificeret,\n"
 "så kør kontrollerne på alle pakker.\n"
 
-#: guix/scripts/lint.scm:738
+#: guix/scripts/lint.scm:820
 msgid ""
 "\n"
 "  -c, --checkers=CHECKER1,CHECKER2...\n"
@@ -1543,7 +1652,7 @@ msgstr ""
 "  -c, --checkers=KONTROL1,KONTROL2...\n"
 "                         kør kun de specificerede kontroller"
 
-#: guix/scripts/lint.scm:743
+#: guix/scripts/lint.scm:825
 msgid ""
 "\n"
 "  -l, --list-checkers    display the list of available lint checkers"
@@ -1551,7 +1660,7 @@ msgstr ""
 "\n"
 "  -l, --list-checkers    vis listen med tilgængelige lint-kontroller"
 
-#: guix/scripts/lint.scm:763
+#: guix/scripts/lint.scm:845
 #, scheme-format
 msgid "~a: invalid checker~%"
 msgstr "~a: ugyldig kontrol~%"
@@ -1607,39 +1716,44 @@ msgstr "opslag efter værten »~a« mislykkedes: ~a~%"
 msgid "lookup of host '~a' returned nothing"
 msgstr "opslag efter værten »~a« returnerede intet"
 
-#: guix/scripts/publish.scm:343
+#: guix/scripts/publish.scm:342
 #, scheme-format
 msgid "user '~a' not found: ~a~%"
 msgstr "brugeren »~a« blev ikke fundet: ~a~%"
 
-#: guix/scripts/publish.scm:378
+#: guix/scripts/publish.scm:377
 #, scheme-format
 msgid "server running as root; consider using the '--user' option!~%"
 msgstr "server kører som root; overvej at bruge tilvalget »--user«!~%"
 
-#: guix/scripts/publish.scm:380
+#: guix/scripts/publish.scm:379
 #, scheme-format
 msgid "publishing ~a on ~a, port ~d~%"
 msgstr "udgiver ~a på ~a, port ~d~%"
 
-#: guix/scripts/edit.scm:40
+#: guix/scripts/edit.scm:41
 msgid ""
 "Usage: guix edit PACKAGE...\n"
-"Start $EDITOR to edit the definitions of PACKAGE...\n"
+"Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"
 msgstr ""
-"Brug: guix edit PAKKE...\n"
-"Start $EDITOR for at redigere definitionerne for PAKKE...\n"
+"Brug: guix edit PAKKE ...\n"
+"Start $VISUAL eller $EDITOR for at redigere definitionerne for PAKKE ...\n"
 
-#: guix/scripts/edit.scm:58
+#: guix/scripts/edit.scm:62
 #, scheme-format
 msgid "file '~a' not found in search path ~s~%"
 msgstr "filen »~a« blev ikke fundet i søgestien ~s~%"
 
-#: guix/scripts/edit.scm:70
+#: guix/scripts/edit.scm:83
 #, scheme-format
 msgid "source location of package '~a' is unknown~%"
 msgstr "kildeplacering for pakken »~a« er ukendt~%"
 
+#: guix/scripts/edit.scm:96
+#, scheme-format
+msgid "failed to launch '~a': ~a~%"
+msgstr "kunne ikke starte »~a«: ~a~%"
+
 #: guix/scripts/size.scm:75
 #, scheme-format
 msgid "no available substitute information for '~a'~%"
@@ -1696,43 +1810,47 @@ msgstr "manglende lagerpostargument\n"
 msgid "too many arguments\n"
 msgstr "for mange argumenter\n"
 
-#: guix/scripts/graph.scm:105
+#: guix/scripts/graph.scm:77
 msgid "the DAG of packages, excluding implicit inputs"
 msgstr "DAG'en for pakker, ekskluderende implicitte inddata"
 
-#: guix/scripts/graph.scm:155
+#: guix/scripts/graph.scm:133
 msgid "the DAG of packages, including implicit inputs"
 msgstr "DAG'en for pakker, inkluderende implicitte inddata"
 
-#: guix/scripts/graph.scm:179
+#: guix/scripts/graph.scm:142
+msgid "the DAG of packages and origins, including implicit inputs"
+msgstr "DAG'en for pakker og oprindelser, inkluderende implicitte inddata"
+
+#: guix/scripts/graph.scm:172
 msgid "same as 'bag', but without the bootstrap nodes"
 msgstr "samme som »bag«m uden bootstrap-knuder"
 
-#: guix/scripts/graph.scm:222
+#: guix/scripts/graph.scm:217
 msgid "the DAG of derivations"
 msgstr "DAG'en for afledninger"
 
-#: guix/scripts/graph.scm:246
+#: guix/scripts/graph.scm:241
 #, scheme-format
 msgid "references for '~a' are not known~%"
 msgstr "referencer for »~a« er ikke kendt~%"
 
-#: guix/scripts/graph.scm:253
+#: guix/scripts/graph.scm:248
 msgid "the DAG of run-time dependencies (store references)"
 msgstr "DAG'en for kørselstidsafhængigheder (lagerreferencer)"
 
-#: guix/scripts/graph.scm:282
+#: guix/scripts/graph.scm:278
 #, scheme-format
 msgid "~a: unknown node type~%"
 msgstr "~a: ukendt knudetype~%"
 
-#: guix/scripts/graph.scm:286
+#: guix/scripts/graph.scm:282
 msgid "The available node types are:\n"
 msgstr "De gyldige knudetyper er:\n"
 
 #. TRANSLATORS: Here 'dot' is the name of a program; it must not be
 #. translated.
-#: guix/scripts/graph.scm:389
+#: guix/scripts/graph.scm:318
 msgid ""
 "Usage: guix graph PACKAGE...\n"
 "Emit a Graphviz (dot) representation of the dependencies of PACKAGE...\n"
@@ -1740,7 +1858,7 @@ msgstr ""
 "Brug: guix graph PAKKE...\n"
 "Udsend en Graphviz-repræsentation (dot) af afhængighederne for PAKKE...\n"
 
-#: guix/scripts/graph.scm:391
+#: guix/scripts/graph.scm:320
 msgid ""
 "\n"
 "  -t, --type=TYPE        represent nodes of the given TYPE"
@@ -1748,7 +1866,7 @@ msgstr ""
 "\n"
 "  -t, --type=TYPE        repræsenter knuder for den givne TYPE"
 
-#: guix/scripts/graph.scm:393
+#: guix/scripts/graph.scm:322
 msgid ""
 "\n"
 "      --list-types       list the available graph types"
@@ -1756,7 +1874,7 @@ msgstr ""
 "\n"
 "      --list-types       vis de tilgængelige graftyper"
 
-#: guix/scripts/graph.scm:395
+#: guix/scripts/graph.scm:324
 msgid ""
 "\n"
 "  -e, --expression=EXPR  consider the package EXPR evaluates to"
@@ -1817,86 +1935,149 @@ msgstr ""
 "      --substitute-urls=ADRESSER\n"
 "                         sammenlign byggeresultater med dem på ADRESSER"
 
-#: guix/gnu-maintenance.scm:418
+#: guix/gnu-maintenance.scm:542
 msgid "Updater for GNU packages"
 msgstr "Opdater for GNU-pakker"
 
-#: guix/upstream.scm:156
+#: guix/gnu-maintenance.scm:549
+msgid "Updater for GNOME packages"
+msgstr "Opdater for GNOME-pakker"
+
+#: guix/gnu-maintenance.scm:556
+msgid "Updater for X.org packages"
+msgstr "Opdater for X.org-pakker"
+
+#: guix/scripts/container.scm:25
+msgid ""
+"Usage: guix container ACTION ARGS...\n"
+"Build and manipulate Linux containers.\n"
+msgstr ""
+"Brug: guix container HANDLING ARG ...\n"
+"Byg og manipuler Linuxcontainere.\n"
+
+#: guix/scripts/container.scm:30
+msgid "   exec            execute a command inside of an existing container\n"
+msgstr "   exec            kør en kommando inden i en eksisterende container\n"
+
+#: guix/scripts/container.scm:53
+#, scheme-format
+msgid "guix container: missing action~%"
+msgstr "guix container: mangler handling~%"
+
+#: guix/scripts/container.scm:63
+#, scheme-format
+msgid "guix container: invalid action~%"
+msgstr "guix container: ugyldig handling~%"
+
+#: guix/scripts/container/exec.scm:40
+msgid ""
+"Usage: guix container exec PID COMMAND [ARGS...]\n"
+"Execute COMMMAND within the container process PID.\n"
+msgstr ""
+"Brug: guix container exec PID KOMMANDO [ARG ...]\n"
+"Kør KOMMANDO inden i containerproces-PID'en.\n"
+
+#: guix/scripts/container/exec.scm:69
+#, scheme-format
+msgid "~a: extraneous argument~%"
+msgstr "~a: uvedkommende argument~%"
+
+#: guix/scripts/container/exec.scm:80
+#, scheme-format
+msgid "no pid specified~%"
+msgstr "ingen pid angivet~%"
+
+#: guix/scripts/container/exec.scm:83
+#, scheme-format
+msgid "no command specified~%"
+msgstr "ingen kommando angivet~%"
+
+#: guix/scripts/container/exec.scm:86
+#, scheme-format
+msgid "no such process ~d~%"
+msgstr "ingen sådan proces ~d~%"
+
+#: guix/scripts/container/exec.scm:94
+#, scheme-format
+msgid "exec failed with status ~d~%"
+msgstr "exec mislykkedes med status ~d~%"
+
+#: guix/upstream.scm:158
 #, scheme-format
 msgid "signature verification failed for `~a'~%"
 msgstr "signaturverifikation mislykkedes for »~a«~%"
 
-#: guix/upstream.scm:158
+#: guix/upstream.scm:160
 #, scheme-format
 msgid "(could be because the public key is not in your keyring)~%"
 msgstr "(kunne være fordi den offentlige nøgle ikke er i din nøglering)~%"
 
-#: guix/upstream.scm:190
+#: guix/upstream.scm:192
 msgid "gz"
 msgstr "gz"
 
-#: guix/upstream.scm:253
+#: guix/upstream.scm:255
 #, scheme-format
 msgid "~a: could not locate source file"
 msgstr "~a: kunne ikke lokalisere kildefil"
 
-#: guix/upstream.scm:258
+#: guix/upstream.scm:260
 #, scheme-format
 msgid "~a: ~a: no `version' field in source; skipping~%"
 msgstr "~a: ~a: intet »versionsfelt« i kilde; udelader~%"
 
-#: guix/ui.scm:234
+#: guix/ui.scm:236
 msgid "entering debugger; type ',bt' for a backtrace\n"
 msgstr "går i fejlsøger; tast »,bt« for en tilbagesporing\n"
 
-#: guix/ui.scm:250 guix/ui.scm:267
+#: guix/ui.scm:252 guix/ui.scm:269
 #, scheme-format
 msgid "failed to load '~a': ~a~%"
 msgstr "kunne ikke indlæse »~a«: ~a~%"
 
-#: guix/ui.scm:253
+#: guix/ui.scm:255
 #, scheme-format
 msgid "~a: error: ~a~%"
 msgstr "~a: fejl: ~a~%"
 
-#: guix/ui.scm:256 guix/ui.scm:510
+#: guix/ui.scm:258 guix/ui.scm:512
 #, scheme-format
 msgid "exception thrown: ~s~%"
 msgstr "undtagelse smidt: ~s~%"
 
-#: guix/ui.scm:258 guix/ui.scm:276
+#: guix/ui.scm:260 guix/ui.scm:278
 #, scheme-format
 msgid "failed to load '~a':~%"
 msgstr "kunne ikke indlæse »~a«:~%"
 
-#: guix/ui.scm:270
+#: guix/ui.scm:272
 #, scheme-format
 msgid "~a: warning: ~a~%"
 msgstr "~a: advarsel: ~a~%"
 
-#: guix/ui.scm:273
+#: guix/ui.scm:275
 #, scheme-format
 msgid "failed to load '~a': exception thrown: ~s~%"
 msgstr "kunne ikke indlæse »~a«: undtagelse smidt: ~s~%"
 
-#: guix/ui.scm:285
+#: guix/ui.scm:287
 #, scheme-format
 msgid "failed to install locale: ~a~%"
 msgstr "kunne ikke installere sprog: ~a~%"
 
-#: guix/ui.scm:304
+#: guix/ui.scm:306
 msgid ""
-"Copyright (C) 2015 the Guix authors\n"
+"Copyright (C) 2016 the Guix authors\n"
 "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n"
 "This is free software: you are free to change and redistribute it.\n"
 "There is NO WARRANTY, to the extent permitted by law.\n"
 msgstr ""
-"Ophavsret 2015 Guix-forfatterne\n"
+"Ophavsret 2016 Guix-forfatterne\n"
 "Licens GPLv3+: GNU GPL version 3 eller senere <http://gnu.org/licenses/gpl.html>\n"
 "Dette er et frit program; du kan frit ændre og videredistribuere programmet.\n"
 "Der er INGEN GARANTI, inden for lovens rammer.\n"
 
-#: guix/ui.scm:312
+#: guix/ui.scm:314
 #, scheme-format
 msgid ""
 "\n"
@@ -1905,7 +2086,7 @@ msgstr ""
 "\n"
 "Rapporter fejl til: ~a."
 
-#: guix/ui.scm:314
+#: guix/ui.scm:316
 #, scheme-format
 msgid ""
 "\n"
@@ -1914,7 +2095,7 @@ msgstr ""
 "\n"
 "~a hjemmeside: <~a>"
 
-#: guix/ui.scm:316
+#: guix/ui.scm:318
 msgid ""
 "\n"
 "General help using GNU software: <http://www.gnu.org/gethelp/>"
@@ -1922,219 +2103,219 @@ msgstr ""
 "\n"
 "Generel hjælp til brugen af GNU-programmer: <http://www.gnu.org/gethelp/>"
 
-#: guix/ui.scm:361
+#: guix/ui.scm:363
 #, scheme-format
 msgid "'~a' is not a valid regular expression: ~a~%"
 msgstr "»~a« er ikke et gyldigt regulært udtryk: ~a~%"
 
-#: guix/ui.scm:367
+#: guix/ui.scm:369
 #, scheme-format
 msgid "~a: invalid number~%"
 msgstr "~a: ugyldigt nummer~%"
 
-#: guix/ui.scm:384
+#: guix/ui.scm:386
 #, scheme-format
 msgid "invalid number: ~a~%"
 msgstr "ugyldigt nummer: ~a~%"
 
-#: guix/ui.scm:407
+#: guix/ui.scm:409
 #, scheme-format
 msgid "unknown unit: ~a~%"
 msgstr "ukendt enhed: ~a~%"
 
-#: guix/ui.scm:418
+#: guix/ui.scm:420
 #, scheme-format
 msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%"
 msgstr "~a:~a:~a: pakken »~a« har ugyldige inddata: ~s~%"
 
-#: guix/ui.scm:425
+#: guix/ui.scm:427
 #, scheme-format
 msgid "~a: ~a: build system `~a' does not support cross builds~%"
 msgstr "~a: ~a: byggesystem »~a« understøtter ikke krydsbygninger~%"
 
-#: guix/ui.scm:430
+#: guix/ui.scm:432
 #, scheme-format
 msgid "profile '~a' does not exist~%"
 msgstr "profilen »~a« findes ikke~%"
 
-#: guix/ui.scm:433
+#: guix/ui.scm:435
 #, scheme-format
 msgid "generation ~a of profile '~a' does not exist~%"
 msgstr "oprettelse ~a af profilen »~a« findes ikke~%"
 
-#: guix/ui.scm:440
+#: guix/ui.scm:442
 #, scheme-format
 msgid "corrupt input while restoring '~a' from ~s~%"
 msgstr "ødelagte inddata under gendannelse af »~a« fra ~s~%"
 
-#: guix/ui.scm:442
+#: guix/ui.scm:444
 #, scheme-format
 msgid "corrupt input while restoring archive from ~s~%"
 msgstr "ødelagte inddata under gendannelse af arkiv fra ~s~%"
 
-#: guix/ui.scm:445
+#: guix/ui.scm:447
 #, scheme-format
 msgid "failed to connect to `~a': ~a~%"
 msgstr "kunne ikke forbinde til »~a«: ~a~%"
 
-#: guix/ui.scm:450
+#: guix/ui.scm:452
 #, scheme-format
 msgid "build failed: ~a~%"
 msgstr "bygning mislykkedes: ~a~%"
 
-#: guix/ui.scm:453
+#: guix/ui.scm:455
 #, scheme-format
 msgid "reference to invalid output '~a' of derivation '~a'~%"
 msgstr "reference til ugyldige uddata »~a« for afledning »~a«~%"
 
-#: guix/ui.scm:464
+#: guix/ui.scm:466
 #, scheme-format
 msgid "~a: ~a~%"
 msgstr "~a: ~a~%"
 
-#: guix/ui.scm:499
+#: guix/ui.scm:501
 #, scheme-format
 msgid "failed to read expression ~s: ~s~%"
 msgstr "kunne ikke læse udtryk ~s: ~s~%"
 
-#: guix/ui.scm:505
+#: guix/ui.scm:507
 #, scheme-format
 msgid "failed to evaluate expression '~a':~%"
 msgstr "kunne ikke evaluere udtryk »~a«:~%"
 
-#: guix/ui.scm:508
+#: guix/ui.scm:510
 #, scheme-format
 msgid "syntax error: ~a~%"
 msgstr "syntaksfejl: ~a~%"
 
-#: guix/ui.scm:522
+#: guix/ui.scm:524
 #, scheme-format
 msgid "expression ~s does not evaluate to a package~%"
 msgstr "udtryk ~s evaluerer ikke til en pakke~%"
 
-#: guix/ui.scm:582
+#: guix/ui.scm:586
 #, scheme-format
 msgid "~:[The following derivation would be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations would be built:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Den følgende afledning ville blive bygget:~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[De følgende afledninger ville blive bygget:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:587
+#: guix/ui.scm:591
 #, scheme-format
 msgid "~:[The following file would be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files would be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Den følgende fil ville blive hentet:~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[De følgende filer ville blive hentet:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:593
+#: guix/ui.scm:597
 #, scheme-format
 msgid "~:[The following derivation will be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations will be built:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Den følgende afledning vil blive bygget:~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[De følgende afledninger vil blive bygget:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:598
+#: guix/ui.scm:602
 #, scheme-format
 msgid "~:[The following file will be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files will be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] "~:[Den følgende fil vil blive hentet:~%~{   ~a~%~}~;~]"
 msgstr[1] "~:[De følgende filer vil blive hentet:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:653
+#: guix/ui.scm:657
 #, scheme-format
 msgid "The following package would be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be removed:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke ville blive fjernet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker ville blive fjernet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:658
+#: guix/ui.scm:662
 #, scheme-format
 msgid "The following package will be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be removed:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke vil blive fjernet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker vil blive fjernet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:671
+#: guix/ui.scm:675
 #, scheme-format
 msgid "The following package would be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke ville blive nedgraderet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker ville blive nedgraderet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:676
+#: guix/ui.scm:680
 #, scheme-format
 msgid "The following package will be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke vil blive nedgraderet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker vil blive nedgraderet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:689
+#: guix/ui.scm:693
 #, scheme-format
 msgid "The following package would be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke ville blive opgraderet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker ville blive opgraderet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:694
+#: guix/ui.scm:698
 #, scheme-format
 msgid "The following package will be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke vil blive opgraderet:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker vil blive opgraderet:~%~{~a~%~}~%"
 
-#: guix/ui.scm:705
+#: guix/ui.scm:709
 #, scheme-format
 msgid "The following package would be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be installed:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke ville blive installeret:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker ville blive installeret:~%~{~a~%~}~%"
 
-#: guix/ui.scm:710
+#: guix/ui.scm:714
 #, scheme-format
 msgid "The following package will be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be installed:~%~{~a~%~}~%"
 msgstr[0] "Den følgende pakke vil blive installeret:~%~{~a~%~}~%"
 msgstr[1] "De følgende pakker vil blive installeret:~%~{~a~%~}~%"
 
-#: guix/ui.scm:727
+#: guix/ui.scm:731
 msgid "<unknown location>"
 msgstr "<ukendt sted>"
 
-#: guix/ui.scm:746
+#: guix/ui.scm:750
 #, scheme-format
 msgid "failed to create configuration directory `~a': ~a~%"
 msgstr "kunne ikke oprette konfiguratinsmappe »~a«: ~a~%"
 
-#: guix/ui.scm:865 guix/ui.scm:879
+#: guix/ui.scm:869 guix/ui.scm:883
 msgid "unknown"
 msgstr "ukendt"
 
-#: guix/ui.scm:1029
+#: guix/ui.scm:1033
 #, scheme-format
 msgid "Generation ~a\t~a"
 msgstr "Generation ~a\t~a"
 
-#: guix/ui.scm:1036
+#: guix/ui.scm:1040
 #, scheme-format
 msgid "~a\t(current)~%"
 msgstr "~a\t(nuværende)~%"
 
-#: guix/ui.scm:1053
+#: guix/ui.scm:1057
 #, scheme-format
 msgid "switched from generation ~a to ~a~%"
 msgstr "skiftede fra generation ~a til ~a~%"
 
-#: guix/ui.scm:1069
+#: guix/ui.scm:1073
 #, scheme-format
 msgid "deleting ~a~%"
 msgstr "sletter ~a~%"
 
-#: guix/ui.scm:1117
+#: guix/ui.scm:1121
 #, scheme-format
 msgid "Try `guix --help' for more information.~%"
 msgstr "Prøv »guix --help« for yderligere information.~%"
 
-#: guix/ui.scm:1144
+#: guix/ui.scm:1148
 msgid ""
 "Usage: guix COMMAND ARGS...\n"
 "Run COMMAND with ARGS.\n"
@@ -2142,31 +2323,31 @@ msgstr ""
 "Brug: guix KOMMANDO ARG...\n"
 "Kør KOMMANDO med ARG.\n"
 
-#: guix/ui.scm:1147
+#: guix/ui.scm:1151
 msgid "COMMAND must be one of the sub-commands listed below:\n"
 msgstr "KOMMANDO skal være en af underkommandoerne vist nedenfor:\n"
 
-#: guix/ui.scm:1167
+#: guix/ui.scm:1171
 #, scheme-format
 msgid "guix: ~a: command not found~%"
 msgstr "guix: ~a: kommando blev ikke fundet~%"
 
-#: guix/ui.scm:1184
+#: guix/ui.scm:1188
 #, scheme-format
 msgid "guix: missing command name~%"
 msgstr "guix: mangler kommandonavn~%"
 
-#: guix/ui.scm:1192
+#: guix/ui.scm:1196
 #, scheme-format
 msgid "guix: unrecognized option '~a'~%"
 msgstr "guix: ikke genkendt tilvalg »~a«~%"
 
-#: guix/http-client.scm:228
+#: guix/http-client.scm:261
 #, scheme-format
 msgid "following redirection to `~a'...~%"
 msgstr "følger omdirigering til »~a«...~%"
 
-#: guix/http-client.scm:237
+#: guix/http-client.scm:270
 msgid "download failed"
 msgstr "overførsel mislykkedes"
 
@@ -2220,113 +2401,122 @@ msgstr "guix-daemon - udfør afledningsbygninger og lageradgange"
 msgid "This program is a daemon meant to run in the background.  It serves requests sent over a Unix-domain socket.  It accesses the store, and builds derivations on behalf of its clients."
 msgstr "Dette program er en ædmon lavet til at køre i baggrunden. Den betjener forespørgsler sendt over en Unix-domænesokkel. Den tilgår lageret, og bgyger afledninger på vegne af dens klienter."
 
-#: nix/nix-daemon/guix-daemon.cc:86
+#: nix/nix-daemon/guix-daemon.cc:87
 msgid "SYSTEM"
 msgstr "SYSTEM"
 
-#: nix/nix-daemon/guix-daemon.cc:87
+#: nix/nix-daemon/guix-daemon.cc:88
 msgid "assume SYSTEM as the current system type"
 msgstr "antag SYSTEM som den nuværende systemtype"
 
-#: nix/nix-daemon/guix-daemon.cc:88 nix/nix-daemon/guix-daemon.cc:91
+#: nix/nix-daemon/guix-daemon.cc:89 nix/nix-daemon/guix-daemon.cc:92
 msgid "N"
 msgstr "N"
 
-#: nix/nix-daemon/guix-daemon.cc:89
+#: nix/nix-daemon/guix-daemon.cc:90
 msgid "use N CPU cores to build each derivation; 0 means as many as available"
 msgstr "brug N CPU-kerner til at bygge hver afledning; 0 betyder så mange som er tilgængelige"
 
-#: nix/nix-daemon/guix-daemon.cc:92
+#: nix/nix-daemon/guix-daemon.cc:93
 msgid "allow at most N build jobs"
 msgstr "tillad højest N-byggejob"
 
-#: nix/nix-daemon/guix-daemon.cc:94
+#: nix/nix-daemon/guix-daemon.cc:95
 msgid "disable chroot builds"
 msgstr "deaktiver chroot-bygninger"
 
-#: nix/nix-daemon/guix-daemon.cc:95
+#: nix/nix-daemon/guix-daemon.cc:96
 msgid "DIR"
 msgstr "MAPPE"
 
-#: nix/nix-daemon/guix-daemon.cc:96
+#: nix/nix-daemon/guix-daemon.cc:97
 msgid "add DIR to the build chroot"
 msgstr "tilføj MAPPE til byggechrooten"
 
-#: nix/nix-daemon/guix-daemon.cc:97
+#: nix/nix-daemon/guix-daemon.cc:98
 msgid "GROUP"
 msgstr "GRUPPE"
 
-#: nix/nix-daemon/guix-daemon.cc:98
+#: nix/nix-daemon/guix-daemon.cc:99
 msgid "perform builds as a user of GROUP"
 msgstr "udfør bygninger som en bruger i GRUPPE"
 
-#: nix/nix-daemon/guix-daemon.cc:100
+#: nix/nix-daemon/guix-daemon.cc:101
 msgid "do not use substitutes"
 msgstr "brug ikke substitutter"
 
-#: nix/nix-daemon/guix-daemon.cc:101
+#: nix/nix-daemon/guix-daemon.cc:102
 msgid "URLS"
 msgstr "ADRESSER"
 
-#: nix/nix-daemon/guix-daemon.cc:102
+#: nix/nix-daemon/guix-daemon.cc:103
 msgid "use URLS as the default list of substitute providers"
 msgstr "brug ADRESSER som standardlisten for substitutleverandører"
 
-#: nix/nix-daemon/guix-daemon.cc:104
+#: nix/nix-daemon/guix-daemon.cc:105
 msgid "do not use the 'build hook'"
 msgstr "brug ikke »build hook«"
 
-#: nix/nix-daemon/guix-daemon.cc:106
+#: nix/nix-daemon/guix-daemon.cc:107
 msgid "cache build failures"
 msgstr "mellemlagerbyggefejl"
 
-#: nix/nix-daemon/guix-daemon.cc:108
+#: nix/nix-daemon/guix-daemon.cc:109
+msgid "build each derivation N times in a row"
+msgstr "byg hver derivation N gange i en række"
+
+#: nix/nix-daemon/guix-daemon.cc:111
 msgid "do not keep build logs"
 msgstr "bevar ikke byggelogge"
 
-#: nix/nix-daemon/guix-daemon.cc:110
+#: nix/nix-daemon/guix-daemon.cc:113
 msgid "disable compression of the build logs"
 msgstr "deaktiver komprimering af byggelogge"
 
-#: nix/nix-daemon/guix-daemon.cc:115
+#: nix/nix-daemon/guix-daemon.cc:118
 msgid "disable automatic file \"deduplication\" in the store"
 msgstr "deaktiver automatisk »fildeduplikation« i lageret"
 
-#: nix/nix-daemon/guix-daemon.cc:125
+#: nix/nix-daemon/guix-daemon.cc:128
 msgid "impersonate Linux 2.6"
 msgstr "udgiv Linux 2.6"
 
-#: nix/nix-daemon/guix-daemon.cc:129
+#: nix/nix-daemon/guix-daemon.cc:132
 msgid "tell whether the GC must keep outputs of live derivations"
 msgstr "fortæl om GC'en skal bevare uddata for live afledninger"
 
-#: nix/nix-daemon/guix-daemon.cc:132
+#: nix/nix-daemon/guix-daemon.cc:135
 msgid "tell whether the GC must keep derivations corresponding to live outputs"
 msgstr "fortæl om GC'en skal bevare afledninger svarende til live uddata"
 
-#: nix/nix-daemon/guix-daemon.cc:135
+#: nix/nix-daemon/guix-daemon.cc:138
 msgid "SOCKET"
 msgstr "SOKKEL"
 
-#: nix/nix-daemon/guix-daemon.cc:136
+#: nix/nix-daemon/guix-daemon.cc:139
 msgid "listen for connections on SOCKET"
 msgstr "lyt efter forbindelser på SOKKEL"
 
-#: nix/nix-daemon/guix-daemon.cc:138
+#: nix/nix-daemon/guix-daemon.cc:141
 msgid "produce debugging output"
 msgstr "lav fejlsøgningsinformation"
 
-#: nix/nix-daemon/guix-daemon.cc:205 nix/nix-daemon/guix-daemon.cc:381
+#: nix/nix-daemon/guix-daemon.cc:201
+#, c-format
+msgid "error: %s: invalid number of rounds\n"
+msgstr "fejl: %s: ugyldigt antal runder\n"
+
+#: nix/nix-daemon/guix-daemon.cc:220 nix/nix-daemon/guix-daemon.cc:396
 #, c-format
 msgid "error: %s\n"
 msgstr "fejl: %s\n"
 
-#: nix/nix-daemon/guix-daemon.cc:266
+#: nix/nix-daemon/guix-daemon.cc:281
 #, c-format
 msgid "error: libgcrypt version mismatch\n"
 msgstr "fejl: forskellige versioner af libgcrypt\n"
 
-#: nix/nix-daemon/guix-daemon.cc:357
+#: nix/nix-daemon/guix-daemon.cc:372
 #, c-format
 msgid "warning: daemon is running as root, so using `--build-users-group' is highly recommended\n"
 msgstr "advarsel: dæmon kører som root, så brug af »--build-users-group« anbefales\n"
diff --git a/po/packages/da.po b/po/packages/da.po
index 66c2e7cc7e..fae57bca19 100644
--- a/po/packages/da.po
+++ b/po/packages/da.po
@@ -1,15 +1,15 @@
 # Danish translation guix-packages.
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the guix package.
-# Joe Hansen <joedalton2@yahoo.dk>, 2015.
+# Joe Hansen <joedalton2@yahoo.dk>, 2015, 2016.
 #
-#: gnu/packages/databases.scm:598
+#: gnu/packages/databases.scm:626
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-packages 0.9.0\n"
+"Project-Id-Version: guix-packages 0.9.1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2015-10-28 16:31+0100\n"
-"PO-Revision-Date: 2015-10-31 19:30+01:00\n"
+"POT-Creation-Date: 2016-03-04 16:52+0100\n"
+"PO-Revision-Date: 2016-03-27 19:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -37,11 +37,11 @@ msgstr ""
 "som kan bruges i dit daglige arbejde, personlige behov, eller bare\n"
 "god gammeldags skrivning."
 
-#: gnu/packages/aspell.scm:43 gnu/packages/libreoffice.scm:611
+#: gnu/packages/aspell.scm:53 gnu/packages/libreoffice.scm:616
 msgid "Spell checker"
 msgstr "Stavekontrol"
 
-#: gnu/packages/aspell.scm:45
+#: gnu/packages/aspell.scm:55
 msgid ""
 "Aspell is a spell-checker which can be used either as a library or as\n"
 "a standalone program.  Notable features of Aspell include its full support of\n"
@@ -53,15 +53,15 @@ msgstr ""
 "fulde understøttelse af dokumenter skrivet i UTF-8-kodning og dets evne\n"
 "til at bruge flere ordbøger, inklusive personlige."
 
-#: gnu/packages/aspell.scm:85
+#: gnu/packages/aspell.scm:95
 msgid "This package provides a dictionary for the GNU Aspell spell checker."
 msgstr "Denne pakke tilbyder en ordbog for stavekontrollen GNU Aspell."
 
-#: gnu/packages/audio.scm:92
+#: gnu/packages/audio.scm:96
 msgid "Realtime modular synthesizer and effect processor"
 msgstr ""
 
-#: gnu/packages/audio.scm:94
+#: gnu/packages/audio.scm:98
 msgid ""
 "AlsaModularSynth is a digital implementation of a classical analog\n"
 "modular synthesizer system.  It uses virtual control voltages to control the\n"
@@ -70,11 +70,11 @@ msgid ""
 "Filter) modules follow the convention of 1V / Octave."
 msgstr ""
 
-#: gnu/packages/audio.scm:131
-msgid "A library for audio labelling"
+#: gnu/packages/audio.scm:135
+msgid "Library for audio labelling"
 msgstr ""
 
-#: gnu/packages/audio.scm:133
+#: gnu/packages/audio.scm:137
 msgid ""
 "aubio is a tool designed for the extraction of annotations from audio\n"
 "signals.  Its features include segmenting a sound file before each of its\n"
@@ -82,22 +82,22 @@ msgid ""
 "streams from live audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:226
+#: gnu/packages/audio.scm:229
 msgid "Digital audio workstation"
 msgstr ""
 
-#: gnu/packages/audio.scm:228
+#: gnu/packages/audio.scm:231
 msgid ""
 "Ardour is a multi-channel digital audio workstation, allowing users to\n"
 "record, edit, mix and master audio and MIDI projects.  It is targeted at audio\n"
 "engineers, musicians, soundtrack editors and composers."
 msgstr ""
 
-#: gnu/packages/audio.scm:289
+#: gnu/packages/audio.scm:263
 msgid "Tonewheel organ synthesizer"
 msgstr ""
 
-#: gnu/packages/audio.scm:291
+#: gnu/packages/audio.scm:265
 msgid ""
 "AZR-3 is a port of the free VST plugin AZR-3.  It is a tonewheel organ\n"
 "with drawbars, distortion and rotating speakers.  The organ has three\n"
@@ -106,11 +106,11 @@ msgid ""
 "plugins are provided."
 msgstr ""
 
-#: gnu/packages/audio.scm:329
+#: gnu/packages/audio.scm:302
 msgid "Audio plug-in pack for LV2 and JACK environments"
 msgstr ""
 
-#: gnu/packages/audio.scm:331
+#: gnu/packages/audio.scm:304
 msgid ""
 "Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments.\n"
 "The suite contains lots of effects (delay, modulation, signal processing,\n"
@@ -119,31 +119,31 @@ msgid ""
 "tools (analyzer, mono/stereo tools, crossovers)."
 msgstr ""
 
-#: gnu/packages/audio.scm:367
+#: gnu/packages/audio.scm:347
 msgid "Sound and music computing system"
 msgstr ""
 
-#: gnu/packages/audio.scm:369
+#: gnu/packages/audio.scm:349
 msgid ""
 "Csound is a user-programmable and user-extensible sound processing\n"
 "language and software synthesizer."
 msgstr ""
 
-#: gnu/packages/audio.scm:412 gnu/packages/audio.scm:1900
+#: gnu/packages/audio.scm:392 gnu/packages/audio.scm:2005
 msgid "C++ wrapper around the ALSA API"
 msgstr ""
 
-#: gnu/packages/audio.scm:414
+#: gnu/packages/audio.scm:394
 msgid ""
 "clalsadrv is a C++ wrapper around the ALSA API simplifying access to\n"
 "ALSA PCM devices."
 msgstr ""
 
-#: gnu/packages/audio.scm:449
+#: gnu/packages/audio.scm:429
 msgid "SoundFont synthesizer"
 msgstr ""
 
-#: gnu/packages/audio.scm:451
+#: gnu/packages/audio.scm:431
 msgid ""
 "FluidSynth is a real-time software synthesizer based on the SoundFont 2\n"
 "specifications.  FluidSynth reads and handles MIDI events from the MIDI input\n"
@@ -151,39 +151,39 @@ msgid ""
 "also play midifiles using a Soundfont."
 msgstr ""
 
-#: gnu/packages/audio.scm:483
+#: gnu/packages/audio.scm:463
 msgid "MPEG-4 and MPEG-2 AAC decoder"
 msgstr ""
 
-#: gnu/packages/audio.scm:485
+#: gnu/packages/audio.scm:465
 msgid ""
 "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR,\n"
 "PS, and DAB+."
 msgstr ""
 
-#: gnu/packages/audio.scm:514
+#: gnu/packages/audio.scm:494
 msgid "Signal processing language"
 msgstr ""
 
-#: gnu/packages/audio.scm:516
+#: gnu/packages/audio.scm:496
 msgid "Faust is a programming language for realtime audio signal processing."
 msgstr ""
 
-#: gnu/packages/audio.scm:551
+#: gnu/packages/audio.scm:531
 msgid "GUS compatible patches for MIDI players"
 msgstr ""
 
-#: gnu/packages/audio.scm:553
+#: gnu/packages/audio.scm:533
 msgid ""
 "FreePats is a project to create a free and open set of GUS compatible\n"
 "patches that can be used with softsynths such as Timidity and WildMidi."
 msgstr ""
 
-#: gnu/packages/audio.scm:604
+#: gnu/packages/audio.scm:586
 msgid "Virtual guitar amplifier"
 msgstr ""
 
-#: gnu/packages/audio.scm:605
+#: gnu/packages/audio.scm:587
 msgid ""
 "Guitarix is a virtual guitar amplifier running JACK.\n"
 "Guitarix takes the signal from your guitar as a mono-signal from your sound\n"
@@ -194,22 +194,38 @@ msgid ""
 "auto-wah."
 msgstr ""
 
-#: gnu/packages/audio.scm:647
+#: gnu/packages/audio.scm:633
+msgid "Audio effects processor"
+msgstr ""
+
+#: gnu/packages/audio.scm:635
+msgid ""
+"Rakarrack is a richly featured multi-effects processor emulating a\n"
+"guitar effects pedalboard.  Effects include compressor, expander, noise gate,\n"
+"equalizers, exciter, flangers, chorus, various delay and reverb effects,\n"
+"distortion modules and many more.  Most of the effects engine is built from\n"
+"modules found in the excellent software synthesizer ZynAddSubFX.  Presets and\n"
+"user interface are optimized for guitar, but Rakarrack processes signals in\n"
+"stereo while it does not apply internal band-limiting filtering, and thus is\n"
+"well suited to all musical instruments and vocals."
+msgstr ""
+
+#: gnu/packages/audio.scm:679
 msgid "LV2 convolution reverb"
 msgstr ""
 
-#: gnu/packages/audio.scm:649
+#: gnu/packages/audio.scm:681
 msgid ""
 "IR is a low-latency, real-time, high performance signal convolver\n"
 "especially for creating reverb effects.  It supports impulse responses with 1,\n"
 "2 or 4 channels, in any soundfile format supported by libsndfile."
 msgstr ""
 
-#: gnu/packages/audio.scm:679
+#: gnu/packages/audio.scm:711
 msgid "JACK audio connection kit"
 msgstr ""
 
-#: gnu/packages/audio.scm:681
+#: gnu/packages/audio.scm:713
 msgid ""
 "JACK is a low-latency audio server.  It can connect a number of\n"
 "different applications to an audio device, as well as allowing them to share\n"
@@ -219,32 +235,32 @@ msgid ""
 "synchronous execution of all clients, and low latency operation."
 msgstr ""
 
-#: gnu/packages/audio.scm:760
+#: gnu/packages/audio.scm:811
 msgid "Simple LV2 host for JACK"
 msgstr ""
 
-#: gnu/packages/audio.scm:762
+#: gnu/packages/audio.scm:813
 msgid ""
 "Jalv is a simple but fully featured LV2 host for JACK.  It runs LV2\n"
 "plugins and exposes their ports as JACK ports, essentially making any LV2\n"
 "plugin function as a JACK application."
 msgstr ""
 
-#: gnu/packages/audio.scm:798
+#: gnu/packages/audio.scm:856
 msgid "Linux Audio Developer's Simple Plugin API (LADSPA)"
 msgstr ""
 
-#: gnu/packages/audio.scm:800
+#: gnu/packages/audio.scm:858
 msgid ""
 "LADSPA is a standard that allows software audio processors and effects\n"
 "to be plugged into a wide range of audio synthesis and recording packages."
 msgstr ""
 
-#: gnu/packages/audio.scm:836
+#: gnu/packages/audio.scm:894
 msgid "Audio application session manager"
 msgstr ""
 
-#: gnu/packages/audio.scm:838
+#: gnu/packages/audio.scm:896
 msgid ""
 "LASH is a session management system for audio applications.  It allows\n"
 "you to save and restore audio sessions consisting of multiple interconneced\n"
@@ -252,11 +268,11 @@ msgid ""
 "connections between them."
 msgstr ""
 
-#: gnu/packages/audio.scm:859
+#: gnu/packages/audio.scm:917
 msgid "Bauer stereophonic-to-binaural DSP"
 msgstr ""
 
-#: gnu/packages/audio.scm:861
+#: gnu/packages/audio.scm:919
 msgid ""
 "The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is\n"
 "designed to improve headphone listening of stereo audio records.  Recommended\n"
@@ -264,32 +280,44 @@ msgid ""
 "essential distortions."
 msgstr ""
 
-#: gnu/packages/audio.scm:886
+#: gnu/packages/audio.scm:944
 msgid "Implementation of the Open Sound Control protocol"
 msgstr ""
 
-#: gnu/packages/audio.scm:888
+#: gnu/packages/audio.scm:946
 msgid ""
 "liblo is a lightweight library that provides an easy to use\n"
 "implementation of the Open Sound Control (OSC) protocol."
 msgstr ""
 
-#: gnu/packages/audio.scm:925
+#: gnu/packages/audio.scm:967
+msgid "Python bindings for liblo"
+msgstr ""
+
+#: gnu/packages/audio.scm:969
+msgid ""
+"Pyliblo is a Python wrapper for the liblo Open Sound Control (OSC)\n"
+"library.  It supports almost the complete functionality of liblo, allowing you\n"
+"to send and receive OSC messages using a nice and simple Python API.  Also\n"
+"included are the command line utilities @code{send_osc} and @code{dump_osc}."
+msgstr ""
+
+#: gnu/packages/audio.scm:1011
 msgid "Library to simplify use of LV2 plugins in applications"
 msgstr ""
 
-#: gnu/packages/audio.scm:927
+#: gnu/packages/audio.scm:1013
 msgid ""
 "Lilv is a C library to make the use of LV2 plugins as simple as possible\n"
 "for applications.  Lilv is the successor to SLV2, rewritten to be\n"
 "significantly faster and have minimal dependencies."
 msgstr ""
 
-#: gnu/packages/audio.scm:954
+#: gnu/packages/audio.scm:1040
 msgid "LV2 audio plugin specification"
 msgstr ""
 
-#: gnu/packages/audio.scm:956
+#: gnu/packages/audio.scm:1042
 msgid ""
 "LV2 is an open specification for audio plugins and host applications.\n"
 "At its core, LV2 is a simple stable interface, accompanied by extensions which\n"
@@ -297,38 +325,38 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnu/packages/audio.scm:991
+#: gnu/packages/audio.scm:1077
 msgid "LV2 port of the mda Piano plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:992
+#: gnu/packages/audio.scm:1078
 msgid "An LV2 port of the mda Piano VSTi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1005
+#: gnu/packages/audio.scm:1091
 msgid "LV2 port of the mda EPiano plugin"
 msgstr ""
 
-#: gnu/packages/audio.scm:1006
+#: gnu/packages/audio.scm:1092
 msgid "An LV2 port of the mda EPiano VSTi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1035
+#: gnu/packages/audio.scm:1130
 msgid "C++ libraries for LV2 plugins"
 msgstr ""
 
-#: gnu/packages/audio.scm:1037
+#: gnu/packages/audio.scm:1132
 msgid ""
 "The LV2 Toolkit (LVTK) contains libraries that wrap the LV2 C API and\n"
 "extensions into easy to use C++ classes.  It is the successor of\n"
 "lv2-c++-tools."
 msgstr ""
 
-#: gnu/packages/audio.scm:1078
+#: gnu/packages/audio.scm:1173
 msgid "3D audio API"
 msgstr ""
 
-#: gnu/packages/audio.scm:1080
+#: gnu/packages/audio.scm:1175
 msgid ""
 "OpenAL provides capabilities for playing audio in a virtual 3D\n"
 "environment.  Distance attenuation, doppler shift, and directional sound\n"
@@ -338,62 +366,62 @@ msgid ""
 "buffers, and audio capture."
 msgstr ""
 
-#: gnu/packages/audio.scm:1114
+#: gnu/packages/audio.scm:1209
 msgid "Modular patch bay for audio and MIDI systems"
 msgstr ""
 
-#: gnu/packages/audio.scm:1116
+#: gnu/packages/audio.scm:1211
 msgid ""
 "Patchage is a modular patch bay for audio and MIDI systems based on JACK\n"
 "and ALSA."
 msgstr ""
 
-#: gnu/packages/audio.scm:1141
+#: gnu/packages/audio.scm:1236
 msgid "Real-time audio utility library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1143
+#: gnu/packages/audio.scm:1238
 msgid ""
 "Raul (Real-time Audio Utility Library) is a C++ utility library primarily\n"
 "aimed at audio/musical applications."
 msgstr ""
 
-#: gnu/packages/audio.scm:1169
+#: gnu/packages/audio.scm:1264
 msgid "Audio time-stretching and pitch-shifting library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1171
+#: gnu/packages/audio.scm:1266
 msgid ""
 "Rubber Band is a library and utility program that permits changing the\n"
 "tempo and pitch of an audio recording independently of one another."
 msgstr ""
 
-#: gnu/packages/audio.scm:1219
+#: gnu/packages/audio.scm:1314
 msgid "Cross-platform MIDI library for C++"
 msgstr ""
 
-#: gnu/packages/audio.scm:1221
+#: gnu/packages/audio.scm:1316
 msgid ""
 "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific\n"
 "classes) that provide a common cross-platform API for realtime MIDI\n"
 "input/output."
 msgstr ""
 
-#: gnu/packages/audio.scm:1247
+#: gnu/packages/audio.scm:1342
 msgid "Library for serialising LV2 atoms to/from RDF"
 msgstr ""
 
-#: gnu/packages/audio.scm:1249
+#: gnu/packages/audio.scm:1344
 msgid ""
 "Sratom is a library for serialising LV2 atoms to/from RDF, particularly\n"
 "the Turtle syntax."
 msgstr ""
 
-#: gnu/packages/audio.scm:1274
+#: gnu/packages/audio.scm:1369
 msgid "Library for loading and wrapping LV2 plugin UIs"
 msgstr ""
 
-#: gnu/packages/audio.scm:1276
+#: gnu/packages/audio.scm:1371
 msgid ""
 "Suil is a lightweight C library for loading and wrapping LV2 plugin UIs.\n"
 "\n"
@@ -405,11 +433,11 @@ msgid ""
 "Suil currently supports every combination of Gtk 2, Qt 4, and X11."
 msgstr ""
 
-#: gnu/packages/audio.scm:1333
+#: gnu/packages/audio.scm:1428
 msgid "Software synthesizer for playing MIDI files"
 msgstr ""
 
-#: gnu/packages/audio.scm:1335
+#: gnu/packages/audio.scm:1430
 msgid ""
 "TiMidity++ is a software synthesizer.  It can play MIDI files by\n"
 "converting them into PCM waveform data; give it a MIDI data along with digital\n"
@@ -418,43 +446,43 @@ msgid ""
 "disks as various audio file formats."
 msgstr ""
 
-#: gnu/packages/audio.scm:1374
+#: gnu/packages/audio.scm:1469
 msgid "Modular and extensible audio processing system"
 msgstr ""
 
-#: gnu/packages/audio.scm:1376
+#: gnu/packages/audio.scm:1471
 msgid ""
 "Vamp is an audio processing plugin system for plugins that extract\n"
 "descriptive information from audio data — typically referred to as audio\n"
 "analysis plugins or audio feature extraction plugins."
 msgstr ""
 
-#: gnu/packages/audio.scm:1415
+#: gnu/packages/audio.scm:1510
 msgid "Library for time stretching and pitch scaling of audio"
 msgstr ""
 
-#: gnu/packages/audio.scm:1417
+#: gnu/packages/audio.scm:1512
 msgid ""
 "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time\n"
 "stretching and pitch scaling of audio.  This package contains the library."
 msgstr ""
 
-#: gnu/packages/audio.scm:1440
+#: gnu/packages/audio.scm:1535
 msgid "Hybrid lossless audio codec"
 msgstr ""
 
-#: gnu/packages/audio.scm:1442
+#: gnu/packages/audio.scm:1537
 msgid ""
 "WavPack is an audio compression format with lossless, lossy and hybrid\n"
 "compression modes.  This package contains command-line programs and library to\n"
 "encode and decode wavpack files."
 msgstr ""
 
-#: gnu/packages/audio.scm:1461
+#: gnu/packages/audio.scm:1556
 msgid "Mod file playing library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1463
+#: gnu/packages/audio.scm:1558
 msgid ""
 "Libmodplug renders mod music files as raw audio data, for playing or\n"
 "conversion.  mod, .s3m, .it, .xm, and a number of lesser-known formats are\n"
@@ -462,33 +490,33 @@ msgid ""
 "surround and reverb."
 msgstr ""
 
-#: gnu/packages/audio.scm:1482
+#: gnu/packages/audio.scm:1577
 msgid "Module player library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1484
+#: gnu/packages/audio.scm:1579
 msgid ""
 "Libxmp is a library that renders module files to PCM data.  It supports\n"
 "over 90 mainstream and obscure module formats including Protracker (MOD),\n"
 "Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT)."
 msgstr ""
 
-#: gnu/packages/audio.scm:1507
+#: gnu/packages/audio.scm:1602
 msgid "Extended module player"
 msgstr ""
 
-#: gnu/packages/audio.scm:1509
+#: gnu/packages/audio.scm:1604
 msgid ""
 "Xmp is a portable module player that plays over 90 mainstream and\n"
 "obscure module formats, including Protracker MOD, Fasttracker II XM, Scream\n"
 "Tracker 3 S3M and Impulse Tracker IT files."
 msgstr ""
 
-#: gnu/packages/audio.scm:1541
+#: gnu/packages/audio.scm:1636
 msgid "Audio processing library for changing tempo, pitch and playback rate"
 msgstr ""
 
-#: gnu/packages/audio.scm:1543
+#: gnu/packages/audio.scm:1638
 msgid ""
 "SoundTouch is an audio processing library for changing the tempo, pitch\n"
 "and playback rates of audio streams or audio files.  It is intended for\n"
@@ -496,11 +524,11 @@ msgid ""
 "control functionality, or just for playing around with the sound effects."
 msgstr ""
 
-#: gnu/packages/audio.scm:1580
+#: gnu/packages/audio.scm:1675
 msgid "Sound processing utility"
 msgstr ""
 
-#: gnu/packages/audio.scm:1582
+#: gnu/packages/audio.scm:1677
 msgid ""
 "SoX (Sound eXchange) is a command line utility that can convert\n"
 "various formats of computer audio files to other formats.  It can also\n"
@@ -508,92 +536,92 @@ msgid ""
 "can play and record audio files."
 msgstr ""
 
-#: gnu/packages/audio.scm:1605
+#: gnu/packages/audio.scm:1700
 msgid "One-dimensional sample-rate conversion library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1607
+#: gnu/packages/audio.scm:1702
 msgid ""
 "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate\n"
 "conversion.  It may be used, for example, to resample PCM-encoded audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:1629
+#: gnu/packages/audio.scm:1724
 msgid "MPEG Audio Layer 2 (MP2) encoder"
 msgstr ""
 
-#: gnu/packages/audio.scm:1631
+#: gnu/packages/audio.scm:1726
 msgid ""
 "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on\n"
 "tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and\n"
 "portions of LAME."
 msgstr ""
 
-#: gnu/packages/audio.scm:1671
+#: gnu/packages/audio.scm:1766
 msgid "Audio I/O library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1673
+#: gnu/packages/audio.scm:1768
 msgid ""
 "PortAudio is a portable C/C++ audio I/O library providing a simple API\n"
 "to record and/or play sound using a callback function or a blocking read/write\n"
 "interface."
 msgstr ""
 
-#: gnu/packages/audio.scm:1696
+#: gnu/packages/audio.scm:1791
 msgid "Graphical user interface for FluidSynth"
 msgstr ""
 
-#: gnu/packages/audio.scm:1698
+#: gnu/packages/audio.scm:1793
 msgid ""
 "Qsynth is a GUI front-end application for the FluidSynth SoundFont\n"
 "synthesizer written in C++."
 msgstr ""
 
-#: gnu/packages/audio.scm:1736
+#: gnu/packages/audio.scm:1831
 msgid "Networked audio system"
 msgstr ""
 
-#: gnu/packages/audio.scm:1738
+#: gnu/packages/audio.scm:1833
 msgid ""
 "RSound allows you to send audio from an application and transfer it\n"
 "directly to a different computer on your LAN network.  It is an audio daemon\n"
 "with a much different focus than most other audio daemons."
 msgstr ""
 
-#: gnu/packages/audio.scm:1769
+#: gnu/packages/audio.scm:1864
 msgid "JACK audio frequency analyzer and display"
 msgstr ""
 
-#: gnu/packages/audio.scm:1771
+#: gnu/packages/audio.scm:1866
 msgid ""
 "XJackFreak is an audio analysis and equalizing tool for the Jack Audio\n"
 "Connection Kit.  It can display the FFT of any input, modify it and output the\n"
 "result."
 msgstr ""
 
-#: gnu/packages/audio.scm:1812
+#: gnu/packages/audio.scm:1912
 msgid "Fast, partitioned convolution engine library"
 msgstr ""
 
-#: gnu/packages/audio.scm:1814
+#: gnu/packages/audio.scm:1914
 msgid ""
 "Zita convolver is a C++ library providing a real-time convolution\n"
 "engine."
 msgstr ""
 
-#: gnu/packages/audio.scm:1854
+#: gnu/packages/audio.scm:1959
 msgid "C++ library for resampling audio signals"
 msgstr ""
 
-#: gnu/packages/audio.scm:1856
+#: gnu/packages/audio.scm:1961
 msgid ""
 "Libzita-resampler is a C++ library for resampling audio signals.  It is\n"
 "designed to be used within a real-time processing context, to be fast, and to\n"
 "provide high-quality sample rate conversion."
 msgstr ""
 
-#: gnu/packages/audio.scm:1902
+#: gnu/packages/audio.scm:2007
 msgid ""
 "Zita-alsa-pcmi is a C++ wrapper around the ALSA API.  It provides easy\n"
 "access to ALSA PCM devices, taking care of the many functions required to\n"
@@ -601,11 +629,35 @@ msgid ""
 "point audio data."
 msgstr ""
 
-#: gnu/packages/backup.scm:89
+#: gnu/packages/audio.scm:2038
+msgid "Cue and toc file parsers and utilities"
+msgstr ""
+
+#: gnu/packages/audio.scm:2039
+msgid ""
+"Cuetools is a set of programs that are useful for manipulating\n"
+"and using CUE sheet (cue) files and Table of Contents (toc) files.  CUE and TOC\n"
+"files are a way to represent the layout of a data or audio CD in a\n"
+"machine-readable ASCII format."
+msgstr ""
+
+#: gnu/packages/audio.scm:2058
+msgid "WAVE audio data processing tool"
+msgstr ""
+
+#: gnu/packages/audio.scm:2059
+msgid ""
+"shntool is a multi-purpose WAVE data processing and reporting\n"
+"utility.  File formats are abstracted from its core, so it can process any file\n"
+"that contains WAVE data, compressed or not---provided there exists a format\n"
+"module to handle that particular file type."
+msgstr ""
+
+#: gnu/packages/backup.scm:92
 msgid "Encrypted backup using rsync algorithm"
 msgstr "Krypteret sikkerhedskopiering via brug af rsync-algoritmen"
 
-#: gnu/packages/backup.scm:91
+#: gnu/packages/backup.scm:94
 msgid ""
 "Duplicity backs up directories by producing encrypted tar-format volumes\n"
 "and uploading them to a remote or local file server.  Because duplicity uses\n"
@@ -622,11 +674,11 @@ msgstr ""
 "underskrive disse arkiver, så vil de være sikret mod spionage og/eller\n"
 "ændring af serveren."
 
-#: gnu/packages/backup.scm:125
+#: gnu/packages/backup.scm:128
 msgid "Simple incremental backup tool"
 msgstr "Simpelt værktøj til trinvis sikkerhedskopiering"
 
-#: gnu/packages/backup.scm:127
+#: gnu/packages/backup.scm:130
 msgid ""
 "Hdup2 is a backup utility, its aim is to make backup really simple.  The\n"
 "backup scheduling is done by means of a cron job.  It supports an\n"
@@ -639,11 +691,11 @@ msgstr ""
 "sikkerhedskopier, krypterede sikkerhedskopier og opdelte sikkerhedskopier\n"
 "(kaldt klumper) så der nemt kan brændes til cd/dvd."
 
-#: gnu/packages/backup.scm:181
+#: gnu/packages/backup.scm:185
 msgid "Multi-format archive and compression library"
 msgstr "Arkiv- og komprimeringsbibliotek for flere formater"
 
-#: gnu/packages/backup.scm:183
+#: gnu/packages/backup.scm:187
 msgid ""
 "Libarchive provides a flexible interface for reading and writing\n"
 "archives in various formats such as tar and cpio.  Libarchive also supports\n"
@@ -661,11 +713,11 @@ msgstr ""
 "Bemærk venligst at der i øjeblikket ikke er indbygget understøttelse\n"
 "for vilkårlig vilkårlig adgang eller for direkte modifikation i arkivet."
 
-#: gnu/packages/backup.scm:246
+#: gnu/packages/backup.scm:250
 msgid "Provide a list of files to backup"
 msgstr "Tilbyder en liste af filer til sikkerhedskopiering"
 
-#: gnu/packages/backup.scm:248
+#: gnu/packages/backup.scm:252
 msgid ""
 "Rdup is a utility inspired by rsync and the plan9 way of doing backups.\n"
 "Rdup itself does not backup anything, it only print a list of absolute\n"
@@ -678,11 +730,11 @@ msgstr ""
 "skripter er krævet til for det videre arbejde med denne liste og\n"
 "implementering af sikkerhedskopistrategien."
 
-#: gnu/packages/backup.scm:278
+#: gnu/packages/backup.scm:282
 msgid "Tar-compatible archiver"
 msgstr "Tar-kompatibelt arkivprogram"
 
-#: gnu/packages/backup.scm:280
+#: gnu/packages/backup.scm:284
 msgid ""
 "Btar is a tar-compatible archiver which allows arbitrary compression and\n"
 "ciphering, redundancy, differential backup, indexed extraction, multicore\n"
@@ -694,11 +746,11 @@ msgstr ""
 "indekseret udtrækning, komprimering med flere kerner, inddata- og uddata-\n"
 "serialisering, og tolerance for delvise arkivfejl."
 
-#: gnu/packages/backup.scm:308
+#: gnu/packages/backup.scm:312
 msgid "Local/remote mirroring+incremental backup"
 msgstr "Lokal/ekstern spejlning+trinvis sikkerhedskopiering"
 
-#: gnu/packages/backup.scm:310
+#: gnu/packages/backup.scm:314
 msgid ""
 "Rdiff-backup backs up one directory to another, possibly over a network.\n"
 "The target directory ends up a copy of the source directory, but extra reverse\n"
@@ -726,11 +778,11 @@ msgstr ""
 "placering og kun forskellene vil blive overført. Endelig er rdiff-backup\n"
 "nem at bruge og startopsætningen er lavet med fornuftige standarder."
 
-#: gnu/packages/backup.scm:349
+#: gnu/packages/backup.scm:353
 msgid "Deduplicating backup program"
 msgstr ""
 
-#: gnu/packages/backup.scm:350
+#: gnu/packages/backup.scm:354
 msgid ""
 "Attic is a deduplicating backup program.  The main goal of\n"
 "Attic is to provide an efficient and secure way to backup data.  The data\n"
@@ -738,11 +790,26 @@ msgid ""
 "changes are stored."
 msgstr ""
 
-#: gnu/packages/base.scm:65
+#: gnu/packages/backup.scm:391
+msgid "Tools & library for data backup and distributed storage"
+msgstr ""
+
+#: gnu/packages/backup.scm:393
+msgid ""
+"Libchop is a set of utilities and library for data backup and\n"
+"distributed storage.  Its main application is @command{chop-backup}, an\n"
+"encrypted backup program that supports data integrity checks, versioning,\n"
+"distribution among several sites, selective sharing of stored data, adaptive\n"
+"compression, and more.  The library itself implements storage techniques such\n"
+"as content-addressable storage, content hash keys, Merkle trees, similarity\n"
+"detection, and lossless compression."
+msgstr ""
+
+#: gnu/packages/base.scm:66
 msgid "Hello, GNU world: An example GNU package"
 msgstr "Hej, GNU-verden: Et eksempel på en GNU-pakke"
 
-#: gnu/packages/base.scm:67
+#: gnu/packages/base.scm:68
 msgid ""
 "GNU Hello prints the message \"Hello, world!\" and then exits.  It\n"
 "serves as an example of standard GNU coding practices.  As such, it supports\n"
@@ -753,11 +820,11 @@ msgstr ""
 "sådan understøtter programmer parametre på kommandolinjen, flere\n"
 "sprog og så videre."
 
-#: gnu/packages/base.scm:86
+#: gnu/packages/base.scm:89
 msgid "Print lines matching a pattern"
 msgstr "Udskriv linjer der matcher et mønster"
 
-#: gnu/packages/base.scm:88
+#: gnu/packages/base.scm:91
 msgid ""
 "grep is a tool for finding text inside files.  Text is found by\n"
 "matching a pattern provided by the user in one or many files.  The pattern\n"
@@ -776,11 +843,11 @@ msgstr ""
 "grep tilbyder mange udvidelser i forhold til standardredskabet,\n"
 "inklusiv rekursiv mappesøgning."
 
-#: gnu/packages/base.scm:111
+#: gnu/packages/base.scm:114
 msgid "Stream editor"
 msgstr "Strømredigeringsprogram"
 
-#: gnu/packages/base.scm:126
+#: gnu/packages/base.scm:129
 msgid ""
 "Sed is a non-interactive, text stream editor.  It receives a text\n"
 "input from a file or from standard input and it then applies a series of text\n"
@@ -794,11 +861,11 @@ msgstr ""
 "tekstmønster i en strøm. GNU-implementeringen tilbyder flere\n"
 "udvidelser i forhold til standardredskabet."
 
-#: gnu/packages/base.scm:149
+#: gnu/packages/base.scm:152
 msgid "Managing tar archives"
 msgstr "Håndtering af tar-arkiver"
 
-#: gnu/packages/base.scm:151
+#: gnu/packages/base.scm:154
 msgid ""
 "Tar provides the ability to create tar archives, as well as the\n"
 "ability to extract, update or list files in an existing archive.  It is\n"
@@ -813,11 +880,11 @@ msgstr ""
 "mappestruktur og filinformation såsom rettigheder og oprettelse/ændrings-\n"
 "datoer bevares. GNU tar tilbyder mange udvidelser over standardredskabet."
 
-#: gnu/packages/base.scm:174
+#: gnu/packages/base.scm:177
 msgid "Apply differences to originals, with optional backups"
 msgstr "Anvend forskelle på originaler, med valgfri sikkerhedskopiering"
 
-#: gnu/packages/base.scm:176
+#: gnu/packages/base.scm:179
 msgid ""
 "Patch is a program that applies changes to files based on differences\n"
 "laid out as by the program \"diff\".  The changes may be applied to one or more\n"
@@ -831,11 +898,11 @@ msgstr ""
 "forskellige diff-formater. Det kan også bruges til at tilbageføre\n"
 "tidligere anvendte forskelle."
 
-#: gnu/packages/base.scm:196
+#: gnu/packages/base.scm:199
 msgid "Comparing and merging files"
 msgstr "Sammenligning og sammenføjning af filer"
 
-#: gnu/packages/base.scm:198
+#: gnu/packages/base.scm:201
 msgid ""
 "GNU Diffutils is a package containing tools for finding the\n"
 "differences between files.  The \"diff\" command is used to show how two files\n"
@@ -849,11 +916,11 @@ msgstr ""
 "de er forskellige. »diff3« giver dig mulighed for at sammenligne tre filer.\n"
 "Endelig tilbyder »sdiff« en interaktiv måde at sammenføje to filer."
 
-#: gnu/packages/base.scm:231
+#: gnu/packages/base.scm:234
 msgid "Operating on files matching given criteria"
 msgstr "Operation på filer der matcher angivne kriterier"
 
-#: gnu/packages/base.scm:233
+#: gnu/packages/base.scm:236
 msgid ""
 "Findutils supplies the basic file directory searching utilities of the\n"
 "GNU system.  It consists of two primary searching utilities: \"find\"\n"
@@ -869,11 +936,11 @@ msgstr ""
 "ekstra værktøjer er inkluderet: »updatedb« opdaterer filnavnsdatabasen\n"
 "og »xargs« kan bruges til at anvende kommandoer med arbitrært lange argumenter."
 
-#: gnu/packages/base.scm:297
+#: gnu/packages/base.scm:300
 msgid "Core GNU utilities (file, text, shell)"
 msgstr "Core GNU-redskaber (file, text, shell)"
 
-#: gnu/packages/base.scm:299
+#: gnu/packages/base.scm:302
 msgid ""
 "GNU Coreutils includes all of the basic command-line tools that are\n"
 "expected in a POSIX system.  These provide the basic file, shell and text\n"
@@ -886,11 +953,11 @@ msgstr ""
 "af disse værktøjer tilbyder udvidet funktionalitet udover det skitseret\n"
 "i POSIX-standarden."
 
-#: gnu/packages/base.scm:341
+#: gnu/packages/base.scm:344
 msgid "Remake files automatically"
 msgstr "Gendan filer automatisk"
 
-#: gnu/packages/base.scm:343
+#: gnu/packages/base.scm:346
 msgid ""
 "Make is a program that is used to control the production of\n"
 "executables or other files from their source files.  The process is\n"
@@ -907,11 +974,11 @@ msgstr ""
 "gendannes efter at deres kilder har ændret sig. GNU make tilbyder\n"
 "mange funktionsrige udvidelser der ligger udover standardredskabet."
 
-#: gnu/packages/base.scm:388
+#: gnu/packages/base.scm:391
 msgid "Binary utilities: bfd gas gprof ld"
 msgstr "Binære redskaber: bfd gas gprof ld"
 
-#: gnu/packages/base.scm:390
+#: gnu/packages/base.scm:393
 msgid ""
 "GNU Binutils is a collection of tools for working with binary files.\n"
 "Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler.\n"
@@ -921,22 +988,22 @@ msgid ""
 "included."
 msgstr ""
 
-#: gnu/packages/base.scm:455
+#: gnu/packages/base.scm:458
 msgid "The linker wrapper"
 msgstr ""
 
-#: gnu/packages/base.scm:457
+#: gnu/packages/base.scm:460
 msgid ""
 "The linker wrapper (or 'ld-wrapper') wraps the linker to add any\n"
 "missing '-rpath' flags, and to detect any misuse of libraries outside of the\n"
 "store."
 msgstr ""
 
-#: gnu/packages/base.scm:625
+#: gnu/packages/base.scm:638
 msgid "The GNU C Library"
 msgstr ""
 
-#: gnu/packages/base.scm:627
+#: gnu/packages/base.scm:640
 msgid ""
 "Any Unix-like operating system needs a C library: the library which\n"
 "defines the \"system calls\" and other basic facilities such as open, malloc,\n"
@@ -946,47 +1013,47 @@ msgid ""
 "with the Linux kernel."
 msgstr ""
 
-#: gnu/packages/base.scm:643
+#: gnu/packages/base.scm:671
 msgid "All the locales supported by the GNU C Library"
 msgstr ""
 
-#: gnu/packages/base.scm:645
+#: gnu/packages/base.scm:673
 msgid ""
 "This package provides all the locales supported by the GNU C Library,\n"
 "more than 400 in total.  To use them set the 'LOCPATH' environment variable to\n"
 "the 'share/locale' sub-directory of this package."
 msgstr ""
 
-#: gnu/packages/base.scm:713
+#: gnu/packages/base.scm:741
 msgid "Small sample of UTF-8 locales"
 msgstr ""
 
-#: gnu/packages/base.scm:715
+#: gnu/packages/base.scm:743
 msgid ""
 "This package provides a small sample of UTF-8 locales mostly useful in\n"
 "test environments."
 msgstr ""
 
-#: gnu/packages/base.scm:733
+#: gnu/packages/base.scm:761
 msgid "Find full path of shell commands"
 msgstr ""
 
-#: gnu/packages/base.scm:735
+#: gnu/packages/base.scm:763
 msgid ""
 "The which program finds the location of executables in PATH, with a\n"
 "variety of options.  It is an alternative to the shell \"type\" built-in\n"
 "command."
 msgstr ""
 
-#: gnu/packages/base.scm:805
+#: gnu/packages/base.scm:833
 msgid "The GNU C Library (GNU Hurd variant)"
 msgstr ""
 
-#: gnu/packages/base.scm:907
+#: gnu/packages/base.scm:935
 msgid "Database of current and historical time zones"
 msgstr ""
 
-#: gnu/packages/base.scm:908
+#: gnu/packages/base.scm:936
 msgid ""
 "The Time Zone Database (often called tz or zoneinfo)\n"
 "contains code and data that represent the history of local time for many\n"
@@ -995,11 +1062,11 @@ msgid ""
 "and daylight-saving rules."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:82
+#: gnu/packages/bittorrent.scm:90
 msgid "Fast and easy BitTorrent client"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:84
+#: gnu/packages/bittorrent.scm:92
 msgid ""
 "Transmission is a BitTorrent client that comes with graphical,\n"
 "textual, and Web user interfaces.  Transmission also has a daemon for\n"
@@ -1007,28 +1074,49 @@ msgid ""
 "DHT, µTP, PEX and Magnet Links."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:116
+#: gnu/packages/bittorrent.scm:124
 msgid "BitTorrent library of rtorrent"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:118
+#: gnu/packages/bittorrent.scm:126
 msgid ""
 "LibTorrent is a BitTorrent library used by and developed in parallel\n"
 "with the BitTorrent client rtorrent.  It is written in C++ with emphasis on\n"
 "speed and efficiency."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:145
+#: gnu/packages/bittorrent.scm:153
 msgid "BitTorrent client with ncurses interface"
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:147
+#: gnu/packages/bittorrent.scm:155
 msgid ""
 "rTorrent is a BitTorrent client with an ncurses interface.  It supports\n"
 "full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via\n"
 "XML-RPC over SCGI."
 msgstr ""
 
+#: gnu/packages/bittorrent.scm:196
+msgid "Console client for the Transmission BitTorrent daemon"
+msgstr ""
+
+#: gnu/packages/bittorrent.scm:197
+msgid ""
+"Transmission-remote-cli is a console client, with a curses\n"
+"interface, for the Transmission BitTorrent daemon."
+msgstr ""
+
+#: gnu/packages/bittorrent.scm:240
+msgid "Utility for parallel downloading files"
+msgstr ""
+
+#: gnu/packages/bittorrent.scm:242
+msgid ""
+"Aria2 is a lightweight, multi-protocol & multi-source command-line\n"
+"download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.\n"
+"Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces."
+msgstr ""
+
 #: gnu/packages/certs.scm:65
 msgid "Python script to extract .pem data from certificate collection"
 msgstr ""
@@ -1050,11 +1138,11 @@ msgid ""
 "taken from the NSS package and thus ultimately from the Mozilla project."
 msgstr ""
 
-#: gnu/packages/compression.scm:72
+#: gnu/packages/compression.scm:75
 msgid "Compression library"
 msgstr ""
 
-#: gnu/packages/compression.scm:74
+#: gnu/packages/compression.scm:77
 msgid ""
 "zlib is designed to be a free, general-purpose, legally unencumbered --\n"
 "that is, not covered by any patents -- lossless data-compression library for\n"
@@ -1067,31 +1155,31 @@ msgid ""
 "in compression."
 msgstr ""
 
-#: gnu/packages/compression.scm:99
+#: gnu/packages/compression.scm:102
 msgid "Replacement for Sun's 'jar' utility"
 msgstr ""
 
-#: gnu/packages/compression.scm:101
+#: gnu/packages/compression.scm:104
 msgid ""
 "FastJar is an attempt to create a much faster replacement for Sun's 'jar'\n"
 "utility.  Instead of being written in Java, FastJar is written in C."
 msgstr ""
 
-#: gnu/packages/compression.scm:119
+#: gnu/packages/compression.scm:122
 msgid "C library for manipulating POSIX tar files"
 msgstr ""
 
-#: gnu/packages/compression.scm:121
+#: gnu/packages/compression.scm:124
 msgid ""
 "libtar is a C library for manipulating POSIX tar files.  It handles\n"
 "adding and extracting files to/from a tar archive."
 msgstr ""
 
-#: gnu/packages/compression.scm:138
+#: gnu/packages/compression.scm:141
 msgid "General file (de)compression (using lzw)"
 msgstr ""
 
-#: gnu/packages/compression.scm:143
+#: gnu/packages/compression.scm:146
 msgid ""
 "GNU Gzip provides data compression and decompression utilities; the\n"
 "typical extension is \".gz\".  Unlike the \"zip\" format, it compresses a single\n"
@@ -1099,11 +1187,11 @@ msgid ""
 "\".tar.gz\" or \".tgz\", etc."
 msgstr ""
 
-#: gnu/packages/compression.scm:219
+#: gnu/packages/compression.scm:222
 msgid "High-quality data compression program"
 msgstr ""
 
-#: gnu/packages/compression.scm:221
+#: gnu/packages/compression.scm:224
 msgid ""
 "bzip2 is a freely available, patent free (see below), high-quality data\n"
 "compressor.  It typically compresses files to within 10% to 15% of the best\n"
@@ -1112,11 +1200,11 @@ msgid ""
 "decompression."
 msgstr ""
 
-#: gnu/packages/compression.scm:251
+#: gnu/packages/compression.scm:254
 msgid "Parallel bzip2 implementation"
 msgstr ""
 
-#: gnu/packages/compression.scm:253
+#: gnu/packages/compression.scm:256
 msgid ""
 "Pbzip2 is a parallel implementation of the bzip2 block-sorting file\n"
 "compressor that uses pthreads and achieves near-linear speedup on SMP machines.\n"
@@ -1124,11 +1212,11 @@ msgid ""
 "compressed with pbzip2 can be decompressed with bzip2)."
 msgstr ""
 
-#: gnu/packages/compression.scm:272
+#: gnu/packages/compression.scm:277
 msgid "General-purpose data compression"
 msgstr ""
 
-#: gnu/packages/compression.scm:274
+#: gnu/packages/compression.scm:279
 msgid ""
 "XZ Utils is free general-purpose data compression software with high\n"
 "compression ratio.  XZ Utils were written for POSIX-like systems, but also\n"
@@ -1141,11 +1229,11 @@ msgid ""
 "than gzip and 15 % smaller output than bzip2."
 msgstr ""
 
-#: gnu/packages/compression.scm:302
+#: gnu/packages/compression.scm:307
 msgid "Data compression library suitable for real-time data de-/compression"
 msgstr ""
 
-#: gnu/packages/compression.scm:304
+#: gnu/packages/compression.scm:309
 msgid ""
 "LZO is a data compression library which is suitable for data\n"
 "de-/compression in real-time.  This means it favours speed over\n"
@@ -1155,11 +1243,11 @@ msgid ""
 "format are designed to be portable across platforms."
 msgstr ""
 
-#: gnu/packages/compression.scm:327
+#: gnu/packages/compression.scm:332
 msgid "Compress or expand files"
 msgstr ""
 
-#: gnu/packages/compression.scm:329
+#: gnu/packages/compression.scm:334
 msgid ""
 "Lzop is a file compressor which is very similar to gzip.  Lzop uses the\n"
 "LZO data compression library for compression services, and its main advantages\n"
@@ -1167,11 +1255,11 @@ msgid ""
 "some compression ratio)."
 msgstr ""
 
-#: gnu/packages/compression.scm:348
+#: gnu/packages/compression.scm:353
 msgid "Lossless data compressor based on the LZMA algorithm"
 msgstr ""
 
-#: gnu/packages/compression.scm:350
+#: gnu/packages/compression.scm:355
 msgid ""
 "Lzip is a lossless data compressor with a user interface similar to the\n"
 "one of gzip or bzip2.  Lzip decompresses almost as fast as gzip and compresses\n"
@@ -1179,11 +1267,11 @@ msgid ""
 "archiving.  Lzip is a clean implementation of the LZMA algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:382
+#: gnu/packages/compression.scm:387
 msgid "Archives in shell scripts, uuencode/uudecode"
 msgstr ""
 
-#: gnu/packages/compression.scm:384
+#: gnu/packages/compression.scm:389
 msgid ""
 "GNU sharutils is a package for creating and manipulating shell\n"
 "archives that can be readily emailed.  A shell archive is a file that can be\n"
@@ -1191,71 +1279,71 @@ msgid ""
 "This package is mostly for compatibility and historical interest."
 msgstr ""
 
-#: gnu/packages/compression.scm:415
+#: gnu/packages/compression.scm:420
 msgid "Library for SoundFont decompression"
 msgstr ""
 
-#: gnu/packages/compression.scm:417
+#: gnu/packages/compression.scm:422
 msgid ""
 "SfArkLib is a C++ library for decompressing SoundFont files compressed\n"
 "with the sfArk algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:449
+#: gnu/packages/compression.scm:454
 msgid "Basic sfArk decompressor"
 msgstr ""
 
-#: gnu/packages/compression.scm:450
+#: gnu/packages/compression.scm:455
 msgid ""
 "SfArk extractor converts SoundFonts in the compressed legacy\n"
 "sfArk file format to the uncompressed sf2 format."
 msgstr ""
 
-#: gnu/packages/compression.scm:467
+#: gnu/packages/compression.scm:472
 msgid "Compression tools for some formats used by Microsoft"
 msgstr ""
 
-#: gnu/packages/compression.scm:469
+#: gnu/packages/compression.scm:474
 msgid ""
 "The purpose of libmspack is to provide both compression and\n"
 "decompression of some loosely related file formats used by Microsoft."
 msgstr ""
 
-#: gnu/packages/compression.scm:488
+#: gnu/packages/compression.scm:493
 msgid "Low-level interface to bzip2 compression library"
 msgstr ""
 
-#: gnu/packages/compression.scm:489
+#: gnu/packages/compression.scm:494
 msgid ""
 "This module provides a Perl interface to the bzip2\n"
 "compression library."
 msgstr ""
 
-#: gnu/packages/compression.scm:523
+#: gnu/packages/compression.scm:528
 msgid "Low-level interface to zlib compression library"
 msgstr ""
 
-#: gnu/packages/compression.scm:524
+#: gnu/packages/compression.scm:529
 msgid ""
 "This module provides a Perl interface to the zlib\n"
 "compression library."
 msgstr ""
 
-#: gnu/packages/compression.scm:545
+#: gnu/packages/compression.scm:550
 msgid "IO Interface to compressed files/buffers"
 msgstr ""
 
-#: gnu/packages/compression.scm:546
+#: gnu/packages/compression.scm:551
 msgid ""
 "IO-Compress provides a Perl interface to allow reading and\n"
 "writing of compressed data created with the zlib and bzip2 libraries."
 msgstr ""
 
-#: gnu/packages/compression.scm:572
+#: gnu/packages/compression.scm:577
 msgid "Compression algorithm focused on speed"
 msgstr ""
 
-#: gnu/packages/compression.scm:573
+#: gnu/packages/compression.scm:578
 msgid ""
 "LZ4 is a lossless compression algorithm, providing\n"
 "compression speed at 400 MB/s per core (0.16 Bytes/cycle).  It also features an\n"
@@ -1264,11 +1352,11 @@ msgid ""
 "time for compression ratio."
 msgstr ""
 
-#: gnu/packages/compression.scm:613
+#: gnu/packages/compression.scm:618
 msgid "Tools to create and extract squashfs filesystems"
 msgstr ""
 
-#: gnu/packages/compression.scm:615
+#: gnu/packages/compression.scm:620
 msgid ""
 "Squashfs is a highly compressed read-only filesystem for Linux.  It uses\n"
 "zlib to compress files, inodes, and directories.  All blocks are packed to\n"
@@ -1278,52 +1366,76 @@ msgid ""
 "extract such filesystems."
 msgstr ""
 
-#: gnu/packages/compression.scm:652
+#: gnu/packages/compression.scm:657
 msgid "Parallel implementation of gzip"
 msgstr ""
 
-#: gnu/packages/compression.scm:654
+#: gnu/packages/compression.scm:659
 msgid ""
 "This package provides a parallel implementation of gzip that exploits\n"
 "multiple processors and multiple cores when compressing data."
 msgstr ""
 
-#: gnu/packages/databases.scm:97
+#: gnu/packages/compression.scm:683
+msgid "Parallel indexing implementation of LZMA"
+msgstr ""
+
+#: gnu/packages/compression.scm:685
+msgid ""
+"The existing XZ Utils provide great compression in the .xz file format,\n"
+"but they produce just one big block of compressed data.  Pixz instead produces\n"
+"a collection of smaller blocks which makes random access to the original data\n"
+"possible and can compress in parallel.  This is especially useful for large\n"
+"tarballs."
+msgstr ""
+
+#: gnu/packages/databases.scm:75
+msgid "Hash library of database functions compatible with traditional dbm"
+msgstr ""
+
+#: gnu/packages/databases.scm:77
+msgid ""
+"GDBM is a library for manipulating hashed databases.  It is used to\n"
+"store key/value pairs in a file in a manner similar to the Unix dbm library\n"
+"and provides interfaces to the traditional file format."
+msgstr ""
+
+#: gnu/packages/databases.scm:123
 msgid "Berkeley database"
 msgstr ""
 
-#: gnu/packages/databases.scm:99
+#: gnu/packages/databases.scm:125
 msgid ""
 "Berkeley DB is an embeddable database allowing developers the choice of\n"
 "SQL, Key/Value, XML/XQuery or Java Object storage for their data model."
 msgstr ""
 
-#: gnu/packages/databases.scm:173
+#: gnu/packages/databases.scm:199
 msgid "Fast, easy to use, and popular database"
 msgstr ""
 
-#: gnu/packages/databases.scm:175
+#: gnu/packages/databases.scm:201
 msgid ""
 "MySQL is a fast, reliable, and easy to use relational database\n"
 "management system that supports the standardized Structured Query\n"
 "Language."
 msgstr ""
 
-#: gnu/packages/databases.scm:242
+#: gnu/packages/databases.scm:268
 msgid "SQL database server"
 msgstr ""
 
-#: gnu/packages/databases.scm:244
+#: gnu/packages/databases.scm:270
 msgid ""
 "MariaDB is a multi-user and multi-threaded SQL database server, designed\n"
 "as a drop-in replacement of MySQL."
 msgstr ""
 
-#: gnu/packages/databases.scm:264
+#: gnu/packages/databases.scm:290
 msgid "Powerful object-relational database system"
 msgstr ""
 
-#: gnu/packages/databases.scm:266
+#: gnu/packages/databases.scm:292
 msgid ""
 "PostgreSQL is a powerful object-relational database system.  It is fully\n"
 "ACID compliant, has full support for foreign keys, joins, views, triggers, and\n"
@@ -1333,11 +1445,11 @@ msgid ""
 "pictures, sounds, or video."
 msgstr ""
 
-#: gnu/packages/databases.scm:302
+#: gnu/packages/databases.scm:330
 msgid "Manipulate plain text files as databases"
 msgstr ""
 
-#: gnu/packages/databases.scm:304
+#: gnu/packages/databases.scm:332
 msgid ""
 "GNU Recutils is a set of tools and libraries for creating and\n"
 "manipulating text-based, human-editable databases.  Despite being text-based,\n"
@@ -1346,11 +1458,11 @@ msgid ""
 "types are supported, as is encryption."
 msgstr ""
 
-#: gnu/packages/databases.scm:356
+#: gnu/packages/databases.scm:384
 msgid "The SQLite database management system"
 msgstr ""
 
-#: gnu/packages/databases.scm:358
+#: gnu/packages/databases.scm:386
 msgid ""
 "SQLite is a software library that implements a self-contained, serverless,\n"
 "zero-configuration, transactional SQL database engine.  SQLite is the most\n"
@@ -1358,11 +1470,11 @@ msgid ""
 "is in the public domain."
 msgstr ""
 
-#: gnu/packages/databases.scm:393
+#: gnu/packages/databases.scm:421
 msgid "Trivial database"
 msgstr ""
 
-#: gnu/packages/databases.scm:395
+#: gnu/packages/databases.scm:423
 msgid ""
 "TDB is a Trivial Database.  In concept, it is very much like GDBM,\n"
 "and BSD's DB except that it allows multiple simultaneous writers and uses\n"
@@ -1370,19 +1482,19 @@ msgid ""
 "extremely small."
 msgstr ""
 
-#: gnu/packages/databases.scm:414
+#: gnu/packages/databases.scm:442
 msgid "Database independent interface for Perl"
 msgstr ""
 
-#: gnu/packages/databases.scm:415
+#: gnu/packages/databases.scm:443
 msgid "This package provides an database interface for Perl."
 msgstr ""
 
-#: gnu/packages/databases.scm:462
+#: gnu/packages/databases.scm:490
 msgid "Extensible and flexible object <-> relational mapper"
 msgstr ""
 
-#: gnu/packages/databases.scm:463
+#: gnu/packages/databases.scm:491
 msgid ""
 "An SQL to OO mapper with an object API inspired by\n"
 "Class::DBI (with a compatibility layer as a springboard for porting) and a\n"
@@ -1394,21 +1506,21 @@ msgid ""
 "\"ORDER BY\" and \"HAVING\" support."
 msgstr ""
 
-#: gnu/packages/databases.scm:493
+#: gnu/packages/databases.scm:521
 msgid "Cursor with built-in caching support"
 msgstr ""
 
-#: gnu/packages/databases.scm:494
+#: gnu/packages/databases.scm:522
 msgid ""
 "DBIx::Class::Cursor::Cached provides a cursor class with\n"
 "built-in caching support."
 msgstr ""
 
-#: gnu/packages/databases.scm:514
+#: gnu/packages/databases.scm:542
 msgid "Introspect many-to-many relationships"
 msgstr ""
 
-#: gnu/packages/databases.scm:515
+#: gnu/packages/databases.scm:543
 msgid ""
 "Because the many-to-many relationships are not real\n"
 "relationships, they can not be introspected with DBIx::Class.  Many-to-many\n"
@@ -1418,26 +1530,38 @@ msgid ""
 "introspected and examined."
 msgstr ""
 
-#: gnu/packages/databases.scm:572
+#: gnu/packages/databases.scm:600
 msgid "Create a DBIx::Class::Schema based on a database"
-msgstr ""
+msgstr "Opret et DBIx::Class::Schema baseret på en database"
 
-#: gnu/packages/databases.scm:573
+#: gnu/packages/databases.scm:601
 msgid ""
 "DBIx::Class::Schema::Loader automates the definition of a\n"
 "DBIx::Class::Schema by scanning database table definitions and setting up the\n"
 "columns, primary keys, unique constraints and relationships."
 msgstr ""
 
-#: gnu/packages/databases.scm:597
+#: gnu/packages/databases.scm:625
 msgid "DBI PostgreSQL interface"
+msgstr "DBI PostgreSQL-grænseflade"
+
+#: gnu/packages/databases.scm:648
+msgid "DBI MySQL interface"
+msgstr "DBI MySQL-grænseflade"
+
+#: gnu/packages/databases.scm:649
+msgid ""
+"This package provides a MySQL driver for the Perl5\n"
+"@dfn{Database Interface} (DBI)."
 msgstr ""
+"Denne pakke tilbyder en MySQL-driver for Perl5-\n"
+"@dfn{Database Interface} (DBI)."
 
-#: gnu/packages/databases.scm:616
+#: gnu/packages/databases.scm:668
 msgid "SQlite interface for Perl"
-msgstr ""
+msgstr "SQlite-grænseflade for Perl"
 
-#: gnu/packages/databases.scm:617
+#: gnu/packages/databases.scm:669
 msgid ""
 "DBD::SQLite is a Perl DBI driver for SQLite, that includes\n"
 "the entire thing in the distribution.  So in order to get a fast transaction\n"
@@ -1445,11 +1569,11 @@ msgid ""
 "module, and nothing else."
 msgstr ""
 
-#: gnu/packages/databases.scm:647
+#: gnu/packages/databases.scm:699
 msgid "Generate SQL from Perl data structures"
-msgstr ""
+msgstr "Opret SQL fra Perldatastrukturer"
 
-#: gnu/packages/databases.scm:648
+#: gnu/packages/databases.scm:700
 msgid ""
 "This module was inspired by the excellent DBIx::Abstract.\n"
 "While based on the concepts used by DBIx::Abstract, the concepts used have\n"
@@ -1459,43 +1583,43 @@ msgid ""
 "time your data changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:677
+#: gnu/packages/databases.scm:729
 msgid "Split SQL code into atomic statements"
 msgstr ""
 
-#: gnu/packages/databases.scm:678
+#: gnu/packages/databases.scm:730
 msgid ""
 "This module tries to split any SQL code, even including\n"
 "non-standard extensions, into the atomic statements it is composed of."
 msgstr ""
 
-#: gnu/packages/databases.scm:696
+#: gnu/packages/databases.scm:748
 msgid "SQL tokenizer"
 msgstr ""
 
-#: gnu/packages/databases.scm:697
+#: gnu/packages/databases.scm:749
 msgid ""
 "SQL::Tokenizer is a tokenizer for SQL queries.  It does not\n"
 "claim to be a parser or query verifier.  It just creates sane tokens from a\n"
 "valid SQL query."
 msgstr ""
 
-#: gnu/packages/databases.scm:714
+#: gnu/packages/databases.scm:766
 msgid "Data source abstraction library"
-msgstr ""
+msgstr "Abstraktionsbibliotek for datakilde"
 
-#: gnu/packages/databases.scm:715
+#: gnu/packages/databases.scm:767
 msgid ""
 "Unixodbc is a library providing an API with which to access\n"
 "data sources.  Data sources include SQL Servers and any software with an ODBC\n"
 "Driver."
 msgstr ""
 
-#: gnu/packages/databases.scm:739
+#: gnu/packages/databases.scm:791
 msgid "In-memory key/value and document store"
 msgstr ""
 
-#: gnu/packages/databases.scm:741
+#: gnu/packages/databases.scm:793
 msgid ""
 "UnQLite is an in-process software library which implements a\n"
 "self-contained, serverless, zero-configuration, transactional NoSQL\n"
@@ -1504,17 +1628,28 @@ msgid ""
 "similar to BerkeleyDB, LevelDB, etc."
 msgstr ""
 
-#: gnu/packages/databases.scm:768
+#: gnu/packages/databases.scm:820
 msgid "Key-value cache and store"
 msgstr ""
 
-#: gnu/packages/databases.scm:769
+#: gnu/packages/databases.scm:821
 msgid ""
 "Redis is an advanced key-value cache and store.  Redis\n"
 "supports many data structures including strings, hashes, lists, sets, sorted\n"
 "sets, bitmaps and hyperloglogs."
 msgstr ""
 
+#: gnu/packages/databases.scm:847
+msgid "Kyoto Cabinet is a modern implementation of the DBM database"
+msgstr ""
+
+#: gnu/packages/databases.scm:849
+msgid ""
+"Kyoto Cabinet is a standalone file-based database that supports Hash\n"
+"and B+ Tree data storage models.  It is a fast key-value lightweight\n"
+"database and supports many programming languages.  It is a NoSQL database."
+msgstr ""
+
 #: gnu/packages/debug.scm:74
 msgid "Heuristical file minimizer"
 msgstr ""
@@ -1540,11 +1675,11 @@ msgid ""
 "tools that process C/C++ code."
 msgstr ""
 
-#: gnu/packages/debug.scm:229
+#: gnu/packages/debug.scm:249
 msgid "Security-oriented fuzzer"
 msgstr ""
 
-#: gnu/packages/debug.scm:231
+#: gnu/packages/debug.scm:251
 msgid ""
 "American fuzzy lop is a security-oriented fuzzer that employs a novel\n"
 "type of compile-time instrumentation and genetic algorithms to automatically\n"
@@ -1566,11 +1701,11 @@ msgid ""
 "multiple test suites, which are then all managed by a single harness."
 msgstr ""
 
-#: gnu/packages/feh.scm:53
+#: gnu/packages/feh.scm:54
 msgid "Fast and light imlib2-based image viewer"
-msgstr ""
+msgstr "Hurtig og simpel imlib2-baseret billedfremviser"
 
-#: gnu/packages/feh.scm:55
+#: gnu/packages/feh.scm:56
 msgid ""
 "feh is an X11 image viewer aimed mostly at console users.\n"
 "Unlike most other viewers, it does not have a fancy GUI, but simply\n"
@@ -1579,11 +1714,11 @@ msgid ""
 "actions."
 msgstr ""
 
-#: gnu/packages/games.scm:113
+#: gnu/packages/games.scm:119
 msgid "Backgammon game"
-msgstr ""
+msgstr "Backgammonspil"
 
-#: gnu/packages/games.scm:114
+#: gnu/packages/games.scm:120
 msgid ""
 "The GNU backgammon application can be used for playing, analyzing and\n"
 "teaching the game.  It has an advanced evaluation engine based on artificial\n"
@@ -1591,12 +1726,17 @@ msgid ""
 "addition to a command-line interface, it also features an attractive, 3D\n"
 "representation of the playing board."
 msgstr ""
+"GNU backgammon-programmet kan bruges til at spille, analysere og\n"
+"undervise i spillet Backgammon. Det har en avanceret evalueringsmotor\n"
+"baseret på kunstige neurale netværk egnet for både begyndere og\n"
+"avancerede spillere. Udover grænsefladen for kommandolinjen har\n"
+"spillet også en attraktiv 3D-repræsentation af brættet."
 
-#: gnu/packages/games.scm:143
+#: gnu/packages/games.scm:149
 msgid "3d Rubik's cube game"
 msgstr ""
 
-#: gnu/packages/games.scm:145
+#: gnu/packages/games.scm:151
 msgid ""
 "GNUbik is a puzzle game in which you must manipulate a cube to make\n"
 "each of its faces have a uniform color.  The game is customizable, allowing\n"
@@ -1605,11 +1745,11 @@ msgid ""
 "scriptable with Guile."
 msgstr ""
 
-#: gnu/packages/games.scm:195
+#: gnu/packages/games.scm:201
 msgid "GNU/Linux port of the indie game \"l'Abbaye des Morts\""
-msgstr ""
+msgstr "GNU/Linux-port af indiespillet »l'Abbaye des Morts«"
 
-#: gnu/packages/games.scm:196
+#: gnu/packages/games.scm:202
 msgid ""
 "L'Abbaye des Morts is a 2D platform game set in 13th century\n"
 "France.  The Cathars, who preach about good Christian beliefs, were being\n"
@@ -1618,11 +1758,11 @@ msgid ""
 "that beneath its ruins lay buried an ancient evil."
 msgstr ""
 
-#: gnu/packages/games.scm:239
+#: gnu/packages/games.scm:245
 msgid "Lemmings clone"
-msgstr ""
+msgstr "Lemmingsklon"
 
-#: gnu/packages/games.scm:241
+#: gnu/packages/games.scm:247
 msgid ""
 "Pingus is a free Lemmings-like puzzle game in which the player takes\n"
 "command of a bunch of small animals and has to guide them through levels.\n"
@@ -1632,22 +1772,22 @@ msgid ""
 "level's exit.  The game is presented in a 2D side view."
 msgstr ""
 
-#: gnu/packages/games.scm:263
+#: gnu/packages/games.scm:269
 msgid "Convert English text to humorous dialects"
 msgstr ""
 
-#: gnu/packages/games.scm:264
+#: gnu/packages/games.scm:270
 msgid ""
 "The GNU Talk Filters are programs that convert English text\n"
 "into stereotyped or otherwise humorous dialects.  The filters are provided as\n"
 "a C library, so they can easily be integrated into other programs."
 msgstr ""
 
-#: gnu/packages/games.scm:296
+#: gnu/packages/games.scm:302
 msgid "Simulate the display from \"The Matrix\""
 msgstr ""
 
-#: gnu/packages/games.scm:297
+#: gnu/packages/games.scm:303
 msgid ""
 "CMatrix simulates the display from \"The Matrix\" and is\n"
 "based on the screensaver from the movie's website.  It works with terminal\n"
@@ -1655,22 +1795,22 @@ msgid ""
 "asynchronously and at a user-defined speed."
 msgstr ""
 
-#: gnu/packages/games.scm:317
+#: gnu/packages/games.scm:323
 msgid "Full chess implementation"
-msgstr ""
+msgstr "Fuld skakimplementering"
 
-#: gnu/packages/games.scm:318
+#: gnu/packages/games.scm:324
 msgid ""
 "GNU Chess is a chess engine.  It allows you to compete\n"
 "against the computer in a game of chess, either through the default terminal\n"
 "interface or via an external visual interface such as GNU XBoard."
 msgstr ""
 
-#: gnu/packages/games.scm:346
+#: gnu/packages/games.scm:352
 msgid "Twisted adventures of young pig farmer Dink Smallwood"
 msgstr ""
 
-#: gnu/packages/games.scm:348
+#: gnu/packages/games.scm:354
 msgid ""
 "GNU FreeDink is a free and portable re-implementation of the engine\n"
 "for the role-playing game Dink Smallwood.  It supports not only the original\n"
@@ -1678,19 +1818,19 @@ msgid ""
 "To that extent, it also includes a front-end for managing all of your D-Mods."
 msgstr ""
 
-#: gnu/packages/games.scm:370
+#: gnu/packages/games.scm:376
 msgid "Game data for GNU Freedink"
-msgstr ""
+msgstr "Spildata for GNU Freedink"
 
-#: gnu/packages/games.scm:372
+#: gnu/packages/games.scm:378
 msgid "This package contains the game data of GNU Freedink."
-msgstr ""
+msgstr "Denne pakke indeholder spildataen for GNU Freedink."
 
-#: gnu/packages/games.scm:424
+#: gnu/packages/games.scm:430
 msgid "Graphical user interface for chess programs"
-msgstr ""
+msgstr "Grafisk brugerflade for skakprogrammer"
 
-#: gnu/packages/games.scm:425
+#: gnu/packages/games.scm:431
 msgid ""
 "GNU XBoard is a graphical board for all varieties of chess,\n"
 "including international chess, xiangqi (Chinese chess), shogi (Japanese chess)\n"
@@ -1699,11 +1839,11 @@ msgid ""
 "Portable Game Notation."
 msgstr ""
 
-#: gnu/packages/games.scm:478
+#: gnu/packages/games.scm:484
 msgid "Ball and paddle game"
 msgstr ""
 
-#: gnu/packages/games.scm:479
+#: gnu/packages/games.scm:485
 msgid ""
 "XBoing is a blockout type game where you have a paddle which\n"
 "you control to bounce a ball around the game zone destroying blocks with a\n"
@@ -1711,11 +1851,11 @@ msgid ""
 "destroy, the better your score.  The person with the highest score wins."
 msgstr ""
 
-#: gnu/packages/games.scm:511
+#: gnu/packages/games.scm:517
 msgid "Typing tutor"
 msgstr ""
 
-#: gnu/packages/games.scm:513
+#: gnu/packages/games.scm:519
 msgid ""
 "GNU Typist is a universal typing tutor.  It can be used to learn and\n"
 "practice touch-typing.  Several tutorials are included; in addition to\n"
@@ -1724,11 +1864,11 @@ msgid ""
 "are primarily in English, however some in other languages are provided."
 msgstr ""
 
-#: gnu/packages/games.scm:566
+#: gnu/packages/games.scm:572
 msgid "3D game engine written in C++"
-msgstr ""
+msgstr "3D-spilmotor skrevet i C++"
 
-#: gnu/packages/games.scm:568
+#: gnu/packages/games.scm:574
 msgid ""
 "The Irrlicht Engine is a high performance realtime 3D engine written in\n"
 "C++.  Features include an OpenGL renderer, extensible materials, scene graph\n"
@@ -1736,11 +1876,11 @@ msgid ""
 "for common mesh file formats, and collision detection."
 msgstr ""
 
-#: gnu/packages/games.scm:620
+#: gnu/packages/games.scm:626
 msgid "2D space shooter"
-msgstr ""
+msgstr "2D-rumskyder"
 
-#: gnu/packages/games.scm:622
+#: gnu/packages/games.scm:628
 msgid ""
 "M.A.R.S. is a 2D space shooter with pretty visual effects and\n"
 "attractive physics.  Players can battle each other or computer controlled\n"
@@ -1748,19 +1888,19 @@ msgid ""
 "match, cannon keep, and grave-itation pit."
 msgstr ""
 
-#: gnu/packages/games.scm:663
+#: gnu/packages/games.scm:669
 msgid "Main game data for the Minetest game engine"
-msgstr ""
+msgstr "Spildata for spilmotoren Minetest"
 
-#: gnu/packages/games.scm:665
+#: gnu/packages/games.scm:671
 msgid "Game data for the Minetest infinite-world block sandox game."
 msgstr ""
 
-#: gnu/packages/games.scm:717
+#: gnu/packages/games.scm:723
 msgid "Infinite-world block sandbox game"
 msgstr ""
 
-#: gnu/packages/games.scm:719
+#: gnu/packages/games.scm:725
 msgid ""
 "Minetest is a sandbox construction game.  Players can create and destroy\n"
 "various types of blocks in a three-dimensional open world.  This allows\n"
@@ -1769,11 +1909,11 @@ msgid ""
 "in different ways."
 msgstr ""
 
-#: gnu/packages/games.scm:758
+#: gnu/packages/games.scm:764
 msgid "Curses Implementation of the Glk API"
 msgstr ""
 
-#: gnu/packages/games.scm:760
+#: gnu/packages/games.scm:766
 msgid ""
 "Glk defines a portable API for applications with text UIs.  It was\n"
 "primarily designed for interactive fiction, but it should be suitable for many\n"
@@ -1782,11 +1922,11 @@ msgid ""
 "using the curses.h library for screen control."
 msgstr ""
 
-#: gnu/packages/games.scm:797
+#: gnu/packages/games.scm:803
 msgid "Interpreter for Glulx VM"
-msgstr ""
+msgstr "Fortolker for Glulx VM"
 
-#: gnu/packages/games.scm:799
+#: gnu/packages/games.scm:805
 msgid ""
 "Glulx is a 32-bit portable virtual machine intended for writing and\n"
 "playing interactive fiction.  It was designed by Andrew Plotkin to relieve\n"
@@ -1794,22 +1934,22 @@ msgid ""
 "reference interpreter, using Glk API."
 msgstr ""
 
-#: gnu/packages/games.scm:835
+#: gnu/packages/games.scm:841
 msgid "Z-machine interpreter"
 msgstr ""
 
-#: gnu/packages/games.scm:837
+#: gnu/packages/games.scm:843
 msgid ""
 "Fizmo is a console-based Z-machine interpreter.  It is used to play\n"
 "interactive fiction, also known as text adventures, which were implemented\n"
 "either by Infocom or created using the Inform compiler."
 msgstr ""
 
-#: gnu/packages/games.scm:887
+#: gnu/packages/games.scm:893
 msgid "Reference frontend for the libretro API"
 msgstr ""
 
-#: gnu/packages/games.scm:889
+#: gnu/packages/games.scm:895
 msgid ""
 "Libretro is a simple but powerful development interface that allows for\n"
 "the easy creation of emulators, games and multimedia applications that can plug\n"
@@ -1818,11 +1958,11 @@ msgid ""
 "multi-system game/emulator system."
 msgstr ""
 
-#: gnu/packages/games.scm:909
+#: gnu/packages/games.scm:915
 msgid "Play the game of Go"
-msgstr ""
+msgstr "Spil Go"
 
-#: gnu/packages/games.scm:911
+#: gnu/packages/games.scm:917
 msgid ""
 "GNU Go is a program that plays the game of Go, in which players\n"
 "place stones on a grid to form territory or capture other stones.  While\n"
@@ -1833,11 +1973,11 @@ msgid ""
 "Protocol)."
 msgstr ""
 
-#: gnu/packages/games.scm:961
+#: gnu/packages/games.scm:967
 msgid "High speed arctic racing game based on Tux Racer"
 msgstr ""
 
-#: gnu/packages/games.scm:963
+#: gnu/packages/games.scm:969
 msgid ""
 "Extreme Tux Racer, or etracer as it is called for short, is\n"
 "a simple OpenGL racing game featuring Tux, the Linux mascot.  The goal of the\n"
@@ -1850,11 +1990,11 @@ msgid ""
 "This game is based on the GPL version of the famous game TuxRacer."
 msgstr ""
 
-#: gnu/packages/games.scm:1001
+#: gnu/packages/games.scm:1007
 msgid "Game of jumping to the next floor, trying not to fall"
 msgstr ""
 
-#: gnu/packages/games.scm:1003
+#: gnu/packages/games.scm:1009
 msgid ""
 "GNUjump is a simple, yet addictive game in which you must jump from\n"
 "platform to platform to avoid falling, while the platforms drop at faster rates\n"
@@ -1862,11 +2002,11 @@ msgid ""
 "falling, themeable graphics and sounds, and replays."
 msgstr ""
 
-#: gnu/packages/games.scm:1044
+#: gnu/packages/games.scm:1050
 msgid "Turn-based strategy game"
 msgstr ""
 
-#: gnu/packages/games.scm:1046
+#: gnu/packages/games.scm:1052
 msgid ""
 "The Battle for Wesnoth is a fantasy, turn based tactical strategy game,\n"
 "with several single player campaigns, and multiplayer games (both networked and\n"
@@ -1878,11 +2018,11 @@ msgid ""
 "next campaign."
 msgstr ""
 
-#: gnu/packages/games.scm:1090
-msgid "x86 emulator with CGA/EGA/VGA/etc. graphics and sound"
-msgstr ""
+#: gnu/packages/games.scm:1096
+msgid "X86 emulator with CGA/EGA/VGA/etc. graphics and sound"
+msgstr "X86-emulator med CGA/EGA/VGA/etc. grafik og lyd"
 
-#: gnu/packages/games.scm:1091
+#: gnu/packages/games.scm:1097
 msgid ""
 "DOSBox is a DOS-emulator that uses the SDL library.  DOSBox\n"
 "also emulates CPU:286/386 realmode/protected mode, Directory\n"
@@ -1891,22 +2031,22 @@ msgid ""
 "older games."
 msgstr ""
 
-#: gnu/packages/games.scm:1136
+#: gnu/packages/games.scm:1142
 msgid "Mouse and keyboard discovery for children"
 msgstr ""
 
-#: gnu/packages/games.scm:1138
+#: gnu/packages/games.scm:1144
 msgid ""
 "Gamine is a game designed for young children who are learning to use the\n"
 "mouse and keyboard.  The child uses the mouse to draw colored dots and lines\n"
 "on the screen and keyboard to display letters."
 msgstr ""
 
-#: gnu/packages/games.scm:1169
+#: gnu/packages/games.scm:1175
 msgid "Puzzle game with a cat in lead role"
 msgstr ""
 
-#: gnu/packages/games.scm:1170
+#: gnu/packages/games.scm:1176
 msgid ""
 "Project Raincat is a game developed by Carnegie Mellon\n"
 "students through GCS during the Fall 2008 semester.  Raincat features game\n"
@@ -1915,11 +2055,11 @@ msgid ""
 "is programmed in Haskell."
 msgstr ""
 
-#: gnu/packages/games.scm:1205
+#: gnu/packages/games.scm:1211
 msgid "Client for 'The Mana World' and similar games"
 msgstr ""
 
-#: gnu/packages/games.scm:1207
+#: gnu/packages/games.scm:1213
 msgid ""
 "ManaPlus is a 2D MMORPG client for game servers.  It is the only\n"
 "fully supported client for @uref{http://www.themanaworld.org, The mana\n"
@@ -1927,34 +2067,183 @@ msgid ""
 "@uref{http://landoffire.org, Land of fire}."
 msgstr ""
 
-#: gnu/packages/gcc.scm:303
+#: gnu/packages/games.scm:1263
+msgid "Nintendo 64 emulator core library"
+msgstr "Nintendo 64-emulator - grundlæggende bibliotek"
+
+#: gnu/packages/games.scm:1265
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"core library."
+msgstr ""
+
+#: gnu/packages/games.scm:1309 gnu/packages/games.scm:1354
+#: gnu/packages/games.scm:1396 gnu/packages/games.scm:1438
+#: gnu/packages/games.scm:1755
+msgid "Mupen64Plus SDL input plugin"
+msgstr ""
+
+#: gnu/packages/games.scm:1311
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"SDL audio plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1356
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"SDL input plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1398
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"high-level emulation (HLE) RSP processor plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1440
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Z64 RSP processor plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1484 gnu/packages/games.scm:1538
+#: gnu/packages/games.scm:1588 gnu/packages/games.scm:1636
+msgid "Mupen64Plus Rice Video plugin"
+msgstr ""
+
+#: gnu/packages/games.scm:1486
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Arachnoid video plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1540
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Glide64 video plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1590
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Glide64MK2 video plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1638
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Rice Video plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1690
+msgid "Mupen64Plus Z64 video plugin"
+msgstr ""
+
+#: gnu/packages/games.scm:1692
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"Z64 video plugin."
+msgstr ""
+
+#: gnu/packages/games.scm:1757
+msgid ""
+"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
+"which is capable of accurately playing many games.  This package contains the\n"
+"command line user interface.  Installing this package is the easiest way\n"
+"towards a working Mupen64Plus for casual users."
+msgstr ""
+
+#: gnu/packages/games.scm:1821
+msgid "Nintendo Entertainment System (NES/Famicom) emulator"
+msgstr ""
+
+#: gnu/packages/games.scm:1823
+msgid ""
+"Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment\n"
+"System (NES/Famicom) emulator Nestopia, with enhancements from members of the\n"
+"emulation community.  It provides highly accurate emulation."
+msgstr ""
+
+#: gnu/packages/games.scm:1852
+msgid "Video game console emulator front-end"
+msgstr ""
+
+#: gnu/packages/games.scm:1853
+msgid ""
+"EmulationStation provides a graphical front-end to a large\n"
+"number of video game console emulators.  It features an interface that is\n"
+"usable with any game controller that has at least 4 buttons, theming support,\n"
+"and a game metadata scraper."
+msgstr ""
+
+#: gnu/packages/games.scm:1893
+msgid "Pinball simulator"
+msgstr "Pinball-simulator"
+
+#: gnu/packages/games.scm:1894
+msgid ""
+"The Emilia Pinball Project is a pinball simulator.  There\n"
+"are only two levels to play with, but they are very addictive."
+msgstr ""
+
+#: gnu/packages/games.scm:1915
+msgid "Board game inspired by The Settlers of Catan"
+msgstr "Brætspil inspireret af The Settlers of Catan"
+
+#: gnu/packages/games.scm:1916
+msgid ""
+"Pioneers is an emulation of the board game The Settlers of\n"
+"Catan.  It can be played on a local network, on the internet, and with AI\n"
+"players."
+msgstr ""
+
+#: gnu/packages/games.scm:1950
+msgid "Nintendo DS emulator"
+msgstr "Nintendo DS-emulator"
+
+#: gnu/packages/games.scm:1952
+msgid "DeSmuME is an emulator for the Nintendo DS handheld gaming console."
+msgstr "DeSmuME er en emulator for den håndholdte spilkonsol Nintendo DS."
+
+#: gnu/packages/gcc.scm:313
 msgid "GNU Compiler Collection"
 msgstr ""
 
-#: gnu/packages/gcc.scm:305
+#: gnu/packages/gcc.scm:315
 msgid ""
 "GCC is the GNU Compiler Collection.  It provides compiler front-ends\n"
 "for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and\n"
 "Go.  It also includes runtime support libraries for these languages."
 msgstr ""
 
-#: gnu/packages/gcc.scm:370
+#: gnu/packages/gcc.scm:380
 msgid "GNU C++ standard library"
 msgstr ""
 
-#: gnu/packages/gcc.scm:405
+#: gnu/packages/gcc.scm:415
 msgid "Collection of subroutines used by various GNU programs"
 msgstr ""
 
-#: gnu/packages/gcc.scm:561
+#: gnu/packages/gcc.scm:610
 msgid "GNU libstdc++ documentation"
 msgstr ""
 
-#: gnu/packages/gcc.scm:629
+#: gnu/packages/gcc.scm:678
 msgid "Manipulating sets and relations of integer points bounded by linear constraints"
 msgstr ""
 
-#: gnu/packages/gcc.scm:632
+#: gnu/packages/gcc.scm:681
 msgid ""
 "isl is a library for manipulating sets and relations of integer points\n"
 "bounded by linear constraints.  Supported operations on sets include\n"
@@ -1966,11 +2255,11 @@ msgid ""
 "dependence analysis and bounds on piecewise step-polynomials."
 msgstr ""
 
-#: gnu/packages/gcc.scm:664
+#: gnu/packages/gcc.scm:713
 msgid "Library to generate code for scanning Z-polyhedra"
 msgstr ""
 
-#: gnu/packages/gcc.scm:666
+#: gnu/packages/gcc.scm:715
 msgid ""
 "CLooG is a free software library to generate code for scanning\n"
 "Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that\n"
@@ -1985,11 +2274,11 @@ msgid ""
 "effective code."
 msgstr ""
 
-#: gnu/packages/gcc.scm:721
+#: gnu/packages/gcc.scm:770
 msgid "Reference manual for the C programming language"
 msgstr ""
 
-#: gnu/packages/gcc.scm:723
+#: gnu/packages/gcc.scm:772
 msgid ""
 "This is a reference manual for the C programming language, as\n"
 "implemented by the GNU C Compiler (gcc).  As a reference, it is not intended\n"
@@ -1999,7 +2288,7 @@ msgstr ""
 
 #: gnu/packages/geeqie.scm:48
 msgid "Library and command-line utility to manage image metadata"
-msgstr ""
+msgstr "Bibliotek og kommandolinjeredskab til at håndtere billedmetadata"
 
 #: gnu/packages/geeqie.scm:50
 msgid ""
@@ -2008,11 +2297,11 @@ msgid ""
 "and XMP metadata of images in various formats."
 msgstr ""
 
-#: gnu/packages/geeqie.scm:81
+#: gnu/packages/geeqie.scm:82
 msgid "Lightweight GTK+ based image viewer"
 msgstr ""
 
-#: gnu/packages/geeqie.scm:83
+#: gnu/packages/geeqie.scm:84
 msgid ""
 "Geeqie is a lightweight GTK+ based image viewer for Unix like operating\n"
 "systems.  It features: EXIF, IPTC and XMP metadata browsing and editing\n"
@@ -2022,11 +2311,11 @@ msgid ""
 "collection.  Geeqie was initially based on GQview."
 msgstr ""
 
-#: gnu/packages/gettext.scm:91
+#: gnu/packages/gettext.scm:93
 msgid "Tools and documentation for translation"
-msgstr ""
+msgstr "Værktøjer og dokumentation for oversættelse"
 
-#: gnu/packages/gettext.scm:93
+#: gnu/packages/gettext.scm:95
 msgid ""
 "GNU Gettext is a package providing a framework for translating the\n"
 "textual output of programs into multiple languages.  It provides translators\n"
@@ -2035,22 +2324,22 @@ msgid ""
 "catalogs.  Nearly all GNU packages use Gettext."
 msgstr ""
 
-#: gnu/packages/gettext.scm:149
+#: gnu/packages/gettext.scm:151
 msgid "Scripts to ease maintenance of translations"
 msgstr ""
 
-#: gnu/packages/gettext.scm:151
+#: gnu/packages/gettext.scm:153
 msgid ""
 "The po4a (PO for anything) project goal is to ease translations (and\n"
 "more interestingly, the maintenance of translations) using gettext tools on\n"
 "areas where they were not expected like documentation."
 msgstr ""
 
-#: gnu/packages/gimp.scm:54
+#: gnu/packages/gimp.scm:53
 msgid "Image pixel format conversion library"
 msgstr ""
 
-#: gnu/packages/gimp.scm:56
+#: gnu/packages/gimp.scm:55
 msgid ""
 "Babl is a dynamic, any to any, pixel format translation library.\n"
 "It allows converting between different methods of storing pixels known as\n"
@@ -2061,22 +2350,22 @@ msgid ""
 "provided as well as the framework to add new color models and data types."
 msgstr ""
 
-#: gnu/packages/gimp.scm:111
+#: gnu/packages/gimp.scm:110
 msgid "Graph based image processing framework"
-msgstr ""
+msgstr "Grafbaseret billedbehandlingsramme"
 
-#: gnu/packages/gimp.scm:112
+#: gnu/packages/gimp.scm:111
 msgid ""
 "GEGL (Generic Graphics Library) provides infrastructure to\n"
 "do demand based cached non destructive image editing on larger than RAM\n"
 "buffers."
 msgstr ""
 
-#: gnu/packages/gimp.scm:148
+#: gnu/packages/gimp.scm:153
 msgid "GNU Image Manipulation Program"
 msgstr ""
 
-#: gnu/packages/gimp.scm:150
+#: gnu/packages/gimp.scm:155
 msgid ""
 "GIMP is an application for image manipulation tasks such as photo\n"
 "retouching, composition and authoring.  It supports all common image formats\n"
@@ -2084,22 +2373,22 @@ msgid ""
 "that is extensible via a plugin system."
 msgstr ""
 
-#: gnu/packages/gnome.scm:138
+#: gnu/packages/gnome.scm:156
 msgid "CD/DVD burning tool for Gnome"
-msgstr ""
+msgstr "Cd/dvd-brændeværktøj for GNOME"
 
-#: gnu/packages/gnome.scm:139
+#: gnu/packages/gnome.scm:157
 msgid ""
 "Brasero is an application to burn CD/DVD for the Gnome\n"
 "Desktop.  It is designed to be as simple as possible and has some unique\n"
 "features to enable users to create their discs easily and quickly."
 msgstr ""
 
-#: gnu/packages/gnome.scm:159
+#: gnu/packages/gnome.scm:177
 msgid "Bootstrap GNOME modules built from Git"
 msgstr ""
 
-#: gnu/packages/gnome.scm:160
+#: gnu/packages/gnome.scm:178
 msgid ""
 "gnome-common contains various files needed to bootstrap\n"
 "GNOME modules built from Git.  It contains a common \"autogen.sh\" script that\n"
@@ -2107,11 +2396,11 @@ msgid ""
 "commonly used macros."
 msgstr ""
 
-#: gnu/packages/gnome.scm:198
+#: gnu/packages/gnome.scm:219
 msgid "Libgnome-desktop, gnome-about, and desktop-wide documents"
 msgstr ""
 
-#: gnu/packages/gnome.scm:200
+#: gnu/packages/gnome.scm:221
 msgid ""
 "The libgnome-desktop library provides API shared by several applications\n"
 "on the desktop, but that cannot live in the platform for various reasons.\n"
@@ -2121,41 +2410,41 @@ msgid ""
 "The gnome-about program helps find which version of GNOME is installed."
 msgstr ""
 
-#: gnu/packages/gnome.scm:233
+#: gnu/packages/gnome.scm:254
 msgid "Documentation utilities for the Gnome project"
-msgstr ""
+msgstr "Dokumentationsredskaber for GNOME-projektet"
 
-#: gnu/packages/gnome.scm:235
+#: gnu/packages/gnome.scm:256
 msgid ""
 "Gnome-doc-utils is a collection of documentation utilities for the\n"
 "Gnome project.  It includes xml2po tool which makes it easier to translate\n"
 "and keep up to date translations of documentation."
 msgstr ""
 
-#: gnu/packages/gnome.scm:277
+#: gnu/packages/gnome.scm:300
 msgid "Libraries for displaying certificates and accessing key stores"
 msgstr ""
 
-#: gnu/packages/gnome.scm:279
+#: gnu/packages/gnome.scm:302
 msgid ""
 "The GCR package contains libraries used for displaying certificates and\n"
 "accessing key stores.  It also provides the viewer for crypto files on the\n"
 "GNOME Desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:308
+#: gnu/packages/gnome.scm:331
 msgid "Accessing passwords from the GNOME keyring"
 msgstr ""
 
-#: gnu/packages/gnome.scm:310
+#: gnu/packages/gnome.scm:333
 msgid "Client library to access passwords from the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:371
+#: gnu/packages/gnome.scm:395
 msgid "Daemon to store passwords and encryption keys"
-msgstr ""
+msgstr "Dæmon til at lagre adgandskoder og krypteringsnøgler"
 
-#: gnu/packages/gnome.scm:373
+#: gnu/packages/gnome.scm:397
 msgid ""
 "gnome-keyring is a program that keeps passwords and other secrets for\n"
 "users.  It is run as a daemon in the session, similar to ssh-agent, and other\n"
@@ -2166,11 +2455,11 @@ msgid ""
 "forgotten when the session ends."
 msgstr ""
 
-#: gnu/packages/gnome.scm:438
+#: gnu/packages/gnome.scm:462
 msgid "GNOME's document viewer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:440
+#: gnu/packages/gnome.scm:464
 msgid ""
 "Evince is a document viewer for multiple document formats.  It\n"
 "currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal\n"
@@ -2178,32 +2467,32 @@ msgid ""
 "on the GNOME Desktop with a single simple application."
 msgstr ""
 
-#: gnu/packages/gnome.scm:469
+#: gnu/packages/gnome.scm:493
 msgid "GNOME settings for various desktop components"
 msgstr ""
 
-#: gnu/packages/gnome.scm:471
+#: gnu/packages/gnome.scm:495
 msgid ""
 "Gsettings-desktop-schemas contains a collection of GSettings schemas\n"
 "for settings shared by various components of the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:505
+#: gnu/packages/gnome.scm:529
 msgid "Utility to implement the Freedesktop Icon Naming Specification"
 msgstr ""
 
-#: gnu/packages/gnome.scm:507
+#: gnu/packages/gnome.scm:531
 msgid ""
 "To help with the transition to the Freedesktop Icon Naming\n"
 "Specification, the icon naming utility maps the icon names used by the\n"
 "GNOME and KDE desktops to the icon names proposed in the specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:529
+#: gnu/packages/gnome.scm:553
 msgid "Utilities for working with desktop entries"
 msgstr ""
 
-#: gnu/packages/gnome.scm:531
+#: gnu/packages/gnome.scm:555
 msgid ""
 "This package contains a few command line utilities for working with\n"
 "desktop entries:\n"
@@ -2218,19 +2507,19 @@ msgid ""
 "                         handled by desktop files."
 msgstr ""
 
-#: gnu/packages/gnome.scm:565
+#: gnu/packages/gnome.scm:589
 msgid "GNOME icon theme"
-msgstr ""
+msgstr "GNOME-ikontema"
 
-#: gnu/packages/gnome.scm:567
+#: gnu/packages/gnome.scm:591
 msgid "Icons for the GNOME desktop."
-msgstr ""
+msgstr "Ikoner for GNOME-skrivebordet."
 
-#: gnu/packages/gnome.scm:606
+#: gnu/packages/gnome.scm:630
 msgid "Database of common MIME types"
-msgstr ""
+msgstr "Database med gængse MIME-typer"
 
-#: gnu/packages/gnome.scm:608
+#: gnu/packages/gnome.scm:632
 msgid ""
 "The shared-mime-info package contains the core database of common types\n"
 "and the update-mime-database command used to extend it.  It requires glib2 to\n"
@@ -2239,19 +2528,19 @@ msgid ""
 "database is translated at Transifex."
 msgstr ""
 
-#: gnu/packages/gnome.scm:632
+#: gnu/packages/gnome.scm:656
 msgid "Freedesktop icon theme"
-msgstr ""
+msgstr "Freedesktop-ikontema"
 
-#: gnu/packages/gnome.scm:634
+#: gnu/packages/gnome.scm:658
 msgid "Freedesktop icon theme."
-msgstr ""
+msgstr "Freedesktop-ikondtema."
 
-#: gnu/packages/gnome.scm:661
+#: gnu/packages/gnome.scm:685
 msgid "GNOME desktop notification library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:663
+#: gnu/packages/gnome.scm:687
 msgid ""
 "Libnotify is a library that sends desktop notifications to a\n"
 "notification daemon, as defined in the Desktop Notifications spec.  These\n"
@@ -2259,11 +2548,11 @@ msgid ""
 "some form of information without getting in the user's way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:695
+#: gnu/packages/gnome.scm:719
 msgid "GObject plugin system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:697
+#: gnu/packages/gnome.scm:721
 msgid ""
 "Libpeas is a gobject-based plugins engine, and is targetted at giving\n"
 "every application the chance to assume its own extensibility.  It also has a\n"
@@ -2272,33 +2561,33 @@ msgid ""
 "the API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:726
+#: gnu/packages/gnome.scm:750
 msgid "OpenGL extension to GTK+"
-msgstr ""
+msgstr "OpenGL-udvidelse til GTK+"
 
-#: gnu/packages/gnome.scm:727
+#: gnu/packages/gnome.scm:751
 msgid ""
 "GtkGLExt is an OpenGL extension to GTK+.  It provides\n"
 "additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget\n"
 "API add-ons to make GTK+ widgets OpenGL-capable."
 msgstr ""
 
-#: gnu/packages/gnome.scm:752
+#: gnu/packages/gnome.scm:794
 msgid "GTK+ rapid application development tool"
 msgstr ""
 
-#: gnu/packages/gnome.scm:753
+#: gnu/packages/gnome.scm:795
 msgid ""
 "Glade is a rapid application development (RAD) tool to\n"
 "enable quick & easy development of user interfaces for the GTK+ toolkit and\n"
 "the GNOME desktop environment."
 msgstr ""
 
-#: gnu/packages/gnome.scm:778
+#: gnu/packages/gnome.scm:820
 msgid "CSS2 parsing and manipulation library"
-msgstr ""
+msgstr "CSS2-fortolknings- og manipuleringsbibliotek"
 
-#: gnu/packages/gnome.scm:780
+#: gnu/packages/gnome.scm:822
 msgid ""
 "Libcroco is a standalone CSS2 parsing and manipulation library.\n"
 "The parser provides a low level event driven SAC-like API and a CSS object\n"
@@ -2306,31 +2595,31 @@ msgid ""
 "XML/CSS rendering engine."
 msgstr ""
 
-#: gnu/packages/gnome.scm:813
+#: gnu/packages/gnome.scm:855
 msgid "GNOME's Structured File Library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:815
+#: gnu/packages/gnome.scm:857
 msgid ""
 "Libgsf aims to provide an efficient extensible I/O abstraction for\n"
 "dealing with different structured file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:880
+#: gnu/packages/gnome.scm:922
 msgid "Render SVG files using Cairo"
 msgstr ""
 
-#: gnu/packages/gnome.scm:882
+#: gnu/packages/gnome.scm:924
 msgid ""
 "Librsvg is a C library to render SVG files using the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:906
+#: gnu/packages/gnome.scm:948
 msgid "Create trees of CORBA Interface Definition Language files"
 msgstr ""
 
-#: gnu/packages/gnome.scm:907
+#: gnu/packages/gnome.scm:949
 msgid ""
 "Libidl is a library for creating trees of CORBA Interface\n"
 "Definition Language (idl) files, which is a specification for defining\n"
@@ -2339,144 +2628,144 @@ msgid ""
 "functionality was designed to be as reusable and portable as possible."
 msgstr ""
 
-#: gnu/packages/gnome.scm:944
+#: gnu/packages/gnome.scm:989
 msgid "CORBA 2.4-compliant Object Request Broker"
 msgstr ""
 
-#: gnu/packages/gnome.scm:945
+#: gnu/packages/gnome.scm:990
 msgid ""
 "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)\n"
 "featuring mature C, C++ and Python bindings."
 msgstr ""
 
-#: gnu/packages/gnome.scm:991
+#: gnu/packages/gnome.scm:1036
 msgid "Framework for creating reusable components for use in GNOME applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:992
+#: gnu/packages/gnome.scm:1037
 msgid ""
 "Bonobo is a framework for creating reusable components for\n"
 "use in GNOME applications, built on top of CORBA."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1023
+#: gnu/packages/gnome.scm:1068
 msgid "Store application preferences"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1024
+#: gnu/packages/gnome.scm:1069
 msgid ""
 "Gconf is a system for storing application preferences.  It\n"
 "is intended for user preferences; not arbitrary data storage."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1046
+#: gnu/packages/gnome.scm:1091
 msgid "Base MIME and Application database for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1047
+#: gnu/packages/gnome.scm:1092
 msgid ""
 "GNOME Mime Data is a module which contains the base MIME\n"
 "and Application database for GNOME.  The data stored by this module is\n"
 "designed to be accessed through the MIME functions in GnomeVFS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1091
+#: gnu/packages/gnome.scm:1136
 msgid "Access files and folders in GNOME applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1093
+#: gnu/packages/gnome.scm:1138
 msgid ""
 "GnomeVFS is the core library used to access files and folders in GNOME\n"
 "applications.  It provides a file system abstraction which allows applications\n"
 "to access local and remote files with a single consistent API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1137
+#: gnu/packages/gnome.scm:1182
 msgid "Useful routines for building applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1138
+#: gnu/packages/gnome.scm:1183
 msgid ""
 "The libgnome library provides a number of useful routines\n"
 "for building modern applications, including session management, activation of\n"
 "files and URIs, and displaying help."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1161
+#: gnu/packages/gnome.scm:1206
 msgid "2D drawing library"
-msgstr ""
+msgstr "2D-tegnebibliotek"
 
-#: gnu/packages/gnome.scm:1162
+#: gnu/packages/gnome.scm:1207
 msgid ""
 "Libart is a 2D drawing library intended as a\n"
 "high-quality vector-based 2D library with antialiasing and alpha composition."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1189
+#: gnu/packages/gnome.scm:1234
 msgid "Flexible widget for creating interactive structured graphics"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1190
+#: gnu/packages/gnome.scm:1235
 msgid ""
 "The GnomeCanvas widget provides a flexible widget for\n"
 "creating interactive structured graphics."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1212
+#: gnu/packages/gnome.scm:1259
 msgid "C++ bindings to the GNOME Canvas library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1213
+#: gnu/packages/gnome.scm:1260
 msgid "C++ bindings to the GNOME Canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1244
+#: gnu/packages/gnome.scm:1291
 msgid "Additional widgets for applications"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1245
+#: gnu/packages/gnome.scm:1292
 msgid ""
 "The libgnomeui library provides additional widgets for\n"
 "applications.  Many of the widgets from libgnomeui have already been\n"
 "ported to GTK+."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1271
+#: gnu/packages/gnome.scm:1318
 msgid "Load glade interfaces and access the glade built widgets"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1272
+#: gnu/packages/gnome.scm:1319
 msgid ""
 "Libglade is a library that provides interfaces for loading\n"
 "graphical interfaces described in glade files and for accessing the\n"
 "widgets built in the loading process."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1309 gnu/packages/gnome.scm:1341
+#: gnu/packages/gnome.scm:1356 gnu/packages/gnome.scm:1388
 msgid "Printing framework for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1311
+#: gnu/packages/gnome.scm:1358
 msgid ""
 "GNOME-print was a printing framework for GNOME.  It has been deprecated\n"
 "since ca. 2006, when GTK+ itself incorporated printing support."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1386
+#: gnu/packages/gnome.scm:1433
 msgid "Some user interface controls using Bonobo"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1387
+#: gnu/packages/gnome.scm:1434
 msgid ""
 "The Bonobo UI library provides a number of user interface\n"
 "controls using the Bonobo component framework."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1411
+#: gnu/packages/gnome.scm:1458
 msgid "Window Navigator Construction Kit"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1413
+#: gnu/packages/gnome.scm:1460
 msgid ""
 "Libwnck is the Window Navigator Construction Kit, a library for use in\n"
 "writing pagers, tasklists, and more generally applications that are dealing\n"
@@ -2484,19 +2773,19 @@ msgid ""
 "Hints specification (EWMH)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1460
+#: gnu/packages/gnome.scm:1513
 msgid "Document-centric objects and utilities"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1461
+#: gnu/packages/gnome.scm:1514
 msgid "A GLib/GTK+ set of document-centric objects and utilities."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1536
+#: gnu/packages/gnome.scm:1596
 msgid "Spreadsheet application"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1538
+#: gnu/packages/gnome.scm:1598
 msgid ""
 "GNUmeric is a GNU spreadsheet application, running under GNOME.  It is\n"
 "interoperable with other spreadsheet applications.  It has a vast array of\n"
@@ -2505,29 +2794,29 @@ msgid ""
 "engineering."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1586
+#: gnu/packages/gnome.scm:1644
 msgid "Default GNOME 3 themes"
-msgstr ""
+msgstr "Standardtemaer for GNOME 3"
 
-#: gnu/packages/gnome.scm:1588
+#: gnu/packages/gnome.scm:1646
 msgid "The default GNOME 3 themes (Adwaita and some accessibility themes)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1619
+#: gnu/packages/gnome.scm:1679
 msgid "Manage encryption keys and passwords in the GNOME keyring"
-msgstr ""
+msgstr "Håndter krypteringsnøgler og adgangskoder i GNOME keyring"
 
-#: gnu/packages/gnome.scm:1621
+#: gnu/packages/gnome.scm:1681
 msgid ""
 "Seahorse is a GNOME application for managing encryption keys and\n"
 "passwords in the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1655 gnu/packages/gnome.scm:1791
+#: gnu/packages/gnome.scm:1717 gnu/packages/gnome.scm:1882
 msgid "Compiler for the GObject type system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1657
+#: gnu/packages/gnome.scm:1719
 msgid ""
 "Vala is a programming language that aims to bring modern programming\n"
 "language features to GNOME developers without imposing any additional runtime\n"
@@ -2535,11 +2824,11 @@ msgid ""
 "libraries written in C."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1687
+#: gnu/packages/gnome.scm:1749
 msgid "Virtual Terminal Emulator"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1689
+#: gnu/packages/gnome.scm:1751
 msgid ""
 "VTE is a library (libvte) implementing a terminal emulator widget for\n"
 "GTK+, and a minimal sample application (vte) using that.  Vte is mainly used in\n"
@@ -2547,18 +2836,18 @@ msgid ""
 "editors, IDEs, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1765
+#: gnu/packages/gnome.scm:1849
 msgid "Low-level GNOME configuration system"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1766
+#: gnu/packages/gnome.scm:1850
 msgid ""
 "Dconf is a low-level configuration system.  Its main purpose\n"
 "is to provide a backend to GSettings on platforms that don't already have\n"
 "configuration storage systems."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1793
+#: gnu/packages/gnome.scm:1884
 msgid ""
 "JSON-GLib is a C library based on GLib providing serialization and\n"
 "deserialization support for the JavaScript Object Notation (JSON) format\n"
@@ -2567,11 +2856,11 @@ msgid ""
 "and objects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1832
+#: gnu/packages/gnome.scm:1923
 msgid "High-level API for X Keyboard Extension"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1834
+#: gnu/packages/gnome.scm:1925
 msgid ""
 "LibXklavier is a library providing high-level API for X Keyboard\n"
 "Extension known as XKB.  This library is intended to support XFree86 and other\n"
@@ -2579,72 +2868,72 @@ msgid ""
 "indicators etc)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1862
+#: gnu/packages/gnome.scm:1953
 msgid "Python bindings to librsvg"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1864
+#: gnu/packages/gnome.scm:1955
 msgid ""
 "This packages provides Python bindings to librsvg, the SVG rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1913
+#: gnu/packages/gnome.scm:2004
 msgid "Network-related GIO modules"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1915
+#: gnu/packages/gnome.scm:2006
 msgid ""
 "This package contains various network related extensions for the GIO\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1946
+#: gnu/packages/gnome.scm:2037
 msgid "RESTful web api query library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:1948
+#: gnu/packages/gnome.scm:2039
 msgid ""
 "This library was designed to make it easier to access web services that\n"
 "claim to be \"RESTful\".  It includes convenience wrappers for libsoup and\n"
 "libxml to ease remote use of the RESTful API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2012
+#: gnu/packages/gnome.scm:2108
 msgid "GLib-based HTTP Library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2014
+#: gnu/packages/gnome.scm:2110
 msgid ""
 "LibSoup is an HTTP client/server library for GNOME.  It uses GObjects\n"
 "and the GLib main loop, to integrate well with GNOME applications."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2059
+#: gnu/packages/gnome.scm:2156
 msgid "GObject bindings for \"Secret Service\" API"
-msgstr ""
+msgstr "GObject-bindinger for »Secret Service«-API'en"
 
-#: gnu/packages/gnome.scm:2061
+#: gnu/packages/gnome.scm:2158
 msgid ""
 "Libsecret is a GObject based library for storing and retrieving passwords\n"
 "and other secrets.  It communicates with the \"Secret Service\" using DBus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2105
+#: gnu/packages/gnome.scm:2202
 msgid "Minesweeper game"
-msgstr ""
+msgstr "Minestrygerspil"
 
-#: gnu/packages/gnome.scm:2107
+#: gnu/packages/gnome.scm:2204
 msgid ""
 "Mines (previously gnomine) is a puzzle game where you locate mines\n"
 "floating in an ocean using only your brain and a little bit of luck."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2151
+#: gnu/packages/gnome.scm:2248
 msgid "Terminal emulator"
-msgstr ""
+msgstr "Terminalemulator"
 
-#: gnu/packages/gnome.scm:2153
+#: gnu/packages/gnome.scm:2250
 msgid ""
 "GNOME Terminal is a terminal emulator application for accessing a\n"
 "UNIX shell environment which can be used to run programs available on\n"
@@ -2654,22 +2943,22 @@ msgid ""
 "keyboard shortcuts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2218
+#: gnu/packages/gnome.scm:2316
 msgid "Color management service"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2219
+#: gnu/packages/gnome.scm:2317
 msgid ""
 "Colord is a system service that makes it easy to manage,\n"
 "install and generate color profiles to accurately color manage input and\n"
 "output devices."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2261
+#: gnu/packages/gnome.scm:2359
 msgid "Geolocation service"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2262
+#: gnu/packages/gnome.scm:2360
 msgid ""
 "Geoclue is a D-Bus service that provides location\n"
 "information.  The primary goal of the Geoclue project is to make creating\n"
@@ -2678,11 +2967,11 @@ msgid ""
 "permission from user."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2298
+#: gnu/packages/gnome.scm:2395
 msgid "Geocoding and reverse-geocoding library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2300
+#: gnu/packages/gnome.scm:2397
 msgid ""
 "geocode-glib is a convenience library for geocoding (finding longitude,\n"
 "and latitude from an address) and reverse geocoding (finding an address from\n"
@@ -2690,11 +2979,11 @@ msgid ""
 "faster results and to avoid unnecessary server load."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2347
+#: gnu/packages/gnome.scm:2450
 msgid "System daemon for managing power devices"
-msgstr ""
+msgstr "Systemdæmon til håndtering af strømenheder"
 
-#: gnu/packages/gnome.scm:2349
+#: gnu/packages/gnome.scm:2452
 msgid ""
 "UPower is an abstraction for enumerating power devices,\n"
 "listening to device events and querying history and statistics.  Any\n"
@@ -2702,21 +2991,21 @@ msgid ""
 "service via the system message bus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2395
+#: gnu/packages/gnome.scm:2502
 msgid "Location, time zone, and weather library for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2397
+#: gnu/packages/gnome.scm:2504
 msgid ""
 "libgweather is a library to access weather information from online\n"
 "services for numerous locations."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2449
+#: gnu/packages/gnome.scm:2556
 msgid "GNOME settings daemon"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2451
+#: gnu/packages/gnome.scm:2558
 msgid ""
 "This package contains the daemon responsible for setting the various\n"
 "parameters of a GNOME session and the applications that run under it.  It\n"
@@ -2724,42 +3013,42 @@ msgid ""
 "settings, themes, mouse settings, and startup of other daemons."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2487
+#: gnu/packages/gnome.scm:2594
 msgid "Library to parse and save media playlists for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2488
+#: gnu/packages/gnome.scm:2595
 msgid ""
 "Totem-pl-parser is a GObjects-based library to parse and save\n"
 "playlists in a variety of formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2522
+#: gnu/packages/gnome.scm:2629
 msgid "Solitaire card games"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2524
+#: gnu/packages/gnome.scm:2631
 msgid ""
 "Aisleriot (also known as Solitaire or sol) is a collection of card games\n"
 "which are easy to play with the aid of a mouse."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2548
+#: gnu/packages/gnome.scm:2655
 msgid "API documentation browser for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2550
+#: gnu/packages/gnome.scm:2657
 msgid ""
 "Devhelp is an API documentation browser for GTK+ and GNOME.  It works\n"
 "natively with GTK-Doc (the API reference system developed for GTK+ and used\n"
 "throughout GNOME for API documentation)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2611
+#: gnu/packages/gnome.scm:2718
 msgid "Object oriented GL/GLES Abstraction/Utility Layer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2613
+#: gnu/packages/gnome.scm:2720
 msgid ""
 "Cogl is a small library for using 3D graphics hardware to draw pretty\n"
 "pictures.  The API departs from the flat state machine style of OpenGL and is\n"
@@ -2767,26 +3056,26 @@ msgid ""
 "without stepping on each others toes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2668
+#: gnu/packages/gnome.scm:2775
 msgid "Open GL based interactive canvas library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2670 gnu/packages/gnome.scm:2698
+#: gnu/packages/gnome.scm:2777 gnu/packages/gnome.scm:2806
 msgid ""
 "Clutter is an Open GL based interactive canvas library, designed for\n"
 "creating fast, mainly 2D single window applications such as media box UIs,\n"
 "presentations, kiosk style applications and so on."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2696
+#: gnu/packages/gnome.scm:2804
 msgid "Open GL based interactive canvas library GTK+ widget"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2726
+#: gnu/packages/gnome.scm:2834
 msgid "Integration library for using GStreamer with Clutter"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2728
+#: gnu/packages/gnome.scm:2836
 msgid ""
 "Clutter-Gst is an integration library for using GStreamer with Clutter.\n"
 "It provides a GStreamer sink to upload frames to GL and an actor that\n"
@@ -2794,11 +3083,11 @@ msgid ""
 "GL based interactive canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2758
+#: gnu/packages/gnome.scm:2866
 msgid "C library providing a ClutterActor to display maps"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2760
+#: gnu/packages/gnome.scm:2868
 msgid ""
 "libchamplain is a C library providing a ClutterActor to display maps.\n"
 "It also provides a Gtk+ widget to display maps in Gtk+ applications.  Python\n"
@@ -2806,22 +3095,22 @@ msgid ""
 "such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2791
+#: gnu/packages/gnome.scm:2899
 msgid "Object mapper from GObjects to SQLite"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2793
+#: gnu/packages/gnome.scm:2901
 msgid ""
 "Gom provides an object mapper from GObjects to SQLite.  It helps you\n"
 "write applications that need to store structured data as well as make complex\n"
 "queries upon that data."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2821
+#: gnu/packages/gnome.scm:2929
 msgid "Sliding block puzzles"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2823
+#: gnu/packages/gnome.scm:2931
 msgid ""
 "GNOME Klotski is a set of block sliding puzzles.  The objective is to move\n"
 "the patterned block to the area bordered by green markers.  To do so, you will\n"
@@ -2829,65 +3118,65 @@ msgid ""
 "as possible!"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2874
+#: gnu/packages/gnome.scm:2982
 msgid "Framework for discovering and browsing media"
 msgstr ""
 
-#: gnu/packages/gnome.scm:2876 gnu/packages/gnome.scm:2928
+#: gnu/packages/gnome.scm:2984 gnu/packages/gnome.scm:3036
 msgid ""
 "Grilo is a framework focused on making media discovery and browsing easy\n"
 "for application developers."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2926
+#: gnu/packages/gnome.scm:3034
 msgid "Plugins for the Grilo media discovery library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3003
+#: gnu/packages/gnome.scm:3111
 msgid "Simple media player for GNOME based on GStreamer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3004
+#: gnu/packages/gnome.scm:3112
 msgid ""
 "Totem is a simple yet featureful media player for GNOME\n"
 "which can read a large number of file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3093
+#: gnu/packages/gnome.scm:3201
 msgid "Music player for GNOME"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3094
+#: gnu/packages/gnome.scm:3202
 msgid ""
 "Rhythmbox is a music playing application for GNOME.  It\n"
 "supports playlists, song ratings, and any codecs installed through gstreamer."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3144
+#: gnu/packages/gnome.scm:3252
 msgid "GNOME image viewer"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3145
+#: gnu/packages/gnome.scm:3253
 msgid ""
 "Eye of GNOME is the GNOME image viewer.  It\n"
 "supports image conversion, rotation, and slideshows."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3170
+#: gnu/packages/gnome.scm:3278
 msgid "GObject bindings for libudev"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3172
+#: gnu/packages/gnome.scm:3280
 msgid ""
 "This library provides GObject bindings for libudev.  It was originally\n"
 "part of udev-extras, then udev, then systemd.  It's now a project on its own."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3217
+#: gnu/packages/gnome.scm:3326
 msgid "Userspace virtual filesystem for GIO"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3219
+#: gnu/packages/gnome.scm:3328
 msgid ""
 "GVFS is a userspace virtual filesystem designed to work with the I/O\n"
 "abstraction of GIO.  It contains a GIO module that seamlessly adds GVFS support\n"
@@ -2898,11 +3187,11 @@ msgid ""
 "DAV, and others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3265
-msgid "A GLib binding for libusb1"
-msgstr ""
+#: gnu/packages/gnome.scm:3374
+msgid "GLib binding for libusb1"
+msgstr "GLib-binding for libusb1"
 
-#: gnu/packages/gnome.scm:3267
+#: gnu/packages/gnome.scm:3376
 msgid ""
 "GUsb is a GObject wrapper for libusb1 that makes it easy to do\n"
 "asynchronous control, bulk and interrupt transfers with proper cancellation\n"
@@ -2910,11 +3199,11 @@ msgid ""
 "USB transfers with your high-level application or system daemon."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3304
+#: gnu/packages/gnome.scm:3413
 msgid "Document and image scanner"
-msgstr ""
+msgstr "Dokument- og billedskanner"
 
-#: gnu/packages/gnome.scm:3305
+#: gnu/packages/gnome.scm:3414
 msgid ""
 "Simple Scan is an easy-to-use application, designed to let\n"
 "users connect their scanner and quickly have the image/document in an\n"
@@ -2923,52 +3212,52 @@ msgid ""
 "work and the interface is well tested."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3354
+#: gnu/packages/gnome.scm:3463
 msgid "GNOME web browser"
-msgstr ""
+msgstr "GNOME-internetbrowser"
 
-#: gnu/packages/gnome.scm:3356
+#: gnu/packages/gnome.scm:3465
 msgid ""
 "Epiphany is a GNOME web browser targeted at non-technical users.  Its\n"
 "principles are simplicity and standards compliance."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3412
+#: gnu/packages/gnome.scm:3521
 msgid "D-Bus debugger"
-msgstr ""
+msgstr "D-Bus-fejlsøger"
 
-#: gnu/packages/gnome.scm:3414
+#: gnu/packages/gnome.scm:3523
 msgid ""
 "D-Feet is a D-Bus debugger, which can be used to inspect D-Bus interfaces\n"
 "of running programs and invoke methods on those interfaces."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3436
+#: gnu/packages/gnome.scm:3545
 msgid "XSL stylesheets for Yelp"
-msgstr ""
+msgstr "XSL-stilark for Yelp"
 
-#: gnu/packages/gnome.scm:3438
+#: gnu/packages/gnome.scm:3547
 msgid ""
 "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser\n"
 "to format Docbook and Mallard documents."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3470
+#: gnu/packages/gnome.scm:3577
 msgid "GNOME help browser"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3472
+#: gnu/packages/gnome.scm:3579
 msgid ""
 "Yelp is the help viewer in Gnome.  It natively views Mallard, DocBook,\n"
 "man, info, and HTML documents.  It can locate documents according to the\n"
 "freedesktop.org help system specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3500
+#: gnu/packages/gnome.scm:3607
 msgid "Yelp documentation tools"
-msgstr ""
+msgstr "Yelp-dokumentationsværktøjer"
 
-#: gnu/packages/gnome.scm:3502
+#: gnu/packages/gnome.scm:3609
 msgid ""
 "Yelp-tools is a collection of scripts and build utilities to help create,\n"
 "manage, and publish documentation for Yelp and the web.  Most of the heavy\n"
@@ -2976,32 +3265,32 @@ msgid ""
 "wraps things up in a developer-friendly way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3539
+#: gnu/packages/gnome.scm:3646
 msgid "GObject collection library"
-msgstr ""
+msgstr "GObject-samlingsbibliotek"
 
-#: gnu/packages/gnome.scm:3541
+#: gnu/packages/gnome.scm:3648
 msgid ""
 "Libgee is a utility library providing GObject-based interfaces and\n"
 "classes for commonly used data structures."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3568
+#: gnu/packages/gnome.scm:3675
 msgid "GObject wrapper around the Exiv2 photo metadata library"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3570
+#: gnu/packages/gnome.scm:3677
 msgid ""
 "Gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.  It\n"
 "allows for GNOME applications to easily inspect and update EXIF, IPTC, and XMP\n"
 "metadata in photo and video files of various formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3622
+#: gnu/packages/gnome.scm:3729
 msgid "Photo manager for GNOME 3"
-msgstr ""
+msgstr "Billedhåndtering for GNOME 3"
 
-#: gnu/packages/gnome.scm:3624
+#: gnu/packages/gnome.scm:3731
 msgid ""
 "Shotwell is a digital photo manager designed for the GNOME desktop\n"
 "environment.  It allows you to import photos from disk or camera, organize\n"
@@ -3009,43 +3298,310 @@ msgid ""
 "share them with others via social networking and more."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3656
+#: gnu/packages/gnome.scm:3763
 msgid "Graphical archive manager for GNOME"
-msgstr ""
+msgstr "Grafisk arkivhåndtering for GNOME"
 
-#: gnu/packages/gnome.scm:3657
+#: gnu/packages/gnome.scm:3764
 msgid ""
 "File Roller is an archive manager for the GNOME desktop\n"
 "environment that allows users to view, unpack, and create compressed archives\n"
 "such as gzip tarballs."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:90
+#: gnu/packages/gnome.scm:3799
+msgid "Session manager for GNOME"
+msgstr ""
+
+#: gnu/packages/gnome.scm:3801
+msgid ""
+"This package contains the GNOME session manager, as well as a\n"
+"configuration program to choose applications starting on login."
+msgstr ""
+
+#: gnu/packages/gnome.scm:3846
+msgid "Javascript bindings for GNOME"
+msgstr "Javascript-bindinger for GNOME"
+
+#: gnu/packages/gnome.scm:3849
+msgid ""
+"Gjs is a javascript binding for GNOME.  It's mainly based on spidermonkey\n"
+"javascript engine and the GObject introspection framework."
+msgstr ""
+
+#: gnu/packages/gnome.scm:3905
+msgid "GNOME text editor"
+msgstr "GNOME-tesktredigeringsprogram"
+
+#: gnu/packages/gnome.scm:3906
+msgid ""
+"While aiming at simplicity and ease of use, gedit is a\n"
+"powerful general purpose text editor."
+msgstr ""
+"Selv om den forsøger at være enkel og nem at bruge, så\n"
+"er gedit et funktionsrigt og alment tekstredigeringsprogram."
+
+#: gnu/packages/gnome.scm:3930
+msgid "Display graphical dialog boxes from shell scripts"
+msgstr "Vis grafiske dialogbokse fra skalskripter"
+
+#: gnu/packages/gnome.scm:3933
+msgid ""
+"Zenity is a rewrite of gdialog, the GNOME port of dialog which allows you\n"
+"to display dialog boxes from the commandline and shell scripts."
+msgstr ""
+
+#: gnu/packages/gnome.scm:3978
+msgid "Window and compositing manager"
+msgstr ""
+
+#: gnu/packages/gnome.scm:3981
+msgid ""
+"Mutter is a window and compositing manager that displays and manages your\n"
+"desktop via OpenGL.  Mutter combines a sophisticated display engine using the\n"
+"Clutter toolkit with solid window-management logic inherited from the Metacity\n"
+"window manager."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4016
+msgid "Single sign-on framework for GNOME"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4019
+msgid ""
+"GNOME Online Accounts provides interfaces so that applications and\n"
+"libraries in GNOME can access the user's online accounts.  It has providers for\n"
+"Google, ownCloud, Facebook, Flickr, Windows Live, Pocket, Foursquare, Microsoft\n"
+"Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4078
+msgid "Store address books and calendars"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4081
+msgid ""
+"This package provides a unified backend for programs that work with\n"
+"contacts, tasks, and calendar information.  It was originally developed for\n"
+"Evolution (hence the name), but is now used by other packages as well."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4144
+msgid "Text entry and UI navigation application"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4147
+msgid ""
+"Caribou is an input assistive technology intended for switch and pointer\n"
+"users."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4233
+msgid "Network connection manager"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4236
+msgid ""
+"NetworkManager is a system network service that manages your network\n"
+"devices and connections, attempting to keep active network connectivity when\n"
+"available.  It manages ethernet, WiFi, mobile broadband (WWAN), and PPPoE\n"
+"devices, and provides VPN integration with a variety of different VPN\n"
+"services."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4271
+msgid "Applet for managing network connections"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4274
+msgid ""
+"This package contains a systray applet for NetworkManager.  It displays\n"
+"the available networks and allows users to easily switch between them."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4299
+msgid "C++ wrapper for XML parser library libxml2"
+msgstr "C++-omslag for XML-fortolkerbiblioteket libxml2"
+
+#: gnu/packages/gnome.scm:4301
+msgid ""
+"This package provides a C++ wrapper for the XML parser library\n"
+"libxml2."
+msgstr ""
+"Denne pakke tilbyder et C++-omslag for XML-fortolkerbiblioteket\n"
+"libxml2."
+
+#: gnu/packages/gnome.scm:4358
+msgid "Display manager for GNOME"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4361
+msgid ""
+"GNOME Display Manager is a system service that is responsible for\n"
+"providing graphical log-ins and managing local and remote displays."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4385
+msgid "Portable system access library"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4388
+msgid ""
+"LibGTop is a library to get system specific data such as CPU and memory\n"
+"usage and information about running processes."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4418
+msgid "GNOME Bluetooth subsystem"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4421
+msgid ""
+"This package contains tools for managing and manipulating Bluetooth\n"
+"devices using the GNOME desktop."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4486
+msgid "Utilities to configure the GNOME desktop"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4489
+msgid ""
+"This package contains configuration applets for the GNOME desktop,\n"
+"allowing to set accessibility configuration, desktop fonts, keyboard and mouse\n"
+"properties, sound setup, desktop theme and background, user interface\n"
+"properties, screen resolution, and other GNOME parameters."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4570
+msgid "Desktop shell for GNOME"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4573
+msgid ""
+"GNOME Shell provides core user interface functions for the GNOME desktop,\n"
+"like switching to windows and launching applications."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4607
+msgid "VNC viewer widget for GTK+"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4609
+msgid ""
+"GTK-VNC is a VNC viewer widget for GTK+, used by remote desktop viewing\n"
+"applications, for instance the Vinagre client, GNOME Boxes and virt-viewer.\n"
+"GTK-VNC implements client side RFB protocol and authentication extensions such\n"
+"as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4647
+msgid "File manager for GNOME"
+msgstr "Filhåndtering for GNOME"
+
+#: gnu/packages/gnome.scm:4650
+msgid ""
+"Nautilus (Files) is a file manager designed to fit the GNOME desktop\n"
+"design and behaviour, giving the user a simple way to navigate and manage its\n"
+"files."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4678
+msgid "Disk usage analyzer for GNOME"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4680
+msgid ""
+"Baobab (Disk Usage Analyzer) is a graphical application to analyse disk\n"
+"usage in the GNOME desktop environment.  It can easily scan device volumes or\n"
+"a specific user-requested directory branch (local or remote).  Once the scan\n"
+"is complete it provides a graphical representation of each selected folder."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4704
+msgid "Background images for the GNOME desktop"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4706
+msgid ""
+"GNOME backgrounds package contains a collection of graphics files which\n"
+"can be used as backgrounds in the GNOME Desktop environment.  Additionally,\n"
+"the package creates the proper framework and directory structure so that you\n"
+"can add your own files to the collection."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4739
+msgid "Take pictures of your screen"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4741
+msgid ""
+"GNOME Screenshot is a utility used for taking screenshots of the entire\n"
+"screen, a window or a user defined area of the screen, with optional\n"
+"beautifying border effects."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4769
+msgid "Graphical editor for GNOME's dconf configuration system"
+msgstr ""
+
+#: gnu/packages/gnome.scm:4771
+msgid ""
+"Dconf-editor is a graphical tool for browsing and editing the dconf\n"
+"configuration system for GNOME.  It allows users to configure desktop\n"
+"software that do not provide their own configuration interface."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4809
+msgid "The GNU desktop environment"
+msgstr "GNU-skrivebordsmiljøet"
+
+#: gnu/packages/gnome.scm:4812
+msgid ""
+"GNOME is the graphical desktop for GNU.  It includes a wide variety of\n"
+"applications for browsing the web, editing text and images, creating\n"
+"documents and diagrams, playing media, scanning, and much more."
+msgstr ""
+
+#: gnu/packages/gnome.scm:4863
+msgid "Desktop recording program"
+msgstr "Skrivebordsoptagelsesprogram"
+
+#: gnu/packages/gnome.scm:4864
+msgid ""
+"Byzanz is a simple desktop recording program with a\n"
+"command-line interface.  It can record part or all of an X display for a\n"
+"specified duration and save it as a GIF encoded animated image file."
+msgstr ""
+
+#: gnu/packages/gnuzilla.scm:95
 msgid "Mozilla javascript engine"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:91
+#: gnu/packages/gnuzilla.scm:96
 msgid ""
 "SpiderMonkey is Mozilla's JavaScript engine written\n"
 "in C/C++."
 msgstr ""
+"SpiderMonkey er Mozillas JavaScript-motor skrevet\n"
+"i C/C++."
 
-#: gnu/packages/gnuzilla.scm:123
+#: gnu/packages/gnuzilla.scm:171
 msgid "Netscape API for system level and libc-like functions"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:124
+#: gnu/packages/gnuzilla.scm:172
 msgid ""
 "Netscape Portable Runtime (NSPR) provides a\n"
 "platform-neutral API for system level and libc-like functions.  It is used\n"
 "in the Mozilla clients."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:219
+#: gnu/packages/gnuzilla.scm:268
 msgid "Network Security Services"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:221
+#: gnu/packages/gnuzilla.scm:270
 msgid ""
 "Network Security Services (NSS) is a set of libraries designed to support\n"
 "cross-platform development of security-enabled client and server applications.\n"
@@ -3054,33 +3610,33 @@ msgid ""
 "standards."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:453
+#: gnu/packages/gnuzilla.scm:507
 msgid "Entirely free browser derived from Mozilla Firefox"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:455
+#: gnu/packages/gnuzilla.scm:509
 msgid ""
 "IceCat is the GNU version of the Firefox browser.  It is entirely free\n"
 "software, which does not recommend non-free plugins and addons.  It also\n"
 "features built-in privacy-protecting features."
 msgstr ""
 
-#: gnu/packages/gtk.scm:84
+#: gnu/packages/gtk.scm:87
 msgid "GNOME accessibility toolkit"
 msgstr ""
 
-#: gnu/packages/gtk.scm:86
+#: gnu/packages/gtk.scm:89
 msgid ""
 "ATK provides the set of accessibility interfaces that are implemented\n"
 "by other toolkits and applications.  Using the ATK interfaces, accessibility\n"
 "tools have full access to view and control running applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:125
+#: gnu/packages/gtk.scm:128
 msgid "2D graphics library"
-msgstr ""
+msgstr "2D-grafikbibliotek"
 
-#: gnu/packages/gtk.scm:127
+#: gnu/packages/gtk.scm:130
 msgid ""
 "Cairo is a 2D graphics library with support for multiple output devices.\n"
 "Currently supported output targets include the X Window System (via both\n"
@@ -3098,52 +3654,52 @@ msgid ""
 "affine transformation (scale, rotation, shear, etc.)."
 msgstr ""
 
-#: gnu/packages/gtk.scm:175
+#: gnu/packages/gtk.scm:178
 msgid "OpenType text shaping engine"
 msgstr ""
 
-#: gnu/packages/gtk.scm:177
+#: gnu/packages/gtk.scm:180
 msgid "HarfBuzz is an OpenType text shaping engine."
 msgstr ""
 
-#: gnu/packages/gtk.scm:208
+#: gnu/packages/gtk.scm:211
 msgid "GNOME text and font handling library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:210
+#: gnu/packages/gtk.scm:213
 msgid ""
 "Pango is the core text and font handling library used in GNOME\n"
 "applications.  It has extensive support for the different writing systems\n"
 "used throughout the world."
 msgstr ""
 
-#: gnu/packages/gtk.scm:236
+#: gnu/packages/gtk.scm:239
 msgid "Obsolete pango functions"
 msgstr ""
 
-#: gnu/packages/gtk.scm:237
+#: gnu/packages/gtk.scm:240
 msgid ""
 "Pangox was a X backend to pango.  It is now obsolete and no\n"
 "longer provided by recent pango releases.  pangox-compat provides the\n"
 "functions which were removed."
 msgstr ""
 
-#: gnu/packages/gtk.scm:271
+#: gnu/packages/gtk.scm:276
 msgid "GTK+ widget for interactive graph-like environments"
 msgstr ""
 
-#: gnu/packages/gtk.scm:273
+#: gnu/packages/gtk.scm:278
 msgid ""
 "Ganv is an interactive GTK+ widget for interactive “boxes and lines” or\n"
 "graph-like environments, e.g. modular synths or finite state machine\n"
 "diagrams."
 msgstr ""
 
-#: gnu/packages/gtk.scm:323
+#: gnu/packages/gtk.scm:330
 msgid "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget"
 msgstr ""
 
-#: gnu/packages/gtk.scm:325
+#: gnu/packages/gtk.scm:332
 msgid ""
 "GtkSourceView is a portable C library that extends the standard GTK+\n"
 "framework for multiline text editing with support for configurable syntax\n"
@@ -3151,41 +3707,52 @@ msgid ""
 "printing and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:374
+#: gnu/packages/gtk.scm:381
+msgid "GNOME source code widget"
+msgstr ""
+
+#: gnu/packages/gtk.scm:382
+msgid ""
+"GtkSourceView is a text widget that extends the standard\n"
+"GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax\n"
+"highlighting and other features typical of a source code editor."
+msgstr ""
+
+#: gnu/packages/gtk.scm:429
 msgid "GNOME image loading and manipulation library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:376
+#: gnu/packages/gtk.scm:431
 msgid ""
 "GdkPixbuf is a library for image loading and manipulation developed\n"
 "in the GNOME project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:417
+#: gnu/packages/gtk.scm:474
 msgid "Assistive Technology Service Provider Interface, core components"
 msgstr ""
 
-#: gnu/packages/gtk.scm:419
+#: gnu/packages/gtk.scm:476
 msgid ""
 "The Assistive Technology Service Provider Interface, core components,\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:451
+#: gnu/packages/gtk.scm:509
 msgid "Assistive Technology Service Provider Interface, ATK bindings"
 msgstr ""
 
-#: gnu/packages/gtk.scm:453
+#: gnu/packages/gtk.scm:511
 msgid ""
 "The Assistive Technology Service Provider Interface\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:505
+#: gnu/packages/gtk.scm:568
 msgid "Cross-platform toolkit for creating graphical user interfaces"
 msgstr ""
 
-#: gnu/packages/gtk.scm:507
+#: gnu/packages/gtk.scm:570
 msgid ""
 "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating\n"
 "graphical user interfaces.  Offering a complete set of widgets, GTK+ is\n"
@@ -3193,11 +3760,11 @@ msgid ""
 "application suites."
 msgstr ""
 
-#: gnu/packages/gtk.scm:630
+#: gnu/packages/gtk.scm:705
 msgid "Cairo bindings for GNU Guile"
 msgstr ""
 
-#: gnu/packages/gtk.scm:632
+#: gnu/packages/gtk.scm:707
 msgid ""
 "Guile-Cairo wraps the Cairo graphics library for Guile Scheme.\n"
 "Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API\n"
@@ -3207,21 +3774,21 @@ msgid ""
 "exceptions, macros, and a dynamic programming environment."
 msgstr ""
 
-#: gnu/packages/gtk.scm:672
+#: gnu/packages/gtk.scm:747
 msgid "Render SVG images using Cairo from Guile"
 msgstr ""
 
-#: gnu/packages/gtk.scm:674
+#: gnu/packages/gtk.scm:749
 msgid ""
 "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG\n"
 "images onto Cairo surfaces."
 msgstr ""
 
-#: gnu/packages/gtk.scm:718
+#: gnu/packages/gtk.scm:793
 msgid "Create SVG or PDF presentations in Guile"
-msgstr ""
+msgstr "Opret SVG- eller PDF-præsentationer i Guile"
 
-#: gnu/packages/gtk.scm:720
+#: gnu/packages/gtk.scm:795
 msgid ""
 "Guile-Present defines a declarative vocabulary for presentations,\n"
 "together with tools to render presentation documents as SVG or PDF.\n"
@@ -3230,41 +3797,41 @@ msgid ""
 "documents."
 msgstr ""
 
-#: gnu/packages/gtk.scm:753
+#: gnu/packages/gtk.scm:829
 msgid "C++ bindings to the Cairo 2D graphics library"
-msgstr ""
+msgstr "C++-bindinger til CAiro 2D-grafikbiblioteket"
 
-#: gnu/packages/gtk.scm:755
+#: gnu/packages/gtk.scm:831
 msgid ""
 "Cairomm provides a C++ programming interface to the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:779
+#: gnu/packages/gtk.scm:855
 msgid "C++ interface to the Pango text rendering library"
-msgstr ""
+msgstr "C++-grænseflade til tekstoptegningsbiblioteket Pango"
 
-#: gnu/packages/gtk.scm:781
+#: gnu/packages/gtk.scm:857
 msgid ""
 "Pangomm provides a C++ programming interface to the Pango text rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:802
+#: gnu/packages/gtk.scm:878
 msgid "C++ interface to the ATK accessibility library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:804
+#: gnu/packages/gtk.scm:880
 msgid ""
 "ATKmm provides a C++ programming interface to the ATK accessibility\n"
 "toolkit."
 msgstr ""
 
-#: gnu/packages/gtk.scm:830
+#: gnu/packages/gtk.scm:907
 msgid "C++ interface to the GTK+ graphical user interface library"
 msgstr ""
 
-#: gnu/packages/gtk.scm:832
+#: gnu/packages/gtk.scm:909
 msgid ""
 "gtkmm is the official C++ interface for the popular GUI library GTK+.\n"
 "Highlights include typesafe callbacks, and a comprehensive set of widgets that\n"
@@ -3273,30 +3840,30 @@ msgid ""
 "extensive documentation, including API reference and a tutorial."
 msgstr ""
 
-#: gnu/packages/gtk.scm:888
+#: gnu/packages/gtk.scm:968
 msgid "Python bindings for cairo"
 msgstr ""
 
-#: gnu/packages/gtk.scm:890
+#: gnu/packages/gtk.scm:970
 msgid "Pycairo is a set of Python bindings for the Cairo graphics library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:964
+#: gnu/packages/gtk.scm:1054
 msgid "Python bindings for GTK+"
 msgstr ""
 
-#: gnu/packages/gtk.scm:966
+#: gnu/packages/gtk.scm:1056
 msgid ""
 "PyGTK allows you to write full featured GTK programs in Python.  It is\n"
 "targetted at GTK 2.x, and can be used in conjunction with gnome-python to\n"
 "write GNOME applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:997
+#: gnu/packages/gtk.scm:1087
 msgid "Library for minimalistic gtk+3 user interfaces"
 msgstr ""
 
-#: gnu/packages/gtk.scm:998
+#: gnu/packages/gtk.scm:1088
 msgid ""
 "Girara is a library that implements a user interface that\n"
 "focuses on simplicity and minimalism.  Currently based on GTK+, a\n"
@@ -3307,22 +3874,43 @@ msgid ""
 "information."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1041
+#: gnu/packages/gtk.scm:1149
 msgid "Documentation generator from C source code"
 msgstr ""
 
-#: gnu/packages/gtk.scm:1043
+#: gnu/packages/gtk.scm:1151
 msgid ""
-"GTK-Doc generates API documentation from comments added to C code. It is\n"
+"GTK-Doc generates API documentation from comments added to C code.  It is\n"
 "typically used to document the public API of GTK+ and GNOME libraries, but it\n"
 "can also be used to document application code."
 msgstr ""
 
-#: gnu/packages/guile.scm:107 gnu/packages/guile.scm:174
+#: gnu/packages/gtk.scm:1178
+msgid "Theming engines for GTK+ 2.x"
+msgstr ""
+
+#: gnu/packages/gtk.scm:1180
+msgid ""
+"This package contains the standard GTK+ 2.x theming engines including\n"
+"Clearlooks, Crux, High Contrast, Industrial, LighthouseBlue, Metal, Mist,\n"
+"Redmond95 and ThinIce."
+msgstr ""
+
+#: gnu/packages/gtk.scm:1208
+msgid "Cairo-based theming engine for GTK+ 2.x"
+msgstr ""
+
+#: gnu/packages/gtk.scm:1210
+msgid ""
+"Murrine is a cairo-based GTK+ theming engine.  It is named after the\n"
+"glass artworks done by Venicians glass blowers."
+msgstr ""
+
+#: gnu/packages/guile.scm:114 gnu/packages/guile.scm:182
 msgid "Scheme implementation intended especially for extensions"
 msgstr ""
 
-#: gnu/packages/guile.scm:109 gnu/packages/guile.scm:176
+#: gnu/packages/guile.scm:116 gnu/packages/guile.scm:184
 msgid ""
 "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the\n"
 "official extension language of the GNU system.  It is an implementation of\n"
@@ -3331,15 +3919,31 @@ msgid ""
 "without requiring the source code to be rewritten."
 msgstr ""
 
-#: gnu/packages/guile.scm:217
+#: gnu/packages/guile.scm:215
 msgid "Snapshot of what will become version 2.2 of GNU Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:264
-msgid "Framework for building readers for GNU Guile"
+#: gnu/packages/guile.scm:313
+msgid "Web application framework written in Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:266
+#: gnu/packages/guile.scm:314
+msgid ""
+"GNU Artanis is a web application framework written in Guile\n"
+"Scheme.  A web application framework (WAF) is a software framework that is\n"
+"designed to support the development of dynamic websites, web applications, web\n"
+"services and web resources.  The framework aims to alleviate the overhead\n"
+"associated with common activities performed in web development.  Artanis\n"
+"provides several tools for web development: database access, templating\n"
+"frameworks, session management, URL-remapping for RESTful, page caching, and\n"
+"more."
+msgstr ""
+
+#: gnu/packages/guile.scm:344
+msgid "Framework for building readers for GNU Guile"
+msgstr "Ramme til at bygge læsere for GNU Guile"
+
+#: gnu/packages/guile.scm:346
 msgid ""
 "Guile-Reader is a simple framework for building readers for GNU Guile.\n"
 "\n"
@@ -3354,21 +3958,21 @@ msgid ""
 "many readers as needed)."
 msgstr ""
 
-#: gnu/packages/guile.scm:311
+#: gnu/packages/guile.scm:395
 msgid "Guile bindings to ncurses"
-msgstr ""
+msgstr "Guilebindinger til ncurses"
 
-#: gnu/packages/guile.scm:313
+#: gnu/packages/guile.scm:397
 msgid ""
 "guile-ncurses provides Guile language bindings for the ncurses\n"
 "library."
 msgstr ""
 
-#: gnu/packages/guile.scm:333
+#: gnu/packages/guile.scm:417
 msgid "Run jobs at scheduled times"
-msgstr ""
+msgstr "Afvikl job på planlagte tidspunkter"
 
-#: gnu/packages/guile.scm:335
+#: gnu/packages/guile.scm:419
 msgid ""
 "GNU Mcron is a complete replacement for Vixie cron.  It is used to run\n"
 "tasks on a schedule, such as every hour or every Monday.  Mcron is written in\n"
@@ -3376,11 +3980,11 @@ msgid ""
 "format is also supported."
 msgstr ""
 
-#: gnu/packages/guile.scm:363
+#: gnu/packages/guile.scm:447
 msgid "Collection of useful Guile Scheme modules"
 msgstr ""
 
-#: gnu/packages/guile.scm:365
+#: gnu/packages/guile.scm:449
 msgid ""
 "Guile-Lib is intended as an accumulation place for pure-scheme Guile\n"
 "modules, allowing for people to cooperate integrating their generic Guile\n"
@@ -3388,11 +3992,11 @@ msgid ""
 "for Guile\"."
 msgstr ""
 
-#: gnu/packages/guile.scm:396
+#: gnu/packages/guile.scm:480
 msgid "JSON module for Guile"
-msgstr ""
+msgstr "JSON-modul for Guile"
 
-#: gnu/packages/guile.scm:398
+#: gnu/packages/guile.scm:482
 msgid ""
 "Guile-json supports parsing and building JSON documents according to the\n"
 "http:://json.org specification.  These are the main features:\n"
@@ -3402,11 +4006,11 @@ msgid ""
 "- Allows JSON pretty printing."
 msgstr ""
 
-#: gnu/packages/guile.scm:468
+#: gnu/packages/guile.scm:553
 msgid "MiniKanren declarative logic system, packaged for Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:470
+#: gnu/packages/guile.scm:555
 msgid ""
 "MiniKanren is a relational programming extension to the Scheme\n"
 "programming Language, written as a smaller version of Kanren suitable for\n"
@@ -3419,53 +4023,103 @@ msgid ""
 "See http://minikanren.org/ for more on miniKanren generally."
 msgstr ""
 
-#: gnu/packages/guile.scm:540
+#: gnu/packages/guile.scm:638
+msgid "S-expression based regular expressions"
+msgstr ""
+
+#: gnu/packages/guile.scm:640
+msgid ""
+"Irregex is an s-expression based alternative to your classic\n"
+"string-based regular expressions.  It implements SRFI 115 and is deeply\n"
+"inspired by the SCSH regular expression system."
+msgstr ""
+
+#: gnu/packages/guile.scm:704
 msgid "Guile bindings to the GDBM library via Guile's FFI"
 msgstr ""
 
-#: gnu/packages/guile.scm:542
+#: gnu/packages/guile.scm:706
 msgid ""
 "Guile bindings to the GDBM key-value storage system, using\n"
 "Guile's foreign function interface."
 msgstr ""
 
-#: gnu/packages/guile.scm:560
+#: gnu/packages/guile.scm:746
 msgid "Functional static site generator"
 msgstr ""
 
-#: gnu/packages/guile.scm:561
+#: gnu/packages/guile.scm:747
 msgid ""
 "Haunt is a static site generator written in Guile\n"
 "Scheme.  Haunt features a functional build system and an extensible\n"
 "interface for reading articles in any format."
 msgstr ""
 
-#: gnu/packages/guile.scm:591
+#: gnu/packages/guile.scm:768
+msgid "Guile application configuration parsing library"
+msgstr ""
+
+#: gnu/packages/guile.scm:770
+msgid ""
+"Guile Config is a library providing a declarative approach to\n"
+"application configuration specification.  The library provides clean\n"
+"configuration declaration forms, and processors that take care of:\n"
+"configuration file creation; configuration file parsing; command-line\n"
+"parameter parsing using getopt-long; basic GNU command-line parameter\n"
+"generation (--help, --usage, --version); automatic output generation for the\n"
+"above command-line parameters."
+msgstr ""
+
+#: gnu/packages/guile.scm:804
 msgid "Redis client library for Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:592
+#: gnu/packages/guile.scm:805
 msgid ""
 "Guile-redis provides a Scheme interface to the Redis\n"
 "key-value cache and store."
 msgstr ""
 
-#: gnu/packages/guile.scm:666
-msgid "wisp is a whitespace to lisp syntax for Guile"
+#: gnu/packages/guile.scm:879
+msgid "Whitespace to lisp syntax for Guile"
 msgstr ""
 
-#: gnu/packages/guile.scm:667
+#: gnu/packages/guile.scm:880
 msgid ""
-"wisp is a syntax for Guile which provides a Python-like\n"
+"Wisp is a syntax for Guile which provides a Python-like\n"
 "whitespace-significant language.  It may be easier on the eyes for some\n"
 "users and in some situations."
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:99
-msgid "Create, edit, compose, or convert bitmap images"
+#: gnu/packages/guile.scm:913
+msgid "2D/3D game engine for GNU Guile"
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:101
+#: gnu/packages/guile.scm:914
+msgid ""
+"Sly is a 2D/3D game engine written in Guile Scheme.  Sly\n"
+"features a functional reactive programming interface and live coding\n"
+"capabilities."
+msgstr ""
+
+#: gnu/packages/guile.scm:939
+msgid "Generate C bindings for Guile"
+msgstr ""
+
+#: gnu/packages/guile.scm:940
+msgid ""
+"G-Wrap is a tool and Guile library for generating function\n"
+"wrappers for inter-language calls.  It currently only supports generating Guile\n"
+"wrappers for C functions.  Given a definition of the types and prototypes for\n"
+"a given C interface, G-Wrap will automatically generate the C code that\n"
+"provides access to that interface and its types from the Scheme level."
+msgstr ""
+
+#: gnu/packages/imagemagick.scm:101 gnu/packages/imagemagick.scm:195
+msgid "Create, edit, compose, or convert bitmap images"
+msgstr "Opret, rediger, komponer eller konverter bitmap-billeder"
+
+#: gnu/packages/imagemagick.scm:103
 msgid ""
 "ImageMagick® is a software suite to create, edit, compose, or convert\n"
 "bitmap images.  It can read and write images in a variety of formats (over 100)\n"
@@ -3475,11 +4129,11 @@ msgid ""
 "text, lines, polygons, ellipses and Bézier curves."
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:145
+#: gnu/packages/imagemagick.scm:147
 msgid "Perl interface to ImageMagick"
-msgstr ""
+msgstr "Perlgrænseflade til ImageMagick"
 
-#: gnu/packages/imagemagick.scm:146
+#: gnu/packages/imagemagick.scm:148
 msgid ""
 "This Perl extension allows the reading, manipulation and\n"
 "writing of a large number of image file formats using the ImageMagick library.\n"
@@ -3487,21 +4141,28 @@ msgid ""
 "script."
 msgstr ""
 
-#: gnu/packages/image.scm:69
-msgid "Library for handling PNG files"
+#: gnu/packages/imagemagick.scm:197
+msgid ""
+"GraphicsMagick provides a comprehensive collection of utilities,\n"
+"programming interfaces, and GUIs, to support file format conversion, image\n"
+"processing, and 2D vector rendering."
 msgstr ""
 
 #: gnu/packages/image.scm:71
+msgid "Library for handling PNG files"
+msgstr "Bibliotek for håndtering af PNG-filer"
+
+#: gnu/packages/image.scm:73
 msgid ""
 "Libpng is the official PNG (Portable Network Graphics) reference\n"
 "library.  It supports almost all PNG features and is extensible."
 msgstr ""
 
-#: gnu/packages/image.scm:87
+#: gnu/packages/image.scm:89
 msgid "Library for handling JPEG files"
-msgstr ""
+msgstr "Bibliotek for håndtering af JPEG-filer"
 
-#: gnu/packages/image.scm:89
+#: gnu/packages/image.scm:91
 msgid ""
 "Libjpeg implements JPEG image encoding, decoding, and transcoding.\n"
 "JPEG is a standardized compression method for full-color and gray-scale\n"
@@ -3510,11 +4171,22 @@ msgid ""
 "image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats."
 msgstr ""
 
-#: gnu/packages/image.scm:128
-msgid "Library for handling TIFF files"
+#: gnu/packages/image.scm:124
+msgid "Optimize JPEG images"
+msgstr "Optimer JPEG-billeder"
+
+#: gnu/packages/image.scm:126
+msgid ""
+"jpegoptim provides lossless optimization (based on optimizing\n"
+"the Huffman tables) and \"lossy\" optimization based on setting\n"
+"maximum quality factor."
 msgstr ""
 
-#: gnu/packages/image.scm:130
+#: gnu/packages/image.scm:157
+msgid "Library for handling TIFF files"
+msgstr "Bibliotek for håndtering af TIFF-filer"
+
+#: gnu/packages/image.scm:159
 msgid ""
 "Libtiff provides support for the Tag Image File Format (TIFF), a format\n"
 "used for storing image data.\n"
@@ -3522,11 +4194,11 @@ msgid ""
 "collection of tools for doing simple manipulations of TIFF images."
 msgstr ""
 
-#: gnu/packages/image.scm:173
+#: gnu/packages/image.scm:202
 msgid "Library for reading images in the Microsoft WMF format"
-msgstr ""
+msgstr "Bibliotek for læsning af billeder i Microsoft WMF-formatet"
 
-#: gnu/packages/image.scm:175
+#: gnu/packages/image.scm:204
 msgid ""
 "libwmf is a library for reading vector images in Microsoft's native\n"
 "Windows Metafile Format (WMF) and for either (a) displaying them in, e.g., an X\n"
@@ -3534,11 +4206,11 @@ msgid ""
 "the W3C's XML-based Scaleable Vector Graphic (SVG) format."
 msgstr ""
 
-#: gnu/packages/image.scm:233
+#: gnu/packages/image.scm:271
 msgid "Library and tools for image processing and analysis"
-msgstr ""
+msgstr "Bibliotek og værktøjer for billedbehandling og analyse"
 
-#: gnu/packages/image.scm:235
+#: gnu/packages/image.scm:273
 msgid ""
 "Leptonica is a C library and set of command-line tools for efficient\n"
 "image processing and image analysis operations.  It supports rasterop, affine\n"
@@ -3548,11 +4220,11 @@ msgid ""
 "arithmetic ops."
 msgstr ""
 
-#: gnu/packages/image.scm:258
+#: gnu/packages/image.scm:296
 msgid "Decoder of the JBIG2 image compression format"
 msgstr ""
 
-#: gnu/packages/image.scm:260
+#: gnu/packages/image.scm:298
 msgid ""
 "JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit\n"
 "monochrome) images at moderately high resolution, and in particular scanned\n"
@@ -3565,11 +4237,11 @@ msgid ""
 "work."
 msgstr ""
 
-#: gnu/packages/image.scm:295
+#: gnu/packages/image.scm:333
 msgid "JPEG 2000 codec"
-msgstr ""
+msgstr "JPEG 2000-kodning"
 
-#: gnu/packages/image.scm:297
+#: gnu/packages/image.scm:335
 msgid ""
 "The OpenJPEG library is a JPEG 2000 codec written in C.  It has\n"
 "been developed in order to promote the use of JPEG 2000, the new\n"
@@ -3582,11 +4254,11 @@ msgid ""
 "error-resilience, a Java-viewer for j2k-images, ..."
 msgstr ""
 
-#: gnu/packages/image.scm:376
+#: gnu/packages/image.scm:414
 msgid "Tools and library for working with GIF images"
-msgstr ""
+msgstr "Værktøjer og bibliotek for arbejde med GIF-billeder"
 
-#: gnu/packages/image.scm:378
+#: gnu/packages/image.scm:416
 msgid ""
 "GIFLIB is a library for reading and writing GIF images.  It is API and\n"
 "ABI compatible with libungif which was in wide use while the LZW compression\n"
@@ -3594,19 +4266,19 @@ msgid ""
 "compose, and analyze GIF images."
 msgstr ""
 
-#: gnu/packages/image.scm:399
+#: gnu/packages/image.scm:437
 msgid "GIF decompression library"
 msgstr "GIF-dekomprimeringsbibliotek"
 
-#: gnu/packages/image.scm:401
+#: gnu/packages/image.scm:439
 msgid "libungif is the old GIF decompression library by the GIFLIB project."
 msgstr "libungif er det gamle GIF-dekomprimeringsbibliotek af GIFLIB-projektet."
 
-#: gnu/packages/image.scm:430
+#: gnu/packages/image.scm:468
 msgid "Loading, saving, rendering and manipulating image files"
 msgstr "Indlæs, gem, optegn og manipuler billedfiler"
 
-#: gnu/packages/image.scm:432
+#: gnu/packages/image.scm:470
 msgid ""
 "Imlib2 is a library that does image file loading and saving as well as\n"
 "rendering, manipulation, arbitrary polygon support, etc.\n"
@@ -3619,32 +4291,32 @@ msgid ""
 "more modular, simple, and flexible."
 msgstr ""
 
-#: gnu/packages/image.scm:460
+#: gnu/packages/image.scm:498
 msgid "Wrapper library for imlib2"
-msgstr ""
+msgstr "Omslagsbibliotek for imlib2"
 
-#: gnu/packages/image.scm:462
+#: gnu/packages/image.scm:500
 msgid ""
 "Giblib is a simple library which wraps imlib2's context API, avoiding\n"
 "all the context_get/set calls, adds fontstyles to the truetype renderer and\n"
 "supplies a generic doubly-linked list and some string functions."
 msgstr ""
 
-#: gnu/packages/image.scm:502
+#: gnu/packages/image.scm:540
 msgid "Library for handling popular graphics image formats"
-msgstr ""
+msgstr "Bibliotek til håndtering af populære grafiske billedformater"
 
-#: gnu/packages/image.scm:504
+#: gnu/packages/image.scm:542
 msgid ""
 "FreeImage is a library for developers who would like to support popular\n"
 "graphics image formats like PNG, BMP, JPEG, TIFF and others."
 msgstr ""
 
-#: gnu/packages/image.scm:554
+#: gnu/packages/image.scm:592
 msgid "Computer vision library"
 msgstr ""
 
-#: gnu/packages/image.scm:556
+#: gnu/packages/image.scm:594
 msgid ""
 "VIGRA stands for Vision with Generic Algorithms.  It is an image\n"
 "processing and analysis library that puts its main emphasis on customizable\n"
@@ -3652,11 +4324,11 @@ msgid ""
 "multi-dimensional image processing."
 msgstr ""
 
-#: gnu/packages/image.scm:587
+#: gnu/packages/image.scm:625
 msgid "Lossless and lossy image compression"
-msgstr ""
+msgstr "Billedkomprimering med og uden kvalitetetstab"
 
-#: gnu/packages/image.scm:589
+#: gnu/packages/image.scm:627
 msgid ""
 "WebP is a new image format that provides lossless and lossy compression\n"
 "for images.  WebP lossless images are 26% smaller in size compared to\n"
@@ -3668,19 +4340,41 @@ msgid ""
 "channels."
 msgstr ""
 
-#: gnu/packages/image.scm:617
+#: gnu/packages/image.scm:655
 msgid "Library for handling MNG files"
-msgstr ""
+msgstr "Bibliotek for håndtering af MNG-filer"
 
-#: gnu/packages/image.scm:619
+#: gnu/packages/image.scm:657
 msgid "Libmng is the MNG (Multiple-image Network Graphics) reference library."
+msgstr "Libmng er MNG-referencebiblioteket (Multiple-image Network Graphics)."
+
+#: gnu/packages/image.scm:705
+msgid "Library for manipulating many image formats"
+msgstr "Bibliotek for manipulering af mange billedformater"
+
+#: gnu/packages/image.scm:706
+msgid ""
+"Developer's Image Library (DevIL) is a library to develop\n"
+"applications with support for many types of images.  DevIL can load, save,\n"
+"convert, manipulate, filter and display a wide variety of image formats."
+msgstr ""
+
+#: gnu/packages/image.scm:738
+msgid "JPEG-2000 library"
+msgstr "JPEG-2000-bibliotek"
+
+#: gnu/packages/image.scm:739
+msgid ""
+"The JasPer Project is an initiative to provide a reference\n"
+"implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,\n"
+"ISO/IEC 15444-1)."
 msgstr ""
 
-#: gnu/packages/inkscape.scm:84
+#: gnu/packages/inkscape.scm:88
 msgid "Vector graphics editor"
 msgstr ""
 
-#: gnu/packages/inkscape.scm:85
+#: gnu/packages/inkscape.scm:89
 msgid ""
 "Inkscape is a vector graphics editor.  What sets Inkscape\n"
 "apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,\n"
@@ -3728,11 +4422,11 @@ msgstr ""
 msgid "Clone of the Motif toolkit for the X window system."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:85
+#: gnu/packages/libreoffice.scm:86
 msgid "General purpose formula parser and interpreter"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:86
+#: gnu/packages/libreoffice.scm:87
 msgid ""
 "Ixion is a library for calculating the results of formula\n"
 "expressions stored in multiple named targets, or \"cells\".  The cells can\n"
@@ -3740,11 +4434,11 @@ msgid ""
 "their dependencies automatically upon calculation."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:111
+#: gnu/packages/libreoffice.scm:112
 msgid "File import filter library for spreadsheet documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:112
+#: gnu/packages/libreoffice.scm:113
 msgid ""
 "Orcus is a library that provides a collection of standalone\n"
 "file processing filters.  It is currently focused on providing filters for\n"
@@ -3754,33 +4448,33 @@ msgid ""
 "CSV, CSS and XML."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:143
+#: gnu/packages/libreoffice.scm:147
 msgid "Document importer for office suites"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:144
+#: gnu/packages/libreoffice.scm:148
 msgid ""
 "Librevenge is a base library for writing document import\n"
 "filters.  It has interfaces for text documents, vector graphics,\n"
 "spreadsheets and presentations."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:169
+#: gnu/packages/libreoffice.scm:173
 msgid "Library for importing WordPerfect documents"
-msgstr ""
+msgstr "Bibliotek til import af WordPerfect-dokumenter"
 
-#: gnu/packages/libreoffice.scm:170
+#: gnu/packages/libreoffice.scm:174
 msgid ""
 "Libwpd is a C++ library designed to help process\n"
 "WordPerfect documents.  It is most commonly used to import such documents\n"
 "into other word processors."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:202
+#: gnu/packages/libreoffice.scm:206
 msgid "Library for import of reflowable e-book formats"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:203
+#: gnu/packages/libreoffice.scm:207
 msgid ""
 "Libe-book is a library and a set of tools for reading and\n"
 "converting various reflowable e-book formats.  Currently supported are:\n"
@@ -3790,113 +4484,115 @@ msgid ""
 "ZVR (simple compressed text format)."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:232
+#: gnu/packages/libreoffice.scm:236
 msgid "Library and tools for the WordPerfect Graphics format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:233
+#: gnu/packages/libreoffice.scm:237
 msgid ""
 "The libwpg project provides a library and tools for\n"
 "working with graphics in the WPG (WordPerfect Graphics) format."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:273
+#: gnu/packages/libreoffice.scm:278
 msgid "CMIS client library"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:274
+#: gnu/packages/libreoffice.scm:279
 msgid ""
 "LibCMIS is a C++ client library for the CMIS interface.  It\n"
 "allows C++ applications to connect to any ECM behaving as a CMIS server such\n"
 "as Alfresco or Nuxeo."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:305
+#: gnu/packages/libreoffice.scm:310
 msgid "Library for parsing the AbiWord format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:306
+#: gnu/packages/libreoffice.scm:311
 msgid ""
 "Libabw is a library that parses the file format of\n"
 "AbiWord documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:336
+#: gnu/packages/libreoffice.scm:341
 msgid "Library for parsing the CorelDRAW format"
-msgstr ""
+msgstr "Bibliotek til fortolkning af CorelDRAW-formatet"
 
-#: gnu/packages/libreoffice.scm:337
+#: gnu/packages/libreoffice.scm:342
 msgid ""
 "Libcdr is a library that parses the file format of\n"
 "CorelDRAW documents of all versions."
 msgstr ""
+"Libcdr er et bibliotek, som fortolker filformatet\n"
+"for CorelDraw-dokumenter for alle versioner."
 
-#: gnu/packages/libreoffice.scm:366
+#: gnu/packages/libreoffice.scm:371
 msgid "Library for parsing the Apple Keynote format"
-msgstr ""
+msgstr "Bibliotek for fortolkning af Apple Keynote-formatet"
 
-#: gnu/packages/libreoffice.scm:367
+#: gnu/packages/libreoffice.scm:372
 msgid ""
 "Libetonyek is a library that parses the file format of\n"
 "Apple Keynote documents.  It currently supports Keynote versions 2 to 5."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:384
+#: gnu/packages/libreoffice.scm:389
 msgid "Text Categorization library"
-msgstr ""
+msgstr "Tekstkategoriseringsbibliotek"
 
-#: gnu/packages/libreoffice.scm:385
+#: gnu/packages/libreoffice.scm:390
 msgid ""
 "Libexttextcat is an N-Gram-Based Text Categorization\n"
 "library primarily intended for language guessing."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:411
+#: gnu/packages/libreoffice.scm:416
 msgid "Library for parsing the FreeHand format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:412
+#: gnu/packages/libreoffice.scm:417
 msgid ""
 "Libfreehand is a library that parses the file format of\n"
 "Aldus/Macromedia/Adobe FreeHand documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:438
+#: gnu/packages/libreoffice.scm:443
 msgid "Library for parsing the Microsoft Publisher format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:439
+#: gnu/packages/libreoffice.scm:444
 msgid ""
 "Libmspub is a library that parses the file format of\n"
 "Microsoft Publisher documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:467
+#: gnu/packages/libreoffice.scm:472
 msgid "Library for parsing the PageMaker format"
-msgstr ""
+msgstr "Bibliotek til fortolkning af PageMaker-formatet"
 
-#: gnu/packages/libreoffice.scm:468
+#: gnu/packages/libreoffice.scm:473
 msgid ""
 "Libpagemaker is a library that parses the file format of\n"
 "Aldus/Adobe PageMaker documents.  Currently it only understands documents\n"
 "created by PageMaker version 6.x and 7."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:503
+#: gnu/packages/libreoffice.scm:508
 msgid "Library for parsing the Microsoft Visio format"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:504
+#: gnu/packages/libreoffice.scm:509
 msgid ""
 "Libvisio is a library that parses the file format of\n"
 "Microsoft Visio documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:532
+#: gnu/packages/libreoffice.scm:537
 msgid "ODF (Open Document Format) library"
-msgstr ""
+msgstr "ODF-bibliotek (Open Document Format)"
 
-#: gnu/packages/libreoffice.scm:533
+#: gnu/packages/libreoffice.scm:538
 msgid ""
 "Libodfgen is a library for generating documents in the\n"
 "Open Document Format (ODF).  It provides generator implementations for all\n"
@@ -3904,60 +4600,60 @@ msgid ""
 "text documents, vector drawings, presentations and spreadsheets."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:563
+#: gnu/packages/libreoffice.scm:568
 msgid "Import library for some old Macintosh text documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:564
+#: gnu/packages/libreoffice.scm:569
 msgid ""
 "Libmwaw contains some import filters for old Macintosh\n"
 "text documents (MacWrite, ClarisWorks, ... ) and for some graphics and\n"
 "spreadsheet documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:593
+#: gnu/packages/libreoffice.scm:598
 msgid "Import library for Microsoft Works text documents"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:594
+#: gnu/packages/libreoffice.scm:599
 msgid ""
 "Libwps is a library for importing files in the Microsoft\n"
 "Works word processor file format."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:612
+#: gnu/packages/libreoffice.scm:617
 msgid ""
 "Hunspell is a spell checker and morphological analyzer\n"
 "library and program designed for languages with rich morphology and complex\n"
 "word compounding or character encoding."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:633
+#: gnu/packages/libreoffice.scm:638
 msgid "Hyphenation library"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:634
+#: gnu/packages/libreoffice.scm:639
 msgid ""
 "Hyphen is a hyphenation library using TeX hyphenation\n"
 "patterns, which are pre-processed by a perl script."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:657
+#: gnu/packages/libreoffice.scm:662
 msgid "Thesaurus"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:658
+#: gnu/packages/libreoffice.scm:663
 msgid ""
 "MyThes is a simple thesaurus that uses a structured text\n"
 "data file and an index file with binary search to look up words and phrases\n"
 "and to return information on pronunciations, meanings and synonyms."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:822
+#: gnu/packages/libreoffice.scm:829
 msgid "Office suite"
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:823
+#: gnu/packages/libreoffice.scm:830
 msgid ""
 "LibreOffice is a comprehensive office suite.  It contains\n"
 "a number of components: Writer, a word processor; Calc, a spreadsheet\n"
@@ -3966,39 +4662,39 @@ msgid ""
 "Math for editing mathematics."
 msgstr ""
 
-#: gnu/packages/linux.scm:149
+#: gnu/packages/linux.scm:155
 msgid "GNU Linux-Libre kernel headers"
-msgstr ""
+msgstr "GNU Linux-LIbre - kerneteksthoveder"
 
-#: gnu/packages/linux.scm:150
+#: gnu/packages/linux.scm:156
 msgid "Headers of the Linux-Libre kernel."
-msgstr ""
+msgstr "Teksthoveder for Linux-Libre-kernen."
 
-#: gnu/packages/linux.scm:181
+#: gnu/packages/linux.scm:187
 msgid "Tools for loading and managing Linux kernel modules"
-msgstr ""
+msgstr "Værktøjer til at indlæse og håndtere Linuxkernemoduler"
 
-#: gnu/packages/linux.scm:183
+#: gnu/packages/linux.scm:189
 msgid ""
 "Tools for loading and managing Linux kernel modules, such as `modprobe',\n"
 "`insmod', `lsmod', and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:311
+#: gnu/packages/linux.scm:322
 msgid "100% free redistribution of a cleaned Linux kernel"
 msgstr ""
 
-#: gnu/packages/linux.scm:313
+#: gnu/packages/linux.scm:324
 msgid ""
 "GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.\n"
 "It has been modified to remove all non-free binary blobs."
 msgstr ""
 
-#: gnu/packages/linux.scm:356
+#: gnu/packages/linux.scm:384
 msgid "Pluggable authentication modules for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:358
+#: gnu/packages/linux.scm:386
 msgid ""
 "A *Free* project to implement OSF's RFC 86.0.\n"
 "Pluggable authentication modules are small shared object files that can\n"
@@ -4006,30 +4702,33 @@ msgid ""
 "at login.  Local and dynamic reconfiguration are its key features."
 msgstr ""
 
-#: gnu/packages/linux.scm:385
+#: gnu/packages/linux.scm:413
 msgid "Small utilities that use the proc filesystem"
-msgstr ""
+msgstr "Små redskaber som bruger filsystemet proc"
 
-#: gnu/packages/linux.scm:387
+#: gnu/packages/linux.scm:415
 msgid ""
 "This PSmisc package is a set of some small useful utilities that\n"
 "use the proc filesystem.  We're not about changing the world, but\n"
 "providing the system administrator with some help in common tasks."
 msgstr ""
 
-#: gnu/packages/linux.scm:449
+#: gnu/packages/linux.scm:480
 msgid "Collection of utilities for the Linux kernel"
-msgstr ""
+msgstr "Samling af redskaber for Linuxkernen"
 
-#: gnu/packages/linux.scm:451
-msgid "Util-linux is a random collection of utilities for the Linux kernel."
+#: gnu/packages/linux.scm:481
+msgid ""
+"Util-linux is a diverse collection of Linux kernel\n"
+"utilities.  It provides dmesg and includes tools for working with filesystems,\n"
+"block devices, UUIDs, TTYs, and many other tools."
 msgstr ""
 
-#: gnu/packages/linux.scm:518
+#: gnu/packages/linux.scm:522
 msgid "Utilities that give information about processes"
-msgstr ""
+msgstr "Redskaber som giver information om processer"
 
-#: gnu/packages/linux.scm:520
+#: gnu/packages/linux.scm:524
 msgid ""
 "Procps is the package that has a bunch of small useful utilities\n"
 "that give information about processes using the Linux /proc file system.\n"
@@ -4037,93 +4736,93 @@ msgid ""
 "slabtop, and skill."
 msgstr ""
 
-#: gnu/packages/linux.scm:545
+#: gnu/packages/linux.scm:549
 msgid "Tools for working with USB devices, such as lsusb"
-msgstr ""
+msgstr "Værktøjer for arbejde med USB-enheder, såsom lsusb"
 
-#: gnu/packages/linux.scm:547
+#: gnu/packages/linux.scm:551
 msgid "Tools for working with USB devices, such as lsusb."
-msgstr ""
+msgstr "Værktøjer for arbejde med USB-enheder, såsom lsusb."
 
-#: gnu/packages/linux.scm:621
+#: gnu/packages/linux.scm:625
 msgid "Creating and checking ext2/ext3/ext4 file systems"
-msgstr ""
+msgstr "Oprettelse og kontrol af ext2/ext3/ext4-filsystemer"
 
-#: gnu/packages/linux.scm:623
+#: gnu/packages/linux.scm:627
 msgid "This package provides tools for manipulating ext2/ext3/ext4 file systems."
-msgstr ""
+msgstr "Denne pakke tilbyder værktøjer til manipulering af ext2/ext3/ext4-filsystemer."
 
-#: gnu/packages/linux.scm:665
+#: gnu/packages/linux.scm:669
 msgid "Statically-linked fsck.* commands from e2fsprogs"
 msgstr ""
 
-#: gnu/packages/linux.scm:667
+#: gnu/packages/linux.scm:671
 msgid ""
 "This package provides statically-linked command of fsck.ext[234] taken\n"
 "from the e2fsprogs package.  It is meant to be used in initrds."
 msgstr ""
 
-#: gnu/packages/linux.scm:686
+#: gnu/packages/linux.scm:690
 msgid "Recover deleted files from ext2/3/4 partitions"
-msgstr ""
+msgstr "Gendan slettede filer fra ext2/3/4-partitioner"
 
-#: gnu/packages/linux.scm:688
+#: gnu/packages/linux.scm:692
 msgid ""
 "Extundelete is a set of tools that can recover deleted files from an\n"
 "ext3 or ext4 partition."
 msgstr ""
 
-#: gnu/packages/linux.scm:720
+#: gnu/packages/linux.scm:724
 msgid "Zero non-allocated regions in ext2/ext3/ext4 file systems"
 msgstr ""
 
-#: gnu/packages/linux.scm:722
+#: gnu/packages/linux.scm:726
 msgid ""
 "The zerofree command scans the free blocks in an ext2 file system and\n"
 "fills any non-zero blocks with zeroes.  This is a useful way to make disk\n"
 "images more compressible."
 msgstr ""
 
-#: gnu/packages/linux.scm:741
+#: gnu/packages/linux.scm:745
 msgid "System call tracer for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:743
+#: gnu/packages/linux.scm:747
 msgid ""
 "strace is a system call tracer, i.e. a debugging tool which prints out a\n"
 "trace of all the system calls made by a another process/program."
 msgstr ""
 
-#: gnu/packages/linux.scm:764
+#: gnu/packages/linux.scm:768
 msgid "Library call tracer for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:766
+#: gnu/packages/linux.scm:770
 msgid ""
 "ltrace intercepts and records dynamic library calls which are called by\n"
 "an executed process and the signals received by that process.  It can also\n"
 "intercept and print the system calls executed by the program."
 msgstr ""
 
-#: gnu/packages/linux.scm:786
+#: gnu/packages/linux.scm:790
 msgid "The Advanced Linux Sound Architecture libraries"
 msgstr ""
 
-#: gnu/packages/linux.scm:788 gnu/packages/linux.scm:830
+#: gnu/packages/linux.scm:792 gnu/packages/linux.scm:834
 msgid ""
 "The Advanced Linux Sound Architecture (ALSA) provides audio and\n"
 "MIDI functionality to the Linux-based operating system."
 msgstr ""
 
-#: gnu/packages/linux.scm:828
+#: gnu/packages/linux.scm:832
 msgid "Utilities for the Advanced Linux Sound Architecture (ALSA)"
 msgstr ""
 
-#: gnu/packages/linux.scm:855
+#: gnu/packages/linux.scm:859
 msgid "Program to configure the Linux IP packet filtering rules"
 msgstr ""
 
-#: gnu/packages/linux.scm:857
+#: gnu/packages/linux.scm:861
 msgid ""
 "iptables is the userspace command line program used to configure the\n"
 "Linux 2.4.x and later IPv4 packet filtering ruleset.  It is targeted towards\n"
@@ -4133,11 +4832,11 @@ msgid ""
 "packet filter."
 msgstr ""
 
-#: gnu/packages/linux.scm:905
+#: gnu/packages/linux.scm:908
 msgid "Utilities for controlling TCP/IP networking and traffic in Linux"
-msgstr ""
+msgstr "Redskaber for kontrol af TCP/IP-netværk og trafik i Linux"
 
-#: gnu/packages/linux.scm:907
+#: gnu/packages/linux.scm:910
 msgid ""
 "Iproute2 is a collection of utilities for controlling TCP/IP\n"
 "networking and traffic with the Linux kernel.\n"
@@ -4158,11 +4857,11 @@ msgid ""
 "manpages."
 msgstr ""
 
-#: gnu/packages/linux.scm:1015
+#: gnu/packages/linux.scm:1022
 msgid "Tools for controlling the network subsystem in Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:1017
+#: gnu/packages/linux.scm:1024
 msgid ""
 "This package includes the important tools for controlling the network\n"
 "subsystem of the Linux kernel.  This includes arp, hostname, ifconfig,\n"
@@ -4171,21 +4870,21 @@ msgid ""
 "advanced aspects of IP configuration (iptunnel, ipmaddr)."
 msgstr ""
 
-#: gnu/packages/linux.scm:1054
+#: gnu/packages/linux.scm:1061
 msgid "Library for working with POSIX capabilities"
-msgstr ""
+msgstr "Bibliotek til arbejde med POSIX-funktioner"
 
-#: gnu/packages/linux.scm:1056
+#: gnu/packages/linux.scm:1063
 msgid ""
 "Libcap2 provides a programming interface to POSIX capabilities on\n"
 "Linux-based operating systems."
 msgstr ""
 
-#: gnu/packages/linux.scm:1099
+#: gnu/packages/linux.scm:1106
 msgid "Manipulate Ethernet bridges"
 msgstr ""
 
-#: gnu/packages/linux.scm:1101
+#: gnu/packages/linux.scm:1108
 msgid ""
 "Utilities for Linux's Ethernet bridging facilities.  A bridge is a way\n"
 "to connect two Ethernet segments together in a protocol independent way.\n"
@@ -4194,11 +4893,11 @@ msgid ""
 "transparently through a bridge."
 msgstr ""
 
-#: gnu/packages/linux.scm:1123
+#: gnu/packages/linux.scm:1130
 msgid "NetLink protocol library suite"
 msgstr ""
 
-#: gnu/packages/linux.scm:1125
+#: gnu/packages/linux.scm:1132
 msgid ""
 "The libnl suite is a collection of libraries providing APIs to netlink\n"
 "protocol based Linux kernel interfaces.  Netlink is an IPC mechanism primarily\n"
@@ -4207,21 +4906,21 @@ msgid ""
 "configuration and monitoring interfaces."
 msgstr ""
 
-#: gnu/packages/linux.scm:1155
+#: gnu/packages/linux.scm:1162
 msgid "Tool for configuring wireless devices"
-msgstr ""
+msgstr "Værktøj til konfiguration af trådløse enheder"
 
-#: gnu/packages/linux.scm:1157
+#: gnu/packages/linux.scm:1164
 msgid ""
 "iw is a new nl80211 based CLI configuration utility for wireless\n"
 "devices.  It replaces 'iwconfig', which is deprecated."
 msgstr ""
 
-#: gnu/packages/linux.scm:1183
+#: gnu/packages/linux.scm:1190
 msgid "Analyze power consumption on Intel-based laptops"
-msgstr ""
+msgstr "Analyser strømforbrug på Intelbaserede bærbare"
 
-#: gnu/packages/linux.scm:1185
+#: gnu/packages/linux.scm:1192
 msgid ""
 "PowerTOP is a Linux tool to diagnose issues with power consumption and\n"
 "power management.  In addition to being a diagnostic tool, PowerTOP also has\n"
@@ -4230,31 +4929,31 @@ msgid ""
 "settings."
 msgstr ""
 
-#: gnu/packages/linux.scm:1207
+#: gnu/packages/linux.scm:1214
 msgid "Audio mixer for X and the console"
 msgstr ""
 
-#: gnu/packages/linux.scm:1209
+#: gnu/packages/linux.scm:1216
 msgid ""
 "Aumix adjusts an audio mixer from X, the console, a terminal,\n"
 "the command line or a script."
 msgstr ""
 
-#: gnu/packages/linux.scm:1233
+#: gnu/packages/linux.scm:1240
 msgid "Displays the IO activity of running processes"
-msgstr ""
+msgstr "Viser IO-aktivet for kørende processer"
 
-#: gnu/packages/linux.scm:1235
+#: gnu/packages/linux.scm:1242
 msgid ""
 "Iotop is a Python program with a top like user interface to show the\n"
 "processes currently causing I/O."
 msgstr ""
 
-#: gnu/packages/linux.scm:1287
+#: gnu/packages/linux.scm:1297
 msgid "Support file systems implemented in user space"
 msgstr ""
 
-#: gnu/packages/linux.scm:1289
+#: gnu/packages/linux.scm:1299
 msgid ""
 "As a consequence of its monolithic design, file system code for Linux\n"
 "normally goes into the kernel itself---which is not only a robustness issue,\n"
@@ -4264,11 +4963,11 @@ msgid ""
 "user-space processes."
 msgstr ""
 
-#: gnu/packages/linux.scm:1314
+#: gnu/packages/linux.scm:1324
 msgid "User-space union file system"
 msgstr ""
 
-#: gnu/packages/linux.scm:1316
+#: gnu/packages/linux.scm:1326
 msgid ""
 "UnionFS-FUSE is a flexible union file system implementation in user\n"
 "space, using the FUSE library.  Mounting a union file system allows you to\n"
@@ -4276,15 +4975,15 @@ msgid ""
 "UnionFS-FUSE additionally supports copy-on-write."
 msgstr ""
 
-#: gnu/packages/linux.scm:1341
+#: gnu/packages/linux.scm:1351
 msgid "User-space union file system (statically linked)"
 msgstr ""
 
-#: gnu/packages/linux.scm:1383
+#: gnu/packages/linux.scm:1396
 msgid "Mount remote file systems over SSH"
 msgstr ""
 
-#: gnu/packages/linux.scm:1385
+#: gnu/packages/linux.scm:1398
 msgid ""
 "This is a file system client based on the SSH File Transfer Protocol.\n"
 "Since most SSH servers already support this protocol it is very easy to set\n"
@@ -4292,11 +4991,11 @@ msgid ""
 "file system is as easy as logging into the server with an SSH client."
 msgstr ""
 
-#: gnu/packages/linux.scm:1433
+#: gnu/packages/linux.scm:1427
 msgid "Tools for non-uniform memory access (NUMA) machines"
 msgstr ""
 
-#: gnu/packages/linux.scm:1435
+#: gnu/packages/linux.scm:1429
 msgid ""
 "NUMA stands for Non-Uniform Memory Access, in other words a system whose\n"
 "memory is not all in one place.  The numactl program allows you to run your\n"
@@ -4309,32 +5008,32 @@ msgid ""
 "system."
 msgstr ""
 
-#: gnu/packages/linux.scm:1498
+#: gnu/packages/linux.scm:1492
 msgid "Linux keyboard utilities and keyboard maps"
 msgstr ""
 
-#: gnu/packages/linux.scm:1500
+#: gnu/packages/linux.scm:1494
 msgid ""
 "This package contains keytable files and keyboard utilities compatible\n"
 "for systems using the Linux kernel.  This includes commands such as\n"
 "'loadkeys', 'setfont', 'kbdinfo', and 'chvt'."
 msgstr ""
 
-#: gnu/packages/linux.scm:1519
+#: gnu/packages/linux.scm:1513
 msgid "Monitor file accesses"
 msgstr ""
 
-#: gnu/packages/linux.scm:1521
+#: gnu/packages/linux.scm:1515
 msgid ""
 "The inotify-tools packages provides a C library and command-line tools\n"
 "to use Linux' inotify mechanism, which allows file accesses to be monitored."
 msgstr ""
 
-#: gnu/packages/linux.scm:1559
+#: gnu/packages/linux.scm:1553
 msgid "Kernel module tools"
 msgstr ""
 
-#: gnu/packages/linux.scm:1560
+#: gnu/packages/linux.scm:1554
 msgid ""
 "Kmod is a set of tools to handle common tasks with Linux\n"
 "kernel modules like insert, remove, list, check properties, resolve\n"
@@ -4345,33 +5044,33 @@ msgid ""
 "from the module-init-tools project."
 msgstr ""
 
-#: gnu/packages/linux.scm:1631
+#: gnu/packages/linux.scm:1586
 msgid "Userspace device management"
 msgstr ""
 
-#: gnu/packages/linux.scm:1632
+#: gnu/packages/linux.scm:1587
 msgid ""
 "Udev is a daemon which dynamically creates and removes\n"
 "device nodes from /dev/, handles hotplug events and loads drivers at boot\n"
 "time."
 msgstr ""
 
-#: gnu/packages/linux.scm:1692
+#: gnu/packages/linux.scm:1659
 msgid "Logical volume management for Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:1694
+#: gnu/packages/linux.scm:1661
 msgid ""
 "LVM2 is the logical volume management tool set for Linux-based systems.\n"
 "This package includes the user-space libraries and tools, including the device\n"
 "mapper.  Kernel components are part of Linux-libre."
 msgstr ""
 
-#: gnu/packages/linux.scm:1730
+#: gnu/packages/linux.scm:1697
 msgid "Tools for manipulating Linux Wireless Extensions"
 msgstr ""
 
-#: gnu/packages/linux.scm:1731
+#: gnu/packages/linux.scm:1698
 msgid ""
 "Wireless Tools are used to manipulate the now-deprecated\n"
 "Linux Wireless Extensions; consider using 'iw' instead.  The Wireless\n"
@@ -4380,44 +5079,44 @@ msgid ""
 "interface."
 msgstr ""
 
-#: gnu/packages/linux.scm:1803
+#: gnu/packages/linux.scm:1770
 msgid "Central regulatory domain agent (CRDA) for WiFi"
 msgstr ""
 
-#: gnu/packages/linux.scm:1805
+#: gnu/packages/linux.scm:1772
 msgid ""
 "The Central Regulatory Domain Agent (CRDA) acts as the udev helper for\n"
 "communication between the kernel Linux and user space for regulatory\n"
 "compliance."
 msgstr ""
 
-#: gnu/packages/linux.scm:1841
+#: gnu/packages/linux.scm:1818
 msgid "Wireless regulatory database"
 msgstr ""
 
-#: gnu/packages/linux.scm:1843
+#: gnu/packages/linux.scm:1820
 msgid ""
 "This package contains the wireless regulatory database Central\n"
 "Regulatory Database Agent (CRDA) daemon.  The database contains information on\n"
 "country-specific regulations for the wireless spectrum."
 msgstr ""
 
-#: gnu/packages/linux.scm:1914
+#: gnu/packages/linux.scm:1891
 msgid "Utilities to read temperature/voltage/fan sensors"
 msgstr ""
 
-#: gnu/packages/linux.scm:1916
+#: gnu/packages/linux.scm:1893
 msgid ""
 "Lm-sensors is a hardware health monitoring package for Linux.  It allows\n"
 "you to access information from temperature, voltage, and fan speed sensors.\n"
 "It works with most newer systems."
 msgstr ""
 
-#: gnu/packages/linux.scm:1943
+#: gnu/packages/linux.scm:1920
 msgid "I2C tools for Linux"
-msgstr ""
+msgstr "I2C-værktøjer for Linux"
 
-#: gnu/packages/linux.scm:1945
+#: gnu/packages/linux.scm:1922
 msgid ""
 "The i2c-tools package contains a heterogeneous set of I2C tools for\n"
 "Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers,\n"
@@ -4425,22 +5124,22 @@ msgid ""
 "SMBus access."
 msgstr ""
 
-#: gnu/packages/linux.scm:1981
+#: gnu/packages/linux.scm:1958
 msgid "Hardware health information viewer"
 msgstr ""
 
-#: gnu/packages/linux.scm:1983
+#: gnu/packages/linux.scm:1960
 msgid ""
 "Xsensors reads data from the libsensors library regarding hardware\n"
 "health such as temperature, voltage and fan speed and displays the information\n"
 "in a digital read-out."
 msgstr ""
 
-#: gnu/packages/linux.scm:2031
+#: gnu/packages/linux.scm:2008
 msgid "Linux profiling with performance counters"
 msgstr ""
 
-#: gnu/packages/linux.scm:2033
+#: gnu/packages/linux.scm:2010
 msgid ""
 "perf is a tool suite for profiling using hardware performance counters,\n"
 "with support in the Linux kernel.  perf can instrument CPU performance\n"
@@ -4449,11 +5148,11 @@ msgid ""
 "particular the 'perf' command."
 msgstr ""
 
-#: gnu/packages/linux.scm:2056
+#: gnu/packages/linux.scm:2033
 msgid "Simple tool for creating Linux namespace containers"
-msgstr ""
+msgstr "Simpelt værktøj til oprettelse af naverumscontainere under Linux"
 
-#: gnu/packages/linux.scm:2057
+#: gnu/packages/linux.scm:2034
 msgid ""
 "pflask is a simple tool for creating Linux namespace\n"
 "containers.  It can be used for running a command or even booting an OS inside\n"
@@ -4462,32 +5161,32 @@ msgid ""
 "thanks to the use of namespaces."
 msgstr ""
 
-#: gnu/packages/linux.scm:2084
+#: gnu/packages/linux.scm:2061
 msgid "Tune hard disk parameters for high performance"
-msgstr ""
+msgstr "Finjuster harddiskparametre for høj ydelse"
 
-#: gnu/packages/linux.scm:2086
+#: gnu/packages/linux.scm:2063
 msgid ""
 "Get/set device parameters for Linux SATA/IDE drives.  It's primary use\n"
 "is for enabling irq-unmasking and IDE multiple-mode."
 msgstr ""
 
-#: gnu/packages/linux.scm:2109
+#: gnu/packages/linux.scm:2086
 msgid "Tool for enabling and disabling wireless devices"
-msgstr ""
+msgstr "Værktøj til aktivering og deaktivering af trådløse enheder"
 
-#: gnu/packages/linux.scm:2111
+#: gnu/packages/linux.scm:2088
 msgid ""
 "rfkill is a simple tool for accessing the rfkill device interface,\n"
 "which is used to enable and disable wireless networking devices, typically\n"
 "WLAN, Bluetooth and mobile broadband."
 msgstr ""
 
-#: gnu/packages/linux.scm:2130
+#: gnu/packages/linux.scm:2107
 msgid "Daemon for delivering ACPI events to user-space programs"
 msgstr ""
 
-#: gnu/packages/linux.scm:2132
+#: gnu/packages/linux.scm:2109
 msgid ""
 "acpid is designed to notify user-space programs of Advanced\n"
 "Configuration and Power Interface (ACPI) events.  acpid should be started\n"
@@ -4496,37 +5195,37 @@ msgid ""
 "specified in /etc/acpi/events and execute the rules that match the event."
 msgstr ""
 
-#: gnu/packages/linux.scm:2154
+#: gnu/packages/linux.scm:2131
 msgid "System utilities based on Linux sysfs"
 msgstr ""
 
-#: gnu/packages/linux.scm:2156
+#: gnu/packages/linux.scm:2133
 msgid ""
 "These are a set of utilities built upon sysfs, a virtual filesystem in\n"
 "Linux kernel versions 2.5+ that exposes a system's device tree.  The package\n"
 "also contains the libsysfs library."
 msgstr ""
 
-#: gnu/packages/linux.scm:2185
+#: gnu/packages/linux.scm:2162
 msgid "System utilities based on Linux sysfs (version 1.x)"
 msgstr ""
 
-#: gnu/packages/linux.scm:2208
+#: gnu/packages/linux.scm:2185
 msgid "Utilities to get and set CPU frequency on Linux"
 msgstr ""
 
-#: gnu/packages/linux.scm:2210
+#: gnu/packages/linux.scm:2187
 msgid ""
 "The cpufrequtils suite contains utilities to retrieve CPU frequency\n"
 "information, and set the CPU frequency if supported, using the cpufreq\n"
 "capabilities of the Linux kernel."
 msgstr ""
 
-#: gnu/packages/linux.scm:2229
+#: gnu/packages/linux.scm:2206
 msgid "Interface library for the Linux IEEE1394 drivers"
 msgstr ""
 
-#: gnu/packages/linux.scm:2231
+#: gnu/packages/linux.scm:2208
 msgid ""
 "Libraw1394 is the only supported interface to the kernel side raw1394 of\n"
 "the Linux IEEE-1394 subsystem, which provides direct access to the connected\n"
@@ -4535,68 +5234,90 @@ msgid ""
 "protocol in question."
 msgstr ""
 
-#: gnu/packages/linux.scm:2255
+#: gnu/packages/linux.scm:2232
 msgid "AV/C protocol library for IEEE 1394"
 msgstr ""
 
-#: gnu/packages/linux.scm:2257
+#: gnu/packages/linux.scm:2234
 msgid ""
 "Libavc1394 is a programming interface to the AV/C specification from\n"
 "the 1394 Trade Association.  AV/C stands for Audio/Video Control."
 msgstr ""
 
-#: gnu/packages/linux.scm:2279
+#: gnu/packages/linux.scm:2256
 msgid "Isochronous streaming media library for IEEE 1394"
 msgstr ""
 
-#: gnu/packages/linux.scm:2281
+#: gnu/packages/linux.scm:2258
 msgid ""
 "The libiec61883 library provides a higher level API for streaming DV,\n"
 "MPEG-2 and audio over Linux IEEE 1394."
 msgstr ""
 
-#: gnu/packages/linux.scm:2321
+#: gnu/packages/linux.scm:2298
 msgid "Tool for managing Linux Software RAID arrays"
 msgstr ""
 
-#: gnu/packages/linux.scm:2323
+#: gnu/packages/linux.scm:2300
 msgid ""
 "mdadm is a tool for managing Linux Software RAID arrays.  It can create,\n"
 "assemble, report on, and monitor arrays.  It can also move spares between raid\n"
 "arrays when needed."
 msgstr ""
 
-#: gnu/packages/linux.scm:2350
+#: gnu/packages/linux.scm:2327
 msgid "Linux-native asynchronous I/O access library"
 msgstr ""
 
-#: gnu/packages/linux.scm:2352
+#: gnu/packages/linux.scm:2329
 msgid ""
 "This library enables userspace to use Linux kernel asynchronous I/O\n"
 "system calls, important for the performance of databases and other advanced\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/linux.scm:2388
+#: gnu/packages/linux.scm:2365
 msgid "Linux Bluetooth protocol stack"
 msgstr ""
 
-#: gnu/packages/linux.scm:2390
+#: gnu/packages/linux.scm:2367
 msgid ""
 "BlueZ provides support for the core Bluetooth layers and protocols.  It\n"
 "is flexible, efficient and uses a modular implementation."
 msgstr ""
 
-#: gnu/packages/linux.scm:2446
+#: gnu/packages/linux.scm:2423
 msgid "Mount exFAT file systems"
 msgstr ""
 
-#: gnu/packages/linux.scm:2448
+#: gnu/packages/linux.scm:2425
 msgid ""
 "This package provides a FUSE-based file system that provides read and\n"
 "write access to exFAT devices."
 msgstr ""
 
+#: gnu/packages/linux.scm:2465
+msgid "Mouse support for the Linux console"
+msgstr "Museunderstøttelse for Linuxkonsollen"
+
+#: gnu/packages/linux.scm:2467
+msgid ""
+"The GPM (general-purpose mouse) daemon is a mouse server for\n"
+"applications running on the Linux console.  It allows users to select items\n"
+"and copy/paste text in the console and in xterm."
+msgstr ""
+
+#: gnu/packages/linux.scm:2501
+msgid "Create and manage btrfs copy-on-write file systems"
+msgstr ""
+
+#: gnu/packages/linux.scm:2502
+msgid ""
+"Btrfs is a copy-on-write (CoW) filesystem for Linux aimed at\n"
+"implementing advanced features while focusing on fault tolerance, repair and\n"
+"easy administration."
+msgstr ""
+
 #: gnu/packages/lout.scm:109
 msgid "Document layout system"
 msgstr ""
@@ -4620,11 +5341,11 @@ msgid ""
 "beginning."
 msgstr ""
 
-#: gnu/packages/messaging.scm:76
+#: gnu/packages/messaging.scm:77
 msgid "Off-the-Record (OTR) Messaging Library and Toolkit"
 msgstr ""
 
-#: gnu/packages/messaging.scm:78
+#: gnu/packages/messaging.scm:79
 msgid ""
 "OTR allows you to have private conversations over instant messaging by\n"
 "providing: (1) Encryption: No one else can read your instant messages.  (2)\n"
@@ -4727,11 +5448,11 @@ msgid ""
 "was initially a fork of xmpppy, but is using non-blocking sockets."
 msgstr ""
 
-#: gnu/packages/messaging.scm:466
+#: gnu/packages/messaging.scm:473
 msgid "Jabber (XMPP) client"
 msgstr ""
 
-#: gnu/packages/messaging.scm:467
+#: gnu/packages/messaging.scm:474
 msgid ""
 "Gajim is a feature-rich and easy to use Jabber/XMPP client.\n"
 "Among its features are: a tabbed chat window and single window modes; support\n"
@@ -4740,21 +5461,21 @@ msgid ""
 "end-to-end encryption support; XML console."
 msgstr ""
 
-#: gnu/packages/mpd.scm:63
+#: gnu/packages/mpd.scm:64
 msgid "Music Player Daemon client library"
 msgstr ""
 
-#: gnu/packages/mpd.scm:64
+#: gnu/packages/mpd.scm:65
 msgid ""
 "A stable, documented, asynchronous API library for\n"
 "interfacing MPD in the C, C++ & Objective C languages."
 msgstr ""
 
-#: gnu/packages/mpd.scm:124
+#: gnu/packages/mpd.scm:125
 msgid "Music Player Daemon"
 msgstr ""
 
-#: gnu/packages/mpd.scm:125
+#: gnu/packages/mpd.scm:126
 msgid ""
 "Music Player Daemon (MPD) is a flexible, powerful,\n"
 "server-side application for playing music.  Through plugins and libraries it\n"
@@ -4762,31 +5483,33 @@ msgid ""
 "protocol."
 msgstr ""
 
-#: gnu/packages/mpd.scm:148
+#: gnu/packages/mpd.scm:149
 msgid "Music Player Daemon client"
-msgstr ""
+msgstr "Music Player - dæmonklient"
 
-#: gnu/packages/mpd.scm:149
+#: gnu/packages/mpd.scm:150
 msgid ""
 "MPC is a minimalist command line interface to MPD, the music\n"
 "player daemon."
 msgstr ""
+"MPC er en minimalistisk kommandolinjegrænseflade til MPD,\n"
+"musikafspillerdæmonen."
 
-#: gnu/packages/mpd.scm:172
+#: gnu/packages/mpd.scm:173
 msgid "Curses Music Player Daemon client"
 msgstr ""
 
-#: gnu/packages/mpd.scm:173
+#: gnu/packages/mpd.scm:174
 msgid ""
 "ncmpc is a fully featured MPD client, which runs in a\n"
 "terminal using ncurses."
 msgstr ""
 
-#: gnu/packages/mpd.scm:211
+#: gnu/packages/mpd.scm:212
 msgid "Featureful ncurses based MPD client inspired by ncmpc"
 msgstr ""
 
-#: gnu/packages/mpd.scm:212
+#: gnu/packages/mpd.scm:213
 msgid ""
 "Ncmpcpp is an mpd client with a UI very similar to ncmpc,\n"
 "but it provides new useful features such as support for regular expressions\n"
@@ -4794,11 +5517,11 @@ msgid ""
 "sort playlists, and a local filesystem browser."
 msgstr ""
 
-#: gnu/packages/mpd.scm:235
+#: gnu/packages/mpd.scm:236
 msgid "MPD client for track scrobbling"
 msgstr ""
 
-#: gnu/packages/mpd.scm:236
+#: gnu/packages/mpd.scm:237
 msgid ""
 "mpdscribble is a Music Player Daemon client which submits\n"
 "information about tracks being played to a scrobbler, such as Libre.FM."
@@ -4816,11 +5539,11 @@ msgid ""
 "about 100 graphics formats."
 msgstr ""
 
-#: gnu/packages/nettle.scm:50
+#: gnu/packages/nettle.scm:51
 msgid "C library for low-level cryptographic functionality"
 msgstr ""
 
-#: gnu/packages/nettle.scm:52
+#: gnu/packages/nettle.scm:53
 msgid ""
 "GNU Nettle is a low-level cryptographic library.  It is designed to\n"
 "fit in easily in almost any context.  It can be easily included in\n"
@@ -4904,92 +5627,92 @@ msgid ""
 "intended as a substitute for the PPPStatus and EthStatus projects."
 msgstr ""
 
-#: gnu/packages/pdf.scm:102
+#: gnu/packages/pdf.scm:101
 msgid "PDF rendering library"
 msgstr ""
 
-#: gnu/packages/pdf.scm:104
+#: gnu/packages/pdf.scm:103
 msgid "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
 msgstr ""
 
-#: gnu/packages/pdf.scm:113
+#: gnu/packages/pdf.scm:112
 msgid "Qt4 frontend for the Poppler PDF rendering library"
 msgstr ""
 
-#: gnu/packages/pdf.scm:146
+#: gnu/packages/pdf.scm:145
 msgid "Python bindings for Poppler-Qt4"
 msgstr ""
 
-#: gnu/packages/pdf.scm:148
+#: gnu/packages/pdf.scm:147
 msgid ""
 "This package provides Python bindings for the Qt4 interface of the\n"
 "Poppler PDF rendering library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:195
+#: gnu/packages/pdf.scm:194
 msgid "Viewer for PDF files based on the Motif toolkit"
 msgstr ""
 
-#: gnu/packages/pdf.scm:197
+#: gnu/packages/pdf.scm:196
 msgid "Xpdf is a viewer for Portable Document Format (PDF) files."
-msgstr ""
+msgstr "Xpdf er en fremviser for Portable Document Format-filer (PDF)."
 
-#: gnu/packages/pdf.scm:227
+#: gnu/packages/pdf.scm:226
 msgid "Comic book support for zathura (libarchive backend)"
-msgstr ""
+msgstr "Understøttelse af tegneserier i zathura (libarchive-motor)"
 
-#: gnu/packages/pdf.scm:228
+#: gnu/packages/pdf.scm:227
 msgid ""
 "The zathura-cb plugin adds comic book support to zathura\n"
 "using libarchive."
 msgstr ""
 
-#: gnu/packages/pdf.scm:258
+#: gnu/packages/pdf.scm:257
 msgid "PS support for zathura (libspectre backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:259
+#: gnu/packages/pdf.scm:258
 msgid ""
 "The zathura-ps plugin adds PS support to zathura\n"
 "using libspectre."
 msgstr ""
 
-#: gnu/packages/pdf.scm:290
+#: gnu/packages/pdf.scm:289
 msgid "DjVu support for zathura (DjVuLibre backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:291
+#: gnu/packages/pdf.scm:290
 msgid ""
 "The zathura-djvu plugin adds DjVu support to zathura\n"
 "using the DjVuLibre library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:323
+#: gnu/packages/pdf.scm:322
 msgid "PDF support for zathura (poppler backend)"
 msgstr ""
 
-#: gnu/packages/pdf.scm:324
+#: gnu/packages/pdf.scm:323
 msgid ""
 "The zathura-pdf-poppler plugin adds PDF support to zathura\n"
 "by using the poppler rendering engine."
 msgstr ""
 
-#: gnu/packages/pdf.scm:362
+#: gnu/packages/pdf.scm:361
 msgid "Lightweight keyboard-driven PDF viewer"
 msgstr ""
 
-#: gnu/packages/pdf.scm:363
+#: gnu/packages/pdf.scm:362
 msgid ""
 "Zathura is a customizable document viewer.  It provides a\n"
 "minimalistic interface and an interface that mainly focuses on keyboard\n"
 "interaction."
 msgstr ""
 
-#: gnu/packages/pdf.scm:402
+#: gnu/packages/pdf.scm:401
 msgid "Tools to work with the PDF file format"
 msgstr ""
 
-#: gnu/packages/pdf.scm:404
+#: gnu/packages/pdf.scm:403
 msgid ""
 "PoDoFo is a C++ library and set of command-line tools to work with the\n"
 "PDF file format.  It can parse PDF files and load them into memory, and makes\n"
@@ -4998,11 +5721,11 @@ msgid ""
 "extracting content or merging files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:465
+#: gnu/packages/pdf.scm:464
 msgid "Lightweight PDF viewer and toolkit"
 msgstr ""
 
-#: gnu/packages/pdf.scm:467
+#: gnu/packages/pdf.scm:466
 msgid ""
 "MuPDF is a C library that implements a PDF and XPS parsing and\n"
 "rendering engine.  It is used primarily to render pages into bitmaps,\n"
@@ -5014,11 +5737,11 @@ msgid ""
 "and examining the file structure (pdfshow)."
 msgstr ""
 
-#: gnu/packages/pdf.scm:507
+#: gnu/packages/pdf.scm:506
 msgid "Command-line tools and library for transforming PDF files"
 msgstr ""
 
-#: gnu/packages/pdf.scm:509
+#: gnu/packages/pdf.scm:508
 msgid ""
 "QPDF is a command-line program that does structural, content-preserving\n"
 "transformations on PDF files.  It could have been called something like\n"
@@ -5027,11 +5750,11 @@ msgid ""
 "program capable of converting PDF into other formats."
 msgstr ""
 
-#: gnu/packages/pdf.scm:539
+#: gnu/packages/pdf.scm:538
 msgid "Notetaking using a stylus"
 msgstr ""
 
-#: gnu/packages/pdf.scm:541
+#: gnu/packages/pdf.scm:540
 msgid ""
 "Xournal is an application for notetaking, sketching, keeping a journal\n"
 "using a stylus."
@@ -5050,31 +5773,31 @@ msgid ""
 "feature."
 msgstr ""
 
-#: gnu/packages/perl.scm:100
+#: gnu/packages/perl.scm:111
 msgid "Implementation of the Perl programming language"
 msgstr ""
 
-#: gnu/packages/perl.scm:102
+#: gnu/packages/perl.scm:113
 msgid ""
 "Perl 5 is a highly capable, feature-rich programming language with over\n"
 "24 years of development."
 msgstr ""
 
-#: gnu/packages/perl.scm:121
+#: gnu/packages/perl.scm:154
 msgid "Module for merging hierarchies using the C3 algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:122
+#: gnu/packages/perl.scm:155
 msgid ""
 "This module implements the C3 algorithm, which aims to\n"
 "provide a sane method resolution order under multiple inheritance."
 msgstr ""
 
-#: gnu/packages/perl.scm:140
+#: gnu/packages/perl.scm:173
 msgid "Compute differences between two files or lists"
 msgstr ""
 
-#: gnu/packages/perl.scm:141
+#: gnu/packages/perl.scm:174
 msgid ""
 "This is a module for computing the difference between two\n"
 "files, two strings, or any other two lists of things.  It uses an intelligent\n"
@@ -5083,11 +5806,11 @@ msgid ""
 "differences."
 msgstr ""
 
-#: gnu/packages/perl.scm:162
+#: gnu/packages/perl.scm:196
 msgid "Use shorter versions of class names"
 msgstr ""
 
-#: gnu/packages/perl.scm:163
+#: gnu/packages/perl.scm:197
 msgid ""
 "The alias module loads the class you specify and exports\n"
 "into your namespace a subroutine that returns the class name.  You can\n"
@@ -5095,31 +5818,31 @@ msgid ""
 "implicitly."
 msgstr ""
 
-#: gnu/packages/perl.scm:185
+#: gnu/packages/perl.scm:219
 msgid "Configuration files and command line parsing"
 msgstr ""
 
-#: gnu/packages/perl.scm:186
+#: gnu/packages/perl.scm:220
 msgid ""
 "AppConfig is a bundle of Perl5 modules for reading\n"
 "configuration files and parsing command line arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:204
+#: gnu/packages/perl.scm:238
 msgid "Perl API to zip files"
 msgstr ""
 
-#: gnu/packages/perl.scm:205 gnu/packages/zip.scm:168
+#: gnu/packages/perl.scm:239 gnu/packages/zip.scm:170
 msgid ""
 "The Archive::Zip module allows a Perl program to create,\n"
 "manipulate, read, and write Zip archive files."
 msgstr ""
 
-#: gnu/packages/perl.scm:224 gnu/packages/perl.scm:3966
+#: gnu/packages/perl.scm:258 gnu/packages/perl.scm:4133
 msgid "Establish an ISA relationship with base classes at compile time"
 msgstr ""
 
-#: gnu/packages/perl.scm:225
+#: gnu/packages/perl.scm:259
 msgid ""
 "Allows you to both load one or more modules, while setting\n"
 "up inheritance from those modules at the same time.  Unless you are using the\n"
@@ -5127,21 +5850,21 @@ msgid ""
 "parent."
 msgstr ""
 
-#: gnu/packages/perl.scm:250
+#: gnu/packages/perl.scm:284
 msgid "Execute code after a scope finished compilation"
 msgstr ""
 
-#: gnu/packages/perl.scm:251
+#: gnu/packages/perl.scm:285
 msgid ""
 "This module allows you to execute code when perl finished\n"
 "compiling the surrounding scope."
 msgstr ""
 
-#: gnu/packages/perl.scm:269
+#: gnu/packages/perl.scm:303
 msgid "Benchmarking with statistical confidence"
 msgstr ""
 
-#: gnu/packages/perl.scm:271
+#: gnu/packages/perl.scm:305
 msgid ""
 "The Benchmark::Timer class allows you to time portions of code\n"
 "conveniently, as well as benchmark code by allowing timings of repeated\n"
@@ -5150,11 +5873,11 @@ msgid ""
 "but don't want to go all out and profile your code."
 msgstr ""
 
-#: gnu/packages/perl.scm:296
+#: gnu/packages/perl.scm:330
 msgid "Bit vector library"
 msgstr ""
 
-#: gnu/packages/perl.scm:297
+#: gnu/packages/perl.scm:331
 msgid ""
 "Bit::Vector is an efficient C library which allows you to\n"
 "handle bit vectors, sets (of integers), \"big integer arithmetic\" and boolean\n"
@@ -5164,21 +5887,21 @@ msgid ""
 "library can nevertheless be used stand-alone, without Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:319
+#: gnu/packages/perl.scm:353
 msgid "Boolean support for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:320
+#: gnu/packages/perl.scm:354
 msgid ""
 "This module provides basic Boolean support, by defining two\n"
 "special objects: true and false."
 msgstr ""
 
-#: gnu/packages/perl.scm:341
+#: gnu/packages/perl.scm:375
 msgid "Cache interface for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:342
+#: gnu/packages/perl.scm:376
 msgid ""
 "The Cache modules are designed to assist a developer in\n"
 "persisting data for a specified period of time.  Often these modules are used\n"
@@ -5189,11 +5912,11 @@ msgid ""
 "easy to use abstraction of the filesystem or shared memory."
 msgstr ""
 
-#: gnu/packages/perl.scm:365
+#: gnu/packages/perl.scm:399
 msgid "Shared memory interprocess cache via mmap"
 msgstr ""
 
-#: gnu/packages/perl.scm:366
+#: gnu/packages/perl.scm:400
 msgid ""
 "A shared memory cache through an mmap'ed file.  It's core is\n"
 "written in C for performance.  It uses fcntl locking to ensure multiple\n"
@@ -5201,11 +5924,11 @@ msgid ""
 "algorithm to keep the most used entries in the cache."
 msgstr ""
 
-#: gnu/packages/perl.scm:387
+#: gnu/packages/perl.scm:421
 msgid "Capture STDOUT and STDERR from Perl, XS or external programs"
 msgstr ""
 
-#: gnu/packages/perl.scm:389
+#: gnu/packages/perl.scm:423
 msgid ""
 "Capture::Tiny provides a simple, portable way to capture almost anything\n"
 "sent to STDOUT or STDERR, regardless of whether it comes from Perl, from XS\n"
@@ -5213,31 +5936,31 @@ msgid ""
 "is captured while being passed through to the original file handles."
 msgstr ""
 
-#: gnu/packages/perl.scm:409
+#: gnu/packages/perl.scm:443
 msgid "Executable comments for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:410
+#: gnu/packages/perl.scm:444
 msgid ""
 "Carp::Assert is intended for a purpose like the ANSI C\n"
 "library assert.h."
 msgstr ""
 
-#: gnu/packages/perl.scm:432
+#: gnu/packages/perl.scm:466
 msgid "Convenience wrappers around Carp::Assert"
 msgstr ""
 
-#: gnu/packages/perl.scm:433
+#: gnu/packages/perl.scm:467
 msgid ""
 "Carp::Assert::More is a set of handy assertion functions for\n"
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:453
+#: gnu/packages/perl.scm:487
 msgid "Report errors from a \"clan\" of modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:454
+#: gnu/packages/perl.scm:488
 msgid ""
 "This module allows errors from a clan (or family) of modules\n"
 "to appear to originate from the caller of the clan.  This is necessary in\n"
@@ -5245,21 +5968,21 @@ msgid ""
 "the Carp.pm module doesn't help."
 msgstr ""
 
-#: gnu/packages/perl.scm:478
+#: gnu/packages/perl.scm:512
 msgid "Automated accessor generation"
 msgstr ""
 
-#: gnu/packages/perl.scm:479
+#: gnu/packages/perl.scm:513
 msgid ""
 "This module automagically generates accessors/mutators for\n"
 "your class."
 msgstr ""
 
-#: gnu/packages/perl.scm:499
+#: gnu/packages/perl.scm:535
 msgid "Faster, but less expandable, chained accessors"
 msgstr ""
 
-#: gnu/packages/perl.scm:500
+#: gnu/packages/perl.scm:536
 msgid ""
 "A chained accessor is one that always returns the object\n"
 "when called with parameters (to set), and the value of the field when called\n"
@@ -5267,52 +5990,52 @@ msgid ""
 "the same mk_accessors interface."
 msgstr ""
 
-#: gnu/packages/perl.scm:526
+#: gnu/packages/perl.scm:562
 msgid "Build groups of accessors"
 msgstr ""
 
-#: gnu/packages/perl.scm:527
+#: gnu/packages/perl.scm:563
 msgid ""
 "This class lets you build groups of accessors that will call\n"
 "different getters and setters."
 msgstr ""
 
-#: gnu/packages/perl.scm:547
+#: gnu/packages/perl.scm:583
 msgid "Pragma to use the C3 method resolution order algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:548
+#: gnu/packages/perl.scm:584
 msgid ""
 "This is pragma to change Perl 5's standard method resolution\n"
 "order from depth-first left-to-right (a.k.a - pre-order) to the more\n"
 "sophisticated C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:572
+#: gnu/packages/perl.scm:608
 msgid "Drop-in replacement for NEXT"
 msgstr ""
 
-#: gnu/packages/perl.scm:573
+#: gnu/packages/perl.scm:609
 msgid ""
 "This module is intended as a drop-in replacement for NEXT,\n"
 "supporting the same interface, but using Class::C3 to do the hard work."
 msgstr ""
 
-#: gnu/packages/perl.scm:597
+#: gnu/packages/perl.scm:633
 msgid "Load mix-ins or components to your C3-based class"
 msgstr ""
 
-#: gnu/packages/perl.scm:598
+#: gnu/packages/perl.scm:634
 msgid ""
 "This module will inject base classes to your module using\n"
 "the Class::C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:616
+#: gnu/packages/perl.scm:652
 msgid "Inheritable, overridable class data"
 msgstr ""
 
-#: gnu/packages/perl.scm:617
+#: gnu/packages/perl.scm:653
 msgid ""
 "Class::Data::Inheritable is for creating accessor/mutators\n"
 "to class data.  That is, if you want to store something about your class as a\n"
@@ -5320,70 +6043,70 @@ msgid ""
 "subclasses and can be overridden."
 msgstr ""
 
-#: gnu/packages/perl.scm:638
+#: gnu/packages/perl.scm:674
 msgid "Class for easy date and time manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:639
+#: gnu/packages/perl.scm:675
 msgid ""
 "This module provides a general-purpose date and datetime\n"
 "type for perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:657
+#: gnu/packages/perl.scm:694
 msgid "Utility methods for factory classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:658
+#: gnu/packages/perl.scm:695
 msgid "This module exports methods useful for factory classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:675
+#: gnu/packages/perl.scm:712
 msgid "Get information about a class and its structure"
 msgstr ""
 
-#: gnu/packages/perl.scm:676
+#: gnu/packages/perl.scm:713
 msgid ""
 "Class::Inspector allows you to get information about a\n"
 "loaded class."
 msgstr ""
 
-#: gnu/packages/perl.scm:704
+#: gnu/packages/perl.scm:741
 msgid "Working (require \"Class::Name\") and more"
 msgstr ""
 
-#: gnu/packages/perl.scm:705
+#: gnu/packages/perl.scm:742
 msgid ""
 "\"require EXPR\" only accepts Class/Name.pm style module\n"
 "names, not Class::Name.  For that, this module provides \"load_class\n"
 "'Class::Name'\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:728
+#: gnu/packages/perl.scm:765
 msgid "XS implementation of parts of Class::Load"
 msgstr ""
 
-#: gnu/packages/perl.scm:729
+#: gnu/packages/perl.scm:766
 msgid ""
 "This module provides an XS implementation for portions of\n"
 "Class::Load."
 msgstr ""
 
-#: gnu/packages/perl.scm:748
+#: gnu/packages/perl.scm:785
 msgid "Create generic methods for OO Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:749
+#: gnu/packages/perl.scm:786
 msgid ""
 "This module solves the problem of having to continually\n"
 "write accessor methods for your objects that perform standard tasks."
 msgstr ""
 
-#: gnu/packages/perl.scm:770
+#: gnu/packages/perl.scm:807
 msgid "Moose-like method modifiers"
 msgstr ""
 
-#: gnu/packages/perl.scm:771
+#: gnu/packages/perl.scm:808
 msgid ""
 "Class::Method::Modifiers provides three modifiers: 'before',\n"
 "'around', and 'after'.  'before' and 'after' are run just before and after the\n"
@@ -5392,42 +6115,42 @@ msgid ""
 "original method."
 msgstr ""
 
-#: gnu/packages/perl.scm:792
+#: gnu/packages/perl.scm:829
 msgid "Implementation of a singleton class for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:793
+#: gnu/packages/perl.scm:830
 msgid ""
 "This module implements a Singleton class from which other\n"
 "classes can be derived.  By itself, the Class::Singleton module does very\n"
 "little other than manage the instantiation of a single object."
 msgstr ""
 
-#: gnu/packages/perl.scm:812
+#: gnu/packages/perl.scm:849
 msgid "Minimalist class construction"
 msgstr ""
 
-#: gnu/packages/perl.scm:813
+#: gnu/packages/perl.scm:850
 msgid ""
 "This module offers a minimalist class construction kit.  It\n"
 "uses no non-core modules for any recent Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:833
+#: gnu/packages/perl.scm:870
 msgid "Unload a class"
 msgstr ""
 
-#: gnu/packages/perl.scm:834
+#: gnu/packages/perl.scm:871
 msgid ""
 "Class:Unload unloads a given class by clearing out its\n"
 "symbol table and removing it from %INC."
 msgstr ""
 
-#: gnu/packages/perl.scm:852
+#: gnu/packages/perl.scm:889
 msgid "Generate fast XS accessors without runtime compilation"
 msgstr ""
 
-#: gnu/packages/perl.scm:853
+#: gnu/packages/perl.scm:890
 msgid ""
 "Class::XSAccessor implements fast read, write, and\n"
 "read/write accessors in XS.  Additionally, it can provide predicates such as\n"
@@ -5437,53 +6160,53 @@ msgid ""
 "arrays for their internal representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:873
+#: gnu/packages/perl.scm:910
 msgid "Recursively copy Perl datatypes"
 msgstr ""
 
-#: gnu/packages/perl.scm:875
+#: gnu/packages/perl.scm:912
 msgid ""
 "This module provides a clone() method which makes recursive copies of\n"
 "nested hash, array, scalar and reference types, including tied variables and\n"
 "objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:896
+#: gnu/packages/perl.scm:933
 msgid "Sane defaults for Perl programs"
 msgstr ""
 
-#: gnu/packages/perl.scm:897
+#: gnu/packages/perl.scm:934
 msgid ""
 "This module implements some sane defaults for Perl programs,\n"
 "as defined by two typical specimens of Perl coders."
 msgstr ""
 
-#: gnu/packages/perl.scm:915
+#: gnu/packages/perl.scm:954
 msgid "Load configuration from different file formats"
 msgstr ""
 
-#: gnu/packages/perl.scm:916
+#: gnu/packages/perl.scm:955
 msgid ""
 "Config::Any provides a facility for Perl applications and\n"
 "libraries to load configuration data from multiple different file formats.  It\n"
 "supports XML, YAML, JSON, Apache-style configuration, and Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:937
+#: gnu/packages/perl.scm:976
 msgid "Module to implement some AutoConf macros in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:938
+#: gnu/packages/perl.scm:977
 msgid ""
 "Config::AutoConf is intended to provide the same\n"
 "opportunities to Perl developers as GNU Autoconf does for Shell developers."
 msgstr ""
 
-#: gnu/packages/perl.scm:956
+#: gnu/packages/perl.scm:995
 msgid "Generic Config Module"
 msgstr ""
 
-#: gnu/packages/perl.scm:957
+#: gnu/packages/perl.scm:996
 msgid ""
 "This module opens a config file and parses its contents for\n"
 "you.  The format of config files supported by Config::General is inspired by\n"
@@ -5494,42 +6217,42 @@ msgid ""
 "options."
 msgstr ""
 
-#: gnu/packages/perl.scm:983
+#: gnu/packages/perl.scm:1022
 msgid "Preserve context during subroutine call"
 msgstr ""
 
-#: gnu/packages/perl.scm:984
+#: gnu/packages/perl.scm:1023
 msgid ""
 "This module runs code after a subroutine call, preserving\n"
 "the context the subroutine would have seen if it were the last statement in\n"
 "the caller."
 msgstr ""
 
-#: gnu/packages/perl.scm:1005
+#: gnu/packages/perl.scm:1044
 msgid "Verify requirements in a CPAN::Meta object"
 msgstr ""
 
-#: gnu/packages/perl.scm:1006
+#: gnu/packages/perl.scm:1045
 msgid ""
 "This module verifies if requirements described in a\n"
 "CPAN::Meta object are present."
 msgstr ""
 
-#: gnu/packages/perl.scm:1026
+#: gnu/packages/perl.scm:1065
 msgid "JSON::XS for Cpanel"
 msgstr ""
 
-#: gnu/packages/perl.scm:1027 gnu/packages/perl.scm:2769
+#: gnu/packages/perl.scm:1066 gnu/packages/perl.scm:2841
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa."
 msgstr ""
 
-#: gnu/packages/perl.scm:1045
+#: gnu/packages/perl.scm:1084
 msgid "Random password generator"
 msgstr ""
 
-#: gnu/packages/perl.scm:1046
+#: gnu/packages/perl.scm:1085
 msgid ""
 "Crypt::RandPasswd provides three functions that can be used\n"
 "to generate random passwords, constructed from words, letters, or characters.\n"
@@ -5540,51 +6263,51 @@ msgid ""
 "Password Generator\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1089
+#: gnu/packages/perl.scm:1128
 msgid "Library for genomic analysis"
 msgstr ""
 
-#: gnu/packages/perl.scm:1090
+#: gnu/packages/perl.scm:1129
 msgid ""
 "Chaolin Zhang's Perl Library (czplib) contains assorted\n"
 "functions and data structures for processing and analysing genomic and\n"
 "bioinformatics data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1109
+#: gnu/packages/perl.scm:1148
 msgid "Pretty printing of data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1110
+#: gnu/packages/perl.scm:1149
 msgid ""
 "This module provide functions that takes a list of values as\n"
 "their argument and produces a string as its result.  The string contains Perl\n"
 "code that, when \"eval\"ed, produces a deep copy of the original arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:1129
+#: gnu/packages/perl.scm:1168
 msgid "Concise data dumper"
 msgstr ""
 
-#: gnu/packages/perl.scm:1130
+#: gnu/packages/perl.scm:1169
 msgid ""
 "Data::Dumper::Concise provides a dumper with Less\n"
 "indentation and newlines plus sub deparsing."
 msgstr ""
 
-#: gnu/packages/perl.scm:1152
+#: gnu/packages/perl.scm:1191
 msgid "Parse and validate simple name/value option pairs"
 msgstr ""
 
-#: gnu/packages/perl.scm:1154
+#: gnu/packages/perl.scm:1193
 msgid "Data::OptList provides a simple syntax for name/value option pairs."
 msgstr ""
 
-#: gnu/packages/perl.scm:1175
+#: gnu/packages/perl.scm:1215
 msgid "Help when paging through sets of results"
 msgstr ""
 
-#: gnu/packages/perl.scm:1176
+#: gnu/packages/perl.scm:1216
 msgid ""
 "When searching through large amounts of data, it is often\n"
 "the case that a result set is returned that is larger than we want to display\n"
@@ -5592,11 +6315,11 @@ msgid ""
 "The maths behind this is unfortunately fiddly, hence this module."
 msgstr ""
 
-#: gnu/packages/perl.scm:1198
+#: gnu/packages/perl.scm:1238
 msgid "Structured tags datastructures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1200
+#: gnu/packages/perl.scm:1240
 msgid ""
 "This module is for manipulating data as hierarchical tag/value\n"
 "pairs (Structured TAGs or Simple Tree AGgregates).  These datastructures can\n"
@@ -5604,11 +6327,11 @@ msgid ""
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1227
+#: gnu/packages/perl.scm:1267
 msgid "N at a time iteration API"
 msgstr ""
 
-#: gnu/packages/perl.scm:1228
+#: gnu/packages/perl.scm:1268
 msgid ""
 "This module tries to find middle ground between one at a\n"
 "time and all at once processing of data sets.  The purpose of this module is\n"
@@ -5617,21 +6340,21 @@ msgid ""
 "necessary later on."
 msgstr ""
 
-#: gnu/packages/perl.scm:1253
+#: gnu/packages/perl.scm:1293
 msgid "Dynamic generation of nested combinations of variants"
 msgstr ""
 
-#: gnu/packages/perl.scm:1254
+#: gnu/packages/perl.scm:1294
 msgid ""
 "Data::Tumbler - Dynamic generation of nested combinations of\n"
 "variants."
 msgstr ""
 
-#: gnu/packages/perl.scm:1280
+#: gnu/packages/perl.scm:1320
 msgid "Visitor style traversal of Perl data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1281
+#: gnu/packages/perl.scm:1321
 msgid ""
 "This module is a simple visitor implementation for Perl\n"
 "values.  It has a main dispatcher method, visit, which takes a single perl\n"
@@ -5641,11 +6364,11 @@ msgid ""
 "structures, and all ref types (hashes, arrays, scalars, code, globs)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1306
+#: gnu/packages/perl.scm:1346
 msgid "Gregorian calendar date calculations"
 msgstr ""
 
-#: gnu/packages/perl.scm:1307
+#: gnu/packages/perl.scm:1347
 msgid ""
 "This package consists of a Perl module for date calculations\n"
 "based on the Gregorian calendar, thereby complying with all relevant norms and\n"
@@ -5653,43 +6376,43 @@ msgid ""
 "applicable)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1331
+#: gnu/packages/perl.scm:1371
 msgid "XS wrapper for Date::Calc"
 msgstr ""
 
-#: gnu/packages/perl.scm:1332
+#: gnu/packages/perl.scm:1372
 msgid ""
 "Date::Calc::XS is an XS wrapper and C library plug-in for\n"
 "Date::Calc."
 msgstr ""
 
-#: gnu/packages/perl.scm:1355
+#: gnu/packages/perl.scm:1396
 msgid "Date manipulation routines"
 msgstr ""
 
-#: gnu/packages/perl.scm:1356
+#: gnu/packages/perl.scm:1397
 msgid ""
 "Date::Manip is a series of modules for common date/time\n"
 "operations, such as comparing two times, determining a date a given amount of\n"
 "time from another, or parsing international times."
 msgstr ""
 
-#: gnu/packages/perl.scm:1383
+#: gnu/packages/perl.scm:1425
 msgid "Date and time object for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1384
+#: gnu/packages/perl.scm:1426
 msgid ""
 "DateTime is a class for the representation of date/time\n"
 "combinations.  It represents the Gregorian calendar, extended backwards in\n"
 "time before its creation (in 1582)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1407
+#: gnu/packages/perl.scm:1451
 msgid "DateTime set objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:1408
+#: gnu/packages/perl.scm:1452
 msgid ""
 "The DateTime::Set module provides a date/time sets\n"
 "implementation.  It allows, for example, the generation of groups of dates,\n"
@@ -5697,21 +6420,21 @@ msgid ""
 "within a time range."
 msgstr ""
 
-#: gnu/packages/perl.scm:1431
+#: gnu/packages/perl.scm:1475
 msgid "DateTime rfc2445 recurrences"
 msgstr ""
 
-#: gnu/packages/perl.scm:1432
+#: gnu/packages/perl.scm:1476
 msgid ""
 "This module provides convenience methods that let you easily\n"
 "create DateTime::Set objects for RFC 2445 style recurrences."
 msgstr ""
 
-#: gnu/packages/perl.scm:1453
+#: gnu/packages/perl.scm:1497
 msgid "DateTime::Set extension for basic recurrences"
 msgstr ""
 
-#: gnu/packages/perl.scm:1454
+#: gnu/packages/perl.scm:1498
 msgid ""
 "This module provides convenience methods that let you easily\n"
 "create DateTime::Set objects for various recurrences, such as \"once a month\"\n"
@@ -5719,11 +6442,11 @@ msgid ""
 "\"every Monday, Wednesday and Thursday at 10:00 AM and 2:00 PM\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1479
+#: gnu/packages/perl.scm:1523
 msgid "Create DateTime parser classes and objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:1480
+#: gnu/packages/perl.scm:1524
 msgid ""
 "DateTime::Format::Builder creates DateTime parsers.  Many\n"
 "string formats of dates and times are simple and just require a basic regular\n"
@@ -5731,43 +6454,43 @@ msgid ""
 "to do this without writing reams of structural code."
 msgstr ""
 
-#: gnu/packages/perl.scm:1506
+#: gnu/packages/perl.scm:1551
 msgid "Parse data/time strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:1507
+#: gnu/packages/perl.scm:1552
 msgid ""
 "DateTime::Format::Flexible attempts to take any string you\n"
 "give it and parse it into a DateTime object."
 msgstr ""
 
-#: gnu/packages/perl.scm:1531
+#: gnu/packages/perl.scm:1578
 msgid "Parse and format iCal datetime and duration strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:1532
+#: gnu/packages/perl.scm:1579
 msgid ""
 "This module understands the ICal date/time and duration\n"
 "formats, as defined in RFC 2445.  It can be used to parse these formats in\n"
 "order to create the appropriate objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:1563
+#: gnu/packages/perl.scm:1611
 msgid "Machine-readable date/time with natural parsing"
 msgstr ""
 
-#: gnu/packages/perl.scm:1564
+#: gnu/packages/perl.scm:1612
 msgid ""
 "DateTime::Format::Natural takes a string with a human\n"
 "readable date/time and creates a machine readable one by applying natural\n"
 "parsing logic."
 msgstr ""
 
-#: gnu/packages/perl.scm:1588
+#: gnu/packages/perl.scm:1636
 msgid "Parse and format strp and strf time patterns"
 msgstr ""
 
-#: gnu/packages/perl.scm:1589
+#: gnu/packages/perl.scm:1637
 msgid ""
 "This module implements most of `strptime(3)`, the POSIX\n"
 "function that is the reverse of `strftime(3)`, for `DateTime`.  While\n"
@@ -5775,21 +6498,21 @@ msgid ""
 "takes a string and a pattern and returns the `DateTime` object associated."
 msgstr ""
 
-#: gnu/packages/perl.scm:1612
+#: gnu/packages/perl.scm:1662
 msgid "Localization support for DateTime.pm"
 msgstr ""
 
-#: gnu/packages/perl.scm:1613
+#: gnu/packages/perl.scm:1663
 msgid ""
 "The DateTime::Locale modules provide localization data for\n"
 "the DateTime.pm class."
 msgstr ""
 
-#: gnu/packages/perl.scm:1640
+#: gnu/packages/perl.scm:1690
 msgid "Time zone object for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1641
+#: gnu/packages/perl.scm:1691
 msgid ""
 "This class is the base class for all time zone objects.  A\n"
 "time zone is represented internally as a set of observances, each of which\n"
@@ -5799,81 +6522,81 @@ msgid ""
 "DateTime::TimeZone methods."
 msgstr ""
 
-#: gnu/packages/perl.scm:1671
+#: gnu/packages/perl.scm:1721
 msgid "Parse date/time strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:1672
+#: gnu/packages/perl.scm:1722
 msgid ""
 "DateTimeX::Easy uses a variety of DateTime::Format packages\n"
 "to create DateTime objects, with some custom tweaks to smooth out the rough\n"
 "edges (mainly concerning timezone detection and selection)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1693
+#: gnu/packages/perl.scm:1743
 msgid "Meatier version of caller"
 msgstr ""
 
-#: gnu/packages/perl.scm:1694
+#: gnu/packages/perl.scm:1744
 msgid "Devel::Caller provides meatier version of caller."
 msgstr ""
 
-#: gnu/packages/perl.scm:1711
+#: gnu/packages/perl.scm:1762
 msgid "Check that a command is available"
 msgstr ""
 
-#: gnu/packages/perl.scm:1712
+#: gnu/packages/perl.scm:1763
 msgid ""
 "Devel::CheckBin is a perl module that checks whether a\n"
 "particular command is available."
 msgstr ""
 
-#: gnu/packages/perl.scm:1732
+#: gnu/packages/perl.scm:1783
 msgid "Provides equivalent of ${^GLOBAL_PHASE} eq 'DESTRUCT' for older perls"
 msgstr ""
 
-#: gnu/packages/perl.scm:1733
+#: gnu/packages/perl.scm:1784
 msgid ""
 "Devel::GlobalDestruction provides a function returning the\n"
 "equivalent of \"$@{^GLOBAL_PHASE@} eq 'DESTRUCT'\" for older perls."
 msgstr ""
 
-#: gnu/packages/perl.scm:1753
+#: gnu/packages/perl.scm:1804
 msgid "Alias lexical variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:1754
+#: gnu/packages/perl.scm:1805
 msgid ""
 "Devel::LexAlias provides the ability to alias a lexical\n"
 "variable in a subroutines scope to one of your choosing."
 msgstr ""
 
-#: gnu/packages/perl.scm:1776
+#: gnu/packages/perl.scm:1827
 msgid "Introspect overloaded operators"
 msgstr ""
 
-#: gnu/packages/perl.scm:1777
+#: gnu/packages/perl.scm:1828
 msgid ""
 "Devel::OverloadInfo returns information about overloaded\n"
 "operators for a given class (or object), including where in the inheritance\n"
 "hierarchy the overloads are declared and where the code implementing it is."
 msgstr ""
 
-#: gnu/packages/perl.scm:1804
+#: gnu/packages/perl.scm:1855
 msgid "Partial dumping of data structures"
 msgstr ""
 
-#: gnu/packages/perl.scm:1805
+#: gnu/packages/perl.scm:1856
 msgid ""
 "This module is a data dumper optimized for logging of\n"
 "arbitrary parameters."
 msgstr ""
 
-#: gnu/packages/perl.scm:1823
+#: gnu/packages/perl.scm:1874
 msgid "Object representing a stack trace"
 msgstr ""
 
-#: gnu/packages/perl.scm:1824
+#: gnu/packages/perl.scm:1875
 msgid ""
 "The Devel::StackTrace module contains two classes,\n"
 "Devel::StackTrace and Devel::StackTrace::Frame.  These objects encapsulate the\n"
@@ -5881,11 +6604,11 @@ msgid ""
 "providing a simple interface to this data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1846
+#: gnu/packages/perl.scm:1897
 msgid "Displays stack trace in HTML"
 msgstr ""
 
-#: gnu/packages/perl.scm:1847
+#: gnu/packages/perl.scm:1898
 msgid ""
 "Devel::StackTrace::AsHTML adds as_html method to\n"
 "Devel::StackTrace which displays the stack trace in beautiful HTML, with code\n"
@@ -5894,49 +6617,49 @@ msgid ""
 "each stack frame."
 msgstr ""
 
-#: gnu/packages/perl.scm:1868
+#: gnu/packages/perl.scm:1919
 msgid "Dump symbol names or the symbol table"
 msgstr ""
 
-#: gnu/packages/perl.scm:1869
+#: gnu/packages/perl.scm:1920
 msgid "Devel::Symdump provides access to the perl symbol table."
 msgstr ""
 
-#: gnu/packages/perl.scm:1886
+#: gnu/packages/perl.scm:1937
 msgid "Keyed-Hashing for Message Authentication"
 msgstr ""
 
-#: gnu/packages/perl.scm:1887
+#: gnu/packages/perl.scm:1938
 msgid ""
 "The Digest::HMAC module follows the common Digest::\n"
 "interface for the RFC 2104 HMAC mechanism."
 msgstr ""
 
-#: gnu/packages/perl.scm:1903
+#: gnu/packages/perl.scm:1954
 msgid "Perl implementation of the SHA-1 message digest algorithm"
 msgstr ""
 
-#: gnu/packages/perl.scm:1905
+#: gnu/packages/perl.scm:1956
 msgid ""
 "This package provides 'Digest::SHA1', an implementation of the NIST\n"
 "SHA-1 message digest algorithm for use by Perl programs."
 msgstr ""
 
-#: gnu/packages/perl.scm:1927
+#: gnu/packages/perl.scm:1978
 msgid "Declare version conflicts for your dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:1928
+#: gnu/packages/perl.scm:1979
 msgid ""
 "This module allows you to specify conflicting versions of\n"
 "modules separately and deal with them after the module is done installing."
 msgstr ""
 
-#: gnu/packages/perl.scm:1945
+#: gnu/packages/perl.scm:1997
 msgid "OO-ish Error/Exception handling for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:1946
+#: gnu/packages/perl.scm:1998
 msgid ""
 "The Error package provides two interfaces.  Firstly Error\n"
 "provides a procedural interface to exception handling.  Secondly Error is a\n"
@@ -5944,11 +6667,11 @@ msgid ""
 "catch, or can simply be recorded."
 msgstr ""
 
-#: gnu/packages/perl.scm:1971
+#: gnu/packages/perl.scm:2023
 msgid "Safely and cleanly create closures via string eval"
 msgstr ""
 
-#: gnu/packages/perl.scm:1972
+#: gnu/packages/perl.scm:2024
 msgid ""
 "String eval is often used for dynamic code generation.  For\n"
 "instance, Moose uses it heavily, to generate inlined versions of accessors and\n"
@@ -5962,32 +6685,32 @@ msgid ""
 "errors are rethrown automatically."
 msgstr ""
 
-#: gnu/packages/perl.scm:2001
+#: gnu/packages/perl.scm:2053
 msgid "Allows you to declare real exception classes in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2002
+#: gnu/packages/perl.scm:2054
 msgid ""
 "Exception::Class allows you to declare exception hierarchies\n"
 "in your modules in a \"Java-esque\" manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:2018
+#: gnu/packages/perl.scm:2070
 msgid "Lightweight exporting of functions and variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:2020
+#: gnu/packages/perl.scm:2072
 msgid ""
 "Exporter::Lite is an alternative to Exporter, intended to provide a\n"
 "lightweight subset of the most commonly-used functionality.  It supports\n"
 "import(), @@EXPORT and @@EXPORT_OK and not a whole lot else."
 msgstr ""
 
-#: gnu/packages/perl.scm:2041
+#: gnu/packages/perl.scm:2093
 msgid "Exporter with the features of Sub::Exporter but only core dependencies"
 msgstr ""
 
-#: gnu/packages/perl.scm:2042
+#: gnu/packages/perl.scm:2094
 msgid ""
 "Exporter::Tiny supports many of Sub::Exporter's\n"
 "external-facing features including renaming imported functions with the `-as`,\n"
@@ -5996,85 +6719,85 @@ msgid ""
 "only about 40% as many lines of code and with zero non-core dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:2065
+#: gnu/packages/perl.scm:2117
 msgid "Build.PL install path logic made easy"
 msgstr ""
 
-#: gnu/packages/perl.scm:2066
+#: gnu/packages/perl.scm:2118
 msgid ""
 "This module tries to make install path resolution as easy as\n"
 "possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:2084
+#: gnu/packages/perl.scm:2136
 msgid "Wrapper for perl's configuration"
 msgstr ""
 
-#: gnu/packages/perl.scm:2085
+#: gnu/packages/perl.scm:2137
 msgid ""
 "ExtUtils::Config is an abstraction around the %Config hash.\n"
 "By itself it is not a particularly interesting module by any measure, however\n"
 "it ties together a family of modern toolchain modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:2104
+#: gnu/packages/perl.scm:2156
 msgid "Various portability utilities for module builders"
 msgstr ""
 
-#: gnu/packages/perl.scm:2105
+#: gnu/packages/perl.scm:2157
 msgid ""
 "This module provides various portable helper functions for\n"
 "module building modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:2133
+#: gnu/packages/perl.scm:2187
 msgid "Watch for changes to files"
 msgstr ""
 
-#: gnu/packages/perl.scm:2134
+#: gnu/packages/perl.scm:2188
 msgid ""
 "This module provides a class to monitor a directory for\n"
 "changes made to any file."
 msgstr ""
 
-#: gnu/packages/perl.scm:2152
+#: gnu/packages/perl.scm:2206
 msgid "Recursively copy files and directories"
 msgstr ""
 
-#: gnu/packages/perl.scm:2153
+#: gnu/packages/perl.scm:2207
 msgid ""
 "This module has 3 functions: one to copy files only, one to\n"
 "copy directories only, and one to do either depending on the argument's\n"
 "type."
 msgstr ""
 
-#: gnu/packages/perl.scm:2175
+#: gnu/packages/perl.scm:2229
 msgid "Alternative interface to File::Find"
 msgstr ""
 
-#: gnu/packages/perl.scm:2176
+#: gnu/packages/perl.scm:2230
 msgid ""
 "File::Find::Rule is a friendlier interface to File::Find.\n"
 "It allows you to build rules which specify the desired files and\n"
 "directories."
 msgstr ""
 
-#: gnu/packages/perl.scm:2199
+#: gnu/packages/perl.scm:2253
 msgid "Common rules for searching for Perl things"
 msgstr ""
 
-#: gnu/packages/perl.scm:2200
+#: gnu/packages/perl.scm:2254
 msgid ""
 "File::Find::Rule::Perl provides methods for finding various\n"
 "types Perl-related files, or replicating search queries run on a distribution\n"
 "in various parts of the CPAN ecosystem."
 msgstr ""
 
-#: gnu/packages/perl.scm:2223
+#: gnu/packages/perl.scm:2277
 msgid "Find your home and other directories on any platform"
 msgstr ""
 
-#: gnu/packages/perl.scm:2224
+#: gnu/packages/perl.scm:2278
 msgid ""
 "File::HomeDir is a module for locating the directories that\n"
 "are \"owned\" by a user (typically your user) and to solve the various issues\n"
@@ -6082,24 +6805,24 @@ msgid ""
 "platforms."
 msgstr ""
 
-#: gnu/packages/perl.scm:2251
+#: gnu/packages/perl.scm:2305
 msgid ""
 "Perl extension for crawling directory trees and compiling\n"
 "lists of files"
 msgstr ""
 
-#: gnu/packages/perl.scm:2254
+#: gnu/packages/perl.scm:2308
 msgid ""
 "The File::List module crawls the directory tree starting at the\n"
 "provided base directory and can return files (and/or directories if desired)\n"
 "matching a regular expression."
 msgstr ""
 
-#: gnu/packages/perl.scm:2273
+#: gnu/packages/perl.scm:2327
 msgid "Remove files and directories in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2274
+#: gnu/packages/perl.scm:2328
 msgid ""
 "File::Remove::remove removes files and directories.  It acts\n"
 "like /bin/rm, for the most part.  Although \"unlink\" can be given a list of\n"
@@ -6107,11 +6830,11 @@ msgid ""
 "accepts wildcards, * and ?, as arguments for file names."
 msgstr ""
 
-#: gnu/packages/perl.scm:2298
+#: gnu/packages/perl.scm:2352
 msgid "Locate per-dist and per-module shared files"
 msgstr ""
 
-#: gnu/packages/perl.scm:2299
+#: gnu/packages/perl.scm:2353
 msgid ""
 "The intent of File::ShareDir is to provide a companion to\n"
 "Class::Inspector and File::HomeDir.  Quite often you want or need your Perl\n"
@@ -6121,54 +6844,62 @@ msgid ""
 "the installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:2321
+#: gnu/packages/perl.scm:2375
 msgid "Install shared files"
 msgstr ""
 
-#: gnu/packages/perl.scm:2322
+#: gnu/packages/perl.scm:2376
 msgid ""
 "File::ShareDir::Install allows you to install read-only data\n"
 "files from a distribution.  It is a companion module to File::ShareDir, which\n"
 "allows you to locate these files after installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:2341
+#: gnu/packages/perl.scm:2395
 msgid "Reading/Writing/Modifying of complete files"
 msgstr ""
 
-#: gnu/packages/perl.scm:2342
+#: gnu/packages/perl.scm:2396
 msgid ""
 "File::Slurp provides subroutines to read or write entire\n"
 "files with a simple call.  It also has a subroutine for reading the list of\n"
 "file names in a directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:2363
+#: gnu/packages/perl.scm:2414
+msgid "Simple file reader and writer"
+msgstr ""
+
+#: gnu/packages/perl.scm:2416
+msgid "This module provides functions for fast reading and writing of files."
+msgstr ""
+
+#: gnu/packages/perl.scm:2435
 msgid "Return name and handle of a temporary file safely"
 msgstr ""
 
-#: gnu/packages/perl.scm:2364
+#: gnu/packages/perl.scm:2436
 msgid ""
 "File::Temp can be used to create and open temporary files in\n"
 "a safe way."
 msgstr ""
 
-#: gnu/packages/perl.scm:2381
+#: gnu/packages/perl.scm:2453
 msgid "Portable implementation of the `which' utility"
 msgstr ""
 
-#: gnu/packages/perl.scm:2383
+#: gnu/packages/perl.scm:2455
 msgid ""
 "File::Which was created to be able to get the paths to executable\n"
 "programs on systems under which the `which' program wasn't implemented in the\n"
 "shell."
 msgstr ""
 
-#: gnu/packages/perl.scm:2410
+#: gnu/packages/perl.scm:2482
 msgid "Getopt::Long, but simpler and more powerful"
 msgstr ""
 
-#: gnu/packages/perl.scm:2411
+#: gnu/packages/perl.scm:2483
 msgid ""
 "Getopt::Long::Descriptive is yet another Getopt library.\n"
 "It's built atop Getopt::Long, and gets a lot of its features, but tries to\n"
@@ -6176,21 +6907,21 @@ msgid ""
 "usage (help) messages, data validation, and a few other useful features."
 msgstr ""
 
-#: gnu/packages/perl.scm:2429
+#: gnu/packages/perl.scm:2501
 msgid "Table-driven argument parsing for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2431
+#: gnu/packages/perl.scm:2503
 msgid ""
 "Getopt::Tabular is a Perl 5 module for table-driven argument parsing,\n"
 "vaguely inspired by John Ousterhout's Tk_ParseArgv."
 msgstr ""
 
-#: gnu/packages/perl.scm:2451
+#: gnu/packages/perl.scm:2523
 msgid "Merge arbitrarily deep hashes into a single hash"
 msgstr ""
 
-#: gnu/packages/perl.scm:2452
+#: gnu/packages/perl.scm:2524
 msgid ""
 "Hash::Merge merges two arbitrarily deep hashes into a single\n"
 "hash.  That is, at any level, it will add non-conflicting key-value pairs from\n"
@@ -6200,21 +6931,21 @@ msgid ""
 "merged."
 msgstr ""
 
-#: gnu/packages/perl.scm:2474
+#: gnu/packages/perl.scm:2546
 msgid "Store multiple values per key"
 msgstr ""
 
-#: gnu/packages/perl.scm:2475
+#: gnu/packages/perl.scm:2547
 msgid ""
 "Hash::MultiValue is an object (and a plain hash reference)\n"
 "that may contain multiple values per key, inspired by MultiDict of WebOb."
 msgstr ""
 
-#: gnu/packages/perl.scm:2495
+#: gnu/packages/perl.scm:2567
 msgid "Import packages into other packages"
 msgstr ""
 
-#: gnu/packages/perl.scm:2496
+#: gnu/packages/perl.scm:2568
 msgid ""
 "Writing exporters is a pain.  Some use Exporter, some use\n"
 "Sub::Exporter, some use Moose::Exporter, some use Exporter::Declare ... and\n"
@@ -6224,64 +6955,64 @@ msgid ""
 "compilation.  Import::Into provides global methods to make this painless."
 msgstr ""
 
-#: gnu/packages/perl.scm:2518
+#: gnu/packages/perl.scm:2590
 msgid "Use modules in inc/ if newer than installed"
 msgstr ""
 
-#: gnu/packages/perl.scm:2519
+#: gnu/packages/perl.scm:2591
 msgid ""
 "The inc::latest module helps bootstrap configure-time\n"
 "dependencies for CPAN distributions.  These dependencies get bundled into the\n"
 "inc directory within a distribution and are used by Makefile.PL or Build.PL."
 msgstr ""
 
-#: gnu/packages/perl.scm:2538
+#: gnu/packages/perl.scm:2610
 msgid "Utilities for interactive I/O"
 msgstr ""
 
-#: gnu/packages/perl.scm:2539
+#: gnu/packages/perl.scm:2611
 msgid ""
 "This module provides three utility subroutines that make it\n"
 "easier to develop interactive applications: is_interactive(), interactive(),\n"
 "and busy()."
 msgstr ""
 
-#: gnu/packages/perl.scm:2558
+#: gnu/packages/perl.scm:2630
 msgid "Emulate file interface for in-core strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:2559
+#: gnu/packages/perl.scm:2631
 msgid ""
 "IO::String is an IO::File (and IO::Handle) compatible class\n"
 "that reads or writes data from in-core strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:2577
+#: gnu/packages/perl.scm:2649
 msgid "IO:: interface for reading/writing an array of lines"
 msgstr ""
 
-#: gnu/packages/perl.scm:2578
+#: gnu/packages/perl.scm:2650
 msgid ""
 "This toolkit primarily provides modules for performing both\n"
 "traditional and object-oriented i/o) on things *other* than normal\n"
 "filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines."
 msgstr ""
 
-#: gnu/packages/perl.scm:2596
+#: gnu/packages/perl.scm:2668
 msgid "Perl interface to pseudo ttys"
 msgstr ""
 
-#: gnu/packages/perl.scm:2598
+#: gnu/packages/perl.scm:2670
 msgid ""
 "This package provides the 'IO::Pty' and 'IO::Tty' Perl interfaces to\n"
 "pseudo ttys."
 msgstr ""
 
-#: gnu/packages/perl.scm:2626
+#: gnu/packages/perl.scm:2698
 msgid "Run system() and background procs w/ piping, redirs, ptys"
 msgstr ""
 
-#: gnu/packages/perl.scm:2627
+#: gnu/packages/perl.scm:2699
 msgid ""
 "IPC::Run allows you run and interact with child processes\n"
 "using files, pipes, and pseudo-ttys.  Both system()-style and scripted usages\n"
@@ -6289,11 +7020,11 @@ msgid ""
 "both supported and may be mixed."
 msgstr ""
 
-#: gnu/packages/perl.scm:2645
+#: gnu/packages/perl.scm:2717
 msgid "Run a subprocess with input/output redirection"
 msgstr ""
 
-#: gnu/packages/perl.scm:2647
+#: gnu/packages/perl.scm:2719
 msgid ""
 "The IPC::Run3 module allows you to run a subprocess and redirect stdin,\n"
 "stdout, and/or stderr to files and perl data structures.  It aims to satisfy\n"
@@ -6301,31 +7032,31 @@ msgid ""
 "Perlish API and none of the bloat and rarely used features of IPC::Run."
 msgstr ""
 
-#: gnu/packages/perl.scm:2671
+#: gnu/packages/perl.scm:2743
 msgid "Lightweight interface to shared memory"
 msgstr ""
 
-#: gnu/packages/perl.scm:2672
+#: gnu/packages/perl.scm:2744
 msgid ""
 "IPC::ShareLite provides a simple interface to shared memory,\n"
 "allowing data to be efficiently communicated between processes."
 msgstr ""
 
-#: gnu/packages/perl.scm:2692
+#: gnu/packages/perl.scm:2764
 msgid "JSON encoder/decoder for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2693
+#: gnu/packages/perl.scm:2765
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa using either JSON::XS or JSON::PP."
 msgstr ""
 
-#: gnu/packages/perl.scm:2718
+#: gnu/packages/perl.scm:2790
 msgid "Wrapper for Perl JSON classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:2720
+#: gnu/packages/perl.scm:2792
 msgid ""
 "This module tries to provide a coherent API to bring together the\n"
 "various JSON modules currently on CPAN.  This module will allow you to code to\n"
@@ -6333,11 +7064,11 @@ msgid ""
 "installed."
 msgstr ""
 
-#: gnu/packages/perl.scm:2744
+#: gnu/packages/perl.scm:2816
 msgid "Cpanel::JSON::XS with fallback"
 msgstr ""
 
-#: gnu/packages/perl.scm:2745
+#: gnu/packages/perl.scm:2817
 msgid ""
 "This module first checks to see if either Cpanel::JSON::XS\n"
 "or JSON::XS is already loaded, in which case it uses that module.  Otherwise\n"
@@ -6345,57 +7076,91 @@ msgid ""
 "either uses the first module it finds or throws an error."
 msgstr ""
 
-#: gnu/packages/perl.scm:2768
+#: gnu/packages/perl.scm:2840
 msgid "JSON serialising/deserialising for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:2792
+#: gnu/packages/perl.scm:2860
+msgid "Log::Report in the lightest form"
+msgstr ""
+
+#: gnu/packages/perl.scm:2862
+msgid ""
+"This module allows libraries to have a dependency to a small module\n"
+"instead of the full Log-Report distribution.  The full power of\n"
+"@code{Log::Report} is only released when the main program uses that module.\n"
+"In that case, the module using the 'Optional' will also use the full\n"
+"@code{Log::Report}, otherwise the dressed-down @code{Log::Report::Minimal}\n"
+"version."
+msgstr ""
+
+#: gnu/packages/perl.scm:2887
+msgid "Get messages to users and logs"
+msgstr ""
+
+#: gnu/packages/perl.scm:2889
+msgid ""
+"@code{Log::Report} combines three tasks which are closely related in\n"
+"one: logging, exceptions, and translations."
+msgstr ""
+
+#: gnu/packages/perl.scm:2912
 msgid "Combination of List::Util and List::MoreUtils"
 msgstr ""
 
-#: gnu/packages/perl.scm:2793
+#: gnu/packages/perl.scm:2913
 msgid ""
 "This module exports all of the functions that either\n"
 "List::Util or List::MoreUtils defines, with preference to List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:2817
+#: gnu/packages/perl.scm:2937
 msgid "Provide the stuff missing in List::Util"
 msgstr ""
 
-#: gnu/packages/perl.scm:2818
+#: gnu/packages/perl.scm:2938
 msgid ""
 "List::MoreUtils provides some trivial but commonly needed\n"
 "functionality on lists which is not going to go into List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:2836
+#: gnu/packages/perl.scm:2956
 msgid "Expiry plug-in for Memoize that adds LRU cache expiration"
 msgstr ""
 
-#: gnu/packages/perl.scm:2837
+#: gnu/packages/perl.scm:2957
 msgid ""
 "This module implements an expiry policy for Memoize that\n"
 "follows LRU semantics, that is, the last n results, where n is specified as\n"
 "the argument to the CACHESIZE parameter, will be cached."
 msgstr ""
 
-#: gnu/packages/perl.scm:2856
+#: gnu/packages/perl.scm:2975
+msgid "Charset information for MIME messages"
+msgstr ""
+
+#: gnu/packages/perl.scm:2977
+msgid ""
+"@code{MIME::Charset} provides information about character sets used for\n"
+"MIME messages on Internet."
+msgstr ""
+
+#: gnu/packages/perl.scm:2995
 msgid "Definition of MIME types"
 msgstr ""
 
-#: gnu/packages/perl.scm:2857
+#: gnu/packages/perl.scm:2996
 msgid ""
 "This module provides a list of known mime-types, combined\n"
 "from various sources.  For instance, it contains all IANA types and the\n"
 "knowledge of Apache."
 msgstr ""
 
-#: gnu/packages/perl.scm:2886
+#: gnu/packages/perl.scm:3025
 msgid "Tiny replacement for Module::Build"
 msgstr ""
 
-#: gnu/packages/perl.scm:2887
+#: gnu/packages/perl.scm:3026
 msgid ""
 "Many Perl distributions use a Build.PL file instead of a\n"
 "Makefile.PL file to drive distribution configuration, build, test and\n"
@@ -6405,11 +7170,11 @@ msgid ""
 "has less than 120, yet supports the features needed by most distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:2909
+#: gnu/packages/perl.scm:3048
 msgid "Find and use installed modules in a (sub)category"
 msgstr ""
 
-#: gnu/packages/perl.scm:2910
+#: gnu/packages/perl.scm:3049
 msgid ""
 "Module::Find lets you find and use modules in categories.\n"
 "This can be useful for auto-detecting driver or plugin modules.  You can\n"
@@ -6417,11 +7182,11 @@ msgid ""
 "subcategories."
 msgstr ""
 
-#: gnu/packages/perl.scm:2936
+#: gnu/packages/perl.scm:3075
 msgid "Loads alternate underlying implementations for a module"
 msgstr ""
 
-#: gnu/packages/perl.scm:2937
+#: gnu/packages/perl.scm:3076
 msgid ""
 "This module abstracts out the process of choosing one of\n"
 "several underlying implementations for a module.  This can be used to provide\n"
@@ -6430,11 +7195,11 @@ msgid ""
 "implementations."
 msgstr ""
 
-#: gnu/packages/perl.scm:2975
+#: gnu/packages/perl.scm:3114
 msgid "Standalone, extensible Perl module installer"
 msgstr ""
 
-#: gnu/packages/perl.scm:2976
+#: gnu/packages/perl.scm:3115
 msgid ""
 "Module::Install is a package for writing installers for\n"
 "CPAN (or CPAN-like) distributions that are clean, simple, minimalist, act in a\n"
@@ -6442,42 +7207,52 @@ msgid ""
 "installation version 5.005 or newer."
 msgstr ""
 
-#: gnu/packages/perl.scm:2996
+#: gnu/packages/perl.scm:3136
+msgid "Give your Perl module the ability to have plugins"
+msgstr ""
+
+#: gnu/packages/perl.scm:3137
+msgid ""
+"This module provides a simple but extensible way of having\n"
+"'plugins' for your Perl module."
+msgstr ""
+
+#: gnu/packages/perl.scm:3156
 msgid "Perl runtime module handling"
 msgstr ""
 
-#: gnu/packages/perl.scm:2997
+#: gnu/packages/perl.scm:3157
 msgid ""
 "The functions exported by this module deal with runtime\n"
 "handling of Perl modules, which are normally handled at compile time."
 msgstr ""
 
-#: gnu/packages/perl.scm:3018
+#: gnu/packages/perl.scm:3180
 msgid "Provide information on conflicts for Module::Runtime"
 msgstr ""
 
-#: gnu/packages/perl.scm:3019
+#: gnu/packages/perl.scm:3181
 msgid ""
 "This module provides conflicts checking for Module::Runtime,\n"
 "which had a recent release that broke some versions of Moose.  It is called\n"
 "from Moose::Conflicts and moose-outdated."
 msgstr ""
 
-#: gnu/packages/perl.scm:3040
+#: gnu/packages/perl.scm:3202
 msgid "Recursively scan Perl code for dependencies"
 msgstr ""
 
-#: gnu/packages/perl.scm:3041
+#: gnu/packages/perl.scm:3203
 msgid ""
 "Module::ScanDeps is a module to recursively scan Perl\n"
 "programs for dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:3061
+#: gnu/packages/perl.scm:3223
 msgid "Module name tools and transformations"
 msgstr ""
 
-#: gnu/packages/perl.scm:3062
+#: gnu/packages/perl.scm:3224
 msgid ""
 "This module provides a few useful functions for manipulating\n"
 "module names.  Its main aim is to centralise some of the functions commonly\n"
@@ -6485,11 +7260,11 @@ msgid ""
 "module names to relative paths."
 msgstr ""
 
-#: gnu/packages/perl.scm:3092
+#: gnu/packages/perl.scm:3254
 msgid "Minimalist Object Orientation (with Moose compatibility)"
 msgstr ""
 
-#: gnu/packages/perl.scm:3093
+#: gnu/packages/perl.scm:3255
 msgid ""
 "Moo is an extremely light-weight Object Orientation system.\n"
 "It allows one to concisely define objects and roles with a convenient syntax\n"
@@ -6497,11 +7272,11 @@ msgid ""
 "Moose and is optimised for rapid startup."
 msgstr ""
 
-#: gnu/packages/perl.scm:3169
+#: gnu/packages/perl.scm:3331
 msgid "Postmodern object system for Perl 5"
 msgstr ""
 
-#: gnu/packages/perl.scm:3171
+#: gnu/packages/perl.scm:3333
 msgid ""
 "Moose is a complete object system for Perl 5.  It provides keywords for\n"
 "attribute declaration, object construction, inheritance, and maybe more.  With\n"
@@ -6512,11 +7287,11 @@ msgid ""
 "sentences."
 msgstr ""
 
-#: gnu/packages/perl.scm:3199
+#: gnu/packages/perl.scm:3361
 msgid "Emulate Class::Accessor::Fast behavior using Moose attributes"
 msgstr ""
 
-#: gnu/packages/perl.scm:3200
+#: gnu/packages/perl.scm:3362
 msgid ""
 "This module attempts to emulate the behavior of\n"
 "Class::Accessor::Fast as accurately as possible using the Moose attribute\n"
@@ -6524,21 +7299,21 @@ msgid ""
 "private methods are not."
 msgstr ""
 
-#: gnu/packages/perl.scm:3231
+#: gnu/packages/perl.scm:3394
 msgid "Moose role for processing command line options"
 msgstr ""
 
-#: gnu/packages/perl.scm:3232
+#: gnu/packages/perl.scm:3395
 msgid ""
 "This is a Moose role which provides an alternate constructor\n"
 "for creating objects using parameters passed in from the command line."
 msgstr ""
 
-#: gnu/packages/perl.scm:3253
+#: gnu/packages/perl.scm:3416
 msgid "Mark overload code symbols as methods"
 msgstr ""
 
-#: gnu/packages/perl.scm:3254
+#: gnu/packages/perl.scm:3417
 msgid ""
 "MooseX::MarkAsMethods allows one to easily mark certain\n"
 "functions as Moose methods.  This will allow other packages such as\n"
@@ -6548,21 +7323,21 @@ msgid ""
 "overloads will \"just work\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:3284
+#: gnu/packages/perl.scm:3447
 msgid "Code attribute introspection"
 msgstr ""
 
-#: gnu/packages/perl.scm:3285
+#: gnu/packages/perl.scm:3448
 msgid ""
 "This module allows code attributes of methods to be\n"
 "introspected using Moose meta method objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:3311
+#: gnu/packages/perl.scm:3474
 msgid "Subclassing of non-Moose classes"
 msgstr ""
 
-#: gnu/packages/perl.scm:3312
+#: gnu/packages/perl.scm:3475
 msgid ""
 "MooseX::NonMoose allows for easily subclassing non-Moose\n"
 "classes with Moose, taking care of the details connected with doing this, such\n"
@@ -6571,31 +7346,31 @@ msgid ""
 "BUILD methods are called.  It tries to be as non-intrusive as possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:3341
+#: gnu/packages/perl.scm:3504
 msgid "Extension of Params::Validate using Moose's types"
 msgstr ""
 
-#: gnu/packages/perl.scm:3342
+#: gnu/packages/perl.scm:3505
 msgid ""
 "This module fills a gap in Moose by adding method parameter\n"
 "validation to Moose."
 msgstr ""
 
-#: gnu/packages/perl.scm:3363
+#: gnu/packages/perl.scm:3526
 msgid "Apply roles to a related Perl class"
 msgstr ""
 
-#: gnu/packages/perl.scm:3364
+#: gnu/packages/perl.scm:3527
 msgid ""
 "This module applies roles to make a subclass instead of\n"
 "manually setting up a subclass."
 msgstr ""
 
-#: gnu/packages/perl.scm:3390
+#: gnu/packages/perl.scm:3554
 msgid "Moose roles with composition parameters"
 msgstr ""
 
-#: gnu/packages/perl.scm:3391
+#: gnu/packages/perl.scm:3555
 msgid ""
 "Because Moose roles serve many different masters, they\n"
 "usually provide only the least common denominator of functionality.  To\n"
@@ -6605,11 +7380,11 @@ msgid ""
 "Parameterized roles offer a solution to these (and other) kinds of problems."
 msgstr ""
 
-#: gnu/packages/perl.scm:3417
+#: gnu/packages/perl.scm:3581
 msgid "Roles which support overloading"
 msgstr ""
 
-#: gnu/packages/perl.scm:3418
+#: gnu/packages/perl.scm:3582
 msgid ""
 "MooseX::Role::WithOverloading allows you to write a\n"
 "Moose::Role which defines overloaded operators and allows those overload\n"
@@ -6617,11 +7392,11 @@ msgid ""
 "where plain Moose::Roles would lose the overloading."
 msgstr ""
 
-#: gnu/packages/perl.scm:3440
+#: gnu/packages/perl.scm:3604
 msgid "Name your accessors foo() and set_foo()"
 msgstr ""
 
-#: gnu/packages/perl.scm:3441
+#: gnu/packages/perl.scm:3605
 msgid ""
 "This module does not provide any methods.  Simply loading it\n"
 "changes the default naming policy for the loading class so that accessors are\n"
@@ -6629,85 +7404,85 @@ msgid ""
 "accessor, while set methods are prefixed with \"_set_\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:3467
+#: gnu/packages/perl.scm:3631
 msgid "Strict object constructors for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:3468
+#: gnu/packages/perl.scm:3632
 msgid ""
 "Simply loading this module makes your constructors\n"
 "\"strict\".  If your constructor is called with an attribute init argument\n"
 "that your class does not declare, then it calls Moose->throw_error()."
 msgstr ""
 
-#: gnu/packages/perl.scm:3496
+#: gnu/packages/perl.scm:3660
 msgid "Trait loading and resolution for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:3497
+#: gnu/packages/perl.scm:3661
 msgid ""
 "Adds support on top of MooseX::Traits for class precedence\n"
 "search for traits and some extra attributes."
 msgstr ""
 
-#: gnu/packages/perl.scm:3522
+#: gnu/packages/perl.scm:3687
 msgid "Organise your Moose types in libraries"
 msgstr ""
 
-#: gnu/packages/perl.scm:3523
+#: gnu/packages/perl.scm:3688
 msgid ""
 "This package lets you declare types using short names, but\n"
 "behind the scenes it namespaces all your type declarations, effectively\n"
 "prevent name clashes between packages."
 msgstr ""
 
-#: gnu/packages/perl.scm:3554
+#: gnu/packages/perl.scm:3719
 msgid "DateTime related constraints and coercions for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:3555
+#: gnu/packages/perl.scm:3720
 msgid ""
 "This module packages several Moose::Util::TypeConstraints\n"
 "with coercions, designed to work with the DateTime suite of objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:3587
+#: gnu/packages/perl.scm:3752
 msgid "Extensions to MooseX::Types::DateTime"
 msgstr ""
 
-#: gnu/packages/perl.scm:3588
+#: gnu/packages/perl.scm:3753
 msgid ""
 "This module builds on MooseX::Types::DateTime to add\n"
 "additional custom types and coercions.  Since it builds on an existing type,\n"
 "all coercions and constraints are inherited."
 msgstr ""
 
-#: gnu/packages/perl.scm:3617
+#: gnu/packages/perl.scm:3782
 msgid "ClassName type constraints for Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:3618
+#: gnu/packages/perl.scm:3783
 msgid ""
 "MooseX::Types::LoadableClass provides a ClassName type\n"
 "constraint with coercion to load the class."
 msgstr ""
 
-#: gnu/packages/perl.scm:3642
+#: gnu/packages/perl.scm:3807
 msgid "Moosish types and type builder"
 msgstr ""
 
-#: gnu/packages/perl.scm:3643
+#: gnu/packages/perl.scm:3808
 msgid ""
 "MooX::Types::MooseLike provides a possibility to build your\n"
 "own set of Moose-like types.  These custom types can then be used to describe\n"
 "fields in Moo-based classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:3662
+#: gnu/packages/perl.scm:3827
 msgid "MRO interface compatibility for Perls < 5.9.5"
 msgstr ""
 
-#: gnu/packages/perl.scm:3663
+#: gnu/packages/perl.scm:3828
 msgid ""
 "The \"mro\" namespace provides several utilities for dealing\n"
 "with method resolution order and method caching in general in Perl 5.9.5 and\n"
@@ -6715,11 +7490,11 @@ msgid ""
 "Perl (back to 5.6.0)."
 msgstr ""
 
-#: gnu/packages/perl.scm:3689
+#: gnu/packages/perl.scm:3855
 msgid "Keep imports out of your namespace"
 msgstr ""
 
-#: gnu/packages/perl.scm:3690
+#: gnu/packages/perl.scm:3856
 msgid ""
 "The namespace::autoclean pragma will remove all imported\n"
 "symbols at the end of the current package's compile cycle.  Functions called\n"
@@ -6730,11 +7505,11 @@ msgid ""
 "anything that looks like a method."
 msgstr ""
 
-#: gnu/packages/perl.scm:3716
+#: gnu/packages/perl.scm:3882
 msgid "Keep imports and functions out of your namespace"
 msgstr ""
 
-#: gnu/packages/perl.scm:3717
+#: gnu/packages/perl.scm:3883
 msgid ""
 "The namespace::clean pragma will remove all previously\n"
 "declared or imported symbols at the end of the current package's compile\n"
@@ -6742,64 +7517,64 @@ msgid ""
 "name, but they won't show up as methods on your class or instances."
 msgstr ""
 
-#: gnu/packages/perl.scm:3737
+#: gnu/packages/perl.scm:3903
 msgid "Numeric comparisons"
 msgstr ""
 
-#: gnu/packages/perl.scm:3738
+#: gnu/packages/perl.scm:3904
 msgid ""
 "Number::Compare compiles a simple comparison to an anonymous\n"
 "subroutine, which you can call with a value to be tested against."
 msgstr ""
 
-#: gnu/packages/perl.scm:3756
+#: gnu/packages/perl.scm:3922
 msgid "Generate cryptographic signatures for objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:3757
+#: gnu/packages/perl.scm:3923
 msgid ""
 "Object::Signature is an abstract base class that you can\n"
 "inherit from in order to allow your objects to generate unique cryptographic\n"
 "signatures."
 msgstr ""
 
-#: gnu/packages/perl.scm:3779
+#: gnu/packages/perl.scm:3945
 msgid "Anonymous packages"
 msgstr ""
 
-#: gnu/packages/perl.scm:3780
+#: gnu/packages/perl.scm:3946
 msgid ""
 "This module allows for anonymous packages that are\n"
 "independent of the main namespace and only available through an object\n"
 "instance, not by name."
 msgstr ""
 
-#: gnu/packages/perl.scm:3808
+#: gnu/packages/perl.scm:3974
 msgid "Manage deprecation warnings for your distribution"
 msgstr ""
 
-#: gnu/packages/perl.scm:3809
+#: gnu/packages/perl.scm:3975
 msgid ""
 "This module allows you to manage a set of deprecations for\n"
 "one or more modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3836
+#: gnu/packages/perl.scm:4002
 msgid "Routines for manipulating stashes"
 msgstr ""
 
-#: gnu/packages/perl.scm:3837
+#: gnu/packages/perl.scm:4003
 msgid ""
 "Manipulating stashes (Perl's symbol tables) is occasionally\n"
 "necessary, but incredibly messy, and easy to get wrong.  This module hides all\n"
 "of that behind a simple API."
 msgstr ""
 
-#: gnu/packages/perl.scm:3860
+#: gnu/packages/perl.scm:4026
 msgid "Faster implementation of the Package::Stash API"
 msgstr ""
 
-#: gnu/packages/perl.scm:3861
+#: gnu/packages/perl.scm:4027
 msgid ""
 "This is a backend for Package::Stash, which provides the\n"
 "functionality in a way that's less buggy and much faster.  It will be used by\n"
@@ -6807,11 +7582,11 @@ msgid ""
 "compiler."
 msgstr ""
 
-#: gnu/packages/perl.scm:3881
+#: gnu/packages/perl.scm:4047
 msgid "Play with other peoples' lexical variables"
 msgstr ""
 
-#: gnu/packages/perl.scm:3882
+#: gnu/packages/perl.scm:4048
 msgid ""
 "PadWalker is a module which allows you to inspect (and even\n"
 "change) lexical variables in any subroutine which called you.  It will only\n"
@@ -6819,78 +7594,78 @@ msgid ""
 "is particularly useful for debugging."
 msgstr ""
 
-#: gnu/packages/perl.scm:3903
+#: gnu/packages/perl.scm:4069
 msgid "Simple, compact and correct param-checking functions"
 msgstr ""
 
-#: gnu/packages/perl.scm:3905
+#: gnu/packages/perl.scm:4071
 msgid ""
 "Params::Util provides a basic set of importable functions that makes\n"
 "checking parameters easier."
 msgstr ""
 
-#: gnu/packages/perl.scm:3928
+#: gnu/packages/perl.scm:4095
 msgid "Validate method/function parameters"
 msgstr ""
 
-#: gnu/packages/perl.scm:3929
+#: gnu/packages/perl.scm:4096
 msgid ""
 "The Params::Validate module allows you to validate method or\n"
 "function call parameters to an arbitrary level of specificity."
 msgstr ""
 
-#: gnu/packages/perl.scm:3947
+#: gnu/packages/perl.scm:4114
 msgid "Create and manipulate PAR distributions"
 msgstr ""
 
-#: gnu/packages/perl.scm:3948
+#: gnu/packages/perl.scm:4115
 msgid ""
 "PAR::Dist is a toolkit to create and manipulate PAR\n"
 "distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:3967
+#: gnu/packages/perl.scm:4134
 msgid ""
 "Allows you to both load one or more modules, while setting\n"
 "up inheritance from those modules at the same time."
 msgstr ""
 
-#: gnu/packages/perl.scm:3985
+#: gnu/packages/perl.scm:4153
 msgid "Path specification manipulation"
 msgstr ""
 
-#: gnu/packages/perl.scm:3986
+#: gnu/packages/perl.scm:4154
 msgid ""
 "Path::Class is a module for manipulation of file and\n"
 "directory specifications in a cross-platform manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:4006
+#: gnu/packages/perl.scm:4174
 msgid "Check for comprehensive documentation of a module"
 msgstr ""
 
-#: gnu/packages/perl.scm:4007
+#: gnu/packages/perl.scm:4175
 msgid ""
 "This module provides a mechanism for determining if the pod\n"
 "for a given module is comprehensive."
 msgstr ""
 
-#: gnu/packages/perl.scm:4024
+#: gnu/packages/perl.scm:4192
 msgid "Parsing library for text in Pod format"
 msgstr ""
 
-#: gnu/packages/perl.scm:4025
+#: gnu/packages/perl.scm:4193
 msgid ""
 "Pod::Simple is a Perl library for parsing text in\n"
 "the Pod (plain old documentation) markup language that is typically\n"
 "used for writing documentation for Perl and for Perl modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:4045
+#: gnu/packages/perl.scm:4214
 msgid "GNU C library compatible strftime for loggers and servers"
 msgstr ""
 
-#: gnu/packages/perl.scm:4046
+#: gnu/packages/perl.scm:4215
 msgid ""
 "POSIX::strftime::Compiler provides GNU C library compatible\n"
 "strftime(3).  But this module is not affected by the system locale.  This\n"
@@ -6898,22 +7673,22 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/perl.scm:4064
+#: gnu/packages/perl.scm:4233
 msgid "Information about the currently running perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4066
+#: gnu/packages/perl.scm:4235
 msgid ""
 "Probe::Perl provides methods for obtaining information about the\n"
 "currently running perl interpreter.  It originally began life as code in the\n"
 "Module::Build project, but has been externalized here for general use."
 msgstr ""
 
-#: gnu/packages/perl.scm:4087
+#: gnu/packages/perl.scm:4257
 msgid "Create read-only scalars, arrays, hashes"
 msgstr ""
 
-#: gnu/packages/perl.scm:4088
+#: gnu/packages/perl.scm:4258
 msgid ""
 "This module provides a facility for creating non-modifiable\n"
 "variables in Perl.  This is useful for configuration files, headers, etc.  It\n"
@@ -6921,11 +7696,11 @@ msgid ""
 "variables that should not be changed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4106
+#: gnu/packages/perl.scm:4276
 msgid "Provide commonly requested regular expressions"
 msgstr ""
 
-#: gnu/packages/perl.scm:4108
+#: gnu/packages/perl.scm:4278
 msgid ""
 "This module exports a single hash (`%RE') that stores or generates\n"
 "commonly needed regular expressions.  Patterns currently provided include:\n"
@@ -6935,29 +7710,29 @@ msgid ""
 "codes."
 msgstr ""
 
-#: gnu/packages/perl.scm:4138
+#: gnu/packages/perl.scm:4308
 msgid "Roles, as a slice of Moose"
 msgstr ""
 
-#: gnu/packages/perl.scm:4139
+#: gnu/packages/perl.scm:4309
 msgid "Role::Tiny is a minimalist role composition tool."
 msgstr ""
 
-#: gnu/packages/perl.scm:4156
+#: gnu/packages/perl.scm:4326
 msgid "Call isa, can, does, and DOES safely"
 msgstr ""
 
-#: gnu/packages/perl.scm:4157
+#: gnu/packages/perl.scm:4327
 msgid ""
 "This module allows you to call isa, can, does, and DOES\n"
 "safely on things that may not be objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:4175
+#: gnu/packages/perl.scm:4345
 msgid "Lexically-scoped resource management"
 msgstr ""
 
-#: gnu/packages/perl.scm:4176
+#: gnu/packages/perl.scm:4346
 msgid ""
 "This module provides a convenient way to perform cleanup or\n"
 "other forms of resource management at the end of a scope.  It is particularly\n"
@@ -6968,29 +7743,29 @@ msgid ""
 "collector."
 msgstr ""
 
-#: gnu/packages/perl.scm:4199
+#: gnu/packages/perl.scm:4369
 msgid "Infinite sets"
 msgstr ""
 
-#: gnu/packages/perl.scm:4200
+#: gnu/packages/perl.scm:4370
 msgid "Set::Infinite is a set theory module for infinite sets."
 msgstr ""
 
-#: gnu/packages/perl.scm:4220
+#: gnu/packages/perl.scm:4390
 msgid "Unordered collections of Perl Objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:4221
+#: gnu/packages/perl.scm:4391
 msgid ""
 "Set::Object provides efficient sets, unordered collections\n"
 "of Perl objects without duplicates for scalars and references."
 msgstr ""
 
-#: gnu/packages/perl.scm:4239
+#: gnu/packages/perl.scm:4409
 msgid "Set operations for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4240
+#: gnu/packages/perl.scm:4410
 msgid ""
 "The first priority of Set::Scalar is to be a convenient\n"
 "interface to sets (as in: unordered collections of Perl scalars).  While not\n"
@@ -6998,11 +7773,11 @@ msgid ""
 "compact."
 msgstr ""
 
-#: gnu/packages/perl.scm:4260
+#: gnu/packages/perl.scm:4430
 msgid "Spiffy Perl Interface Framework For You"
 msgstr ""
 
-#: gnu/packages/perl.scm:4261
+#: gnu/packages/perl.scm:4431
 msgid ""
 "Spiffy is a framework and methodology for doing object\n"
 "oriented (OO) programming in Perl.  Spiffy combines the best parts of\n"
@@ -7012,11 +7787,11 @@ msgid ""
 "other OO languages like Python, Ruby, Java and Perl 6."
 msgstr ""
 
-#: gnu/packages/perl.scm:4283
+#: gnu/packages/perl.scm:4453
 msgid "Temporary buffer to save bytes"
 msgstr ""
 
-#: gnu/packages/perl.scm:4284
+#: gnu/packages/perl.scm:4454
 msgid ""
 "Stream::Buffered is a buffer class to store arbitrary length\n"
 "of byte strings and then get a seekable filehandle once everything is\n"
@@ -7024,51 +7799,62 @@ msgid ""
 "on the length of the size."
 msgstr ""
 
-#: gnu/packages/perl.scm:4304
+#: gnu/packages/perl.scm:4474
 msgid "Turn on strict and make all warnings fatal"
 msgstr ""
 
-#: gnu/packages/perl.scm:4305
+#: gnu/packages/perl.scm:4475
 msgid ""
 "Strictures turns on strict and make all warnings fatal when\n"
 "run from within a source-controlled directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:4323
+#: gnu/packages/perl.scm:4493
 msgid "Camelcase and de-camelcase"
 msgstr ""
 
-#: gnu/packages/perl.scm:4324
+#: gnu/packages/perl.scm:4494
 msgid ""
 "This module may be used to convert from under_score text to\n"
 "CamelCase and back again."
 msgstr ""
 
-#: gnu/packages/perl.scm:4344
+#: gnu/packages/perl.scm:4514
 msgid "Rewrite strings based on a set of known prefixes"
 msgstr ""
 
-#: gnu/packages/perl.scm:4345
+#: gnu/packages/perl.scm:4515
 msgid ""
 "This module allows you to rewrite strings based on a set of\n"
 "known prefixes."
 msgstr ""
 
-#: gnu/packages/perl.scm:4367
+#: gnu/packages/perl.scm:4534
+msgid "String printing alternatives to printf"
+msgstr ""
+
+#: gnu/packages/perl.scm:4536
+msgid ""
+"This module inserts values into (translated) strings.  It provides\n"
+"@code{printf} and @code{sprintf} alternatives via both an object-oriented and\n"
+"a functional interface."
+msgstr ""
+
+#: gnu/packages/perl.scm:4559
 msgid "Sophisticated exporter for custom-built routines"
 msgstr ""
 
-#: gnu/packages/perl.scm:4369
+#: gnu/packages/perl.scm:4561
 msgid ""
 "Sub::Exporter provides a sophisticated alternative to Exporter.pm for\n"
 "custom-built routines."
 msgstr ""
 
-#: gnu/packages/perl.scm:4388
+#: gnu/packages/perl.scm:4580
 msgid "Only use Sub::Exporter if you need it"
 msgstr ""
 
-#: gnu/packages/perl.scm:4389
+#: gnu/packages/perl.scm:4581
 msgid ""
 "Sub::Exporter is an incredibly powerful module, but with\n"
 "that power comes great responsibility, as well as some runtime penalties.\n"
@@ -7078,54 +7864,54 @@ msgid ""
 "renaming exports, if they try to use them."
 msgstr ""
 
-#: gnu/packages/perl.scm:4411
+#: gnu/packages/perl.scm:4603
 msgid "Retrieve names of code references"
 msgstr ""
 
-#: gnu/packages/perl.scm:4412
+#: gnu/packages/perl.scm:4604
 msgid ""
 "Sub::Identify allows you to retrieve the real name of code\n"
 "references."
 msgstr ""
 
-#: gnu/packages/perl.scm:4431
+#: gnu/packages/perl.scm:4623
 msgid "Install subroutines into packages easily"
 msgstr ""
 
-#: gnu/packages/perl.scm:4433
+#: gnu/packages/perl.scm:4625
 msgid ""
 "Sub::Install makes it easy to install subroutines into packages without\n"
 "the unsightly mess of C<no strict> or typeglobs lying about where just anyone\n"
 "can see them."
 msgstr ""
 
-#: gnu/packages/perl.scm:4454
+#: gnu/packages/perl.scm:4646
 msgid "(Re)name a sub"
 msgstr ""
 
-#: gnu/packages/perl.scm:4455
+#: gnu/packages/perl.scm:4647
 msgid ""
 "Assigns a new name to referenced sub.  If package\n"
 "specification is omitted in the name, then the current package is used.  The\n"
 "return value is the sub."
 msgstr ""
 
-#: gnu/packages/perl.scm:4474
+#: gnu/packages/perl.scm:4666
 msgid "Apparently run a function in a higher stack frame"
 msgstr ""
 
-#: gnu/packages/perl.scm:4475
+#: gnu/packages/perl.scm:4667
 msgid ""
 "Like Tcl's uplevel() function, but not quite so dangerous.\n"
 "The idea is just to fool caller().  All the really naughty bits of Tcl's\n"
 "uplevel() are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:4494
+#: gnu/packages/perl.scm:4686
 msgid "Perl extension for generating SVG documents"
 msgstr ""
 
-#: gnu/packages/perl.scm:4495
+#: gnu/packages/perl.scm:4687
 msgid ""
 "SVG is a Perl module which generates a nested data structure\n"
 "containing the DOM representation of an SVG (Scalable Vector Graphics) image.\n"
@@ -7134,32 +7920,32 @@ msgid ""
 "animation content."
 msgstr ""
 
-#: gnu/packages/perl.scm:4514
+#: gnu/packages/perl.scm:4706
 msgid "Perl extension for getting CPU information"
 msgstr ""
 
-#: gnu/packages/perl.scm:4516
+#: gnu/packages/perl.scm:4708
 msgid ""
 "In responce to a post on perlmonks.org, a module for counting the number\n"
 "of CPU's on a system.  Support has now also been added for type of CPU and\n"
 "clock speed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4538
+#: gnu/packages/perl.scm:4730
 msgid "Get full hostname in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4539
+#: gnu/packages/perl.scm:4731
 msgid ""
 "Sys::Hostname::Long tries very hard to get the full hostname\n"
 "of a system."
 msgstr ""
 
-#: gnu/packages/perl.scm:4557
+#: gnu/packages/perl.scm:4749
 msgid "Ensure that a platform has weaken support"
 msgstr ""
 
-#: gnu/packages/perl.scm:4558
+#: gnu/packages/perl.scm:4750
 msgid ""
 "One recurring problem in modules that use Scalar::Util's\n"
 "weaken function is that it is not present in the pure-perl variant.  If\n"
@@ -7169,11 +7955,11 @@ msgid ""
 "error encouraging the user to seek support."
 msgstr ""
 
-#: gnu/packages/perl.scm:4583
+#: gnu/packages/perl.scm:4775
 msgid "Template processing system for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4584
+#: gnu/packages/perl.scm:4776
 msgid ""
 "The Template Toolkit is a collection of modules which\n"
 "implement an extensible template processing system.  It was originally\n"
@@ -7182,42 +7968,42 @@ msgid ""
 "documents: HTML, XML, POD, PostScript, LaTeX, and so on."
 msgstr ""
 
-#: gnu/packages/perl.scm:4607
+#: gnu/packages/perl.scm:4799
 msgid "Profiling for Template Toolkit"
 msgstr ""
 
-#: gnu/packages/perl.scm:4608
+#: gnu/packages/perl.scm:4800
 msgid ""
 "Template::Timer provides inline profiling of the template\n"
 "processing in Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:4626
+#: gnu/packages/perl.scm:4818
 msgid "Detect encoding of the current terminal"
 msgstr ""
 
-#: gnu/packages/perl.scm:4627
+#: gnu/packages/perl.scm:4819
 msgid ""
 "Term::Encoding is a simple module to detect the encoding of\n"
 "the current terminal expects in various ways."
 msgstr ""
 
-#: gnu/packages/perl.scm:4651
+#: gnu/packages/perl.scm:4843
 msgid "Progress meter on a standard terminal"
 msgstr ""
 
-#: gnu/packages/perl.scm:4652
+#: gnu/packages/perl.scm:4844
 msgid ""
 "Term::ProgressBar provides a simple progress bar on the\n"
 "terminal, to let the user know that something is happening, roughly how much\n"
 "stuff has been done, and maybe an estimate at how long remains."
 msgstr ""
 
-#: gnu/packages/perl.scm:4675
+#: gnu/packages/perl.scm:4867
 msgid "Progress meter if run interactively"
 msgstr ""
 
-#: gnu/packages/perl.scm:4676
+#: gnu/packages/perl.scm:4868
 msgid ""
 "Term::ProgressBar is a wonderful module for showing progress\n"
 "bars on the terminal.  This module acts very much like that module when it is\n"
@@ -7225,21 +8011,21 @@ msgid ""
 "a cron job) then it does not show the progress bar."
 msgstr ""
 
-#: gnu/packages/perl.scm:4698
+#: gnu/packages/perl.scm:4890
 msgid "Simple progress bars"
 msgstr ""
 
-#: gnu/packages/perl.scm:4699
+#: gnu/packages/perl.scm:4891
 msgid ""
 "Term::ProgressBar::Simple tells you how much work has been\n"
 "done, how much is left to do, and estimate how long it will take."
 msgstr ""
 
-#: gnu/packages/perl.scm:4717
+#: gnu/packages/perl.scm:4909
 msgid "Simple terminal control"
 msgstr "Simpel terminalkontrol"
 
-#: gnu/packages/perl.scm:4718
+#: gnu/packages/perl.scm:4910
 msgid ""
 "This module, ReadKey, provides ioctl control for terminals\n"
 "so the input modes can be changed (thus allowing reads of a single character\n"
@@ -7248,22 +8034,22 @@ msgid ""
 "screen size, and retrieval/modification of the control characters."
 msgstr ""
 
-#: gnu/packages/perl.scm:4745
+#: gnu/packages/perl.scm:4937
 msgid "Data-driven testing framework for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4746
+#: gnu/packages/perl.scm:4938
 msgid ""
 "Test::Base gives a way to trivially write your own test\n"
 "framework base class.  It concentrates on offering reusable data driven\n"
 "patterns, so that you can write tests with a minimum of code."
 msgstr ""
 
-#: gnu/packages/perl.scm:4777
+#: gnu/packages/perl.scm:4969
 msgid "Check for uncleaned imports"
 msgstr ""
 
-#: gnu/packages/perl.scm:4778
+#: gnu/packages/perl.scm:4970
 msgid ""
 "This module lets you check your module's namespaces for\n"
 "imported functions you might have forgotten to remove with\n"
@@ -7271,11 +8057,11 @@ msgid ""
 "called as methods, which usually isn't want you want."
 msgstr ""
 
-#: gnu/packages/perl.scm:4798
+#: gnu/packages/perl.scm:4990
 msgid "Flexible deep comparison for the Test::Builder framework"
 msgstr ""
 
-#: gnu/packages/perl.scm:4800
+#: gnu/packages/perl.scm:4992
 msgid ""
 "Test::Deep compares two structures by going through each level, ensuring\n"
 "that the values match, that arrays and hashes have the same elements and that\n"
@@ -7283,21 +8069,21 @@ msgid ""
 "structures without getting caught in an infinite loop."
 msgstr ""
 
-#: gnu/packages/perl.scm:4825
+#: gnu/packages/perl.scm:5019
 msgid "Test strings and data structures and show differences"
 msgstr ""
 
-#: gnu/packages/perl.scm:4826
+#: gnu/packages/perl.scm:5020
 msgid ""
 "This module exports three test functions and four diff-style\n"
 "functions."
 msgstr ""
 
-#: gnu/packages/perl.scm:4847
+#: gnu/packages/perl.scm:5041
 msgid "Perl extension for maintaining test directories"
 msgstr ""
 
-#: gnu/packages/perl.scm:4848
+#: gnu/packages/perl.scm:5042
 msgid ""
 "Testing code can involve making sure that files are created\n"
 "and deleted as expected.  Doing this manually can be error prone, as it's easy\n"
@@ -7307,76 +8093,76 @@ msgid ""
 "files, as well as to verify that there are no missing or unknown files."
 msgstr ""
 
-#: gnu/packages/perl.scm:4874
+#: gnu/packages/perl.scm:5068
 msgid "Test exception based code"
 msgstr ""
 
-#: gnu/packages/perl.scm:4875
+#: gnu/packages/perl.scm:5069
 msgid ""
 "This module provides a few convenience methods for testing\n"
 "exception based code.  It is built with Test::Builder and plays happily with\n"
 "Test::More and friends."
 msgstr ""
 
-#: gnu/packages/perl.scm:4895
+#: gnu/packages/perl.scm:5089
 msgid "Simple helpers for testing code with exceptions"
 msgstr ""
 
-#: gnu/packages/perl.scm:4896
+#: gnu/packages/perl.scm:5090
 msgid ""
 "Test::Fatal is an alternative to the popular\n"
 "Test::Exception.  It does much less, but should allow greater flexibility in\n"
 "testing exception-throwing code with about the same amount of typing."
 msgstr ""
 
-#: gnu/packages/perl.scm:4926
+#: gnu/packages/perl.scm:5120
 msgid "Run Perl standard test scripts with statistics"
 msgstr ""
 
-#: gnu/packages/perl.scm:4927
+#: gnu/packages/perl.scm:5121
 msgid ""
 "Simple test harness which allows tests to be run and results\n"
 "automatically aggregated and output to STDOUT."
 msgstr ""
 
-#: gnu/packages/perl.scm:4945
+#: gnu/packages/perl.scm:5139
 msgid "Traces memory leaks in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4946
+#: gnu/packages/perl.scm:5140
 msgid ""
 "Test::LeakTrace provides several functions that trace memory\n"
 "leaks.  This module scans arenas, the memory allocation system, so it can\n"
 "detect any leaked SVs in given blocks."
 msgstr ""
 
-#: gnu/packages/perl.scm:4965
+#: gnu/packages/perl.scm:5159
 msgid "Tests strings for equality, with more helpful failures"
 msgstr ""
 
-#: gnu/packages/perl.scm:4966
+#: gnu/packages/perl.scm:5160
 msgid ""
 "This module provides some drop-in replacements for the\n"
 "string comparison functions of Test::More, but which are more suitable when\n"
 "you test against long strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:4993
+#: gnu/packages/perl.scm:5188
 msgid "Emulate troublesome interfaces in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:4994
+#: gnu/packages/perl.scm:5189
 msgid ""
 "Test::MockObject allows you to create objects that conform\n"
 "to particular interfaces with very little code.  You don't have to reimplement\n"
 "the behavior, just the input and the output."
 msgstr ""
 
-#: gnu/packages/perl.scm:5013
+#: gnu/packages/perl.scm:5208
 msgid "Replaces actual time with simulated time"
 msgstr ""
 
-#: gnu/packages/perl.scm:5014
+#: gnu/packages/perl.scm:5209
 msgid ""
 "This module was created to enable test suites to test code\n"
 "at specific points in time.  Specifically it overrides localtime, gmtime and\n"
@@ -7385,22 +8171,22 @@ msgid ""
 "to gmtime,time or localtime."
 msgstr ""
 
-#: gnu/packages/perl.scm:5041
+#: gnu/packages/perl.scm:5236
 msgid "Most commonly needed test functions and features"
 msgstr ""
 
-#: gnu/packages/perl.scm:5042
+#: gnu/packages/perl.scm:5237
 msgid ""
 "This module provides the most commonly used testing\n"
 "functions, along with automatically turning on strict and warning and gives a\n"
 "bit more fine-grained control over test suites."
 msgstr ""
 
-#: gnu/packages/perl.scm:5060
+#: gnu/packages/perl.scm:5255
 msgid "Ensure no warnings are produced while testing"
 msgstr ""
 
-#: gnu/packages/perl.scm:5062
+#: gnu/packages/perl.scm:5257
 msgid ""
 "This modules causes any warnings during testing to be captured and\n"
 "stored.  It automatically adds an extra test that will run when your script\n"
@@ -7409,91 +8195,91 @@ msgid ""
 "including a stack trace of what was going on when it occurred."
 msgstr ""
 
-#: gnu/packages/perl.scm:5087
+#: gnu/packages/perl.scm:5282
 msgid "Utilities to test STDOUT and STDERR messages"
 msgstr ""
 
-#: gnu/packages/perl.scm:5089
+#: gnu/packages/perl.scm:5284
 msgid ""
 "Test::Output provides a simple interface for testing output sent to\n"
 "STDOUT or STDERR.  A number of different utilities are included to try and be\n"
 "as flexible as possible to the tester."
 msgstr ""
 
-#: gnu/packages/perl.scm:5110
+#: gnu/packages/perl.scm:5306
 msgid "Check for POD errors in files"
 msgstr ""
 
-#: gnu/packages/perl.scm:5111
+#: gnu/packages/perl.scm:5307
 msgid ""
 "Check POD files for errors or warnings in a test file, using\n"
 "Pod::Simple to do the heavy lifting."
 msgstr ""
 
-#: gnu/packages/perl.scm:5131
+#: gnu/packages/perl.scm:5327
 msgid "Check for pod coverage"
 msgstr ""
 
-#: gnu/packages/perl.scm:5132
+#: gnu/packages/perl.scm:5328
 msgid ""
 "This module adds a test to your Perl distribution which\n"
 "checks for pod coverage of all appropriate files."
 msgstr ""
 
-#: gnu/packages/perl.scm:5150
+#: gnu/packages/perl.scm:5346
 msgid "Checks to see if the module can be loaded"
 msgstr ""
 
-#: gnu/packages/perl.scm:5151
+#: gnu/packages/perl.scm:5347
 msgid ""
 "Test::Requires checks to see if the module can be loaded.\n"
 "If this fails, then rather than failing tests this skips all tests."
 msgstr ""
 
-#: gnu/packages/perl.scm:5170
+#: gnu/packages/perl.scm:5366
 msgid "Basic cross-platform tests for scripts"
 msgstr ""
 
-#: gnu/packages/perl.scm:5172
+#: gnu/packages/perl.scm:5368
 msgid ""
 "The intent of the Test::Script module is to provide a series of basic\n"
 "tests for 80% of the testing you will need to do for scripts in the script (or\n"
 "bin as is also commonly used) paths of your Perl distribution."
 msgstr ""
 
-#: gnu/packages/perl.scm:5195
+#: gnu/packages/perl.scm:5391
 msgid "Fork test in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:5196
+#: gnu/packages/perl.scm:5392
 msgid ""
 "Test::SharedFork is a utility module for Test::Builder.  It\n"
 "makes fork(2) safe to use in test cases."
 msgstr ""
 
-#: gnu/packages/perl.scm:5212
+#: gnu/packages/perl.scm:5408
 msgid "Basic utilities for writing tests"
 msgstr ""
 
-#: gnu/packages/perl.scm:5214
+#: gnu/packages/perl.scm:5410
 msgid "Test::Simple contains basic utilities for writing tests."
 msgstr ""
 
-#: gnu/packages/perl.scm:5231
+#: gnu/packages/perl.scm:5427
 msgid "Simplify running Test::Builder tests"
 msgstr ""
 
-#: gnu/packages/perl.scm:5233
+#: gnu/packages/perl.scm:5429
 msgid ""
 "Test::Tester allows testing of test modules based on Test::Builder with\n"
 "a minimum of effort."
 msgstr ""
 
-#: gnu/packages/perl.scm:5257
+#: gnu/packages/perl.scm:5455
 msgid "Trap exit codes, exceptions, output, etc."
 msgstr ""
 
-#: gnu/packages/perl.scm:5258
+#: gnu/packages/perl.scm:5456
 msgid ""
 "This module is primarily (but not exclusively) for use in\n"
 "test scripts: A block eval configurable and extensible but by default trapping\n"
@@ -7501,11 +8287,11 @@ msgid ""
 "from boxed blocks of test code."
 msgstr ""
 
-#: gnu/packages/perl.scm:5278
+#: gnu/packages/perl.scm:5476
 msgid "UTF-8 testing in Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:5279
+#: gnu/packages/perl.scm:5477
 msgid ""
 "This module is a collection of tests useful for dealing with\n"
 "UTF-8 strings in Perl.  This module has two types of tests: The validity tests\n"
@@ -7513,21 +8299,21 @@ msgid ""
 "will check that string has a given set of characteristics."
 msgstr ""
 
-#: gnu/packages/perl.scm:5301
+#: gnu/packages/perl.scm:5499
 msgid "Perl extension to test methods for warnings"
 msgstr ""
 
-#: gnu/packages/perl.scm:5302
+#: gnu/packages/perl.scm:5500
 msgid ""
 "This module provides a few convenience methods for testing\n"
 "warning based code."
 msgstr ""
 
-#: gnu/packages/perl.scm:5320
+#: gnu/packages/perl.scm:5518
 msgid "Test for warnings and the lack of them"
 msgstr ""
 
-#: gnu/packages/perl.scm:5321
+#: gnu/packages/perl.scm:5519
 msgid ""
 "This module is intended to be used as a drop-in replacement\n"
 "for Test::NoWarnings.  It also adds an extra test, but runs this test before\n"
@@ -7536,11 +8322,11 @@ msgid ""
 "plan, or not, and things will still Just Work."
 msgstr ""
 
-#: gnu/packages/perl.scm:5342
+#: gnu/packages/perl.scm:5540
 msgid "Test fallback behaviour in absence of modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:5343
+#: gnu/packages/perl.scm:5541
 msgid ""
 "This module allows you to deliberately hide modules from a\n"
 "program even though they are installed.  This is mostly useful for testing\n"
@@ -7548,62 +8334,62 @@ msgid ""
 "installed."
 msgstr ""
 
-#: gnu/packages/perl.scm:5369
+#: gnu/packages/perl.scm:5568
 msgid "Dynamic generation of tests"
 msgstr ""
 
-#: gnu/packages/perl.scm:5370
+#: gnu/packages/perl.scm:5569
 msgid ""
 "The Test::WriteVariants module provides for the dynamic\n"
 "generation of tests in nested combinations of contexts."
 msgstr ""
 
-#: gnu/packages/perl.scm:5390
+#: gnu/packages/perl.scm:5589
 msgid "Testing module for YAML implementations"
 msgstr ""
 
-#: gnu/packages/perl.scm:5391
+#: gnu/packages/perl.scm:5590
 msgid ""
 "Test::YAML is a subclass of Test::Base with YAML specific\n"
 "support."
 msgstr ""
 
-#: gnu/packages/perl.scm:5409
+#: gnu/packages/perl.scm:5609
 msgid "Align text"
 msgstr ""
 
-#: gnu/packages/perl.scm:5410
+#: gnu/packages/perl.scm:5610
 msgid ""
 "Text::Aligner exports a single function, align(), which is\n"
 "used to justify strings to various alignment styles."
 msgstr ""
 
-#: gnu/packages/perl.scm:5428
+#: gnu/packages/perl.scm:5628
 msgid "Extract delimited text sequences from strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:5429
+#: gnu/packages/perl.scm:5629
 msgid ""
 "The Text::Balanced module can be used to extract delimited\n"
 "text sequences from strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:5447
+#: gnu/packages/perl.scm:5647
 msgid "Manipulate comma-separated values"
 msgstr ""
 
-#: gnu/packages/perl.scm:5448
+#: gnu/packages/perl.scm:5648
 msgid ""
 "Text::CSV provides facilities for the composition and\n"
 "decomposition of comma-separated values.  An instance of the Text::CSV class\n"
 "can combine fields into a CSV string and parse a CSV string into fields."
 msgstr ""
 
-#: gnu/packages/perl.scm:5469
+#: gnu/packages/perl.scm:5669
 msgid "Perform diffs on files and record sets"
 msgstr ""
 
-#: gnu/packages/perl.scm:5470
+#: gnu/packages/perl.scm:5670
 msgid ""
 "Text::Diff provides a basic set of services akin to the GNU\n"
 "diff utility.  It is not anywhere near as feature complete as GNU diff, but it\n"
@@ -7612,38 +8398,38 @@ msgid ""
 "generally slower on larger files."
 msgstr ""
 
-#: gnu/packages/perl.scm:5491
+#: gnu/packages/perl.scm:5692
 msgid "Match globbing patterns against text"
 msgstr ""
 
-#: gnu/packages/perl.scm:5492
+#: gnu/packages/perl.scm:5693
 msgid ""
 "Text::Glob implements glob(3) style matching that can be\n"
 "used to match against text, rather than fetching names from a filesystem.  If\n"
 "you want to do full file globbing use the File::Glob module instead."
 msgstr ""
 
-#: gnu/packages/perl.scm:5511
+#: gnu/packages/perl.scm:5712
 msgid "Simple ASCII tables"
 msgstr ""
 
-#: gnu/packages/perl.scm:5512
+#: gnu/packages/perl.scm:5713
 msgid "Text::SimpleTable draws simple ASCII tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:5531
+#: gnu/packages/perl.scm:5734
 msgid "Organize Data in Tables"
 msgstr ""
 
-#: gnu/packages/perl.scm:5532
+#: gnu/packages/perl.scm:5735
 msgid "Text::Table renders plaintext tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:5549
+#: gnu/packages/perl.scm:5752
 msgid "Provide plain ASCII transliterations of Unicode text"
 msgstr ""
 
-#: gnu/packages/perl.scm:5550
+#: gnu/packages/perl.scm:5753
 msgid ""
 "Text::Unidecode provides a function, unidecode(...) that\n"
 "takes Unicode data and tries to represent it in US-ASCII characters (i.e., the\n"
@@ -7653,21 +8439,21 @@ msgid ""
 "system."
 msgstr ""
 
-#: gnu/packages/perl.scm:5578
+#: gnu/packages/perl.scm:5781
 msgid "Role for classes that can be thrown"
 msgstr ""
 
-#: gnu/packages/perl.scm:5579
+#: gnu/packages/perl.scm:5782
 msgid ""
 "Throwable is a role for classes that are meant to be thrown\n"
 "as exceptions to standard program flow."
 msgstr ""
 
-#: gnu/packages/perl.scm:5597
+#: gnu/packages/perl.scm:5801
 msgid "Ordered associative arrays for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:5598
+#: gnu/packages/perl.scm:5802
 msgid ""
 "This Perl module implements Perl hashes that preserve the\n"
 "order in which the hash elements were added.  The order is not affected when\n"
@@ -7676,42 +8462,42 @@ msgid ""
 "operations can also be performed on the IxHash."
 msgstr ""
 
-#: gnu/packages/perl.scm:5621
+#: gnu/packages/perl.scm:5825
 msgid "Tie to an existing Perl object"
 msgstr ""
 
-#: gnu/packages/perl.scm:5622
+#: gnu/packages/perl.scm:5826
 msgid ""
 "This class provides a tie constructor that returns the\n"
 "object it was given as it's first argument.  This way side effects of calling\n"
 "$object->TIEHASH are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:5644
+#: gnu/packages/perl.scm:5848
 msgid "English expression of durations"
 msgstr ""
 
-#: gnu/packages/perl.scm:5645
+#: gnu/packages/perl.scm:5849
 msgid ""
 "This module provides functions for expressing durations in\n"
 "rounded or exact terms."
 msgstr ""
 
-#: gnu/packages/perl.scm:5667
+#: gnu/packages/perl.scm:5871
 msgid "Parse time duration strings"
 msgstr ""
 
-#: gnu/packages/perl.scm:5668
+#: gnu/packages/perl.scm:5872
 msgid ""
 "Time::Duration::Parse is a module to parse human readable\n"
 "duration strings like \"2 minutes\" and \"3 seconds\" to seconds."
 msgstr ""
 
-#: gnu/packages/perl.scm:5686
+#: gnu/packages/perl.scm:5890
 msgid "Efficiently compute time from local and GMT time"
 msgstr ""
 
-#: gnu/packages/perl.scm:5687
+#: gnu/packages/perl.scm:5891
 msgid ""
 "This module provides functions that are the inverse of\n"
 "built-in perl functions localtime() and gmtime().  They accept a date as a\n"
@@ -7719,92 +8505,103 @@ msgid ""
 "the system epoch."
 msgstr ""
 
-#: gnu/packages/perl.scm:5707
+#: gnu/packages/perl.scm:5911
 msgid "Date parsing/formatting subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:5708
+#: gnu/packages/perl.scm:5912
 msgid ""
 "This module provides routines for parsing date string into\n"
 "time values and formatting dates into ASCII strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:5728
+#: gnu/packages/perl.scm:5934
 msgid "Shift and scale time"
 msgstr ""
 
-#: gnu/packages/perl.scm:5729
+#: gnu/packages/perl.scm:5935
 msgid ""
 "This module allows you to speed up your sleep(), alarm(),\n"
 "and time() calls."
 msgstr ""
 
-#: gnu/packages/perl.scm:5752
+#: gnu/packages/perl.scm:5958
 msgid "Simple tree object"
 msgstr ""
 
-#: gnu/packages/perl.scm:5753
+#: gnu/packages/perl.scm:5959
 msgid ""
 "This module in a fully object-oriented implementation of a\n"
 "simple n-ary tree."
 msgstr ""
 
-#: gnu/packages/perl.scm:5776
+#: gnu/packages/perl.scm:5983
 msgid "Factory object for dispensing Visitor objects"
 msgstr ""
 
-#: gnu/packages/perl.scm:5777
+#: gnu/packages/perl.scm:5984
 msgid ""
 "This module is a factory for dispensing\n"
 "Tree::Simple::Visitor::* objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:5795
+#: gnu/packages/perl.scm:6002
 msgid "Minimal try/catch with proper preservation of $@"
 msgstr ""
 
-#: gnu/packages/perl.scm:5796
+#: gnu/packages/perl.scm:6003
 msgid ""
 "This module provides bare bones try/catch/finally statements\n"
 "that are designed to minimize common mistakes with eval blocks, and nothing\n"
 "else."
 msgstr ""
 
-#: gnu/packages/perl.scm:5817
+#: gnu/packages/perl.scm:6024
 msgid "Data types for common serialisation formats"
 msgstr ""
 
-#: gnu/packages/perl.scm:5818
+#: gnu/packages/perl.scm:6025
 msgid ""
 "This module provides some extra datatypes that are used by\n"
 "common serialisation formats such as JSON or CBOR."
 msgstr ""
 
-#: gnu/packages/perl.scm:5836
+#: gnu/packages/perl.scm:6044
+msgid "Unicode line breaking algorithm"
+msgstr ""
+
+#: gnu/packages/perl.scm:6046
+msgid ""
+"@code{Unicode::LineBreak} implements the line breaking algorithm\n"
+"described in Unicode Standard Annex #14.  The @code{East_Asian_Width} property\n"
+"defined by Annex #11 is used to determine breaking positions."
+msgstr ""
+
+#: gnu/packages/perl.scm:6065
 msgid "UNIVERSAL::can() reimplementation"
 msgstr ""
 
-#: gnu/packages/perl.scm:5837
+#: gnu/packages/perl.scm:6066
 msgid ""
 "This module attempts to work around people calling\n"
 "UNIVERSAL::can() as a function, which it is not."
 msgstr ""
 
-#: gnu/packages/perl.scm:5857
+#: gnu/packages/perl.scm:6086
 msgid "UNIVERSAL::isa() reimplementation"
 msgstr ""
 
-#: gnu/packages/perl.scm:5858
+#: gnu/packages/perl.scm:6087
 msgid ""
 "This module attempts to recover from people calling\n"
 "UNIVERSAL::isa as a function."
 msgstr ""
 
-#: gnu/packages/perl.scm:5876
+#: gnu/packages/perl.scm:6105
 msgid "Associate user-defined magic to variables from Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:5877
+#: gnu/packages/perl.scm:6106
 msgid ""
 "Magic is Perl's way of enhancing variables.  This mechanism\n"
 "lets the user add extra data to any variable and hook syntactical\n"
@@ -7813,32 +8610,32 @@ msgid ""
 "having to write a single line of XS."
 msgstr ""
 
-#: gnu/packages/perl.scm:5900
+#: gnu/packages/perl.scm:6129
 msgid "YAML for Perl"
 msgstr ""
 
-#: gnu/packages/perl.scm:5901
+#: gnu/packages/perl.scm:6130
 msgid ""
 "The YAML.pm module implements a YAML Loader and Dumper based\n"
 "on the YAML 1.0 specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:5924
+#: gnu/packages/perl.scm:6153
 msgid "Read/Write YAML files"
 msgstr ""
 
-#: gnu/packages/perl.scm:5925
+#: gnu/packages/perl.scm:6154
 msgid ""
 "YAML::Tiny is a perl class for reading and writing\n"
 "YAML-style files, written with as little code as possible, reducing load time\n"
 "and memory overhead."
 msgstr ""
 
-#: gnu/packages/perl.scm:5952
+#: gnu/packages/perl.scm:6181
 msgid "Distribution metadata for a CPAN dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:5953
+#: gnu/packages/perl.scm:6182
 msgid ""
 "Software distributions released to the CPAN include a\n"
 "META.json or, for older distributions, META.yml, which describes the\n"
@@ -7849,11 +8646,11 @@ msgid ""
 "methods for interrogating that data."
 msgstr ""
 
-#: gnu/packages/perl.scm:5976
+#: gnu/packages/perl.scm:6205
 msgid "Set of version requirements for a CPAN dist"
 msgstr ""
 
-#: gnu/packages/perl.scm:5977
+#: gnu/packages/perl.scm:6206
 msgid ""
 "A CPAN::Meta::Requirements object models a set of version\n"
 "constraints like those specified in the META.yml or META.json files in CPAN\n"
@@ -7862,46 +8659,47 @@ msgid ""
 "representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:6000
+#: gnu/packages/perl.scm:6229
 msgid "Read and write a subset of YAML for CPAN Meta files"
 msgstr ""
 
-#: gnu/packages/perl.scm:6001
+#: gnu/packages/perl.scm:6230
 msgid ""
 "This module implements a subset of the YAML specification\n"
 "for use in reading and writing CPAN metadata files like META.yml and\n"
 "MYMETA.yml."
 msgstr ""
 
-#: gnu/packages/perl.scm:6022
+#: gnu/packages/perl.scm:6251
 msgid "Build and install Perl modules"
 msgstr ""
 
-#: gnu/packages/perl.scm:6023
+#: gnu/packages/perl.scm:6252
 msgid ""
-"\"Module::Build\" is a system for building, testing, and\n"
-"installing Perl modules.  It is meant to be an alternative to\n"
-"\"ExtUtils::MakeMaker\".  Developers may alter the behavior of the module\n"
+"@code{Module::Build} is a system for building, testing, and\n"
+"installing Perl modules; it used to be part of Perl itself until version 5.22,\n"
+"which dropped it.  It is meant to be an alternative to\n"
+"@code{ExtUtils::MakeMaker}.  Developers may alter the behavior of the module\n"
 "through subclassing in a much more straightforward way than with\n"
-"\"MakeMaker\".  It also does not require a \"make\" on your system - most of\n"
-"the \"Module::Build\" code is pure-perl and written in a cross-platform way."
+"@code{MakeMaker}.  It also does not require a @command{make} on your\n"
+"system---most of the @code{Module::Build} code is pure-Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:6047
+#: gnu/packages/perl.scm:6277
 msgid "Parse META.yml and META.json CPAN metadata files"
 msgstr ""
 
-#: gnu/packages/perl.scm:6048
+#: gnu/packages/perl.scm:6278
 msgid ""
 "Parse::CPAN::Meta is a parser for META.json and META.yml\n"
 "files, using JSON::PP and/or CPAN::Meta::YAML."
 msgstr ""
 
-#: gnu/packages/perl.scm:6066
+#: gnu/packages/perl.scm:6296
 msgid "Common Scalar and List utility subroutines"
 msgstr ""
 
-#: gnu/packages/perl.scm:6067
+#: gnu/packages/perl.scm:6297
 msgid ""
 "This package contains a selection of subroutines that people\n"
 "have expressed would be nice to have in the perl core, but the usage would not\n"
@@ -7909,6 +8707,14 @@ msgid ""
 "such that being individual extensions would be wasteful."
 msgstr ""
 
+#: gnu/packages/perl.scm:6321
+msgid "Cross-platform functions emulating common shell commands"
+msgstr ""
+
+#: gnu/packages/perl.scm:6323
+msgid "Shell::Command is a thin wrapper around ExtUtils::Command."
+msgstr ""
+
 #: gnu/packages/photo.scm:61
 msgid "Raw image decoder"
 msgstr ""
@@ -7983,11 +8789,11 @@ msgid ""
 "scene to produce an image that looks much like a tone-mapped image."
 msgstr ""
 
-#: gnu/packages/qemu.scm:119
-msgid "Machine emulator and virtualizer (without GUI)"
+#: gnu/packages/qemu.scm:155
+msgid "Machine emulator and virtualizer"
 msgstr ""
 
-#: gnu/packages/qemu.scm:121
+#: gnu/packages/qemu.scm:157
 msgid ""
 "QEMU is a generic machine emulator and virtualizer.\n"
 "\n"
@@ -8002,8 +8808,8 @@ msgid ""
 "server and embedded PowerPC, and S390 guests."
 msgstr ""
 
-#: gnu/packages/qemu.scm:143
-msgid "Machine emulator and virtualizer"
+#: gnu/packages/qemu.scm:179
+msgid "Machine emulator and virtualizer (without GUI)"
 msgstr ""
 
 #: gnu/packages/ratpoison.scm:85
@@ -8051,22 +8857,22 @@ msgid ""
 "package contains the library and drivers."
 msgstr ""
 
-#: gnu/packages/scheme.scm:132
+#: gnu/packages/scheme.scm:169
 msgid "A Scheme implementation with integrated editor and debugger"
 msgstr ""
 
-#: gnu/packages/scheme.scm:134
+#: gnu/packages/scheme.scm:171
 msgid ""
 "GNU/MIT Scheme is an implementation of the Scheme programming\n"
 "language.  It provides an interpreter, a compiler and a debugger.  It also\n"
 "features an integrated Emacs-like editor and a large runtime library."
 msgstr ""
 
-#: gnu/packages/scheme.scm:217
+#: gnu/packages/scheme.scm:254
 msgid "Efficient Scheme compiler"
 msgstr ""
 
-#: gnu/packages/scheme.scm:219
+#: gnu/packages/scheme.scm:256
 msgid ""
 "Bigloo is a Scheme implementation devoted to one goal: enabling\n"
 "Scheme based programming style where C(++) is usually\n"
@@ -8078,11 +8884,11 @@ msgid ""
 "Scheme and C programs and between Scheme and Java programs."
 msgstr ""
 
-#: gnu/packages/scheme.scm:262
+#: gnu/packages/scheme.scm:300
 msgid "Multi-tier programming language for the Web 2.0"
 msgstr ""
 
-#: gnu/packages/scheme.scm:264
+#: gnu/packages/scheme.scm:302
 msgid ""
 "HOP is a multi-tier programming language for the Web 2.0 and the\n"
 "so-called diffuse Web.  It is designed for programming interactive web\n"
@@ -8091,33 +8897,33 @@ msgid ""
 "mashups, office (web agendas, mail clients, ...), etc."
 msgstr ""
 
-#: gnu/packages/scheme.scm:304
+#: gnu/packages/scheme.scm:342
 msgid "R5RS Scheme implementation that compiles native code via C"
 msgstr ""
 
-#: gnu/packages/scheme.scm:306
+#: gnu/packages/scheme.scm:344
 msgid ""
 "CHICKEN is a compiler for the Scheme programming language.  CHICKEN\n"
 "produces portable and efficient C, supports almost all of the R5RS Scheme\n"
 "language standard, and includes many enhancements and extensions."
 msgstr ""
 
-#: gnu/packages/scheme.scm:325
+#: gnu/packages/scheme.scm:363
 msgid "Scheme implementation using a bytecode interpreter"
 msgstr ""
 
-#: gnu/packages/scheme.scm:327
+#: gnu/packages/scheme.scm:365
 msgid ""
 "Scheme 48 is an implementation of Scheme based on a byte-code\n"
 "interpreter and is designed to be used as a testbed for experiments in\n"
 "implementation techniques and as an expository tool."
 msgstr ""
 
-#: gnu/packages/scheme.scm:403
+#: gnu/packages/scheme.scm:441
 msgid "Implementation of Scheme and related languages"
 msgstr ""
 
-#: gnu/packages/scheme.scm:405
+#: gnu/packages/scheme.scm:443
 msgid ""
 "Racket is an implementation of the Scheme programming language (R5RS and\n"
 "R6RS) and related languages, such as Typed Racket.  It features a compiler and\n"
@@ -8125,11 +8931,11 @@ msgid ""
 "of libraries."
 msgstr ""
 
-#: gnu/packages/scheme.scm:443
+#: gnu/packages/scheme.scm:481
 msgid "Efficient Scheme interpreter and compiler"
 msgstr ""
 
-#: gnu/packages/scheme.scm:445
+#: gnu/packages/scheme.scm:483
 msgid ""
 "Gambit consists of two main programs: gsi, the Gambit Scheme\n"
 "interpreter, and gsc, the Gambit Scheme compiler.  The interpreter contains\n"
@@ -8140,11 +8946,11 @@ msgid ""
 "mixed."
 msgstr ""
 
-#: gnu/packages/scheme.scm:482
+#: gnu/packages/scheme.scm:520
 msgid "Small embeddable Scheme implementation"
 msgstr ""
 
-#: gnu/packages/scheme.scm:484
+#: gnu/packages/scheme.scm:522
 msgid ""
 "Chibi-Scheme is a very small library with no external dependencies\n"
 "intended for use as an extension and scripting language in C programs.  In\n"
@@ -8153,11 +8959,11 @@ msgid ""
 "threads."
 msgstr ""
 
-#: gnu/packages/scheme.scm:660
+#: gnu/packages/scheme.scm:693
 msgid "Scmutils library for MIT Scheme"
 msgstr ""
 
-#: gnu/packages/scheme.scm:661
+#: gnu/packages/scheme.scm:694
 msgid ""
 "The Scmutils system is an integrated library of\n"
 "procedures, embedded in the programming language Scheme, and intended to\n"
@@ -8191,7 +8997,7 @@ msgstr ""
 
 #: gnu/packages/search.scm:121
 msgid "Command-line interface to libtocc"
-msgstr ""
+msgstr "Kommandolinjegrænseflade til libtocc"
 
 #: gnu/packages/search.scm:123
 msgid ""
@@ -8201,7 +9007,7 @@ msgstr ""
 
 #: gnu/packages/search.scm:141
 msgid "Finding text and HTML files that match boolean expressions"
-msgstr ""
+msgstr "Find tekst- og HTML-filer som matcher booleske udtryk"
 
 #: gnu/packages/search.scm:143
 msgid ""
@@ -8216,7 +9022,7 @@ msgstr ""
 
 #: gnu/packages/serveez.scm:51
 msgid "Framework for implementing IP-based servers"
-msgstr ""
+msgstr "Ramme for implementering af IP-baserede servere"
 
 #: gnu/packages/serveez.scm:53
 msgid ""
@@ -8229,11 +9035,11 @@ msgid ""
 "server and an IRC server."
 msgstr ""
 
-#: gnu/packages/telephony.scm:50
+#: gnu/packages/telephony.scm:52
 msgid "(u)Common C++ framework for threaded applications"
-msgstr ""
+msgstr "(u)Common C++-ramme for trådede programmer"
 
-#: gnu/packages/telephony.scm:51
+#: gnu/packages/telephony.scm:53
 msgid ""
 "GNU Common C++ is an portable, optimized class framework for\n"
 "threaded applications, supporting concurrent synchronization, inter-process\n"
@@ -8242,11 +9048,11 @@ msgid ""
 "reimplementation."
 msgstr ""
 
-#: gnu/packages/telephony.scm:70
+#: gnu/packages/telephony.scm:73
 msgid "Common C++ framework for threaded applications"
 msgstr ""
 
-#: gnu/packages/telephony.scm:71
+#: gnu/packages/telephony.scm:74
 msgid ""
 "GNU uCommon C++ is meant as a very light-weight C++ library\n"
 "to facilitate using C++ design patterns even for very deeply embedded\n"
@@ -8254,11 +9060,11 @@ msgid ""
 "support."
 msgstr ""
 
-#: gnu/packages/telephony.scm:92
+#: gnu/packages/telephony.scm:95
 msgid "Implementation of RTP (real-time transport protocol)"
 msgstr ""
 
-#: gnu/packages/telephony.scm:93
+#: gnu/packages/telephony.scm:96
 msgid ""
 "GNU ccRTP is an implementation of RTP, the real-time transport\n"
 "protocol from the IETF.  It is suitable both for high capacity servers and\n"
@@ -8267,22 +9073,22 @@ msgid ""
 "packet-manipulation library."
 msgstr ""
 
-#: gnu/packages/telephony.scm:113
+#: gnu/packages/telephony.scm:116
 msgid "Library implementing SIP (RFC-3261)"
 msgstr ""
 
-#: gnu/packages/telephony.scm:114
+#: gnu/packages/telephony.scm:117
 msgid ""
 "GNU oSIP is an implementation of the SIP protocol.  It is\n"
 "used to provide multimedia and telecom software developers with an interface\n"
 "to initiate and control SIP sessions."
 msgstr ""
 
-#: gnu/packages/telephony.scm:134
+#: gnu/packages/telephony.scm:137
 msgid "Sip abstraction library"
 msgstr ""
 
-#: gnu/packages/telephony.scm:135
+#: gnu/packages/telephony.scm:138
 msgid ""
 "EXosip is a library that hides the complexity of using the\n"
 "SIP protocol for multimedia session establishment.  This protocol is mainly to\n"
@@ -8291,11 +9097,11 @@ msgid ""
 "multiplayer games."
 msgstr ""
 
-#: gnu/packages/telephony.scm:178
+#: gnu/packages/telephony.scm:181
 msgid "Secure peer-to-peer VoIP server for the SIP protocol"
 msgstr ""
 
-#: gnu/packages/telephony.scm:179
+#: gnu/packages/telephony.scm:182
 msgid ""
 "GNU SIP Witch is a peer-to-peer Voice-over-IP server that\n"
 "uses the SIP protocol.  Calls can be made from behind NAT firewalls and\n"
@@ -8305,22 +9111,22 @@ msgid ""
 "internet."
 msgstr ""
 
-#: gnu/packages/telephony.scm:204
+#: gnu/packages/telephony.scm:207
 msgid "Secure RTP (SRTP) Reference Implementation"
 msgstr ""
 
-#: gnu/packages/telephony.scm:205
+#: gnu/packages/telephony.scm:208
 msgid ""
 "This package provides an implementation of the Secure\n"
 "Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),\n"
 "and a supporting cryptographic kernel."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:56
+#: gnu/packages/texinfo.scm:55
 msgid "The GNU documentation format"
 msgstr ""
 
-#: gnu/packages/texinfo.scm:58
+#: gnu/packages/texinfo.scm:57
 msgid ""
 "Texinfo is the official documentation format of the GNU project.  It\n"
 "uses a single source file using explicit commands to produce a final document\n"
@@ -8330,11 +9136,11 @@ msgid ""
 "is on expressing the content semantically, avoiding physical markup commands."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:116
+#: gnu/packages/texinfo.scm:132
 msgid "Convert Texinfo to HTML"
 msgstr ""
 
-#: gnu/packages/texinfo.scm:118
+#: gnu/packages/texinfo.scm:134
 msgid ""
 "Texi2HTML is a Perl script which converts Texinfo source files to HTML\n"
 "output.  It now supports many advanced features, such as internationalization\n"
@@ -8349,12 +9155,12 @@ msgid ""
 "Texi2HTML."
 msgstr ""
 
-#: gnu/packages/texlive.scm:156 gnu/packages/texlive.scm:216
-#: gnu/packages/texlive.scm:274
+#: gnu/packages/texlive.scm:158 gnu/packages/texlive.scm:221
+#: gnu/packages/texlive.scm:279
 msgid "TeX Live, a package of the TeX typesetting system"
 msgstr ""
 
-#: gnu/packages/texlive.scm:158
+#: gnu/packages/texlive.scm:160
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -8364,7 +9170,7 @@ msgid ""
 "This package contains the binaries."
 msgstr ""
 
-#: gnu/packages/texlive.scm:218
+#: gnu/packages/texlive.scm:223
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -8374,7 +9180,7 @@ msgid ""
 "This package contains the complete tree of texmf-dist data."
 msgstr ""
 
-#: gnu/packages/texlive.scm:276
+#: gnu/packages/texlive.scm:281
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -8384,11 +9190,31 @@ msgid ""
 "This package contains the complete TeX Live distribution."
 msgstr ""
 
-#: gnu/packages/texlive.scm:305
+#: gnu/packages/texlive.scm:335
+msgid ""
+"TeX Live provides a comprehensive TeX document production system.\n"
+"It includes all the major TeX-related programs, macro packages, and fonts\n"
+"that are free software, including support for many languages around the\n"
+"world.\n"
+"\n"
+"This package contains a small subset of the texmf-dist data."
+msgstr ""
+
+#: gnu/packages/texlive.scm:353
+msgid ""
+"TeX Live provides a comprehensive TeX document production system.\n"
+"It includes all the major TeX-related programs, macro packages, and fonts\n"
+"that are free software, including support for many languages around the\n"
+"world.\n"
+"\n"
+"This package contains a small working part of the TeX Live distribution."
+msgstr ""
+
+#: gnu/packages/texlive.scm:381
 msgid "Wrapper for LaTeX and friends"
 msgstr ""
 
-#: gnu/packages/texlive.scm:307
+#: gnu/packages/texlive.scm:383
 msgid ""
 "Rubber is a program whose purpose is to handle all tasks related to the\n"
 "compilation of LaTeX documents.  This includes compiling the document itself,\n"
@@ -8398,11 +9224,11 @@ msgid ""
 "PDF documents."
 msgstr ""
 
-#: gnu/packages/textutils.scm:58
+#: gnu/packages/textutils.scm:61
 msgid "Text encoding converter"
 msgstr ""
 
-#: gnu/packages/textutils.scm:59
+#: gnu/packages/textutils.scm:62
 msgid ""
 "The Recode library converts files between character sets and\n"
 "usages.  It recognises or produces over 200 different character sets (or about\n"
@@ -8412,85 +9238,121 @@ msgid ""
 "handy front-end to the library."
 msgstr ""
 
-#: gnu/packages/textutils.scm:86
+#: gnu/packages/textutils.scm:90
 msgid "Text encoding detection tool"
 msgstr ""
 
-#: gnu/packages/textutils.scm:87
+#: gnu/packages/textutils.scm:91
 msgid ""
 "Enca (Extremely Naive Charset Analyser) consists of libenca,\n"
 "an encoding detection library, and enca, a command line frontend, integrating\n"
 "libenca and several charset conversion libraries and tools."
 msgstr ""
 
-#: gnu/packages/textutils.scm:122
+#: gnu/packages/textutils.scm:118
 msgid "C library for processing UTF-8 Unicode data"
 msgstr ""
 
-#: gnu/packages/textutils.scm:123
+#: gnu/packages/textutils.scm:119
 msgid ""
 "utf8proc is a small C library that provides Unicode\n"
 "normalization, case-folding, and other operations for data in the UTF-8\n"
 "encoding, supporting Unicode version 7.0."
 msgstr ""
 
-#: gnu/packages/textutils.scm:152
+#: gnu/packages/textutils.scm:148
 msgid "Gordon's text utils library"
 msgstr ""
 
-#: gnu/packages/textutils.scm:154
+#: gnu/packages/textutils.scm:150
 msgid ""
 "libgtextutils is a text utilities library used by the fastx toolkit from\n"
 "the Hannon Lab."
 msgstr ""
 
-#: gnu/packages/textutils.scm:175
+#: gnu/packages/textutils.scm:182
 msgid "C++ hash functions for strings"
 msgstr ""
 
-#: gnu/packages/textutils.scm:177
+#: gnu/packages/textutils.scm:184
 msgid ""
 "CityHash provides hash functions for strings.  The functions mix the\n"
 "input bits thoroughly but are not suitable for cryptography."
 msgstr ""
 
-#: gnu/packages/version-control.scm:97
+#: gnu/packages/textutils.scm:201
+msgid "C/C++ configuration file library"
+msgstr ""
+
+#: gnu/packages/textutils.scm:203
+msgid ""
+"Libconfig is a simple library for manipulating structured configuration\n"
+"files.  This file format is more compact and more readable than XML.  And\n"
+"unlike XML, it is type-aware, so it is not necessary to do string parsing in\n"
+"application code."
+msgstr ""
+
+#: gnu/packages/textutils.scm:223
+msgid "Probabilistic fast file fingerprinting tool"
+msgstr ""
+
+#: gnu/packages/textutils.scm:225
+msgid ""
+"pfff is a tool for calculating a compact digital fingerprint of a file\n"
+"by sampling randomly from the file instead of reading it in full.\n"
+"Consequently, the computation has a flat performance characteristic,\n"
+"correlated with data variation rather than file size.  pfff can be as reliable\n"
+"as existing hashing techniques, with provably negligible risk of collisions."
+msgstr ""
+
+#: gnu/packages/version-control.scm:105
 msgid "Version control system supporting both distributed and centralized workflows"
 msgstr ""
 
-#: gnu/packages/version-control.scm:99
+#: gnu/packages/version-control.scm:107
 msgid ""
 "GNU Bazaar is a version control system that allows you to record\n"
 "changes to project files over time.  It supports both a distributed workflow\n"
 "as well as the classic centralized workflow."
 msgstr ""
 
-#: gnu/packages/version-control.scm:258
+#: gnu/packages/version-control.scm:271
 msgid "Distributed version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:260
+#: gnu/packages/version-control.scm:273
 msgid ""
 "Git is a free distributed version control system designed to handle\n"
 "everything from small to very large projects with speed and efficiency."
 msgstr ""
 
-#: gnu/packages/version-control.scm:305
+#: gnu/packages/version-control.scm:318
 msgid "Man pages of the Git version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:307
+#: gnu/packages/version-control.scm:320
 msgid ""
 "This package provides the man pages of the Git version control system.\n"
 "This is the documentation displayed when using the '--help' option of a 'git'\n"
 "command."
 msgstr ""
 
-#: gnu/packages/version-control.scm:344
+#: gnu/packages/version-control.scm:359
+msgid "Library providing Git core methods"
+msgstr ""
+
+#: gnu/packages/version-control.scm:361
+msgid ""
+"Libgit2 is a portable, pure C implementation of the Git core methods\n"
+"provided as a re-entrant linkable library with a solid API, allowing you to\n"
+"write native speed custom Git applications in any language with bindings."
+msgstr ""
+
+#: gnu/packages/version-control.scm:400
 msgid "Command-line flags library for shell scripts"
 msgstr ""
 
-#: gnu/packages/version-control.scm:346
+#: gnu/packages/version-control.scm:402
 msgid ""
 "Shell Flags (shFlags) is a library written to greatly simplify the\n"
 "handling of command-line flags in Bourne based Unix shell scripts (bash, dash,\n"
@@ -8501,11 +9363,11 @@ msgid ""
 "will work."
 msgstr ""
 
-#: gnu/packages/version-control.scm:389
+#: gnu/packages/version-control.scm:445
 msgid "Git extensions for Vincent Driessen's branching model"
 msgstr ""
 
-#: gnu/packages/version-control.scm:391
+#: gnu/packages/version-control.scm:447
 msgid ""
 "Vincent Driessen's branching model is a git branching and release\n"
 "management strategy that helps developers keep track of features, hotfixes,\n"
@@ -8514,43 +9376,43 @@ msgid ""
 "lot easier."
 msgstr ""
 
-#: gnu/packages/version-control.scm:426
+#: gnu/packages/version-control.scm:482
 msgid "Run a command over a sequence of commits"
 msgstr ""
 
-#: gnu/packages/version-control.scm:428
+#: gnu/packages/version-control.scm:484
 msgid ""
 "git-test-sequence is similar to an automated git bisect except it’s\n"
 "linear.  It will test every change between two points in the DAG.  It will\n"
 "also walk each side of a merge and test those changes individually."
 msgstr ""
 
-#: gnu/packages/version-control.scm:486
+#: gnu/packages/version-control.scm:542
 msgid "Git access control layer"
 msgstr ""
 
-#: gnu/packages/version-control.scm:488
+#: gnu/packages/version-control.scm:544
 msgid ""
 "Gitolite is an access control layer on top of Git, providing fine access\n"
 "control to Git repositories."
 msgstr ""
 
-#: gnu/packages/version-control.scm:512
+#: gnu/packages/version-control.scm:568
 msgid "Decentralized version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:514
+#: gnu/packages/version-control.scm:570
 msgid ""
 "Mercurial is a free, distributed source control management tool.\n"
 "It efficiently handles projects of any size\n"
 "and offers an easy and intuitive interface."
 msgstr ""
 
-#: gnu/packages/version-control.scm:548
+#: gnu/packages/version-control.scm:604
 msgid "HTTP and WebDAV client library"
 msgstr ""
 
-#: gnu/packages/version-control.scm:549
+#: gnu/packages/version-control.scm:605
 msgid ""
 "Neon is an HTTP and WebDAV client library, with a\n"
 "C interface.  Features:\n"
@@ -8570,11 +9432,11 @@ msgid ""
 "property manipulation."
 msgstr ""
 
-#: gnu/packages/version-control.scm:628
+#: gnu/packages/version-control.scm:684
 msgid "Revision control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:630
+#: gnu/packages/version-control.scm:686
 msgid ""
 "Subversion exists to be universally recognized and adopted as a\n"
 "centralized version control system characterized by its\n"
@@ -8583,11 +9445,11 @@ msgid ""
 "projects, from individuals to large-scale enterprise operations."
 msgstr ""
 
-#: gnu/packages/version-control.scm:651
+#: gnu/packages/version-control.scm:707
 msgid "Per-file local revision control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:653
+#: gnu/packages/version-control.scm:709
 msgid ""
 "RCS is the original Revision Control System.  It works on a\n"
 "file-by-file basis, in contrast to subsequent version control systems such as\n"
@@ -8596,11 +9458,11 @@ msgid ""
 "machine."
 msgstr ""
 
-#: gnu/packages/version-control.scm:679
+#: gnu/packages/version-control.scm:736
 msgid "Historical centralized version control system"
 msgstr ""
 
-#: gnu/packages/version-control.scm:681
+#: gnu/packages/version-control.scm:738
 msgid ""
 "CVS is a version control system, an important component of Source\n"
 "Configuration Management (SCM).  Using it, you can record the history of\n"
@@ -8608,11 +9470,11 @@ msgid ""
 "RCS, PRCS, and Aegis packages."
 msgstr ""
 
-#: gnu/packages/version-control.scm:714
+#: gnu/packages/version-control.scm:771
 msgid "Export an RCS or CVS history as a fast-import stream"
 msgstr ""
 
-#: gnu/packages/version-control.scm:715
+#: gnu/packages/version-control.scm:772
 msgid ""
 "This program analyzes a collection of RCS files in a CVS\n"
 "repository (or outside of one) and, when possible, emits an equivalent history\n"
@@ -8625,11 +9487,11 @@ msgid ""
 "masters from remote CVS hosts."
 msgstr ""
 
-#: gnu/packages/version-control.scm:742
+#: gnu/packages/version-control.scm:799
 msgid "Version-control-agnostic ChangeLog diff and commit tool"
 msgstr ""
 
-#: gnu/packages/version-control.scm:744
+#: gnu/packages/version-control.scm:801
 msgid ""
 "The vc-dwim package contains two tools, \"vc-dwim\" and \"vc-chlog\".\n"
 "vc-dwim is a tool that simplifies the task of maintaining a ChangeLog and\n"
@@ -8639,33 +9501,33 @@ msgid ""
 "standards-compliant ChangeLog entries based on the changes that it detects."
 msgstr ""
 
-#: gnu/packages/version-control.scm:766
+#: gnu/packages/version-control.scm:823
 msgid "Make histograms from the output of 'diff'"
 msgstr ""
 
-#: gnu/packages/version-control.scm:768
+#: gnu/packages/version-control.scm:825
 msgid ""
 "Diffstat reads the output of 'diff' and displays a histogram of the\n"
 "insertions, deletions, and modifications per-file.  It is useful for reviewing\n"
 "large, complex patch files."
 msgstr ""
 
-#: gnu/packages/version-control.scm:809
+#: gnu/packages/version-control.scm:866
 msgid "File-based version control like SCCS"
 msgstr ""
 
-#: gnu/packages/version-control.scm:810
+#: gnu/packages/version-control.scm:867
 msgid ""
 "GNU CSSC provides a replacement for the legacy Unix source\n"
 "code control system SCCS.  This allows old code still under that system to be\n"
 "accessed and migrated on modern systems."
 msgstr ""
 
-#: gnu/packages/version-control.scm:891
+#: gnu/packages/version-control.scm:948
 msgid "Project change supervisor"
 msgstr ""
 
-#: gnu/packages/version-control.scm:892
+#: gnu/packages/version-control.scm:949
 msgid ""
 "Aegis is a project change supervisor, and performs some of\n"
 "the Software Configuration Management needed in a CASE environment.  Aegis\n"
@@ -8676,33 +9538,65 @@ msgid ""
 "any project with more than one developer, is one of Aegis's major functions."
 msgstr ""
 
-#: gnu/packages/version-control.scm:919
+#: gnu/packages/version-control.scm:977
 msgid "Ncurses-based text user interface for Git"
 msgstr ""
 
-#: gnu/packages/version-control.scm:921
+#: gnu/packages/version-control.scm:979
 msgid ""
 "Tig is an ncurses text user interface for Git, primarily intended as\n"
 "a history browser.  It can also stage hunks for commit, or colorize the\n"
 "output of the 'git' command."
 msgstr ""
 
-#: gnu/packages/webkit.scm:121
-msgid "Web content engine for GTK+"
+#: gnu/packages/version-control.scm:1005
+msgid "Print the modification time of the latest file"
+msgstr ""
+
+#: gnu/packages/version-control.scm:1007
+msgid ""
+"Recursively find the newest file in a file tree and print its\n"
+"modification time."
+msgstr ""
+
+#: gnu/packages/version-control.scm:1032
+msgid "Multiple repository management tool"
+msgstr ""
+
+#: gnu/packages/version-control.scm:1034
+msgid ""
+"Myrepos provides the @code{mr} command, which maps an operation (e.g.,\n"
+"fetching updates) over a collection of version control repositories.  It\n"
+"supports a large number of version control systems: Git, Subversion,\n"
+"Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity."
+msgstr ""
+
+#: gnu/packages/version-control.scm:1064
+msgid "Use hubic as a git-annex remote"
+msgstr ""
+
+#: gnu/packages/version-control.scm:1066
+msgid ""
+"This package allows you to use your hubic account as a \"special\n"
+"repository\" with git-annex."
 msgstr ""
 
 #: gnu/packages/webkit.scm:123
+msgid "Web content engine for GTK+"
+msgstr ""
+
+#: gnu/packages/webkit.scm:125
 msgid ""
 "WebKitGTK+ is a full-featured port of the WebKit rendering engine,\n"
 "suitable for projects requiring any kind of web integration, from hybrid\n"
 "HTML/CSS applications to full-fledged web browsers."
 msgstr ""
 
-#: gnu/packages/web.scm:88
+#: gnu/packages/web.scm:89
 msgid "Featureful HTTP server"
 msgstr ""
 
-#: gnu/packages/web.scm:90
+#: gnu/packages/web.scm:91
 msgid ""
 "The Apache HTTP Server Project is a collaborative software development\n"
 "effort aimed at creating a robust, commercial-grade, featureful, and\n"
@@ -8712,85 +9606,85 @@ msgid ""
 "and its related documentation."
 msgstr ""
 
-#: gnu/packages/web.scm:168
+#: gnu/packages/web.scm:169
 msgid "HTTP and reverse proxy server"
 msgstr ""
 
-#: gnu/packages/web.scm:170
+#: gnu/packages/web.scm:171
 msgid ""
 "Nginx (\"engine X\") is a high-performance web and reverse proxy server\n"
 "created by Igor Sysoev.  It can be used both as a standalone web server\n"
 "and as a proxy to reduce the load on back-end HTTP or mail servers."
 msgstr ""
 
-#: gnu/packages/web.scm:206
+#: gnu/packages/web.scm:207
 msgid "PSGI/Plack web server"
 msgstr ""
 
-#: gnu/packages/web.scm:207
+#: gnu/packages/web.scm:208
 msgid ""
 "Starman is a PSGI perl web server that has unique features\n"
 "such as high performance, preforking, signal support, superdaemon awareness,\n"
 "and UNIX socket support."
 msgstr ""
 
-#: gnu/packages/web.scm:226
+#: gnu/packages/web.scm:227
 msgid "JSON C library"
 msgstr ""
 
-#: gnu/packages/web.scm:228
+#: gnu/packages/web.scm:229
 msgid ""
 "Jansson is a C library for encoding, decoding and manipulating JSON\n"
 "data."
 msgstr ""
 
-#: gnu/packages/web.scm:259
+#: gnu/packages/web.scm:261
 msgid "JSON implementation in C"
 msgstr ""
 
-#: gnu/packages/web.scm:261
+#: gnu/packages/web.scm:263
 msgid ""
 "JSON-C implements a reference counting object model that allows you to\n"
 "easily construct JSON objects in C, output them as JSON formatted strings and\n"
 "parse JSON formatted strings back into the C representation of JSON objects."
 msgstr ""
 
-#: gnu/packages/web.scm:287
+#: gnu/packages/web.scm:289
 msgid "JSON parser/generator for C++ with both SAX/DOM style API"
 msgstr ""
 
-#: gnu/packages/web.scm:289
+#: gnu/packages/web.scm:291
 msgid ""
 "RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM\n"
 "style API."
 msgstr ""
 
-#: gnu/packages/web.scm:307
+#: gnu/packages/web.scm:309
 msgid "C library for parsing JSON"
 msgstr ""
 
-#: gnu/packages/web.scm:309
+#: gnu/packages/web.scm:311
 msgid ""
 "Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON\n"
 "parser written in ANSI C and a small validating JSON generator."
 msgstr ""
 
-#: gnu/packages/web.scm:339
+#: gnu/packages/web.scm:341
 msgid "WebSockets library written in C"
 msgstr ""
 
-#: gnu/packages/web.scm:341
+#: gnu/packages/web.scm:343
 msgid ""
 "Libwebsockets is a library that allows C programs to establish client\n"
 "and server WebSockets connections---a protocol layered above HTTP that allows\n"
 "for efficient socket-like bidirectional reliable communication channels."
 msgstr ""
 
-#: gnu/packages/web.scm:376
+#: gnu/packages/web.scm:378
 msgid "C library for the Publix Suffix List"
 msgstr ""
 
-#: gnu/packages/web.scm:378
+#: gnu/packages/web.scm:380
 msgid ""
 "A \"public suffix\" is a domain name under which Internet users can\n"
 "directly register own names.\n"
@@ -8808,21 +9702,21 @@ msgid ""
 "UTS#46."
 msgstr ""
 
-#: gnu/packages/web.scm:424
+#: gnu/packages/web.scm:426
 msgid "HTML validator and tidier"
 msgstr ""
 
-#: gnu/packages/web.scm:425
+#: gnu/packages/web.scm:427
 msgid ""
 "HTML Tidy is a command-line tool and C library that can be\n"
 "used to validate and fix HTML data."
 msgstr ""
 
-#: gnu/packages/web.scm:465
+#: gnu/packages/web.scm:468
 msgid "Light-weight HTTP/HTTPS proxy daemon"
 msgstr ""
 
-#: gnu/packages/web.scm:466
+#: gnu/packages/web.scm:469
 msgid ""
 "Tinyproxy is a light-weight HTTP/HTTPS proxy\n"
 "daemon.  Designed from the ground up to be fast and yet small, it is an ideal\n"
@@ -8831,52 +9725,52 @@ msgid ""
 "unavailable."
 msgstr ""
 
-#: gnu/packages/web.scm:499
+#: gnu/packages/web.scm:502
 msgid "Small caching web proxy"
 msgstr ""
 
-#: gnu/packages/web.scm:501
+#: gnu/packages/web.scm:504
 msgid ""
 "Polipo is a small caching web proxy (web cache, HTTP proxy, and proxy\n"
 "server).  It was primarily designed to be used by one person or a small group\n"
 "of people."
 msgstr ""
 
-#: gnu/packages/web.scm:521
+#: gnu/packages/web.scm:524
 msgid "YAML 1.1 parser and emitter written in C"
 msgstr ""
 
-#: gnu/packages/web.scm:523
+#: gnu/packages/web.scm:526
 msgid "LibYAML is a YAML 1.1 parser and emitter written in C."
 msgstr ""
 
-#: gnu/packages/web.scm:539 gnu/packages/web.scm:572 gnu/packages/web.scm:594
+#: gnu/packages/web.scm:542 gnu/packages/web.scm:575 gnu/packages/web.scm:597
 msgid "Media stream URL parser"
 msgstr ""
 
-#: gnu/packages/web.scm:540
+#: gnu/packages/web.scm:543
 msgid ""
 "This package contains support scripts called by libquvi to\n"
 "parse media stream properties."
 msgstr ""
 
-#: gnu/packages/web.scm:573
+#: gnu/packages/web.scm:576
 msgid ""
 "libquvi is a library with a C API for parsing media stream\n"
 "URLs and extracting their actual media files."
 msgstr ""
 
-#: gnu/packages/web.scm:595
+#: gnu/packages/web.scm:598
 msgid ""
 "quvi is a command-line-tool suite to extract media files\n"
 "from streaming URLs.  It is a command-line wrapper for the libquvi library."
 msgstr ""
 
-#: gnu/packages/web.scm:658
+#: gnu/packages/web.scm:661
 msgid "High-performance asynchronous HTTP client library"
 msgstr ""
 
-#: gnu/packages/web.scm:660
+#: gnu/packages/web.scm:663
 msgid ""
 "serf is a C-based HTTP client library built upon the Apache Portable\n"
 "Runtime (APR) library.  It multiplexes connections, running the read/write\n"
@@ -8884,49 +9778,49 @@ msgid ""
 "minimum to provide high performance operation."
 msgstr ""
 
-#: gnu/packages/web.scm:715
+#: gnu/packages/web.scm:718
 msgid "CSS pre-processor"
 msgstr ""
 
-#: gnu/packages/web.scm:716
+#: gnu/packages/web.scm:719
 msgid ""
 "SassC is a compiler written in C for the CSS pre-processor\n"
 "language known as SASS."
 msgstr ""
 
-#: gnu/packages/web.scm:744
+#: gnu/packages/web.scm:748
 msgid "Compile a log format string to perl-code"
 msgstr ""
 
-#: gnu/packages/web.scm:745
+#: gnu/packages/web.scm:749
 msgid ""
 "This module provides methods to compile a log format string\n"
 "to perl-code, for faster generation of access_log lines."
 msgstr ""
 
-#: gnu/packages/web.scm:766
+#: gnu/packages/web.scm:770
 msgid "SASL authentication framework"
 msgstr ""
 
-#: gnu/packages/web.scm:767
+#: gnu/packages/web.scm:771
 msgid "Authen::SASL provides an SASL authentication framework."
 msgstr ""
 
-#: gnu/packages/web.scm:791
+#: gnu/packages/web.scm:795
 msgid "Sensible default Catalyst action"
 msgstr ""
 
-#: gnu/packages/web.scm:792
+#: gnu/packages/web.scm:796
 msgid ""
 "This Catalyst action implements a sensible default end\n"
 "action, which will forward to the first available view."
 msgstr ""
 
-#: gnu/packages/web.scm:820
+#: gnu/packages/web.scm:824
 msgid "Automated REST Method Dispatching"
 msgstr ""
 
-#: gnu/packages/web.scm:821
+#: gnu/packages/web.scm:825
 msgid ""
 "This Action handles doing automatic method dispatching for\n"
 "REST requests.  It takes a normal Catalyst action, and changes the dispatch to\n"
@@ -8935,32 +9829,32 @@ msgid ""
 "regular method."
 msgstr ""
 
-#: gnu/packages/web.scm:857
+#: gnu/packages/web.scm:861
 msgid "Storage class for Catalyst authentication using DBIx::Class"
 msgstr ""
 
-#: gnu/packages/web.scm:858
+#: gnu/packages/web.scm:862
 msgid ""
 "The Catalyst::Authentication::Store::DBIx::Class class\n"
 "provides access to authentication information stored in a database via\n"
 "DBIx::Class."
 msgstr ""
 
-#: gnu/packages/web.scm:882
+#: gnu/packages/web.scm:886
 msgid "Create only one instance of Moose component per context"
 msgstr ""
 
-#: gnu/packages/web.scm:883
+#: gnu/packages/web.scm:887
 msgid ""
 "Catalyst::Component::InstancePerContext returns a new\n"
 "instance of a component on each request."
 msgstr ""
 
-#: gnu/packages/web.scm:920
+#: gnu/packages/web.scm:924
 msgid "Catalyst Development Tools"
 msgstr ""
 
-#: gnu/packages/web.scm:921
+#: gnu/packages/web.scm:925
 msgid ""
 "The Catalyst-Devel distribution includes a variety of\n"
 "modules useful for the development of Catalyst applications, but not required\n"
@@ -8970,11 +9864,11 @@ msgid ""
 "modules."
 msgstr ""
 
-#: gnu/packages/web.scm:950
+#: gnu/packages/web.scm:954
 msgid "Regex DispatchType for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:951
+#: gnu/packages/web.scm:955
 msgid ""
 "Dispatch type managing path-matching behaviour using\n"
 "regexes.  Regex dispatch types have been deprecated and removed from Catalyst\n"
@@ -8984,32 +9878,32 @@ msgid ""
 "when the dispatch type is first seen in your application."
 msgstr ""
 
-#: gnu/packages/web.scm:999
+#: gnu/packages/web.scm:1003
 msgid "DBIx::Class::Schema Model Class"
 msgstr ""
 
-#: gnu/packages/web.scm:1000
+#: gnu/packages/web.scm:1004
 msgid ""
 "This is a Catalyst Model for DBIx::Class::Schema-based\n"
 "Models."
 msgstr ""
 
-#: gnu/packages/web.scm:1024
+#: gnu/packages/web.scm:1028
 msgid "Request logging from within Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1025
+#: gnu/packages/web.scm:1029
 msgid ""
 "This Catalyst plugin enables you to create \"access logs\"\n"
 "from within a Catalyst application instead of requiring a webserver to do it\n"
 "for you.  It will work even with Catalyst debug logging turned off."
 msgstr ""
 
-#: gnu/packages/web.scm:1057
+#: gnu/packages/web.scm:1061
 msgid "Infrastructure plugin for the Catalyst authentication framework"
 msgstr ""
 
-#: gnu/packages/web.scm:1058
+#: gnu/packages/web.scm:1062
 msgid ""
 "The authentication plugin provides generic user support for\n"
 "Catalyst apps.  It is the basis for both authentication (checking the user is\n"
@@ -9017,52 +9911,52 @@ msgid ""
 "system authorises them to do)."
 msgstr ""
 
-#: gnu/packages/web.scm:1088
+#: gnu/packages/web.scm:1092
 msgid "Role-based authorization for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1089
+#: gnu/packages/web.scm:1093
 msgid ""
 "Catalyst::Plugin::Authorization::Roles provides role-based\n"
 "authorization for Catalyst based on Catalyst::Plugin::Authentication."
 msgstr ""
 
-#: gnu/packages/web.scm:1112
+#: gnu/packages/web.scm:1116
 msgid "Captchas for Catalyst"
 msgstr ""
 
-#: gnu/packages/web.scm:1113
+#: gnu/packages/web.scm:1117
 msgid ""
 "This plugin creates and validates Captcha images for\n"
 "Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1139
+#: gnu/packages/web.scm:1143
 msgid "Load config files of various types"
 msgstr ""
 
-#: gnu/packages/web.scm:1140
+#: gnu/packages/web.scm:1144
 msgid ""
 "This module will attempt to load find and load configuration\n"
 "files of various types.  Currently it supports YAML, JSON, XML, INI and Perl\n"
 "formats."
 msgstr ""
 
-#: gnu/packages/web.scm:1170
+#: gnu/packages/web.scm:1174
 msgid "Catalyst generic session plugin"
 msgstr ""
 
-#: gnu/packages/web.scm:1171
+#: gnu/packages/web.scm:1175
 msgid ""
 "This plugin links the two pieces required for session\n"
 "management in web applications together: the state, and the store."
 msgstr ""
 
-#: gnu/packages/web.scm:1197
+#: gnu/packages/web.scm:1201
 msgid "Maintain session IDs using cookies"
 msgstr ""
 
-#: gnu/packages/web.scm:1198
+#: gnu/packages/web.scm:1202
 msgid ""
 "In order for Catalyst::Plugin::Session to work, the session\n"
 "ID needs to be stored on the client, and the session data needs to be stored\n"
@@ -9070,22 +9964,22 @@ msgid ""
 "cookie mechanism."
 msgstr ""
 
-#: gnu/packages/web.scm:1228
+#: gnu/packages/web.scm:1232
 msgid "FastMmap session storage backend"
 msgstr ""
 
-#: gnu/packages/web.scm:1229
+#: gnu/packages/web.scm:1233
 msgid ""
 "Catalyst::Plugin::Session::Store::FastMmap is a fast session\n"
 "storage plugin for Catalyst that uses an mmap'ed file to act as a shared\n"
 "memory interprocess cache.  It is based on Cache::FastMmap."
 msgstr ""
 
-#: gnu/packages/web.scm:1252
+#: gnu/packages/web.scm:1256
 msgid "Stack trace on the Catalyst debug screen"
 msgstr ""
 
-#: gnu/packages/web.scm:1253
+#: gnu/packages/web.scm:1257
 msgid ""
 "This plugin enhances the standard Catalyst debug screen by\n"
 "including a stack trace of your application up to the point where the error\n"
@@ -9093,11 +9987,11 @@ msgid ""
 "number, file name, and code context surrounding the line number."
 msgstr ""
 
-#: gnu/packages/web.scm:1279
+#: gnu/packages/web.scm:1283
 msgid "Simple serving of static pages"
 msgstr ""
 
-#: gnu/packages/web.scm:1280
+#: gnu/packages/web.scm:1284
 msgid ""
 "The Static::Simple plugin is designed to make serving static\n"
 "content in your application during development quick and easy, without\n"
@@ -9108,11 +10002,11 @@ msgid ""
 "MIME type directly to the browser, without being processed through Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1346
+#: gnu/packages/web.scm:1351
 msgid "The Catalyst Framework Runtime"
 msgstr ""
 
-#: gnu/packages/web.scm:1347
+#: gnu/packages/web.scm:1352
 msgid ""
 "Catalyst is a modern framework for making web applications.\n"
 "It is designed to make it easy to manage the various tasks you need to do to\n"
@@ -9120,11 +10014,11 @@ msgid ""
 "\"plug in\" existing Perl modules that do what you need."
 msgstr ""
 
-#: gnu/packages/web.scm:1377
+#: gnu/packages/web.scm:1382
 msgid "Replace request base with value passed by HTTP proxy"
 msgstr ""
 
-#: gnu/packages/web.scm:1378
+#: gnu/packages/web.scm:1383
 msgid ""
 "This module is a Moose::Role which allows you more\n"
 "flexibility in your application's deployment configurations when deployed\n"
@@ -9132,42 +10026,42 @@ msgid ""
 "replaced with the contents of the X-Request-Base header."
 msgstr ""
 
-#: gnu/packages/web.scm:1404
+#: gnu/packages/web.scm:1409
 msgid "Download data in many formats"
 msgstr ""
 
-#: gnu/packages/web.scm:1405
+#: gnu/packages/web.scm:1410
 msgid ""
 "The purpose of this module is to provide a method for\n"
 "downloading data into many supportable formats.  For example, downloading a\n"
 "table based report in a variety of formats (CSV, HTML, etc.)."
 msgstr ""
 
-#: gnu/packages/web.scm:1430
+#: gnu/packages/web.scm:1435
 msgid "Catalyst JSON view"
 msgstr ""
 
-#: gnu/packages/web.scm:1431
+#: gnu/packages/web.scm:1436
 msgid ""
 "Catalyst::View::JSON is a Catalyst View handler that returns\n"
 "stash data in JSON format."
 msgstr ""
 
-#: gnu/packages/web.scm:1456
+#: gnu/packages/web.scm:1461
 msgid "Template View Class"
 msgstr ""
 
-#: gnu/packages/web.scm:1457
+#: gnu/packages/web.scm:1462
 msgid ""
 "This module is a Catalyst view class for the Template\n"
 "Toolkit."
 msgstr ""
 
-#: gnu/packages/web.scm:1486
+#: gnu/packages/web.scm:1491
 msgid "Trait Loading and Resolution for Catalyst Components"
 msgstr ""
 
-#: gnu/packages/web.scm:1487
+#: gnu/packages/web.scm:1492
 msgid ""
 "Adds a \"COMPONENT\" in Catalyst::Component method to your\n"
 "Catalyst component base class that reads the optional \"traits\" parameter\n"
@@ -9176,72 +10070,85 @@ msgid ""
 "MooseX::Traits::Pluggable."
 msgstr ""
 
-#: gnu/packages/web.scm:1512
+#: gnu/packages/web.scm:1517
 msgid "Apply roles to Catalyst classes"
 msgstr ""
 
-#: gnu/packages/web.scm:1513
+#: gnu/packages/web.scm:1518
 msgid ""
 "CatalystX::RoleApplicator applies roles to Catalyst\n"
 "application classes."
 msgstr ""
 
-#: gnu/packages/web.scm:1539
+#: gnu/packages/web.scm:1544
 msgid "Catalyst development server with Starman"
 msgstr ""
 
-#: gnu/packages/web.scm:1540
+#: gnu/packages/web.scm:1545
 msgid ""
 "This module provides a Catalyst extension to replace the\n"
 "development server with Starman."
 msgstr ""
 
-#: gnu/packages/web.scm:1560
+#: gnu/packages/web.scm:1569
+msgid "Handle Common Gateway Interface requests and responses"
+msgstr ""
+
+#: gnu/packages/web.scm:1570
+msgid ""
+"CGI.pm is a stable, complete and mature solution for\n"
+"processing and preparing HTTP requests and responses.  Major features include\n"
+"processing form submissions, file uploads, reading and writing cookies, query\n"
+"string generation and manipulation, and processing and preparing HTTP\n"
+"headers."
+msgstr ""
+
+#: gnu/packages/web.scm:1594
 msgid "CGI interface that is CGI.pm compliant"
 msgstr ""
 
-#: gnu/packages/web.scm:1561
+#: gnu/packages/web.scm:1595
 msgid ""
 "CGI::Simple provides a relatively lightweight drop in\n"
 "replacement for CGI.pm.  It shares an identical OO interface to CGI.pm for\n"
 "parameter parsing, file upload, cookie handling and header generation."
 msgstr ""
 
-#: gnu/packages/web.scm:1582
+#: gnu/packages/web.scm:1616
 msgid "Build structures from CGI data"
 msgstr ""
 
-#: gnu/packages/web.scm:1583
+#: gnu/packages/web.scm:1617
 msgid ""
 "This is a module for building structured data from CGI\n"
 "inputs, in a manner reminiscent of how PHP does."
 msgstr ""
 
-#: gnu/packages/web.scm:1604
+#: gnu/packages/web.scm:1640
 msgid "Date conversion routines"
 msgstr ""
 
-#: gnu/packages/web.scm:1605
+#: gnu/packages/web.scm:1641
 msgid ""
 "This module provides functions that deal with the date\n"
 "formats used by the HTTP protocol."
 msgstr ""
 
-#: gnu/packages/web.scm:1625
+#: gnu/packages/web.scm:1661
 msgid "MD5 sums for files and urls"
 msgstr ""
 
-#: gnu/packages/web.scm:1626
+#: gnu/packages/web.scm:1662
 msgid ""
 "Digest::MD5::File is a Perl extension for getting MD5 sums\n"
 "for files and urls."
 msgstr ""
 
-#: gnu/packages/web.scm:1644
+#: gnu/packages/web.scm:1680
 msgid "Perl locale encoding determination"
 msgstr ""
 
-#: gnu/packages/web.scm:1646
+#: gnu/packages/web.scm:1682
 msgid ""
 "The POSIX locale system is used to specify both the language\n"
 "conventions requested by the user and the preferred character set to\n"
@@ -9253,91 +10160,91 @@ msgid ""
 "with Encode::decode(locale => $string)."
 msgstr ""
 
-#: gnu/packages/web.scm:1672
+#: gnu/packages/web.scm:1708
 msgid "Perl directory listing parser"
 msgstr ""
 
-#: gnu/packages/web.scm:1674
+#: gnu/packages/web.scm:1710
 msgid ""
 "The File::Listing module exports a single function called parse_dir(),\n"
 "which can be used to parse directory listings."
 msgstr ""
 
-#: gnu/packages/web.scm:1705
+#: gnu/packages/web.scm:1742
 msgid "Stock and mutual fund quotes"
 msgstr ""
 
-#: gnu/packages/web.scm:1707
+#: gnu/packages/web.scm:1744
 msgid ""
 "Finance::Quote gets stock quotes from various internet sources, including\n"
 "Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange."
 msgstr ""
 
-#: gnu/packages/web.scm:1729
+#: gnu/packages/web.scm:1766
 msgid "Perl extension providing access to the GSSAPIv2 library"
 msgstr ""
 
-#: gnu/packages/web.scm:1730
+#: gnu/packages/web.scm:1767
 msgid ""
 "This is a Perl extension for using GSSAPI C bindings as\n"
 "described in RFC 2744."
 msgstr ""
 
-#: gnu/packages/web.scm:1750
+#: gnu/packages/web.scm:1787
 msgid "Manipulate tables of HTML::Element"
 msgstr ""
 
-#: gnu/packages/web.scm:1752
+#: gnu/packages/web.scm:1789
 msgid ""
 "HTML::Element::Extended is a Perl extension for manipulating a table\n"
 "composed of HTML::Element style components."
 msgstr ""
 
-#: gnu/packages/web.scm:1776
+#: gnu/packages/web.scm:1813
 msgid "Perl class representing an HTML form element"
 msgstr ""
 
-#: gnu/packages/web.scm:1777
+#: gnu/packages/web.scm:1814
 msgid ""
 "Objects of the HTML::Form class represents a single HTML\n"
 "<form> ... </form> instance."
 msgstr ""
 
-#: gnu/packages/web.scm:1799
+#: gnu/packages/web.scm:1836
 msgid "Check for HTML errors in a string or file"
-msgstr ""
+msgstr "Kontroller for HTML-fejl i en streng eller fil"
 
-#: gnu/packages/web.scm:1800
+#: gnu/packages/web.scm:1837
 msgid ""
 "HTML::Lint is a pure-Perl HTML parser and checker for\n"
 "syntactic legitmacy."
 msgstr ""
 
-#: gnu/packages/web.scm:1821
+#: gnu/packages/web.scm:1858
 msgid "Extract contents from HTML tables"
-msgstr ""
+msgstr "Udtræk indhold fra HTML-tabeller"
 
-#: gnu/packages/web.scm:1823
+#: gnu/packages/web.scm:1860
 msgid ""
 "HTML::TableExtract is a Perl module for extracting the content contained\n"
 "in tables within an HTML document, either as text or encoded element trees."
 msgstr ""
 
-#: gnu/packages/web.scm:1847
+#: gnu/packages/web.scm:1885
 msgid "Work with HTML in a DOM-like tree structure"
-msgstr ""
+msgstr "Arbejd med HTML i en DOM-lignende træstruktur"
 
-#: gnu/packages/web.scm:1848
+#: gnu/packages/web.scm:1886
 msgid ""
 "This distribution contains a suite of modules for\n"
 "representing, creating, and extracting information from HTML syntax trees."
 msgstr ""
 
-#: gnu/packages/web.scm:1868
+#: gnu/packages/web.scm:1906
 msgid "Perl HTML parser class"
 msgstr ""
 
-#: gnu/packages/web.scm:1870
+#: gnu/packages/web.scm:1908
 msgid ""
 "Objects of the HTML::Parser class will recognize markup and separate\n"
 "it from plain text (alias data content) in HTML documents.  As different\n"
@@ -9345,82 +10252,97 @@ msgid ""
 "are invoked."
 msgstr ""
 
-#: gnu/packages/web.scm:1890
+#: gnu/packages/web.scm:1928
 msgid "Perl data tables useful in parsing HTML"
 msgstr ""
 
-#: gnu/packages/web.scm:1892
+#: gnu/packages/web.scm:1930
 msgid ""
 "The HTML::Tagset module contains several data tables useful in various\n"
 "kinds of HTML parsing operations."
 msgstr ""
 
-#: gnu/packages/web.scm:1915
+#: gnu/packages/web.scm:1949
+msgid "HTML-like templates"
+msgstr ""
+
+#: gnu/packages/web.scm:1951
+msgid ""
+"This module attempts to make using HTML templates simple and natural.\n"
+"It extends standard HTML with a few new HTML-esque tags: @code{<TMPL_VAR>},\n"
+"@code{<TMPL_LOOP>}, @code{<TMPL_INCLUDE>}, @code{<TMPL_IF>},\n"
+"@code{<TMPL_ELSE>} and @code{<TMPL_UNLESS>}.  The file written with HTML and\n"
+"these new tags is called a template.  Using this module you fill in the values\n"
+"for the variables, loops and branches declared in the template.  This allows\n"
+"you to separate design from the data."
+msgstr ""
+
+#: gnu/packages/web.scm:1979
 msgid "HTTP Body Parser"
 msgstr ""
 
-#: gnu/packages/web.scm:1916
+#: gnu/packages/web.scm:1980
 msgid ""
 "HTTP::Body parses chunks of HTTP POST data and supports\n"
 "application/octet-stream, application/json, application/x-www-form-urlencoded,\n"
 "and multipart/form-data."
 msgstr ""
 
-#: gnu/packages/web.scm:1942
+#: gnu/packages/web.scm:2006
 msgid "Minimalist HTTP user agent cookie jar"
 msgstr ""
 
-#: gnu/packages/web.scm:1943
+#: gnu/packages/web.scm:2007
 msgid ""
 "This module implements a minimalist HTTP user agent cookie\n"
 "jar in conformance with RFC 6265 <http://tools.ietf.org/html/rfc6265>."
 msgstr ""
 
-#: gnu/packages/web.scm:1963
+#: gnu/packages/web.scm:2027
 msgid "Perl HTTP cookie jars"
 msgstr ""
 
-#: gnu/packages/web.scm:1965
+#: gnu/packages/web.scm:2029
 msgid ""
 "The HTTP::Cookies class is for objects that represent a cookie jar,\n"
 "that is, a database of all the HTTP cookies that a given LWP::UserAgent\n"
 "object knows about."
 msgstr ""
 
-#: gnu/packages/web.scm:1987
+#: gnu/packages/web.scm:2051
 msgid "Perl simple http server class"
 msgstr ""
 
-#: gnu/packages/web.scm:1989
+#: gnu/packages/web.scm:2053
 msgid ""
 "Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen\n"
 "on a socket for incoming requests.  The HTTP::Daemon is a subclass of\n"
 "IO::Socket::INET, so you can perform socket operations directly on it too."
 msgstr ""
 
-#: gnu/packages/web.scm:2008
+#: gnu/packages/web.scm:2072
 msgid "Perl date conversion routines"
 msgstr ""
 
-#: gnu/packages/web.scm:2010
+#: gnu/packages/web.scm:2074
 msgid ""
 "The HTTP::Date module provides functions that deal with date formats\n"
 "used by the HTTP protocol (and then some more)."
 msgstr ""
 
-#: gnu/packages/web.scm:2033
+#: gnu/packages/web.scm:2097
 msgid "Perl HTTP style message"
 msgstr ""
 
-#: gnu/packages/web.scm:2035
+#: gnu/packages/web.scm:2099
 msgid "An HTTP::Message object contains some headers and a content body."
 msgstr ""
 
-#: gnu/packages/web.scm:2054
+#: gnu/packages/web.scm:2118
 msgid "Perl http content negotiation"
 msgstr ""
 
-#: gnu/packages/web.scm:2056
+#: gnu/packages/web.scm:2120
 msgid ""
 "The HTTP::Negotiate module provides a complete implementation of the\n"
 "HTTP content negotiation algorithm specified in\n"
@@ -9430,11 +10352,11 @@ msgid ""
 "fields in the request."
 msgstr ""
 
-#: gnu/packages/web.scm:2081
+#: gnu/packages/web.scm:2145
 msgid "Parse HTTP/1.1 requests"
 msgstr ""
 
-#: gnu/packages/web.scm:2082
+#: gnu/packages/web.scm:2146
 msgid ""
 "This is an HTTP request parser.  It takes chunks of text as\n"
 "received and returns a 'hint' as to what is required, or returns the\n"
@@ -9442,74 +10364,74 @@ msgid ""
 "supported."
 msgstr ""
 
-#: gnu/packages/web.scm:2102
+#: gnu/packages/web.scm:2166
 msgid "Fast HTTP request parser"
 msgstr ""
 
-#: gnu/packages/web.scm:2103
+#: gnu/packages/web.scm:2167
 msgid ""
 "HTTP::Parser::XS is a fast, primitive HTTP request/response\n"
 "parser."
 msgstr ""
 
-#: gnu/packages/web.scm:2124
+#: gnu/packages/web.scm:2188
 msgid "Set up a CGI environment from an HTTP::Request"
 msgstr ""
 
-#: gnu/packages/web.scm:2125
+#: gnu/packages/web.scm:2189
 msgid ""
 "This module provides a convenient way to set up a CGI\n"
 "environment from an HTTP::Request."
 msgstr ""
 
-#: gnu/packages/web.scm:2147
+#: gnu/packages/web.scm:2213
 msgid "Lightweight HTTP server"
-msgstr ""
+msgstr "Simpel HTTP-server"
 
-#: gnu/packages/web.scm:2148
+#: gnu/packages/web.scm:2214
 msgid ""
 "HTTP::Server::Simple is a simple standalone HTTP daemon with\n"
 "no non-core module dependencies.  It can be used for building a standalone\n"
 "http-based UI to your existing tools."
 msgstr ""
 
-#: gnu/packages/web.scm:2172
+#: gnu/packages/web.scm:2238
 msgid "HTTP/1.1 client"
 msgstr ""
 
-#: gnu/packages/web.scm:2173
+#: gnu/packages/web.scm:2239
 msgid ""
 "This is a very simple HTTP/1.1 client, designed for doing\n"
 "simple requests without the overhead of a large framework like LWP::UserAgent.\n"
 "It supports proxies and redirection.  It also correctly resumes after EINTR."
 msgstr ""
 
-#: gnu/packages/web.scm:2192
+#: gnu/packages/web.scm:2258
 msgid "Perl module to open an HTML file with automatic charset detection"
 msgstr ""
 
-#: gnu/packages/web.scm:2194
+#: gnu/packages/web.scm:2260
 msgid ""
 "IO::HTML provides an easy way to open a file containing HTML while\n"
 "automatically determining its encoding.  It uses the HTML5 encoding sniffing\n"
 "algorithm specified in section 8.2.2.1 of the draft standard."
 msgstr ""
 
-#: gnu/packages/web.scm:2213
+#: gnu/packages/web.scm:2280
 msgid "Family-neutral IP socket supporting both IPv4 and IPv6"
 msgstr ""
 
-#: gnu/packages/web.scm:2214
+#: gnu/packages/web.scm:2281
 msgid ""
 "This module provides a protocol-independent way to use IPv4\n"
 "and IPv6 sockets, intended as a replacement for IO::Socket::INET."
 msgstr ""
 
-#: gnu/packages/web.scm:2231
+#: gnu/packages/web.scm:2301
 msgid "Nearly transparent SSL encapsulation for IO::Socket::INET"
 msgstr ""
 
-#: gnu/packages/web.scm:2233
+#: gnu/packages/web.scm:2303
 msgid ""
 "IO::Socket::SSL makes using SSL/TLS much easier by wrapping the\n"
 "necessary functionality into the familiar IO::Socket interface and providing\n"
@@ -9518,11 +10440,11 @@ msgid ""
 "select or poll."
 msgstr ""
 
-#: gnu/packages/web.scm:2264
+#: gnu/packages/web.scm:2334
 msgid "Perl modules for the WWW"
-msgstr ""
+msgstr "Perlmoduler for www"
 
-#: gnu/packages/web.scm:2266
+#: gnu/packages/web.scm:2336
 msgid ""
 "The libwww-perl collection is a set of Perl modules which provides a\n"
 "simple and consistent application programming interface to the\n"
@@ -9532,11 +10454,11 @@ msgid ""
 "help you implement simple HTTP servers."
 msgstr ""
 
-#: gnu/packages/web.scm:2288
+#: gnu/packages/web.scm:2358
 msgid "Perl module to guess the media type for a file or a URL"
 msgstr ""
 
-#: gnu/packages/web.scm:2290
+#: gnu/packages/web.scm:2360
 #, scheme-format
 msgid ""
 "The LWP::MediaTypes module provides functions for handling media (also\n"
@@ -9545,21 +10467,21 @@ msgid ""
 "exists it is used instead."
 msgstr ""
 
-#: gnu/packages/web.scm:2316
+#: gnu/packages/web.scm:2386
 msgid "HTTPS support for LWP::UserAgent"
 msgstr ""
 
-#: gnu/packages/web.scm:2317
+#: gnu/packages/web.scm:2387
 msgid ""
 "The LWP::Protocol::https module provides support for using\n"
 "https schemed URLs with LWP."
 msgstr ""
 
-#: gnu/packages/web.scm:2337
+#: gnu/packages/web.scm:2407
 msgid "Virtual browser that retries errors"
 msgstr ""
 
-#: gnu/packages/web.scm:2338
+#: gnu/packages/web.scm:2408
 msgid ""
 "LWP::UserAgent::Determined works just like LWP::UserAgent,\n"
 "except that when you use it to get a web page but run into a\n"
@@ -9567,19 +10489,19 @@ msgid ""
 "and retry a few times."
 msgstr ""
 
-#: gnu/packages/web.scm:2383
+#: gnu/packages/web.scm:2453
 msgid "Perl interface to Amazon S3"
 msgstr ""
 
-#: gnu/packages/web.scm:2384
+#: gnu/packages/web.scm:2454
 msgid "This module provides a Perlish interface to Amazon S3."
 msgstr ""
 
-#: gnu/packages/web.scm:2404
+#: gnu/packages/web.scm:2474
 msgid "Perl low-level HTTP connection (client)"
 msgstr ""
 
-#: gnu/packages/web.scm:2406
+#: gnu/packages/web.scm:2476
 msgid ""
 "The Net::HTTP class is a low-level HTTP client.  An instance of the\n"
 "Net::HTTP class represents a connection to an HTTP server.  The HTTP protocol\n"
@@ -9587,11 +10509,11 @@ msgid ""
 "HTTP/1.1."
 msgstr ""
 
-#: gnu/packages/web.scm:2426
+#: gnu/packages/web.scm:2496
 msgid "Extensible Perl server engine"
 msgstr ""
 
-#: gnu/packages/web.scm:2427
+#: gnu/packages/web.scm:2497
 msgid ""
 "Net::Server is an extensible, generic Perl server engine.\n"
 "It attempts to be a generic server as in Net::Daemon and NetServer::Generic.\n"
@@ -9605,19 +10527,19 @@ msgid ""
 "or to multiple server ports."
 msgstr ""
 
-#: gnu/packages/web.scm:2455
+#: gnu/packages/web.scm:2525
 msgid "SSL support for Net::SMTP"
-msgstr ""
+msgstr "SSL-understøttelse for Net::SMTP"
 
-#: gnu/packages/web.scm:2456
+#: gnu/packages/web.scm:2526
 msgid "SSL support for Net::SMTP."
-msgstr ""
+msgstr "SSL-understøttelse for Net::SMTP."
 
-#: gnu/packages/web.scm:2490
+#: gnu/packages/web.scm:2560
 msgid "Perl Superglue for Web frameworks and servers (PSGI toolkit)"
 msgstr ""
 
-#: gnu/packages/web.scm:2491
+#: gnu/packages/web.scm:2561
 msgid ""
 "Plack is a set of tools for using the PSGI stack.  It\n"
 "contains middleware components, a reference server, and utilities for Web\n"
@@ -9625,21 +10547,21 @@ msgid ""
 "WSGI."
 msgstr ""
 
-#: gnu/packages/web.scm:2517
+#: gnu/packages/web.scm:2587
 msgid "Plack::Middleware which sets body for redirect response"
 msgstr ""
 
-#: gnu/packages/web.scm:2518
+#: gnu/packages/web.scm:2588
 msgid ""
 "This module sets the body in redirect response, if it's not\n"
 "already set."
 msgstr ""
 
-#: gnu/packages/web.scm:2539
+#: gnu/packages/web.scm:2611
 msgid "Override REST methods to Plack apps via POST"
 msgstr ""
 
-#: gnu/packages/web.scm:2540
+#: gnu/packages/web.scm:2612
 msgid ""
 "This middleware allows for POST requests that pretend to be\n"
 "something else: by adding either a header named X-HTTP-Method-Override to the\n"
@@ -9647,72 +10569,72 @@ msgid ""
 "can say what method it actually meant."
 msgstr ""
 
-#: gnu/packages/web.scm:2564
+#: gnu/packages/web.scm:2636
 msgid "Plack::Middleware which removes body for HTTP response"
 msgstr ""
 
-#: gnu/packages/web.scm:2565
+#: gnu/packages/web.scm:2637
 msgid ""
 "This module removes the body in an HTTP response if it's not\n"
 "required."
 msgstr ""
 
-#: gnu/packages/web.scm:2586
+#: gnu/packages/web.scm:2658
 msgid "Supports app to run as a reverse proxy backend"
 msgstr ""
 
-#: gnu/packages/web.scm:2587
+#: gnu/packages/web.scm:2659
 msgid ""
 "Plack::Middleware::ReverseProxy resets some HTTP headers,\n"
 "which are changed by reverse-proxy.  You can specify the reverse proxy address\n"
 "and stop fake requests using 'enable_if' directive in your app.psgi."
 msgstr ""
 
-#: gnu/packages/web.scm:2608
+#: gnu/packages/web.scm:2680
 msgid "Run HTTP tests on external live servers"
 msgstr ""
 
-#: gnu/packages/web.scm:2609
+#: gnu/packages/web.scm:2681
 msgid ""
 "This module allows your to run your Plack::Test tests\n"
 "against an external server instead of just against a local application through\n"
 "either mocked HTTP or a locally spawned server."
 msgstr ""
 
-#: gnu/packages/web.scm:2631
+#: gnu/packages/web.scm:2703
 msgid "Testing TCP programs"
 msgstr "Testning af TCP-programmer"
 
-#: gnu/packages/web.scm:2632
+#: gnu/packages/web.scm:2704
 msgid "Test::TCP is test utilities for TCP/IP programs."
 msgstr "Test::TCP er testredskaber for TCP/IP-programmer."
 
-#: gnu/packages/web.scm:2660
+#: gnu/packages/web.scm:2732
 msgid "Testing-specific WWW::Mechanize subclass"
 msgstr ""
 
-#: gnu/packages/web.scm:2661
+#: gnu/packages/web.scm:2733
 msgid ""
 "Test::WWW::Mechanize is a subclass of the Perl module\n"
 "WWW::Mechanize that incorporates features for web application testing."
 msgstr ""
 
-#: gnu/packages/web.scm:2694
+#: gnu/packages/web.scm:2766
 msgid "Test::WWW::Mechanize for Catalyst"
-msgstr ""
+msgstr "Test::WWW::Mechanize for Catalyst"
 
-#: gnu/packages/web.scm:2695
+#: gnu/packages/web.scm:2767
 msgid ""
 "The Test::WWW::Mechanize::Catalyst module meshes the\n"
 "Test::WWW:Mechanize module and the Catalyst web application framework to allow\n"
 "testing of Catalyst applications without needing to start up a web server."
 msgstr ""
 
-#: gnu/packages/web.scm:2719
+#: gnu/packages/web.scm:2791
 msgid "Test PSGI programs using WWW::Mechanize"
 msgstr ""
 
-#: gnu/packages/web.scm:2720
+#: gnu/packages/web.scm:2792
 msgid ""
 "PSGI is a specification to decouple web server environments\n"
 "from web application framework code.  Test::WWW::Mechanize is a subclass of\n"
@@ -9721,22 +10643,22 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/web.scm:2740
+#: gnu/packages/web.scm:2812
 msgid "Perl Uniform Resource Identifiers (absolute and relative)"
 msgstr ""
 
-#: gnu/packages/web.scm:2742
+#: gnu/packages/web.scm:2814
 msgid ""
 "The URI module implements the URI class.  Objects of this class\n"
 "represent \"Uniform Resource Identifier references\" as specified in RFC 2396\n"
 "and updated by RFC 2732."
 msgstr ""
 
-#: gnu/packages/web.scm:2763
+#: gnu/packages/web.scm:2837
 msgid "Find URIs in arbitrary text"
 msgstr ""
 
-#: gnu/packages/web.scm:2764
+#: gnu/packages/web.scm:2838
 msgid ""
 "This module finds URIs and URLs (according to what URI.pm\n"
 "considers a URI) in plain text.  It only finds URIs which include a\n"
@@ -9744,41 +10666,41 @@ msgid ""
 "URI::Find::Schemeless.  For a command-line interface, urifind is provided."
 msgstr ""
 
-#: gnu/packages/web.scm:2786
+#: gnu/packages/web.scm:2860
 msgid "WebSocket support for URI package"
 msgstr ""
 
-#: gnu/packages/web.scm:2787
+#: gnu/packages/web.scm:2861
 msgid ""
 "With this module, the URI package provides the same set of\n"
 "methods for WebSocket URIs as it does for HTTP URIs."
 msgstr ""
 
-#: gnu/packages/web.scm:2807
+#: gnu/packages/web.scm:2881
 msgid "Perl extension interface for libcurl"
 msgstr ""
 
-#: gnu/packages/web.scm:2809
+#: gnu/packages/web.scm:2883
 msgid ""
 "This is a Perl extension interface for the libcurl file downloading\n"
 "library."
 msgstr ""
 
-#: gnu/packages/web.scm:2836
+#: gnu/packages/web.scm:2912
 msgid "Web browsing in a Perl object"
 msgstr ""
 
-#: gnu/packages/web.scm:2837
+#: gnu/packages/web.scm:2913
 msgid ""
 "WWW::Mechanize is a Perl module for stateful programmatic\n"
 "web browsing, used for automating interaction with websites."
 msgstr ""
 
-#: gnu/packages/web.scm:2857
+#: gnu/packages/web.scm:2933
 msgid "Perl database of robots.txt-derived permissions"
 msgstr ""
 
-#: gnu/packages/web.scm:2859
+#: gnu/packages/web.scm:2935
 msgid ""
 "The WWW::RobotRules module parses /robots.txt files as specified in\n"
 "\"A Standard for Robot Exclusion\", at\n"
@@ -9787,11 +10709,11 @@ msgid ""
 "their web site."
 msgstr ""
 
-#: gnu/packages/web.scm:2879
+#: gnu/packages/web.scm:2955
 msgid "HTTP and WebSocket server library for R"
 msgstr ""
 
-#: gnu/packages/web.scm:2881
+#: gnu/packages/web.scm:2957
 msgid ""
 "The httpuv package provides low-level socket and protocol support for\n"
 "handling HTTP and WebSocket requests directly from within R.  It is primarily\n"
@@ -9799,11 +10721,11 @@ msgid ""
 "particularly easy to create complete web applications using httpuv alone."
 msgstr ""
 
-#: gnu/packages/web.scm:2902
+#: gnu/packages/web.scm:2978
 msgid "Robust, high performance JSON parser and generator for R"
 msgstr ""
 
-#: gnu/packages/web.scm:2904
+#: gnu/packages/web.scm:2980
 msgid ""
 "The jsonlite package provides a fast JSON parser and generator optimized\n"
 "for statistical data and the web.  It offers flexible, robust, high\n"
@@ -9815,53 +10737,66 @@ msgid ""
 "in systems and applications."
 msgstr ""
 
-#: gnu/packages/web.scm:2932
+#: gnu/packages/web.scm:3008
 msgid "Simple HTTP server to serve static files or dynamic documents"
 msgstr ""
 
-#: gnu/packages/web.scm:2934
+#: gnu/packages/web.scm:3010
 msgid ""
 "Servr provides an HTTP server in R to serve static files, or dynamic\n"
 "documents that can be converted to HTML files (e.g., R Markdown) under a given\n"
 "directory."
 msgstr ""
 
-#: gnu/packages/web.scm:2953
+#: gnu/packages/web.scm:3029
 msgid "R tools for HTML"
-msgstr ""
+msgstr "R-værktøjer for HTML"
 
-#: gnu/packages/web.scm:2955
+#: gnu/packages/web.scm:3031
 msgid "This package provides tools for HTML generation and output in R."
-msgstr ""
+msgstr "Denne pakke tilbyder værktøjer for HTML-oprettelse og uddata i R."
 
-#: gnu/packages/web.scm:2974
+#: gnu/packages/web.scm:3050
 msgid "HTML Widgets for R"
-msgstr ""
+msgstr "HTML-kontroller for R"
 
-#: gnu/packages/web.scm:2976
+#: gnu/packages/web.scm:3052
 msgid ""
 "HTML widgets is a framework for creating HTML widgets that render in\n"
 "various contexts including the R console, R Markdown documents, and Shiny web\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/weechat.scm:92
-msgid "Extensible chat client"
+#: gnu/packages/web.scm:3071
+msgid "HTTP client for R"
+msgstr "HTTP-klient for R"
+
+#: gnu/packages/web.scm:3073
+msgid ""
+"The @code{curl()} and @code{curl_download()} functions provide highly\n"
+"configurable drop-in replacements for base @code{url()} and\n"
+"@code{download.file()} with better performance, support for encryption, gzip\n"
+"compression, authentication, and other @code{libcurl} goodies.  The core of\n"
+"the package implements a framework for performing fully customized requests\n"
+"where data can be processed either in memory, on disk, or streaming via the\n"
+"callback or connection interfaces."
 msgstr ""
 
-#: gnu/packages/weechat.scm:93
+#: gnu/packages/web.scm:3107
+msgid "HTML5 parsing library"
+msgstr "HTML5-fortolkningsbibliotek"
+
+#: gnu/packages/web.scm:3109
 msgid ""
-"WeeChat (Wee Enhanced Environment for Chat) is an\n"
-"Internet Relay Chat client, which is designed to be light and fast.\n"
-"The client uses a curses frontend, and there are remote interfaces\n"
-"for Web, Qt, Android and Emacs.  In WeeChat everything can be done\n"
-"with a keyboard, though it also supports mouse.  It is customizable\n"
-"and extensible with plugins and scripts."
+"Gumbo is an implementation of the HTML5 parsing algorithm implemented as\n"
+"a pure C99 library."
 msgstr ""
+"Gumbo er en implementering af HTML5-fortolkningsalgoritmen implenteret\n"
+"som et rent C99-bibliotek."
 
 #: gnu/packages/wordnet.scm:79
 msgid "Lexical database for the English language"
-msgstr ""
+msgstr "Leksikal database for det engelske sprog"
 
 #: gnu/packages/wordnet.scm:81
 msgid ""
@@ -9875,11 +10810,11 @@ msgid ""
 "language processing."
 msgstr ""
 
-#: gnu/packages/xiph.scm:65
+#: gnu/packages/xiph.scm:66
 msgid "Library for manipulating the ogg multimedia format"
 msgstr ""
 
-#: gnu/packages/xiph.scm:67
+#: gnu/packages/xiph.scm:68
 msgid ""
 "The libogg library allows to manipulate the ogg multimedia container\n"
 "format, which encapsulates raw compressed data and allows the interleaving of\n"
@@ -9888,11 +10823,11 @@ msgid ""
 "periodic timestamps for seeking."
 msgstr ""
 
-#: gnu/packages/xiph.scm:91
+#: gnu/packages/xiph.scm:92
 msgid "Library implementing the vorbis audio format"
 msgstr ""
 
-#: gnu/packages/xiph.scm:93
+#: gnu/packages/xiph.scm:94
 msgid ""
 "The libvorbis library implements the ogg vorbis audio format,\n"
 "a fully open, non-proprietary, patent-and-royalty-free, general-purpose\n"
@@ -9901,22 +10836,22 @@ msgid ""
 "128 kbps/channel."
 msgstr ""
 
-#: gnu/packages/xiph.scm:118
+#: gnu/packages/xiph.scm:119
 msgid "Library implementing the Theora video format"
-msgstr ""
+msgstr "Bibliotek der implementerer videoformatet Theora"
 
-#: gnu/packages/xiph.scm:120
+#: gnu/packages/xiph.scm:121
 msgid ""
 "The libtheora library implements the ogg theora video format,\n"
 "a fully open, non-proprietary, patent-and-royalty-free, general-purpose\n"
 "compressed video format."
 msgstr ""
 
-#: gnu/packages/xiph.scm:141
+#: gnu/packages/xiph.scm:142
 msgid "Library for patent-free audio compression format"
-msgstr ""
+msgstr "Bibliotek for det patentfrie lydkomprimeringsformat"
 
-#: gnu/packages/xiph.scm:143
+#: gnu/packages/xiph.scm:144
 msgid ""
 "GNU Speex is a patent-free audio compression codec specially designed\n"
 "for speech.  It is well-adapted to internet applications, such as VoIP.  It\n"
@@ -9924,11 +10859,11 @@ msgid ""
 "stereo encoding, and voice activity detection."
 msgstr ""
 
-#: gnu/packages/xiph.scm:171
+#: gnu/packages/xiph.scm:174
 msgid "Cross platform audio library"
 msgstr ""
 
-#: gnu/packages/xiph.scm:173
+#: gnu/packages/xiph.scm:176
 msgid ""
 "Libao is a cross-platform audio library that allows programs to\n"
 "output audio using a simple API on a wide variety of platforms.\n"
@@ -9952,21 +10887,21 @@ msgid ""
 "OpenBSD's sndio."
 msgstr ""
 
-#: gnu/packages/xiph.scm:212
+#: gnu/packages/xiph.scm:215
 msgid "Free lossless audio codec"
-msgstr ""
+msgstr "Fri lydkodning uden kvalitetstab"
 
-#: gnu/packages/xiph.scm:214
+#: gnu/packages/xiph.scm:217
 msgid ""
 "FLAC stands for Free Lossless Audio Codec, an audio format that is lossless,\n"
 "meaning that audio is compressed in FLAC without any loss in quality."
 msgstr ""
 
-#: gnu/packages/xiph.scm:240
+#: gnu/packages/xiph.scm:243
 msgid "Karaoke and text codec for embedding in ogg"
 msgstr ""
 
-#: gnu/packages/xiph.scm:242
+#: gnu/packages/xiph.scm:245
 msgid ""
 "Kate is an overlay codec, originally designed for karaoke and text,\n"
 "that can be multiplixed in Ogg.  Text and images can be carried by a Kate\n"
@@ -9981,11 +10916,11 @@ msgid ""
 "Kate stream."
 msgstr ""
 
-#: gnu/packages/xiph.scm:276
+#: gnu/packages/xiph.scm:279
 msgid "Ogg vorbis tools"
-msgstr ""
+msgstr "Ogg vorbis-værktøjer"
 
-#: gnu/packages/xiph.scm:278
+#: gnu/packages/xiph.scm:281
 msgid ""
 "Ogg vorbis is a non-proprietary, patent-and-royalty-free,\n"
 "general-purpose compressed audio format.\n"
@@ -9998,11 +10933,11 @@ msgid ""
 "         an ogg vorbis file."
 msgstr ""
 
-#: gnu/packages/xiph.scm:303 gnu/packages/xiph.scm:366
+#: gnu/packages/xiph.scm:306 gnu/packages/xiph.scm:369
 msgid "Versatile audio codec"
-msgstr ""
+msgstr "Alsidig lydkodning"
 
-#: gnu/packages/xiph.scm:305
+#: gnu/packages/xiph.scm:308
 msgid ""
 "Opus is a totally open, royalty-free, highly versatile audio codec.  Opus\n"
 "is unmatched for interactive speech and music transmission over the Internet,\n"
@@ -10011,29 +10946,29 @@ msgid ""
 "incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec."
 msgstr ""
 
-#: gnu/packages/xiph.scm:339
+#: gnu/packages/xiph.scm:342
 msgid "Command line utilities to encode, inspect, and decode .opus files"
 msgstr ""
 
-#: gnu/packages/xiph.scm:340
+#: gnu/packages/xiph.scm:343
 msgid ""
 "Opus is a royalty-free, highly versatile audio codec.\n"
 "Opus-tools provide command line utilities for creating, inspecting and\n"
 "decoding .opus files."
 msgstr ""
 
-#: gnu/packages/xiph.scm:368
+#: gnu/packages/xiph.scm:371
 msgid ""
 "The opusfile library provides seeking, decode, and playback of Opus\n"
 "streams in the Ogg container (.opus files) including over http(s) on posix and\n"
 "windows systems."
 msgstr ""
 
-#: gnu/packages/xiph.scm:398
+#: gnu/packages/xiph.scm:401
 msgid "Streaming media server"
 msgstr "Strøm-medieserver"
 
-#: gnu/packages/xiph.scm:399
+#: gnu/packages/xiph.scm:402
 msgid ""
 "Icecast is a streaming media server which currently supports\n"
 "Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams.  It can be used to\n"
@@ -10041,11 +10976,11 @@ msgid ""
 "things in between."
 msgstr ""
 
-#: gnu/packages/xiph.scm:427
+#: gnu/packages/xiph.scm:430
 msgid "Audio streaming library for icecast encoders"
 msgstr ""
 
-#: gnu/packages/xiph.scm:429
+#: gnu/packages/xiph.scm:432
 msgid ""
 "Libshout is a library for communicating with and sending data to an\n"
 "icecast server.  It handles the socket connection, the timing of the data,\n"
@@ -10054,7 +10989,7 @@ msgstr ""
 
 #: gnu/packages/zip.scm:57
 msgid "Compression and file packing utility"
-msgstr ""
+msgstr "Komprimerings- og filpakningsredskab"
 
 #: gnu/packages/zip.scm:59
 msgid ""
@@ -10071,11 +11006,11 @@ msgid ""
 "Compression ratios of 2:1 to 3:1 are common for text files."
 msgstr ""
 
-#: gnu/packages/zip.scm:111
+#: gnu/packages/zip.scm:113
 msgid "Decompression and file extraction utility"
 msgstr ""
 
-#: gnu/packages/zip.scm:113
+#: gnu/packages/zip.scm:115
 msgid ""
 "UnZip is an extraction utility for archives compressed in .zip format,\n"
 "also called \"zipfiles\".\n"
@@ -10086,23 +11021,23 @@ msgid ""
 "recreates the stored directory structure by default."
 msgstr ""
 
-#: gnu/packages/zip.scm:147
+#: gnu/packages/zip.scm:149
 msgid "Library for accessing zip files"
-msgstr ""
+msgstr "Bibliotek til at tilgå zip-filer"
 
-#: gnu/packages/zip.scm:149
+#: gnu/packages/zip.scm:151
 msgid "ZZipLib is a library based on zlib for accessing zip files."
-msgstr ""
+msgstr "ZZipLib er et bibliotek baseret på zlib for adgang til zip-filer."
 
-#: gnu/packages/zip.scm:167
+#: gnu/packages/zip.scm:169
 msgid "Provides an interface to ZIP archive files"
-msgstr ""
+msgstr "Tilbyder en grænseflade til ZIP-arkivfiler"
 
-#: gnu/packages/zsh.scm:65
+#: gnu/packages/zsh.scm:71
 msgid "Powerful shell for interactive use and scripting"
-msgstr ""
+msgstr "Funktionsrig skal for interaktiv brug og skriptopbygning"
 
-#: gnu/packages/zsh.scm:66
+#: gnu/packages/zsh.scm:72
 msgid ""
 "The Z shell (zsh) is a Unix shell that can be used\n"
 "as an interactive login shell and as a powerful command interpreter\n"
diff --git a/test-env.in b/test-env.in
index 799a62276f..c3f60f7283 100644
--- a/test-env.in
+++ b/test-env.in
@@ -31,6 +31,10 @@ unset CDPATH
 
 if [ -x "@abs_top_builddir@/guix-daemon" ]
 then
+    # Silence the daemon's output, which is often useless, as well as that of
+    # Bash (such as "Terminated" messages when 'guix-daemon' is killed.)
+    exec 2> /dev/null
+
     NIX_STORE_DIR="@GUIX_TEST_ROOT@/store"
 
     # Do that because store.scm calls `canonicalize-path' on it.
diff --git a/tests/base32.scm b/tests/base32.scm
index dcd926f4b8..194f8da96b 100644
--- a/tests/base32.scm
+++ b/tests/base32.scm
@@ -101,6 +101,3 @@
               l))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/build-utils.scm b/tests/build-utils.scm
index b0a4d1584a..cc96738e36 100644
--- a/tests/build-utils.scm
+++ b/tests/build-utils.scm
@@ -141,6 +141,3 @@
            (equal? str "hello world\n")))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/builders.scm b/tests/builders.scm
index a7c3e42830..bb9e0fa85b 100644
--- a/tests/builders.scm
+++ b/tests/builders.scm
@@ -113,6 +113,3 @@
          (file-exists? (string-append out "/bin/hello")))))
 
 (test-end "builders")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/challenge.scm b/tests/challenge.scm
index e53cacd333..9505042a45 100644
--- a/tests/challenge.scm
+++ b/tests/challenge.scm
@@ -106,9 +106,6 @@
 
 (test-end)
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'with-derivation-narinfo* 'scheme-indent-function 2)
 ;;; End:
diff --git a/tests/containers.scm b/tests/containers.scm
index 12982a64f7..c11cdd1ce5 100644
--- a/tests/containers.scm
+++ b/tests/containers.scm
@@ -26,14 +26,14 @@
 (define (assert-exit x)
   (primitive-exit (if x 0 1)))
 
+(test-begin "containers")
+
 ;; Skip these tests unless user namespaces are available and the setgroups
 ;; file (introduced in Linux 3.19 to address a security issue) exists.
 (unless (and (user-namespace-supported?)
              (unprivileged-user-namespace-supported?)
              (setgroups-supported?))
-  (exit 77))
-
-(test-begin "containers")
+  (test-skip 7))
 
 (test-assert "call-with-container, exit with 0 when there is no error"
   (zero?
@@ -142,6 +142,3 @@
           (zero? result)))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/cpan.scm b/tests/cpan.scm
index 583684104d..5d56f0bd2b 100644
--- a/tests/cpan.scm
+++ b/tests/cpan.scm
@@ -98,6 +98,3 @@
        (pk 'fail x #f)))))
 
 (test-end "cpan")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/cpio.scm b/tests/cpio.scm
index cf65f9808d..516de0655b 100644
--- a/tests/cpio.scm
+++ b/tests/cpio.scm
@@ -79,6 +79,3 @@
                                (stat:size (stat file))))))))))))))
 
 (test-end "cpio")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/cran.scm b/tests/cran.scm
index 83d2e7f554..896c5af06c 100644
--- a/tests/cran.scm
+++ b/tests/cran.scm
@@ -131,6 +131,3 @@ lines.  And: this line continues the description.")
          (pk 'fail x #f))))))
 
 (test-end "cran")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/cve.scm b/tests/cve.scm
index 26bc560e52..26e710ce70 100644
--- a/tests/cve.scm
+++ b/tests/cve.scm
@@ -64,6 +64,3 @@
           (lookup "openoffice.org" "2.3.0"))))
 
 (test-end "cve")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/derivations.scm b/tests/derivations.scm
index 4d3b82fe1a..cb7196e2a9 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -570,6 +570,15 @@
 
 (test-skip (if (%guile-for-build) 0 8))
 
+(test-equal "build-expression->derivation and invalid module name"
+  '(file-search-error "guix/module/that/does/not/exist.scm")
+  (guard (c ((file-search-error? c)
+             (list 'file-search-error
+                   (file-search-error-file-name c))))
+    (build-expression->derivation %store "foo" #t
+                                  #:modules '((guix module that
+                                                    does not exist)))))
+
 (test-assert "build-expression->derivation and derivation-prerequisites"
   (let ((drv (build-expression->derivation %store "fail" #f)))
     (any (match-lambda
@@ -999,6 +1008,3 @@
          (call-with-input-file out get-string-all))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/elpa.scm b/tests/elpa.scm
index e8adde3f07..46c6ac2d75 100644
--- a/tests/elpa.scm
+++ b/tests/elpa.scm
@@ -104,6 +104,3 @@ information about package NAME. (Function 'elpa-package-info'.)"
   (eval-test-with-elpa "auctex"))
 
 (test-end "elpa")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/file-systems.scm b/tests/file-systems.scm
index c36509b2b0..aed27e89c2 100644
--- a/tests/file-systems.scm
+++ b/tests/file-systems.scm
@@ -51,6 +51,3 @@
            (equal? form '(uuid "foobar"))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/gem.scm b/tests/gem.scm
index ebce809840..0b37c70142 100644
--- a/tests/gem.scm
+++ b/tests/gem.scm
@@ -77,6 +77,3 @@
        (pk 'fail x #f)))))
 
 (test-end "gem")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 75b907abee..db0ffd2fdd 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -784,9 +784,6 @@
 
 (test-end "gexp")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;; Local Variables:
 ;; eval: (put 'test-assertm 'scheme-indent-function 1)
 ;; End:
diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm
index e7296137dc..4f2f1ae943 100644
--- a/tests/gnu-maintenance.scm
+++ b/tests/gnu-maintenance.scm
@@ -39,6 +39,3 @@
                 ("gnutls" "gnutls-3.2.18-w32.zip")))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/grafts.scm b/tests/grafts.scm
index 4bc33709d6..afed704cde 100644
--- a/tests/grafts.scm
+++ b/tests/grafts.scm
@@ -159,6 +159,3 @@
                 (string=? (readlink two) one))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/graph.scm b/tests/graph.scm
index 4205b9b8c7..32317195d7 100644
--- a/tests/graph.scm
+++ b/tests/graph.scm
@@ -276,6 +276,3 @@ edges."
                        (list p1a p1b p0)))))))
 
 (test-end "graph")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/gremlin.scm b/tests/gremlin.scm
index dc9f78c21a..2885554967 100644
--- a/tests/gremlin.scm
+++ b/tests/gremlin.scm
@@ -64,6 +64,3 @@
          "ORIGIN/foo")))
 
 (test-end "gremlin")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/guix-environment-container.sh b/tests/guix-environment-container.sh
index aba34a3bd0..0a7ea481fc 100644
--- a/tests/guix-environment-container.sh
+++ b/tests/guix-environment-container.sh
@@ -82,8 +82,13 @@ grep -e "$NIX_STORE_DIR/.*-bash" $tmpdir/mounts # bootstrap bash
 
 rm $tmpdir/mounts
 
+abnormal_exit_code="
+(use-modules (system foreign))
+;; Purposely make Guile crash with a segfault. :)
+(pointer->string (make-pointer 123) 123)"
+
 if guix environment --bootstrap --container \
-	--ad-hoc bootstrap-binaries -- kill -SEGV 2
+	--ad-hoc guile-bootstrap -- guile -c "$abnormal_exit_code"
 then false;
 else
     test $? -gt 127
diff --git a/tests/hackage.scm b/tests/hackage.scm
index b608ccd866..d1ebe37405 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -160,6 +160,3 @@ library
     (x (pk 'fail x #f))))
 
 (test-end "hackage")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/hash.scm b/tests/hash.scm
index 9bcd69440b..8039549971 100644
--- a/tests/hash.scm
+++ b/tests/hash.scm
@@ -126,6 +126,3 @@ In Guile <= 2.0.9, CBIPs were always fully buffered, so the
       (list hello hash world))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
index 08365816d4..3b11875c4a 100644
--- a/tests/import-utils.scm
+++ b/tests/import-utils.scm
@@ -34,6 +34,3 @@
   (beautify-description "A function to establish world peace"))
 
 (test-end "import-utils")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/lint.scm b/tests/lint.scm
index 54be50d1c1..4f0196491d 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -581,9 +581,6 @@ requests."
 
 (test-end "lint")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;; Local Variables:
 ;; eval: (put 'with-http-server 'scheme-indent-function 1)
 ;; eval: (put 'with-warnings 'scheme-indent-function 0)
diff --git a/tests/monads.scm b/tests/monads.scm
index 4112bcb6cf..18bf4119be 100644
--- a/tests/monads.scm
+++ b/tests/monads.scm
@@ -258,6 +258,3 @@
      '())))
 
 (test-end "monads")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/nar.scm b/tests/nar.scm
index e24a638db9..9796980e35 100644
--- a/tests/nar.scm
+++ b/tests/nar.scm
@@ -320,9 +320,6 @@
 
 (test-end "nar")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'with-file-tree 'scheme-indent-function 2)
 ;;; End:
diff --git a/tests/packages.scm b/tests/packages.scm
index 823ede1f25..94e8150b75 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -799,9 +799,6 @@
 
 (test-end "packages")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'dummy-package 'scheme-indent-function 1)
 ;;; End:
diff --git a/tests/pk-crypto.scm b/tests/pk-crypto.scm
index f5008f3248..5024a15a43 100644
--- a/tests/pk-crypto.scm
+++ b/tests/pk-crypto.scm
@@ -287,6 +287,3 @@
     (canonical-sexp->sexp (sexp->canonical-sexp sexp))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/pki.scm b/tests/pki.scm
index 51f2119466..876ad98d73 100644
--- a/tests/pki.scm
+++ b/tests/pki.scm
@@ -119,6 +119,3 @@
       (corrupt-signature 'c))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 6714dfcaa7..fc1dfd2bfc 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -320,9 +320,6 @@
 
 (test-end "profiles")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'dummy-package 'scheme-indent-function 1)
 ;;; End:
diff --git a/tests/publish.scm b/tests/publish.scm
index 6c710fe0a7..6645286f5a 100644
--- a/tests/publish.scm
+++ b/tests/publish.scm
@@ -121,6 +121,3 @@ References: ~a~%"
     (response-code (http-get (publish-uri (string-append "/nar/invalid"))))))
 
 (test-end "publish")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/pypi.scm b/tests/pypi.scm
index cf351a542f..e463467c41 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -106,6 +106,3 @@ baz > 13.37")
        (pk 'fail x #f)))))
 
 (test-end "pypi")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/records.scm b/tests/records.scm
index 800ed03827..c6f85d4a81 100644
--- a/tests/records.scm
+++ b/tests/records.scm
@@ -305,6 +305,3 @@ Description: 1st line,
                  '("a")))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm
index 94ddaf447b..e48c8da264 100644
--- a/tests/scripts-build.scm
+++ b/tests/scripts-build.scm
@@ -22,6 +22,7 @@
   #:use-module (guix packages)
   #:use-module (guix scripts build)
   #:use-module (guix ui)
+  #:use-module (guix utils)
   #:use-module (gnu packages base)
   #:use-module (gnu packages busybox)
   #:use-module (ice-9 match)
@@ -49,6 +50,25 @@
                        (add-to-store store "guix.scm" #t
                                      "sha256" s)))))))
 
+(test-assert "options->transformation, with-source, with version"
+  ;; Our pseudo-package is called 'guix.scm' so the 'guix.scm-2.0' source
+  ;; should be applicable, and its version should be extracted.
+  (let ((p (dummy-package "foo"))
+        (s (search-path %load-path "guix.scm")))
+    (call-with-temporary-directory
+     (lambda (directory)
+       (let* ((f (string-append directory "/foo-42.0.tar.gz"))
+              (t (options->transformation `((with-source . ,f)))))
+         (copy-file s f)
+         (with-store store
+           (let ((new (t store p)))
+             (and (not (eq? new p))
+                  (string=? (package-name new) (package-name p))
+                  (string=? (package-version new) "42.0")
+                  (string=? (package-source new)
+                            (add-to-store store (basename f) #t
+                                          "sha256" f))))))))))
+
 (test-assert "options->transformation, with-source, no matches"
   ;; When a transformation in not applicable, a warning must be raised.
   (let* ((p (dummy-package "foobar"))
@@ -83,6 +103,3 @@
                         (eq? dep findutils)))))))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/scripts.scm b/tests/scripts.scm
index 3bf41aed4d..3901710953 100644
--- a/tests/scripts.scm
+++ b/tests/scripts.scm
@@ -64,9 +64,6 @@
 
 (test-end "scripts")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'with-environment-variable 'scheme-indent-function 2)
 ;;; End:
diff --git a/tests/services.scm b/tests/services.scm
index 3635549077..477a197160 100644
--- a/tests/services.scm
+++ b/tests/services.scm
@@ -119,6 +119,3 @@
          (null? (e s3)))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/sets.scm b/tests/sets.scm
index 0a89591765..cdb7efe172 100644
--- a/tests/sets.scm
+++ b/tests/sets.scm
@@ -47,6 +47,3 @@
          (set-contains? s3 b))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/size.scm b/tests/size.scm
index a1106045f8..fcd590283d 100644
--- a/tests/size.scm
+++ b/tests/size.scm
@@ -88,9 +88,6 @@
 
 (test-end "size")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'match* 'scheme-indent-function 1)
 ;;; End:
diff --git a/tests/snix.scm b/tests/snix.scm
index a66b2c7b60..4c31e3389d 100644
--- a/tests/snix.scm
+++ b/tests/snix.scm
@@ -71,6 +71,3 @@
      (pk 'fail x #f))))
 
 (test-end "snix")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/store.scm b/tests/store.scm
index f7db7df966..eeadcb94f8 100644
--- a/tests/store.scm
+++ b/tests/store.scm
@@ -911,6 +911,3 @@
                    (path-info-deriver (query-path-info %store o))))))
 
 (test-end "store")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/substitute.scm b/tests/substitute.scm
index 9d907e7abf..69b272f2bb 100644
--- a/tests/substitute.scm
+++ b/tests/substitute.scm
@@ -275,9 +275,6 @@ a file for NARINFO."
 
 (test-end "substitute")
 
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
-
 ;;; Local Variables:
 ;;; eval: (put 'with-narinfo 'scheme-indent-function 1)
 ;;; eval: (put 'test-quit 'scheme-indent-function 2)
diff --git a/tests/syscalls.scm b/tests/syscalls.scm
index a57a9ca9f9..8e24184fe2 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 David Thompson <davet@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -223,7 +223,11 @@
     ((interfaces ..1)
      (list (every interface? interfaces)
            (every string? (map interface-name interfaces))
-           (every vector? (map interface-address interfaces))))))
+           (every (lambda (sockaddr)
+                    ;; Sometimes interfaces have no associated address.
+                    (or (vector? sockaddr)
+                        (not sockaddr)))
+                  (map interface-address interfaces))))))
 
 (test-equal "network-interfaces returns \"lo\""
   (list #t (make-socket-address AF_INET (inet-pton AF_INET "127.0.0.1") 0))
@@ -241,6 +245,3 @@
              (lo (interface-address lo)))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/system.scm b/tests/system.scm
index 7e016a610b..b935bd07eb 100644
--- a/tests/system.scm
+++ b/tests/system.scm
@@ -72,6 +72,3 @@
     (eq? gnu (operating-system-store-file-system os))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/ui.scm b/tests/ui.scm
index f28e623ccf..51577acb76 100644
--- a/tests/ui.scm
+++ b/tests/ui.scm
@@ -250,6 +250,3 @@ Second line" 24))
                               (show-manifest-transaction store m t)))))))))
 
 (test-end "ui")
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/union.scm b/tests/union.scm
index 22ba67ce99..cccf397181 100644
--- a/tests/union.scm
+++ b/tests/union.scm
@@ -125,6 +125,3 @@
                 (eq? 'directory (stat:type (lstat "bin"))))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/upstream.scm b/tests/upstream.scm
index eb18dd6193..6c86abe817 100644
--- a/tests/upstream.scm
+++ b/tests/upstream.scm
@@ -44,6 +44,3 @@
                             '("ftp://example.org/foo-1.tar.xz.sig"))))))
 
 (test-end)
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
diff --git a/tests/utils.scm b/tests/utils.scm
index 67b3724451..6b7725554f 100644
--- a/tests/utils.scm
+++ b/tests/utils.scm
@@ -336,6 +336,3 @@
 (test-end)
 
 (false-if-exception (delete-file temp-file))
-
-
-(exit (= (test-runner-fail-count (test-runner-current)) 0))
author	Ludovic Courtès <ludo@gnu.org>	2016-04-06 12:00:29 +0200
committer	Ludovic Courtès <ludo@gnu.org>	2016-04-06 12:00:29 +0200
commit	933d2fe4cfb380f66af631a2203ec23c367e5b1a (patch)
tree	f10581ed0da1911eed9b02e69d999ba481d9d3c6
parent	f8835ff4b3dd59d59bf44838d05d3d60114d15d2 (diff)
parent	998afc3608242b75051f43ece36d52474c51e285 (diff)
download	patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar patches-933d2fe4cfb380f66af631a2203ec23c367e5b1a.tar.gz