Merge branch 'master' into core-updates

40 files changed, 3544 insertions, 836 deletions

diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index b582bc5e57..8b44f579a2 100644
--- a/build-aux/run-system-tests.scm
+++ b/build-aux/run-system-tests.scm
@@ -69,6 +69,7 @@
         (mbegin %store-monad
           (show-what-to-build* drv)
           (set-build-options* #:keep-going? #t #:keep-failed? #t
+                              #:print-build-trace #t
                               #:fallback? #t)
           (built-derivations* drv)
           (mlet %store-monad ((valid  (filterm (store-lift valid-path?)
diff --git a/gnu/local.mk b/gnu/local.mk
index 49f53e6c06..4bdace4768 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -7,6 +7,7 @@
 # Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 # Copyright © 2016 Rene Saavedra <rennes@openmailbox.org>
 # Copyright © 2016 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org>
+# Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
 #
 # This file is part of GNU Guix.
 #
@@ -640,6 +641,8 @@ dist_patch_DATA =						\
   %D%/packages/patches/libdrm-symbol-check.patch		\
   %D%/packages/patches/libevent-dns-tests.patch			\
   %D%/packages/patches/libextractor-ffmpeg-3.patch		\
+  %D%/packages/patches/libjxr-fix-function-signature.patch	\
+  %D%/packages/patches/libjxr-fix-typos.patch			\
   %D%/packages/patches/liboop-mips64-deplibs-fix.patch		\
   %D%/packages/patches/libotr-test-auth-fix.patch		\
   %D%/packages/patches/liblxqt-include.patch			\
@@ -796,7 +799,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/python-dendropy-exclude-failing-tests.patch \
   %D%/packages/patches/python-file-double-encoding-bug.patch	\
   %D%/packages/patches/python-fix-tests.patch			\
-  %D%/packages/patches/python-ipython-inputhook-ctype.patch	\
   %D%/packages/patches/python-parse-too-many-fields.patch	\
   %D%/packages/patches/python-rarfile-fix-tests.patch		\
   %D%/packages/patches/python2-rdflib-drop-sparqlwrapper.patch	\
@@ -882,12 +884,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/vte-CVE-2012-2738-pt1.patch			\
   %D%/packages/patches/vte-CVE-2012-2738-pt2.patch			\
   %D%/packages/patches/vtk-mesa-10.patch			\
-  %D%/packages/patches/w3m-libgc.patch				\
-  %D%/packages/patches/w3m-force-ssl_verify_server-on.patch	\
-  %D%/packages/patches/w3m-disable-sslv2-and-sslv3.patch	\
-  %D%/packages/patches/w3m-disable-weak-ciphers.patch		\
   %D%/packages/patches/weechat-python.patch			\
-  %D%/packages/patches/weex-vacopy.patch			\
   %D%/packages/patches/wicd-bitrate-none-fix.patch		\
   %D%/packages/patches/wicd-get-selected-profile-fix.patch	\
   %D%/packages/patches/wicd-urwid-1.3.patch			\
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 7d100b861a..0b50c8677b 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1859,14 +1859,14 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
 (define-public sunxi-tools
   (package
     (name "sunxi-tools")
-    (version "1.3")
+    (version "1.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://github.com/linux-sunxi/"
                            "sunxi-tools/archive/v" version ".tar.gz"))
        (sha256
-        (base32 "1iazm28gws1i8sls3gxwc5p108n56ags287zmh1rpvkn2k1az81a"))
+        (base32 "06qd2b4dlzbmzfy4q9n8v5rkkbmgcfdbv4nkkcp4nysi10k7cpfs"))
        (modules '((guix build utils)))
        (snippet
         ;; Remove binaries contained in the tarball which are only for the
@@ -1882,19 +1882,16 @@ Kerberos and Heimdal and FAST is supported with recent MIT Kerberos.")
      `(#:tests? #f ; no tests exist
        #:make-flags (list (string-append "PREFIX="
                                          (assoc-ref %outputs "out"))
-                          "TARGET_TOOLS=sunxi-pio sunxi-meminfo"
-                          "CROSS_COMPILE=")
+                          "CROSS_COMPILE="
+                          "CC=gcc"
+                          "all")
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'fix-Makefile
-           (lambda _
-             (substitute* "Makefile"
-               ;; Upstream adds Makefile and config.h as dependencies
-               ;; of all their tools which means $^ would pass them to gcc.
-               ;; gcc won't know what to do with a Makefile.
-               (("-o [$][@] [$]\\^") "-o $@ meminfo.c"))
-             #t))
-         (delete 'configure))))
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (zero? (apply system* "make" "install-all" "install-misc"
+                           make-flags)))))))
     (home-page "https://github.com/linux-sunxi/sunxi-tools")
     (synopsis "Hardware management tools for Allwinner computers")
     (description "This package contains tools for Allwinner devices:
@@ -1910,5 +1907,6 @@ bootloader) parameters.
 @item @command{sunxi-pio}: Sets GPIO parameters and oscillates a GPIO
 in order to be able to find it.
 @item @command{sunxi-meminfo}: Prints memory bus settings.
+@item @command{sunxi-nand-image-builder}: Prepares raw NAND images.
 @end enumerate")
     (license license:gpl2+)))
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 8ec8330b57..994c6e4e04 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -385,6 +385,50 @@ performances.  The plugins include a cellular automaton synthesizer, an
 envelope follower, distortion effects, tape effects and more.")
     (license license:gpl2+)))
 
+(define-public swh-plugins-lv2
+  (package
+    (name "swh-plugins-lv2")
+    (version "1.0.16")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/swh/"
+                                  "lv2/archive/v" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0j1mih0lp4fds07knp5i32in515sh0df1qi6694pmyz2wqnm295w"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no check target
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX="
+                                         (assoc-ref %outputs "out")))
+       #:phases
+       (modify-phases %standard-phases
+         ;; no configure script
+         (delete 'configure)
+         (add-after 'unpack 'patch-makefile-and-enter-directory
+           ;; The default install target doesn't install, but the
+           ;; "install-system" target does.
+           (lambda _
+             (substitute* "Makefile"
+               (("install:") "install: install-system"))
+             #t)))))
+    (inputs
+     `(("lv2" ,lv2)
+       ("fftwf" ,fftwf)))
+    (native-inputs
+     `(("libxslt" ,libxslt)
+       ("pkg-config" ,pkg-config)))
+    (home-page "http://plugin.org.uk")
+    (synopsis "SWH plugins in LV2 format")
+    (description
+     "Swh-plugins-lv2 is a collection of audio plugins in LV2 format.  Plugin
+classes include: dynamics (compressor, limiter), time (delay, chorus,
+flanger), ringmodulator, distortion, filters, pitchshift, oscillators,
+emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc.")
+    (license license:gpl3+)))
+
 (define-public csound
   (package
     (name "csound")
@@ -1985,14 +2029,14 @@ surround and reverb.")
 (define-public libxmp
   (package
     (name "libxmp")
-    (version "4.3.10")
+    (version "4.4.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/xmp/libxmp/" version "/"
                                   name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1gm5xa0ca7ypcbj3bkmj3k1vvzl7nkch8gjyrm8p1a9vgzr0n761"))))
+                "1kycz4jsyvmf7ny9227b497wc7y5ligydi6fvvldmkf8hk63ad9m"))))
     (build-system gnu-build-system)
     (home-page "http://xmp.sourceforge.net/")
     (synopsis "Module player library")
@@ -2005,14 +2049,14 @@ Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT).")
 (define-public xmp
   (package
     (name "xmp")
-    (version "4.0.10")
+    (version "4.1.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/xmp/xmp/" version "/"
                                   name "-" version ".tar.gz"))
               (sha256
                (base32
-                "0gjylvvmq7ha0nhcjg56qfp0xxpsrcsj7y5r914svd5x1ppmzm5n"))))
+                "17i8fc7x7yn3z1x963xp9iv108gxfakxmdgmpv3mlm438w3n3g8x"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 76052ef902..77ba2c7454 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -1027,4 +1027,10 @@ program.  It supports a wide variety of different encodings.")
          (proc  (module-ref iface 'canonical-package)))
     (proc package)))
 
+(define-public (%final-inputs)
+  "Return the list of \"final inputs\"."
+  ;; Avoid circular dependency by lazily resolving 'commencement'.
+  (let ((iface (resolve-interface '(gnu packages commencement))))
+    (module-ref iface '%final-inputs)))
+
 ;;; base.scm ends here
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 4750cb97bf..4dfac15040 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -6171,13 +6171,13 @@ names in their natural, rather than lexicographic, order.")
 (define-public r-edger
   (package
     (name "r-edger")
-    (version "3.16.0")
+    (version "3.16.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "edgeR" version))
               (sha256
                (base32
-                "1qr20j55m35dwzqyzzmla69gk5bzff8v1v2qjh7yd3362wq1ch49"))))
+                "1r6hhwkqp13m022hjajzr1lnjsbai0yjhykwn0kp1f0la990a808"))))
     (properties `((upstream-name . "edgeR")))
     (build-system r-build-system)
     (propagated-inputs
@@ -6235,13 +6235,13 @@ coding changes and predict coding outcomes.")
 (define-public r-limma
   (package
     (name "r-limma")
-    (version "3.30.0")
+    (version "3.30.2")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "limma" version))
               (sha256
                (base32
-                "0d8wp7b7nymawf4czwsg27k4c61i4ij2lhv7phi6cb3hdd8c76yf"))))
+                "04jris7wk2lxksrrvrjsysznsdb2k04lfgrnp18ic49sazva0hfy"))))
     (build-system r-build-system)
     (home-page "http://bioinf.wehi.edu.au/limma")
     (synopsis "Package for linear models for microarray and RNA-seq data")
@@ -6398,13 +6398,13 @@ powerful online queries from gene annotation to database mining.")
 (define-public r-biocparallel
   (package
     (name "r-biocparallel")
-    (version "1.8.0")
+    (version "1.8.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "BiocParallel" version))
               (sha256
                (base32
-                "0vz23i14f7wjygr5d4y1hp8ki6l6igwcsjscfpr6dcigmknyi55c"))))
+                "123i928rwi4h4sy4fpysv6pinw5nns0sm3myxi2ghqhm34ws8gyl"))))
     (properties
      `((upstream-name . "BiocParallel")))
     (build-system r-build-system)
@@ -6554,13 +6554,13 @@ alignments.")
 (define-public r-rtracklayer
   (package
     (name "r-rtracklayer")
-    (version "1.34.0")
+    (version "1.34.1")
     (source (origin
               (method url-fetch)
               (uri (bioconductor-uri "rtracklayer" version))
               (sha256
                (base32
-                "0mix5k75j70mwplbdipqw71n8qic75ny6y8w2f5jj0pqg1k0327d"))))
+                "0x59k2fd0iaqi93gy6bm58p2j2z90z1b7a6w5b4c098y98n096rc"))))
     (build-system r-build-system)
     (arguments
      `(#:phases
@@ -7312,7 +7312,7 @@ paired-end data.")
 (define-public r-rcas
   (package
     (name "r-rcas")
-    (version "0.99.6")
+    (version "1.0.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://github.com/BIMSBbioinfo/RCAS/archive/v"
@@ -7320,7 +7320,7 @@ paired-end data.")
               (file-name (string-append name "-" version ".tar.gz"))
               (sha256
                (base32
-                "1ljgl2b4r6w2n0i9i04d9xaphajsvhfkjdj2i2z830nha4m3w8f0"))))
+                "1h7di822ihgkhmmmlfbfz3c2dkjyjxl307i6mx8w0cwjqbna1kp6"))))
     (build-system r-build-system)
     (native-inputs
      `(("r-knitr" ,r-knitr)
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index 1524ef530b..4173a37294 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Kost <alezost@gmail.com>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -359,3 +360,38 @@ from an audio CD.")
 that grabs tracks off a CD, encodes them to Ogg/Vorbis, MP3, FLAC, Ogg/Speex
 and/or MPP/MP+ (Musepack) format, and tags them, all in one go.")
     (license gpl2+)))
+
+(define-public geteltorito
+  (package
+    (name "geteltorito")
+    (version "0.6")
+    (home-page
+     "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append home-page name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; No tests.
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (delete 'build)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (install-file "geteltorito"
+                             (string-append out "/bin"))))))))
+    (inputs `(("perl" ,perl)))
+    (synopsis "Extract the boot image from a CD-ROM")
+    (description
+     "@command{geteltorito} can extract the initial/default boot
+image from CDs (and ISOs) that follow the El Torito specification
+for bootable CD-ROMs.
+
+Image data is written to standard output by default and all other
+information is written to standard error.")
+    (license gpl2+)))
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm
index c73222a735..e6553dcd34 100644
--- a/gnu/packages/cross-base.scm
+++ b/gnu/packages/cross-base.scm
@@ -24,7 +24,6 @@
   #:use-module (gnu packages)
   #:use-module (gnu packages gcc)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages commencement)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages hurd)
   #:use-module (guix packages)
@@ -260,11 +259,11 @@ GCC that does not target a libc; otherwise, target that libc."
 
        ;; Call it differently so that the builder can check whether the "libc"
        ;; input is #f.
-       ("libc-native" ,@(assoc-ref %final-inputs "libc"))
+       ("libc-native" ,@(assoc-ref (%final-inputs) "libc"))
 
        ;; Remaining inputs.
        ,@(let ((inputs (append (package-inputs %xgcc)
-                               (alist-delete "libc" %final-inputs))))
+                               (alist-delete "libc" (%final-inputs)))))
            (if libc
                `(("libc" ,libc)
                  ("xkernel-headers"                ;the target headers
@@ -522,36 +521,14 @@ XBINUTILS and the cross tool chain."
                        ,@(package-native-inputs libc))))))
 
 
-;;;
-;;; Concrete cross toolchains.
-;;;
-
-(define-public xgcc-mips64el
-  (let* ((triplet "mips64el-linux-gnuabi64")      ;N64 ABI
-         (xgcc    (cross-gcc triplet
-                             (cross-binutils triplet)
-                             (cross-libc triplet))))
-    ;; Don't attempt to build this cross-compiler on i686;
-    ;; see <http://bugs.gnu.org/19598>.
-    (package (inherit xgcc)
-      (supported-systems (fold delete
-                               (package-supported-systems xgcc)
-                               '("mips64el-linux" "i686-linux"))))))
-
-(define-public xgcc-xtensa
-  ;; Bare-bones Xtensa cross-compiler, used to build the Atheros firmware.
-  (cross-gcc "xtensa-elf"))
-
-(define-public xgcc-armhf
-  (let* ((triplet "arm-linux-gnueabihf")
-         (xgcc    (cross-gcc triplet
-                             (cross-binutils triplet)
-                             (cross-libc triplet))))
-    (package (inherit xgcc)
-      (supported-systems (delete "armhf-linux" %supported-systems)))))
-
-;; (define-public xgcc-armel
-;;   (let ((triplet "armel-linux-gnueabi"))
+;;; Concrete cross tool chains are instantiated like this:
+;;
+;; (define-public xgcc-armhf
+;;   (let ((triplet "arm-linux-gnueabihf"))
 ;;     (cross-gcc triplet
 ;;                (cross-binutils triplet)
 ;;                (cross-libc triplet))))
+;;
+;;; We don't do that here because we'd be referring to bindings from (gnu
+;;; packages gcc) from the top level, which doesn't play well with circular
+;;; dependencies among modules.
diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm
index 45b7bf7ab1..484896f592 100644
--- a/gnu/packages/firmware.scm
+++ b/gnu/packages/firmware.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>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -71,7 +71,7 @@
 
     ;; The firmware is cross-compiled using a "bare bones" compiler (no libc.)
     ;; Use our own tool chain for that.
-    (native-inputs `(("cross-gcc" ,xgcc-xtensa)
+    (native-inputs `(("cross-gcc" ,(cross-gcc "xtensa-elf"))
                      ("cross-binutils" ,(cross-binutils "xtensa-elf"))
                      ("cmake" ,cmake)
                      ("perl" ,perl)))
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 22857e84b5..009efd2955 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -29,6 +30,7 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages fonts)
+  #:use-module (ice-9 regex)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
@@ -852,3 +854,47 @@ powerline support.")
     (license (license:x11-style
               "https://github.com/chrissimpkins/Hack/blob/master/LICENSE.md"
               "Hack Open Font License v2.0"))))
+
+(define-public font-adobe-source-code-pro
+  (package
+    (name "font-adobe-source-code-pro")
+    (version "2.030R-ro-1.050R-it")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/adobe-fonts/source-code-pro/archive/"
+                    (regexp-substitute/global
+                     ;; The upstream tag uses "/" between the roman and italic
+                     ;; versions, so substitute our "-" separator here.
+                     #f "R-ro-" version 'pre "R-ro/" 'post) ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0arhhsf3i7ss39ykn73d1j8k4n8vx7115xph6jwkd970p1cxvr54"))))
+    (build-system trivial-build-system)
+    (arguments
+     `(#:modules ((guix build utils))
+       #:builder
+       (begin
+         (use-modules (guix build utils))
+         (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/opentype")))
+           (setenv "PATH" PATH)
+           (mkdir-p font-dir)
+           (zero? (system* tar "-C" font-dir "--strip-components=2"
+                           "-xvf" (assoc-ref %build-inputs "source")
+                           (string-append "source-code-pro-"
+                                          ,version "/OTF")))))))
+    (native-inputs
+     `(("gzip" ,gzip)
+       ("tar" ,tar)))
+    (home-page "https://github.com/adobe-fonts/source-code-pro")
+    (synopsis
+     "Monospaced font family for user interface and coding environments")
+    (description
+     "Source Code Pro is a set of monospaced OpenType fonts that have been
+designed to work well in user interface environments.")
+    (license license:silofl1.1)))
diff --git a/gnu/packages/freeipmi.scm b/gnu/packages/freeipmi.scm
index cd97d52f99..fc11bbd2b9 100644
--- a/gnu/packages/freeipmi.scm
+++ b/gnu/packages/freeipmi.scm
@@ -28,14 +28,14 @@
 (define-public freeipmi
   (package
     (name "freeipmi")
-    (version "1.5.4")
+    (version "1.5.5")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnu/freeipmi/freeipmi-"
                                  version ".tar.gz"))
              (sha256
               (base32
-               "1m8zvnyjyjap07vvc5z90nyghabbb6bjcyyc7qswj66qsmssf135"))))
+               "0lzzvhzbdl1cxin4xz3lirqxsjwmjr5ac0qr4g21cqsv2j6vj85f"))))
     (build-system gnu-build-system)
     (inputs
      `(("readline" ,readline)
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm
index a11265532a..eb622dd17c 100644
--- a/gnu/packages/ftp.scm
+++ b/gnu/packages/ftp.scm
@@ -25,6 +25,8 @@
   #:use-module (guix download)
   #:use-module (guix packages)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages pkg-config)
@@ -126,31 +128,26 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and
 (define-public weex
   (package
     (name "weex")
-    (version "2.6.1.5")
+    (version "2.8.2")
     (source
       (origin
         (method url-fetch)
         (uri
-          (string-append "mirror://sourceforge/weex/weex/" version
-                         "/weex-" version ".tar.gz"))
+          (string-append "mirror://sourceforge/weex/weex/"
+                         "/weex_" version ".tar.gz"))
         (sha256
           (base32
-            "0f5cj5p852wkm24mzy2sxgxyahv2p9rk4wlq21j310pi7wlhgwyl"))
-        (patches (search-patches "weex-vacopy.patch"))))
+            "1ir761hjncr1bamaqcw9j7x57xi3s9jax3223bxwbq30a0vsw1pd"))))
     (build-system gnu-build-system)
+    (native-inputs
+     `(("automake" ,automake)
+       ("autoconf" ,autoconf)
+       ("gettext" ,gnu-gettext)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (replace 'configure
-                  ;; configure does not work followed by both "SHELL=..." and
-                  ;; "CONFIG_SHELL=..."; set environment variables instead
-                  (lambda* (#:key outputs #:allow-other-keys)
-                    (let* ((out (assoc-ref outputs "out"))
-                           (bash (which "bash")))
-                      (setenv "SHELL" bash)
-                      (setenv "CONFIG_SHELL" bash)
-                      (zero? (system* bash "./configure"
-                                      (string-append "--prefix=" out)))))))))
+         (add-before 'configure 'bootstrap
+           (lambda _ (zero? (system* "autoreconf" "-vfi")))))))
     (home-page "http://weex.sourceforge.net/")
     (synopsis "Non-interactive client for FTP synchronization")
     (description
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index ec97c98f82..851d96eee0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2518,7 +2518,7 @@ tactics.")
 (define-public starfighter
   (package
     (name "starfighter")
-    (version "1.5.1.1")
+    (version "1.6")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -2527,7 +2527,7 @@ tactics.")
                     name "-" version "-src.tar.gz"))
               (sha256
                (base32
-                "1qc0hhw9m8sy3n9fips52c7aph3w8a8pdl4n45yaasgxzbvpn9xg"))))
+                "1qb5nk0b3d0ia5zszmg4a3ydf4fiy39fmymb66vwkqn4djajdhzq"))))
     (build-system gnu-build-system)
     (arguments
      '(#:tests? #f ; no check target
@@ -2563,7 +2563,7 @@ in strikes against the evil corporation.")
 (define-public chromium-bsu
   (package
     (name "chromium-bsu")
-    (version "0.9.15.1")
+    (version "0.9.16.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://sourceforge/" name
@@ -2571,18 +2571,11 @@ in strikes against the evil corporation.")
                                   name "-" version ".tar.gz"))
               (sha256
                (base32
-                "01c4mki0rpz6wrqbf18fj4vd7axln5v0xqm80cyksbv63g04s6w6"))))
+                "0jk2w5b6s6nkzri585bbz16cif2fhqcnl5l1mq3rd98r9nil3hd1"))))
     (build-system gnu-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-after 'set-paths 'set-sdl-paths
-                             (lambda* (#:key inputs #:allow-other-keys)
-                               (setenv "CPATH"
-                                       (string-append (assoc-ref inputs "sdl-union")
-                                                      "/include/SDL"))
-                               #t)))))
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (inputs `(("glu" ,glu)
+    (inputs `(("gettext" ,gnu-gettext)
+              ("glu" ,glu)
               ("quesoglc" ,quesoglc)
               ("sdl-union" ,(sdl-union (list sdl sdl-image sdl-mixer)))))
     (home-page "http://chromium-bsu.sourceforge.net/")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index d54ae2fb5f..cbb8115042 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3608,7 +3608,7 @@ work and the interface is well tested.")
 (define-public epiphany
   (package
     (name "epiphany")
-    (version "3.22.0")
+    (version "3.22.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -3616,7 +3616,7 @@ work and the interface is well tested.")
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "09rscbmyjxzd8wlibn1fbmbwmlwnahzfl1kkcka6dhm121yd2id6"))))
+                "03ncqmb8n06qr88rlwa2rph833gjcwsmxaw2wf1yawadwpnn5cda"))))
     (build-system glib-or-gtk-build-system)
     (arguments
      ;; FIXME: tests run under Xvfb, but fail with:
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index 6d9c3c8f33..bcefa42d11 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -163,7 +163,7 @@ and support for SSL3 and TLS.")
 (define-public gnurl
   (package
    (name "gnurl")
-   (version "7.50.3")
+   (version "7.51.0")
    (source (origin
             (method url-fetch)
             (uri (let ((version-with-underscores
@@ -172,7 +172,7 @@ and support for SSL3 and TLS.")
                                   name "-" version-with-underscores ".tar.bz2")))
             (sha256
              (base32
-              "07ij9mj60kpfrmi0436k14b1d1idsj79nk4w5h3bia69arzp2cnk"))))
+              "1rgl4agrzghvyfz1afk1p5ryq4b9cz28lavx8ikrav6aiv9h00ig"))))
    (build-system gnu-build-system)
    (inputs `(("gnutls" ,gnutls)
              ("libidn" ,libidn)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 4aea514411..0b73fd14e2 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -97,7 +97,7 @@ arrays of data.")
 (define-public gstreamer
   (package
     (name "gstreamer")
-    (version "1.8.2")
+    (version "1.10.0")
     (source
      (origin
       (method url-fetch)
@@ -106,7 +106,7 @@ arrays of data.")
             version ".tar.xz"))
       (sha256
        (base32
-        "0hc3j684nx209p10ampvnkza3gna2yiryr7jyx701ciakh3vxglx"))))
+        "01vjsgz58n6nrmnahs4ac7v4656yc042ymffqjzqa0a8pvx7hxqy"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (arguments
@@ -145,7 +145,7 @@ This package provides the core library and elements.")
 (define-public gst-plugins-base
   (package
     (name "gst-plugins-base")
-    (version "1.8.2")
+    (version "1.10.0")
     (source
      (origin
       (method url-fetch)
@@ -153,7 +153,7 @@ This package provides the core library and elements.")
                           name "-" version ".tar.xz"))
       (sha256
        (base32
-        "13fk751vvfrfhbm4ip28vxyvlsm4b4y0bc0pvf7fqp8azg40jwcx"))))
+        "0jp9rwv0am8qv32q3dzhdcbyygg5wjm4fg20njyhp6n6vybyzkdz"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     (propagated-inputs
@@ -199,7 +199,7 @@ for the GStreamer multimedia library.")
 (define-public gst-plugins-good
   (package
     (name "gst-plugins-good")
-    (version "1.8.2")
+    (version "1.10.0")
     (source
      (origin
       (method url-fetch)
@@ -208,7 +208,7 @@ for the GStreamer multimedia library.")
             name "-" version ".tar.xz"))
       (sha256
        (base32
-        "0i1rlbbx3m6ykvcdyaidsd8wa2b7nq2qmcvbrsg00yivi88ljxcd"))))
+        "1qhx6x3ax1qqbvm20zhqax3dsas4yzlx7vdjnjqllqzmcfbma0vs"))))
     (build-system gnu-build-system)
     (inputs
      `(("aalib" ,aalib)
@@ -264,18 +264,18 @@ developers consider to have good quality code and correct functionality.")
 (define-public gst-plugins-bad
   (package
     (name "gst-plugins-bad")
-    (version "1.6.3")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/src/"
                                   name "/" name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0q9s5da54819gwncmdi95l5qzx97l9vxk6adx4zmx73a3l82j6wp"))))
+                "0kqwh5r4j05f2w9m353grvypn0106hxcr52409f7rvm3w4b9sprx"))))
     (outputs '("out" "doc"))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f ; XXX: 11 of 54 tests fail
+     '(#:tests? #f ; XXX: 18 of 65 tests fail
        #:configure-flags
        (list (string-append "--with-html-dir="
                             (assoc-ref %outputs "doc")
@@ -329,8 +329,9 @@ developers consider to have good quality code and correct functionality.")
        ;("qtx11extras" ,qtx11extras)
        ("soundtouch" ,soundtouch)
        ("x265" ,x265)
-       ("wayland" ,wayland)))
-    (home-page "http://gstreamer.freedesktop.org/")
+       ;("wayland" ,wayland) ; needs wayland-protocols
+       ))
+    (home-page "https://gstreamer.freedesktop.org/")
     (synopsis "Plugins for the GStreamer multimedia library")
     (description
      "GStreamer Bad Plug-ins is a set of plug-ins whose quality aren't up to
@@ -340,7 +341,7 @@ par compared to the rest.")
 (define-public gst-plugins-ugly
   (package
     (name "gst-plugins-ugly")
-    (version "1.8.2")
+    (version "1.10.0")
     (source
      (origin
        (method url-fetch)
@@ -348,7 +349,7 @@ par compared to the rest.")
                            name "/" name "-" version ".tar.xz"))
        (sha256
         (base32
-         "1b58s7z430cbbaw8mgy87kslbpmj3xmm66wsr7bddhcgm6i36nww"))))
+         "1q2m3bl8kh9q3grshj55lb2mqby4r20qfsrffc2l7ddb0ccqvplp"))))
     (build-system gnu-build-system)
     (inputs
      `(("gst-plugins-base" ,gst-plugins-base)
@@ -379,7 +380,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
 (define-public gst-libav
   (package
     (name "gst-libav")
-    (version "1.8.2")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -387,7 +388,7 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0yk8pxg3xi26ndj7pliqdfphy0jmqsq4dmdzy31gbd9rgficgwxm"))))
+                "0nyqkggcxfrbflcf4jyj0h9l1rkbi3r5h61w4fcbp2n72522165g"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags '("--with-system-libav")
@@ -397,7 +398,8 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
                      (lambda _
                        (substitute* "gst-libs/ext/libav/configure"
                          (("#! /bin/sh")
-                          (string-append "#! "(which "sh")))))))))
+                          (string-append "#! "(which "sh"))))
+                       #t)))))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("python" ,python)))
@@ -416,7 +418,7 @@ compression formats through the use of the libav library.")
 (define-public python-gst
   (package
     (name "python-gst")
-    (version "1.8.2")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -424,7 +426,7 @@ compression formats through the use of the libav library.")
                     "gst-python-" version ".tar.xz"))
               (sha256
                (base32
-                "15sdfa6lq5pswvi09vk51cs30yf8wr2rlm9myhb4q0c2jhiial2g"))))
+                "0hf71m0vqnd5sdj14li935xzzmqxh606qgw744a25w3vwj9v8nfy"))))
     (build-system gnu-build-system)
     (arguments
      ;; XXX: Factorize python-sitedir with python-build-system.
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 8dc5cdb742..d441485296 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -42,7 +42,7 @@
 (define-public ibus
   (package
    (name "ibus")
-   (version "1.5.11")
+   (version "1.5.14")
    (source (origin
              (method url-fetch)
              (uri (string-append "https://github.com/ibus/ibus/"
@@ -50,10 +50,11 @@
                                  version "/ibus-" version ".tar.gz"))
              (sha256
               (base32
-               "1g26llizd26h9sfz4xdq8krhz19hn08pirvfbkk3g89ri8lmm6a9"))))
+               "0g4x02d7j5w1lfn4zvmzsq93h17lajgn9d7hlvr6pws28vz40ax4"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:tests? #f  ; tests fail because there's no connection to dbus
+      #:configure-flags '("--disable-emoji-dict") ; cannot find emoji.json path
       #:make-flags
       (list "CC=gcc"
             (string-append "pyoverridesdir="
@@ -106,6 +107,7 @@
       ("gtk2" ,gtk+-2)
       ("gtk+" ,gtk+)
       ("intltool" ,intltool)
+      ("json-glib" ,json-glib)
       ("libnotify" ,libnotify)
       ("libx11" ,libx11)
       ("setxkbmap" ,setxkbmap)
@@ -127,7 +129,7 @@
     "IBus is an input framework providing a full-featured and user-friendly
 input method user interface.  It comes with multilingual input support.  It
 may also simplify input method development.")
-   (home-page "http://ibus.googlecode.com/")
+   (home-page "https://github.com/ibus/ibus/wiki")
    (license lgpl2.1+)))
 
 (define-public ibus-libpinyin
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6cfc6e5be1..47544a629e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -129,6 +130,62 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats.")
             (sha256 (base32
                      "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"))))))
 
+(define-public libjxr
+  (package
+    (name "libjxr")
+    (version "1.1")
+    (source (origin
+              ;; We are using the Debian source because CodePlex does not
+              ;; deliver an easily downloadable tarball.
+              (method url-fetch)
+              (uri (string-append "mirror://debian/pool/main/j/jxrlib/jxrlib_"
+                                  version ".orig.tar.gz"))
+              (sha256
+               (base32
+                "00w3f3cmjsm3fiaxq5mxskmp5rl3mki8psrf9y8s1vqbg237na67"))
+              (patch-flags '("-p1" "--binary"))
+              (patches (search-patches "libjxr-fix-function-signature.patch"
+                                       "libjxr-fix-typos.patch"))))
+    (build-system gnu-build-system)
+    (arguments '(#:make-flags '("CC=gcc")
+                 #:tests? #f ; no check target
+                 #:phases
+                 (modify-phases %standard-phases
+                   (delete 'configure) ; no configure script
+                   ;; The upstream makefile does not include an install phase.
+                   (replace 'install
+                     (lambda* (#:key outputs #:allow-other-keys)
+                       (let* ((out (assoc-ref outputs "out"))
+                              (bin (string-append out "/bin"))
+                              (lib (string-append out "/lib"))
+                              (include (string-append out "/include/jxrlib")))
+                         (for-each (lambda (file)
+                                     (install-file file include)
+                                     (delete-file file))
+                                   (append
+                                    '("jxrgluelib/JXRGlue.h"
+                                      "jxrgluelib/JXRMeta.h"
+                                      "jxrtestlib/JXRTest.h"
+                                      "image/sys/windowsmediaphoto.h")
+                                    (find-files "common/include" "\\.h$")))
+                         (for-each (lambda (file)
+                                     (install-file file lib)
+                                     (delete-file file))
+                                   (find-files "." "\\.a$"))
+                         (for-each (lambda (file)
+                                     (install-file file bin)
+                                     (delete-file file))
+                                   '("JxrDecApp" "JxrEncApp")))
+                       #t)))))
+    (synopsis "Implementation of the JPEG XR standard")
+    (description "JPEG XR is an approved ISO/IEC International standard (its
+official designation is ISO/IEC 29199-2). This library is an implementation of that standard.")
+    (license
+     (license:non-copyleft
+      "file://Makefile"
+      "See the header of the Makefile in the distribution."))
+    (home-page "https://jxrlib.codeplex.com/")))
+
 (define-public jpegoptim
   (package
    (name "jpegoptim")
@@ -791,17 +848,15 @@ convert, manipulate, filter and display a wide variety of image formats.")
 (define-public jasper
   (package
     (name "jasper")
-    (version "1.900.16")
+    (version "1.900.19")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.ece.uvic.ca/~frodo/jasper"
                                   "/software/jasper-" version ".tar.gz"))
               (sha256
                (base32
-                "0wgrz6970sf8apyld35vrxamzx46fq15l0ipkvjsjlbwfrhj57rl"))))
+                "0dm3k0wdny3s37zxm9s9riv46p69c14bnn532fv6cv5b6l1b0pwb"))))
     (build-system gnu-build-system)
-    (arguments
-     '(#:make-flags '("CFLAGS=-std=c99"))) ; 1.900.13 added c++ style comments
     (synopsis "JPEG-2000 library")
     (description "The JasPer Project is an initiative to provide a reference
 implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,
diff --git a/gnu/packages/libidn.scm b/gnu/packages/libidn.scm
index 0c9d0af3c8..bc67387b29 100644
--- a/gnu/packages/libidn.scm
+++ b/gnu/packages/libidn.scm
@@ -41,8 +41,31 @@
    (description
      "libidn is a library implementing of the Stringprep, Punycode and IDNA
 specifications.  These are used to encode and decode internationalized domain
-names.  It includes native C, C# and Java libraries.")
+names according to the IDNA2003 specifications.  It includes native C, C# and
+Java libraries.")
    ;; The C code is dual-licensed gpl2+ lgpl3+, the manual is fdl1.3+,
    ;; the command line tool is gpl3+.
    (license (list gpl2+ gpl3+ lgpl3+ fdl1.3+))
    (home-page "http://www.gnu.org/software/libidn/")))
+
+(define-public libidn2
+  (package
+    (name "libidn2")
+    (version "0.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "ftp://alpha.gnu.org/gnu/libidn/libidn2-"
+                                  version ".tar.gz"))
+              (sha256
+               (base32
+                "1zxzhzx14q2b1xkx746pz4lawvqd8d055yy84n52ndwb4pf7nfax"))))
+    (build-system gnu-build-system)
+    (synopsis "Internationalized domain name library for IDNA2008")
+    (description "Libidn2 is an internationalized domain library implementing
+the IDNA2008 specifications.   Libidn2 is believed to be a complete IDNA2008
+implementation, but has yet to be as extensively used as the original Libidn
+library.")
+    (home-page "https://www.gnu.org/software/libidn/#libidn2")
+    ;; The command-line tool 'idn2' is GPL3+, while the library is dual-licensed
+    ;; GPL2+ or LGPL3+.
+    (license (list gpl2+ gpl3+ lgpl3+))))
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index d2df69d1e5..f31db6aaef 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -23,7 +23,6 @@
   #:use-module (guix build-system trivial)
   #:use-module (guix build-system gnu)
   #:use-module ((gnu packages) #:select (search-patch))
-  #:use-module ((gnu packages commencement) #:select (%final-inputs))
   #:use-module (gnu packages base)
   #:use-module (gnu packages cross-base)
   #:use-module (gnu packages bash)
@@ -101,14 +100,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
                                           (cross-binutils target)
                                           (cross-bootstrap-libc)))
             ("cross-binutils" ,(cross-binutils target))
-            ,@%final-inputs))
+            ,@(%final-inputs)))
         `(("libc" ,(glibc-for-bootstrap))
           ("gcc" ,(package (inherit gcc)
                     (outputs '("out")) ; all in one so libgcc_s is easily found
                     (inputs
                      `(("libc",(glibc-for-bootstrap))
                        ,@(package-inputs gcc)))))
-          ,@(fold alist-delete %final-inputs '("libc" "gcc")))))
+          ,@(fold alist-delete (%final-inputs) '("libc" "gcc")))))
 
   (package-with-explicit-inputs p inputs
                                 (current-source-location)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a3822887ae..5665c2a7b8 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1847,7 +1847,7 @@ to BMP, JPEG or PNG image formats.")
 (define-public maxima
   (package
     (name "maxima")
-    (version "5.36.1")
+    (version "5.38.1")
     (source
      (origin
        (method url-fetch)
@@ -1855,7 +1855,7 @@ to BMP, JPEG or PNG image formats.")
                            version "-source/" name "-" version ".tar.gz"))
        (sha256
         (base32
-         "0x1rk659sn3cq0n5c90848ilzr1gb1wf0072fl6jhkdq00qgh2s0"))
+         "1p6646rvq43hk09msyp0dk50cqpkh07mf4x0bc2fqisqmcv6b1hf"))
        (patches (search-patches "maxima-defsystem-mkdir.patch"))))
     (build-system gnu-build-system)
     (inputs
@@ -1864,7 +1864,8 @@ to BMP, JPEG or PNG image formats.")
        ("tk" ,tk)))                               ;Tcl/Tk is used by 'xmaxima'
     (native-inputs
      `(("texinfo" ,texinfo)
-       ("perl" ,perl)))
+       ("perl" ,perl)
+       ("python" ,python)))
     (arguments
      `(#:configure-flags
        (list "--enable-gcl"
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 1bcdecf22a..a3e0d5f4f9 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -428,7 +428,7 @@ and up to 1 Mbit/s downstream.")
 (define-public whois
   (package
     (name "whois")
-    (version "5.2.12")
+    (version "5.2.13")
     (source
      (origin
        (method url-fetch)
@@ -436,7 +436,7 @@ and up to 1 Mbit/s downstream.")
                            name "_" version ".tar.xz"))
        (sha256
         (base32
-         "1wfdyqi64l5x56j259jrrlbh19b7q7i6r83a8q8rjzcqp0kl0vdj"))))
+         "0r3bbxpwsxssa99d8dcjnp79mw1cjwqxgmqjm1537q277jwsk0yc"))))
     (build-system gnu-build-system)
     ;; TODO: unbundle mkpasswd binary + its po files.
     (arguments
@@ -449,7 +449,8 @@ and up to 1 Mbit/s downstream.")
          (add-before 'build 'setenv
            (lambda _
              (setenv "HAVE_ICONV" "1")
-             (setenv "HAVE_LIBIDN" "1"))))))
+             (setenv "HAVE_LIBIDN" "1")
+             #t)))))
     (inputs
      `(("libidn" ,libidn)))
     (native-inputs
diff --git a/gnu/packages/patches/libjxr-fix-function-signature.patch b/gnu/packages/patches/libjxr-fix-function-signature.patch
new file mode 100644
index 0000000000..32f5f64512
--- /dev/null
+++ b/gnu/packages/patches/libjxr-fix-function-signature.patch
@@ -0,0 +1,16 @@
+Description: Fix function signature

+Author: Mathieu Malaterre <malat@debian.org>

+Origin: upstream, https://jxrlib.codeplex.com/SourceControl/changeset/04cf339385b8196f98025b43a366a0790deac994

+Bug-Debian: http://bugs.debian.org/748590

+

+--- jxrlib-1.1.orig/image/decode/JXRTranscode.c

++++ jxrlib-1.1/image/decode/JXRTranscode.c

+@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMIm

+ EXTERN_C Int StrEncInit(CWMImageStrCodec *);

+ EXTERN_C Void StrIOEncTerm(CWMImageStrCodec *);

+ EXTERN_C Void FreeCodingContextEnc(CWMImageStrCodec *);

+-EXTERN_C Void encodeMB(CWMImageStrCodec *, Int, Int);

++EXTERN_C Int encodeMB(CWMImageStrCodec *, Int, Int);

+ EXTERN_C Int  writeIndexTableNull(CWMImageStrCodec *);

+ EXTERN_C Void writePacketHeader(BitIOInfo *, U8, U8);

+ 

diff --git a/gnu/packages/patches/libjxr-fix-typos.patch b/gnu/packages/patches/libjxr-fix-typos.patch
new file mode 100644
index 0000000000..819db34900
--- /dev/null
+++ b/gnu/packages/patches/libjxr-fix-typos.patch
@@ -0,0 +1,29 @@
+Description: Fix typos and remove some warnings

+Author: Mathieu Malaterre <malat@debian.org>

+

+Index: jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c

+===================================================================

+--- jxrlib-1.1.orig/jxrencoderdecoder/JxrEncApp.c

++++ jxrlib-1.1/jxrencoderdecoder/JxrEncApp.c

+@@ -578,7 +578,7 @@ main(int argc, char* argv[])

+ 

+     //================================

+     Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION));

+-    Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder));

++    Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder));

+ 

+     //----------------------------------------------------------------

+     Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION));

+Index: jxrlib-1.1/jxrgluelib/JXRMeta.h

+===================================================================

+--- jxrlib-1.1.orig/jxrgluelib/JXRMeta.h

++++ jxrlib-1.1/jxrgluelib/JXRMeta.h

+@@ -34,7 +34,7 @@

+ 

+ #ifndef UNREFERENCED_PARAMETER

+ #define UNREFERENCED_PARAMETER(P) { (P) = (P); }

+-#endif UNREFERENCED_PARAMETER

++#endif /*UNREFERENCED_PARAMETER*/

+ 

+ //================================================================

+ // Container

diff --git a/gnu/packages/patches/python-ipython-inputhook-ctype.patch b/gnu/packages/patches/python-ipython-inputhook-ctype.patch
deleted file mode 100644
index c77e310542..0000000000
--- a/gnu/packages/patches/python-ipython-inputhook-ctype.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 04c5d358c7ab74d3ddab4f7662e539393d8604c6 Mon Sep 17 00:00:00 2001
-From: Lucretiel <Lucretiel@users.noreply.github.com>
-Date: Wed, 13 May 2015 13:12:43 -0400
-Subject: [PATCH] register now checks for missing ctypes
-
-If ctypes is None, then no input hooks may be registered; `InputHookManager.register` skips registration of input hook classes. Also updated `__init__` to no longer skip creating the instance attributes, to prevent AttributeError exceptions at load time.
----
- IPython/lib/inputhook.py | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/IPython/lib/inputhook.py b/IPython/lib/inputhook.py
-index 4ae2cb3..6578365 100644
---- a/IPython/lib/inputhook.py
-+++ b/IPython/lib/inputhook.py
-@@ -107,8 +107,8 @@ class InputHookManager(object):
-     def __init__(self):
-         if ctypes is None:
-             warn("IPython GUI event loop requires ctypes, %gui will not be available")
--            return
--        self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int)
-+        else:
-+            self.PYFUNC = ctypes.PYFUNCTYPE(ctypes.c_int)
-         self.guihooks = {}
-         self.aliases = {}
-         self.apps = {}
-@@ -197,10 +197,11 @@ def enable(self, app=None):
-                     ...
-         """
-         def decorator(cls):
--            inst = cls(self)
--            self.guihooks[toolkitname] = inst
--            for a in aliases:
--                self.aliases[a] = toolkitname
-+            if ctypes is not None:
-+                inst = cls(self)
-+                self.guihooks[toolkitname] = inst
-+                for a in aliases:
-+                    self.aliases[a] = toolkitname
-             return cls
-         return decorator
- 
diff --git a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch b/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
deleted file mode 100644
index 5b78f2d909..0000000000
--- a/gnu/packages/patches/w3m-disable-sslv2-and-sslv3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Disable SSLv2 and SSLv3.
-
-The only remaining methods are TLSv1.* (the code never distinguishes
-between TLSv1.0, TLSv1.1, and TLSv1.2).
----
- fm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fm.h b/fm.h
-index 320906c..ddcd4fc 100644
---- a/fm.h
-+++ b/fm.h
-@@ -1144,7 +1144,7 @@ global int ssl_path_modified init(FALSE);
- #endif				/* defined(USE_SSL) &&
- 				 * defined(USE_SSL_VERIFY) */
- #ifdef USE_SSL
--global char *ssl_forbid_method init(NULL);
-+global char *ssl_forbid_method init("2, 3");
- #endif
- 
- global int is_redisplay init(FALSE);
--- 
-2.6.4
-
diff --git a/gnu/packages/patches/w3m-disable-weak-ciphers.patch b/gnu/packages/patches/w3m-disable-weak-ciphers.patch
deleted file mode 100644
index 4780d54cb6..0000000000
--- a/gnu/packages/patches/w3m-disable-weak-ciphers.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Disable weak ciphers
-
-Disable RC4, "export ciphers", and all keys < 128 bits.
-
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/w3m/+bug/1325674
----
- url.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/url.c b/url.c
-index ed6062e..e86b1f3 100644
---- a/url.c
-+++ b/url.c
-@@ -326,6 +326,7 @@ openSSLHandle(int sock, char *hostname, char **p_cert)
- 	SSL_load_error_strings();
- 	if (!(ssl_ctx = SSL_CTX_new(SSLv23_client_method())))
- 	    goto eend;
-+	SSL_CTX_set_cipher_list(ssl_ctx, "DEFAULT:!LOW:!RC4:!EXP");
- 	option = SSL_OP_ALL;
- 	if (ssl_forbid_method) {
- 	    if (strchr(ssl_forbid_method, '2'))
--- 
-2.6.4
-
diff --git a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch b/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
deleted file mode 100644
index dc9f117f9d..0000000000
--- a/gnu/packages/patches/w3m-force-ssl_verify_server-on.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Subject: Force ssl_verify_server on.
-
-By default, SSL/TLS certificates are not verified. This enables the
-verification.
----
- fm.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/fm.h b/fm.h
-index 8378939..320906c 100644
---- a/fm.h
-+++ b/fm.h
-@@ -1135,7 +1135,7 @@ global int view_unseenobject init(TRUE);
- #endif
- 
- #if defined(USE_SSL) && defined(USE_SSL_VERIFY)
--global int ssl_verify_server init(FALSE);
-+global int ssl_verify_server init(TRUE);
- global char *ssl_cert_file init(NULL);
- global char *ssl_key_file init(NULL);
- global char *ssl_ca_path init(NULL);
--- 
-2.6.4
-
diff --git a/gnu/packages/patches/w3m-libgc.patch b/gnu/packages/patches/w3m-libgc.patch
deleted file mode 100644
index 0dc6a4027c..0000000000
--- a/gnu/packages/patches/w3m-libgc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-This patch fixes w3m compilation with libgc > 7.2.
-
-Reported:
-https://bugs.archlinux.org/task/33397
-
-Patch with explanation:
-http://anonscm.debian.org/cgit/collab-maint/w3m.git/commit/?id=770eec8304bdbe458
----
- main.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/main.c b/main.c
-index b421943..249eb1a 100644
---- a/main.c
-+++ b/main.c
-@@ -833,7 +833,8 @@ main(int argc, char **argv, char **envp)
-     mySignal(SIGPIPE, SigPipe);
- #endif
- 
--    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
-+    orig_GC_warn_proc = GC_get_warn_proc();
-+    GC_set_warn_proc(wrap_GC_warn_proc);
-     err_msg = Strnew();
-     if (load_argc == 0) {
- 	/* no URL specified */
--- 
-2.6.4
-
diff --git a/gnu/packages/patches/weex-vacopy.patch b/gnu/packages/patches/weex-vacopy.patch
deleted file mode 100644
index f593e86c08..0000000000
--- a/gnu/packages/patches/weex-vacopy.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Taken from the Debian 2.8.0 package.
-
---- weex-2.6.1.5/src/strlib.c	2003-08-18 11:52:38.000000000 +0200
-+++ weex-2.8.0/src/strlib.c	2007-12-04 14:22:02.000000000 +0100
-@@ -42,6 +42,8 @@
- #  define G_VA_COPY(ap1, ap2)     (*(ap1) = *(ap2))
- #  elif defined (G_VA_COPY_AS_ARRAY)
- #  define G_VA_COPY(ap1, ap2)     g_memmove ((ap1), (ap2), sizeof (va_list))
-+#  elif defined (__x86_64__)
-+#  define G_VA_COPY(ap1, ap2)     memmove ((ap1), (ap2), sizeof (va_list))
- #  else /* va_list is a pointer */
- #  define G_VA_COPY(ap1, ap2)     ((ap1) = (ap2))
- #  endif /* va_list is a pointer */
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index af153a05a3..bfb457fcb3 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -9,6 +9,7 @@
 ;;; Coypright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;; Coypright © 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Coypright © 2016 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -752,3 +753,28 @@ the PDF pages.")
 the framebuffer.")
 
     (license license:gpl2+)))
+
+(define-public pdf2svg
+  (package
+    (name "pdf2svg")
+    (version "0.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/dawbarton/pdf2svg/archive/v"
+                    version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "12pa1pajirnlrkz2il3h4l30lc2prryk1qr132jk6z9y1c3qdcag"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("cairo" ,cairo)
+       ("poppler" ,poppler)))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (home-page "http://www.cityinthesky.co.uk/opensource/pdf2svg/")
+    (synopsis "PDF to SVG converter")
+    (description "@command{pdf2svg} is a simple command-line PDF to SVG
+converter using the Poppler and Cairo libraries.")
+    (license license:gpl2+)))
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0daa921c4b..30acb09a1d 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -30,6 +30,7 @@
 ;;; Copyright © 2016 Stefan Reichoer <stefan@xsteve.at>
 ;;; Copyright © 2016 Dylan Jeffers <sapientech@sapientech@openmailbox.org>
 ;;; Copyright © 2016 Alex Vong <alexvong1995@gmail.com>
+;;; Copyright © 2016 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -80,6 +81,7 @@
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages statistics)
@@ -87,6 +89,7 @@
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
+  #:use-module (gnu packages video)
   #:use-module (gnu packages web)
   #:use-module (gnu packages base)
   #:use-module (gnu packages xml)
@@ -1605,6 +1608,28 @@ standard library.")
      `(#:python ,python-2
        #:tests? #f)))) ; no setup.py test command
 
+(define-public python-pafy
+  (package
+    (name "python-pafy")
+    (version "0.5.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pafy" version))
+       (sha256
+        (base32
+         "1ckvrypyvb7jbqlgwdz0y337ajagjv7dgxyns326nqwypn1wpq0i"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     ;; Youtube-dl is a python package which is imported in the file
+     ;; "backend_youtube_dl.py", therefore it needs to be propagated.
+     `(("youtube-dl" ,youtube-dl)))
+    (home-page "https://np1.github.io/pafy/")
+    (synopsis "Retrieve YouTube content and metadata")
+    (description
+     "@code{pafy} is a python library to retrieve YouTube content and metadata.")
+    (license license:lgpl3+)))
+
 (define-public python-py
   (package
     (name "python-py")
@@ -4535,14 +4560,14 @@ standard library.")
 (define-public python-traitlets
   (package
     (name "python-traitlets")
-    (version "4.1.0")
+    (version "4.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "traitlets" version))
        (sha256
         (base32
-         "0nxgj8jxlm1kqf8cx2x7vjid05zdgbxpqhjbdl46r8njlpgkh3j4"))))
+         "1afy08sa5n9gnkvh3da49c16zkyv598vchv0p1hp7zzjy8895hz4"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
@@ -4568,37 +4593,165 @@ without using the configuration machinery.")
 (define-public python2-traitlets
   (package-with-python2 python-traitlets))
 
+(define-public python-jupyter-core
+  (package
+    (name "python-jupyter-core")
+    (version "4.2.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append (pypi-uri "jupyter_core" version)))
+       (sha256
+        (base32
+         "177d9csqldzhsh6xs1p4nf6lzvhzyg6gklqjf69lxgxyadx87v24"))))
+    (build-system python-build-system)
+    ;; FIXME: not sure how to run the tests
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     `(("python-traitlets" ,python-traitlets)))
+    (home-page "http://jupyter.org/")
+    (synopsis "Jupyter base package")
+    (description
+     "Jupyter core is the base package on which Jupyter projects rely.")
+    (license license:bsd-3)))
+
+(define-public python2-jupyter-core
+  (package-with-python2 python-jupyter-core))
+
+(define-public python-jupyter-client
+  (package
+    (name "python-jupyter-client")
+    (version "4.4.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jupyter_client" version))
+       (sha256
+        (base32
+         "1vjjrpjw7k5sh982pbjnslv7byfbfazjw9g92jvs7dz5qbx556n9"))))
+    (build-system python-build-system)
+    ;; Tests fail because of missing native python kernel which I assume is
+    ;; provided by the ipython package, which we cannot use because it would
+    ;; cause a dependency cycle.
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     `(("python-pyzmq" ,python-pyzmq)
+       ("python-traitlets" ,python-traitlets)
+       ("python-jupyter-core" ,python-jupyter-core)))
+    (home-page "http://jupyter.org/")
+    (synopsis "Jupyter protocol implementation and client libraries")
+    (description
+     "The @code{jupyter_client} package contains the reference implementation
+of the Jupyter protocol.  It also provides client and kernel management APIs
+for working with kernels, and the @code{jupyter kernelspec} entrypoint for
+installing @code{kernelspec}s for use with Jupyter frontends.")
+    (license license:bsd-3)))
+
+(define-public python2-jupyter-client
+  (package-with-python2 python-jupyter-client))
+
+(define-public python-ipykernel
+  (package
+    (name "python-ipykernel")
+    (version "4.5.0")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (pypi-uri "ipykernel" version))
+      (sha256
+       (base32 "15c2bp1x3i6s4xb7vz7742h3kmvdfdfn9n2haywm3mwgvf77jni4"))))
+    (build-system python-build-system)
+    ;; The tests load a submodule of IPython.  However, IPython itself depends
+    ;; on ipykernel.
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     ;; imported at runtime during connect
+     `(("python-jupyter-client" ,python-jupyter-client)))
+    (home-page "http://ipython.org")
+    (synopsis "IPython Kernel for Jupyter")
+    (description
+     "This package provides the IPython kernel for Jupyter.")
+    (license license:bsd-3)))
+
+(define-public python2-ipykernel
+  (package-with-python2 python-ipykernel))
+
+(define-public python-testpath
+  (package
+    (name "python-testpath")
+    (version "0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/jupyter/testpath/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "04kh3fgvmqz6cfcw79q70qwjz7ib7lxm27cc548iy2rpr33qqf55"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f ; this package does not even have a setup.py
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'install)
+         (replace 'build
+                  (lambda* (#:key inputs outputs #:allow-other-keys)
+                    (let ((dir (string-append
+                                (assoc-ref outputs "out")
+                                "/lib/python"
+                                (string-take (string-take-right
+                                              (assoc-ref inputs "python") 5) 3)
+                                "/site-packages/testpath")))
+                      (mkdir-p dir)
+                      (copy-recursively "testpath" dir))
+                    #t)))))
+    (home-page "https://github.com/takluyver/testpath")
+    (synopsis "Test utilities for code working with files and commands")
+    (description
+     "Testpath is a collection of utilities for Python code working with files
+and commands.  It contains functions to check things on the filesystem, and
+tools for mocking system commands and recording calls to those.")
+    (license license:expat)))
+
+(define-public python2-testpath
+  (package-with-python2 python-testpath))
+
 (define-public python-ipython
   (package
     (name "python-ipython")
-    (version "3.2.1")
+    (version "4.0.0")
     (source
      (origin
        (method url-fetch)
-       (patches (search-patches "python-ipython-inputhook-ctype.patch"))
-       (uri (string-append "https://pypi.python.org/packages/source/i/"
-                           "ipython/ipython-" version ".tar.gz"))
+       (uri (pypi-uri "ipython" version ".tar.gz"))
        (sha256
-        (base32 "0xwin0sa9n0cabx4cq1ibf5ldsiw5dyimibla82kicz5gbpas4y9"))))
+        (base32 "1npl8g6bfsff9j938ypx0q5fyzy2l8lp0jl8skjjj2zv0z27dlig"))))
     (build-system python-build-system)
     (outputs '("out" "doc"))
     (propagated-inputs
      `(("python-pyzmq" ,python-pyzmq)
-       ("python-terminado" ,python-terminado)))
-    (inputs
-     `(("readline" ,readline)
-       ("which" ,which)
+       ("python-terminado" ,python-terminado)
        ("python-matplotlib" ,python-matplotlib)
        ("python-numpy" ,python-numpy)
        ("python-numpydoc" ,python-numpydoc)
        ("python-jinja2" ,python-jinja2)
        ("python-mistune" ,python-mistune)
+       ("python-pexpect" ,python-pexpect)
+       ("python-pickleshare" ,python-pickleshare)
+       ("python-simplegeneric" ,python-simplegeneric)
        ("python-jsonschema" ,python-jsonschema)
-       ("python-pygments" ,python-pygments)
-       ("python-requests" ,python-requests) ;; for tests
-       ("python-nose" ,python-nose)))
+       ("python-traitlets" ,python-traitlets)
+       ("python-ipykernel" ,python-ipykernel)
+       ("python-pygments" ,python-pygments)))
+    (inputs
+     `(("readline" ,readline)
+       ("which" ,which)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("python-requests" ,python-requests) ;; for tests
+       ("python-testpath" ,python-testpath)
+       ("python-nose" ,python-nose)
        ("python-sphinx" ,python-sphinx)
        ("texlive" ,texlive)
        ("texinfo" ,texinfo)
@@ -4617,13 +4770,13 @@ without using the configuration machinery.")
                    (examples (string-append doc "/examples")))
               (setenv "LANG" "en_US.utf8")
               (with-directory-excursion "docs"
-                ;; FIXME: html and pdf fail to build
-                ;; (system* "make" "html")
-                ;; (system* "make" "pdf" "PAPER=a4")
+                ;; FIXME: pdf fails to build
+                ;;(system* "make" "pdf" "PAPER=a4")
+                (system* "make" "html")
                 (system* "make" "info"))
               (copy-recursively "docs/man" man1)
               (copy-recursively "examples" examples)
-              ;; (copy-recursively "docs/build/html" html)
+              (copy-recursively "docs/build/html" html)
               ;; (copy-file "docs/build/latex/ipython.pdf"
               ;;            (string-append doc "/ipython.pdf"))
               (mkdir-p info)
@@ -4732,6 +4885,22 @@ and written in Python.")
 (define-public python2-html5lib
   (package-with-python2 python-html5lib))
 
+;; Needed for python-bleach, a dependency of python-notebook
+(define-public python-html5lib-0.9
+  (package
+    (inherit python-html5lib)
+    (version "0.999")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "html5lib" version))
+       (sha256
+        (base32
+         "17n4zfsj6ynmbwdwviywmj8r6nzr3xvfx2zs0xhndmvm51z7z263"))))))
+
+(define-public python2-html5lib-0.9
+  (package-with-python2 python-html5lib-0.9))
+
 (define-public python-urwid
   (package
     (name "python-urwid")
@@ -6618,6 +6787,302 @@ Debian-related files, such as:
 (define-public python2-debian
   (package-with-python2 python-debian))
 
+(define-public python-nbformat
+  (package
+    (name "python-nbformat")
+    (version "4.1.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nbformat" version))
+       (sha256
+        (base32
+         "0mq8iki3d4mnx7wy05phss7x98mds4fqydin8lcagidp1knw1xnv"))))
+    (build-system python-build-system)
+    (arguments `(#:tests? #f)) ; no test target
+    (propagated-inputs
+     `(("python-ipython-genutils" ,python-ipython-genutils)
+       ("python-jsonschema" ,python-jsonschema)
+       ("python-jupyter-core" ,python-jupyter-core)
+       ("python-traitlets" ,python-traitlets)))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://jupyter.org")
+    (synopsis "Jupyter Notebook format")
+    (description "This package provides the reference implementation of the
+Jupyter Notebook format and Python APIs for working with notebooks.")
+    (license license:bsd-3)))
+
+(define-public python2-nbformat
+  (package-with-python2 python-nbformat))
+
+(define-public python-bleach
+  (package
+    (name "python-bleach")
+    (version "1.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "bleach" version))
+       (sha256
+        (base32
+         "0jvg3jxrvnx7xmm9gj262v60ib452xlnwlb0navyp7jsvcd0d4qj"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-html5lib" ,python-html5lib-0.9)
+       ("python-setuptools" ,python-setuptools)
+       ("python-six" ,python-six)))
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "http://github.com/jsocol/bleach")
+    (synopsis "Whitelist-based HTML-sanitizing tool")
+    (description "Bleach is an easy whitelist-based HTML-sanitizing tool.")
+    (license license:asl2.0)))
+
+(define-public python2-bleach
+  (package-with-python2 python-bleach))
+
+(define-public python-entrypoints
+  (package
+    (name "python-entrypoints")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/takluyver/entrypoints/archive/"
+                           version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0azqlkh3j0za080lsf5crnhaxx3c93k9dpv5ihkhf5cppgw5sjz5"))))
+    (build-system python-build-system)
+    ;; The package does not come with a setup.py file, so we have to generate
+    ;; one ourselves.
+    (arguments
+     `(#:tests? #f
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'create-setup.py
+           (lambda _
+             (call-with-output-file "setup.py"
+               (lambda (port)
+                 (format port "\
+from setuptools import setup
+setup(name='entrypoints', version='~a', py_modules=['entrypoints'])
+" ,version))))))))
+    (home-page "https://github.com/takluyver/entrypoints")
+    (synopsis "Discover and load entry points from installed Python packages")
+    (description "Entry points are a way for Python packages to advertise
+objects with some common interface.  The most common examples are
+@code{console_scripts} entry points, which define shell commands by
+identifying a Python function to run.  The @code{entrypoints} module contains
+functions to find and load entry points.")
+    (license license:expat)))
+
+(define-public python2-entrypoints
+  (package-with-python2 python-entrypoints))
+
+(define-public python-nbconvert
+  (package
+    (name "python-nbconvert")
+    (version "5.0.0b1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "nbconvert" version))
+       (sha256
+        (base32
+         "0brclbb18l4nmd5qy3dl9wn05rjdh1fz4rmzdlfqacj12rcdvdgp"))))
+    (build-system python-build-system)
+    ;; The "bdist_egg" target is disabled by default, causing the installation
+    ;; to fail.
+    (arguments `(#:configure-flags (list "bdist_egg")))
+    (propagated-inputs
+     `(("python-bleach" ,python-bleach)
+       ("python-entrypoints" ,python-entrypoints)
+       ("python-jinja2" ,python-jinja2)
+       ("python-jupyter-core" ,python-jupyter-core)
+       ("python-mistune" ,python-mistune)
+       ("python-nbformat" ,python-nbformat)
+       ("python-pygments" ,python-pygments)
+       ("python-setuptools" ,python-setuptools)
+       ("python-traitlets" ,python-traitlets)))
+    (home-page "http://jupyter.org")
+    (synopsis "Converting Jupyter Notebooks")
+    (description "The @code{nbconvert} tool, @{jupyter nbconvert}, converts
+notebooks to various other formats via Jinja templates.  It allows you to
+convert an @code{.ipynb} notebook file into various static formats including:
+
+@enumerate
+@item HTML
+@item LaTeX
+@item PDF
+@item Reveal JS
+@item Markdown (md)
+@item ReStructured Text (rst)
+@item executable script
+@end enumerate\n")
+    (license license:bsd-3)))
+
+(define-public python2-nbconvert
+  (package-with-python2 python-nbconvert))
+
+(define-public python-notebook
+  (package
+    (name "python-notebook")
+    (version "4.2.3")
+    (source (origin
+              (method url-fetch)
+              (uri (pypi-uri "notebook" version))
+              (sha256
+               (base32
+                "0laq5c2f21frq6xcdckgq7raqhznbjb0qs0357g612z87wyn1a9r"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (replace 'check
+           (lambda _
+             ;; HOME must be set for tests
+             (setenv "HOME" "/tmp")
+             (zero? (system* "nosetests")))))))
+    (propagated-inputs
+     `(("python-jupyter-core" ,python-jupyter-core)
+       ("python-nbformat" ,python-nbformat)
+       ("python-nbconvert" ,python-nbconvert)
+       ("python-ipython" ,python-ipython)))
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-sphinx" ,python-sphinx)
+       ("python-requests" ,python-requests)))
+    (home-page "http://jupyter.org/")
+    (synopsis "Web-based notebook environment for interactive computing")
+    (description
+     "The Jupyter HTML notebook is a web-based notebook environment for
+interactive computing.")
+    (license license:bsd-3)))
+
+(define-public python2-notebook
+  (package-with-python2 python-notebook))
+
+(define-public python-widgetsnbextension
+  (package
+    (name "python-widgetsnbextension")
+    (version "1.2.6")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "widgetsnbextension" version))
+       (sha256
+        (base32
+         "0lff2mrwrgsa1mxmwx3phl9xvy0jqfpg6khbmxy53jbq56rwy666"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-notebook" ,python-notebook)))
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-setuptools" ,python-setuptools)))
+    (home-page "http://ipython.org")
+    (synopsis "IPython HTML widgets for Jupyter")
+    (description "This package provides interactive HTML widgets for Jupyter
+notebooks.")
+    (license license:bsd-3)))
+
+(define-public python2-widgetsnbextension
+  (package-with-python2 python-widgetsnbextension))
+
+(define-public python-ipywidgets
+  (package
+    (name "python-ipywidgets")
+    (version "5.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "ipywidgets" version))
+       (sha256
+        (base32
+         "1lk0qrr5l9a0z7qkkn30hv5832whxwxymf1l576fmmad0n7hkxms"))))
+    (build-system python-build-system)
+    ;; FIXME: it's not clear how to run the tests.
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipython" ,python-ipython)
+       ("python-setuptools" ,python-setuptools)
+       ("python-traitlets" ,python-traitlets)
+       ("python-widgetsnbextension" ,python-widgetsnbextension)))
+    (home-page "http://ipython.org")
+    (synopsis "IPython HTML widgets for Jupyter")
+    (description "Ipywidgets are interactive HTML widgets for Jupyter
+notebooks and the IPython kernel.  Notebooks come alive when interactive
+widgets are used.  Users gain control of their data and can visualize changes
+in the data.")
+    (license license:bsd-3)))
+
+(define-public python2-ipywidgets
+  (package-with-python2 python-ipywidgets))
+
+(define-public python-jupyter-console
+  (package
+    (name "python-jupyter-console")
+    (version "5.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jupyter_console" version))
+       (sha256
+        (base32
+         "04acmkwsi99rcg3vb54c6n492zv35s92h2ahabc0w6wj976cipvx"))))
+    (build-system python-build-system)
+    ;; FIXME: it's not clear how to run the tests.
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipython" ,python-ipython)
+       ("python-jupyter-client" ,python-jupyter-client)
+       ("python-prompt-toolkit" ,python-prompt-toolkit)
+       ("python-pygments" ,python-pygments)
+       ("python-setuptools" ,python-setuptools)))
+    (home-page "https://jupyter.org")
+    (synopsis "Jupyter terminal console")
+    (description "This package provides a terminal-based console frontend for
+Jupyter kernels.  It also allows for console-based interaction with non-Python
+Jupyter kernels such as IJulia and IRKernel.")
+    (license license:bsd-3)))
+
+(define-public python2-jupyter-console
+  (package-with-python2 python-jupyter-console))
+
+(define-public jupyter
+  (package
+    (name "jupyter")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "jupyter" version))
+       (sha256
+        (base32
+         "0pwf3pminkzyzgx5kcplvvbvwrrzd3baa7lmh96f647k30rlpp6r"))))
+    (build-system python-build-system)
+    ;; FIXME: it's not clear how to run the tests.
+    (arguments `(#:tests? #f))
+    (propagated-inputs
+     `(("python-ipykernel" ,python-ipykernel)
+       ("python-ipywidgets" ,python-ipywidgets)
+       ("python-jupyter-console" ,python-jupyter-console)
+       ("python-nbconvert" ,python-nbconvert)
+       ("python-notebook" ,python-notebook)
+       ("python-setuptools" ,python-setuptools)))
+    (home-page "http://jupyter.org")
+    (synopsis "Web application for interactive documents")
+    (description
+     "The Jupyter Notebook is a web application that allows you to create and
+share documents that contain live code, equations, visualizations and
+explanatory text.  Uses include: data cleaning and transformation, numerical
+simulation, statistical modeling, machine learning and much more.")
+    (license license:bsd-3)))
+
 (define-public python-chardet
   (package
     (name "python-chardet")
@@ -11625,3 +12090,79 @@ PNG, JPEG, JPEG2000 and GIF files in pure Python.")
       (inherit base)
       (native-inputs `(("python2-setuptools" ,python2-setuptools)
                        ,@(package-native-inputs base))))))
+
+(define-public python-axolotl-curve25519
+  (package
+    (name "python-axolotl-curve25519")
+    (version "0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "git://github.com/tgalal/python-axolotl-curve25519")
+             (commit "e4a9c4de0eae27223200579c58d1f8f6d20637e2")))
+       (file-name (string-append name "-" version "-checkout"))
+       (sha256
+        (base32
+         "0agap5q0hmvf6cwzjqc05kw53pjgf6942pcivpazksmg1vk400ra"))))
+    (build-system python-build-system)
+    (arguments
+     `(;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "https://github.com/tgalal/python-axolotl-curve25519")
+    (synopsis "Python wrapper for curve25519 library")
+    (description "This is a python wrapper for the curve25519 library
+with ed25519 signatures.  The C code was pulled from
+libaxolotl-android.  At the moment this wrapper is meant for use by
+python-axolotl.")
+    (license (list license:gpl3    ; Most files
+                   license:bsd-3)))) ; curve/curve25519-donna.c
+
+(define-public python2-axolotl-curve25519
+  (package-with-python2 python-axolotl-curve25519))
+
+(define-public python-axolotl
+  (package
+    (name "python-axolotl")
+    (version "0.1.35")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://github.com/tgalal/python-axolotl/archive/"
+             version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "1z8d89p7v40p4bwywjm9h4z28fdvra79ddw06azlkrfjbl7dxmz8"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Don't install tests
+         (add-before 'install 'remove-tests
+           (lambda _
+             (for-each delete-file-recursively
+                       '("axolotl/tests" "build/lib/axolotl/tests"))
+             #t)))
+       ;; Prevent creation of the egg. This works around
+       ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765
+       #:configure-flags '("--root=/")))
+    (native-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (propagated-inputs
+     `(("python-axolotl-curve25519" ,python-axolotl-curve25519)
+       ("python-dateutil" ,python-dateutil)
+       ("python-protobuf" ,python-protobuf)
+       ("python-pycrypto" ,python-pycrypto)))
+    (home-page "https://github.com/tgalal/python-axolotl")
+    (synopsis "Python port of libaxolotl-android")
+    (description "This is a python port of libaxolotl-android.  This
+is a ratcheting forward secrecy protocol that works in synchronous and
+asynchronous messaging environments.")
+    (license license:gpl3)))
+
+(define-public python2-axolotl
+  (package-with-python2 python-axolotl))
diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm
index 4df1e2457a..4770aa89f1 100644
--- a/gnu/packages/statistics.scm
+++ b/gnu/packages/statistics.scm
@@ -506,13 +506,13 @@ panels or collapse high-dimensional arrays to simpler summary statistics.")
 (define-public r-proto
   (package
     (name "r-proto")
-    (version "0.3-10")
+    (version "1.0.0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "proto" version))
        (sha256
-        (base32 "03mvzi529y6kjcp9bkpk7zlgpcakb3iz73hca6rpjy14pyzl3nfh"))))
+        (base32 "1l843p8vckjckdhgv37ngv47fga5jzy0n00pmipvp05nnaixk54j"))))
     (build-system r-build-system)
     (home-page "http://r-proto.googlecode.com")
     (synopsis "Prototype object-based programming")
@@ -694,20 +694,22 @@ aesthetic attributes.")
 (define-public r-gdtools
   (package
     (name "r-gdtools")
-    (version "0.0.7")
+    (version "0.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "gdtools" version))
        (sha256
         (base32
-         "1bmnf9d677f2jy8jnb9ymjz1qzm4yrd0qp6k5qrrly06jfffyx7g"))))
+         "1l9d759x9s4ddz51sls8kcjps2i9kwfbc72dnagrdavh82h0al8n"))))
     (build-system r-build-system)
     (native-inputs
      `(("r-rcpp" ,r-rcpp)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("cairo" ,cairo)))
+    (propagated-inputs
+     `(("r-withr" ,r-withr)))
     (home-page "http://cran.r-project.org/web/packages/gdtools")
     (synopsis "Utilities for graphical rendering")
     (description
@@ -1217,14 +1219,14 @@ database.")
 (define-public r-acepack
   (package
     (name "r-acepack")
-    (version "1.4.0")
+    (version "1.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "acepack" version))
        (sha256
         (base32
-         "0brivhr0imf2qq1flc9qxibybg1zi5m8pxz8cjn5a8gb42bcv96n"))))
+         "1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"))))
     (build-system r-build-system)
     (inputs
      `(("gfortran" ,gfortran)))
@@ -1646,14 +1648,14 @@ R version.")
 (define-public r-checkmate
   (package
     (name "r-checkmate")
-    (version "1.8.1")
+    (version "1.8.2")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "checkmate" version))
        (sha256
         (base32
-         "1nqyi58jl33af82y8kw8iy9xbna2080y1khhy90kf6lim6q74024"))))
+         "1zqcggl9m7slvc0q6zyhssdypb7jzf3l9byl5vxh1qdwjiw2y64g"))))
     (build-system r-build-system)
     (propagated-inputs
      `(("r-backports" ,r-backports)))
@@ -1786,14 +1788,14 @@ collation, and NAMESPACE files.")
 (define-public r-openssl
   (package
     (name "r-openssl")
-    (version "0.9.4")
+    (version "0.9.5")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "openssl" version))
        (sha256
         (base32
-         "0rpb3xdzab453yjddr8ryad53ll27zss8abnj30aqa2lzbg4jwyb"))))
+         "1lal8mmcwjhhln10mfi96ipv3d364k0wiviiln220wvhddcpr9pp"))))
     (build-system r-build-system)
     (inputs
      `(("openssl" ,openssl)))
@@ -2789,6 +2791,75 @@ Fourier transform, fuzzy clustering, support vector machines, shortest path
 computation, bagged clustering, naive Bayes classifier, and more.")
     (license license:gpl2+)))
 
+(define-public r-bigmemory-sri
+  (package
+    (name "r-bigmemory-sri")
+    (version "0.1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "bigmemory.sri" version))
+       (sha256
+        (base32 "0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"))))
+    (properties
+     `((upstream-name . "bigmemory.sri")))
+    (build-system r-build-system)
+    (home-page "http://cran.r-project.org/web/packages/bigmemory.sri")
+    (synopsis "Shared resource interface for the bigmemory package")
+    (description "This package provides a shared resource interface for the
+bigmemory and synchronicity packages.")
+    ;; Users can choose either LGPLv3 or ASL2.0.
+    (license (list license:lgpl3 license:asl2.0))))
+
+(define-public r-synchronicity
+  (package
+    (name "r-synchronicity")
+    (version "1.1.9.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "synchronicity" version))
+       (sha256
+        (base32
+         "0d9skpwmsnkn4xb3f2kgyyv8bhdi0r9p1kj3cvi0s92fjjnpi00c"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-bh" ,r-bh)
+       ("r-bigmemory-sri" ,r-bigmemory-sri)
+       ("r-rcpp" ,r-rcpp)))
+    (home-page "http://www.bigmemory.org")
+    (synopsis "Boost mutex functionality in R")
+    (description "This package provides support for synchronization
+via mutexes and may eventually support interprocess communication and
+message passing.")
+    ;; Users can choose either LGPLv3 or ASL2.0.
+    (license (list license:lgpl3 license:asl2.0))))
+
+(define-public r-bigmemory
+  (package
+    (name "r-bigmemory")
+    (version "4.5.19")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "bigmemory" version))
+       (sha256
+        (base32
+         "191gbzca557kpk7mdsg716vfyqpr7j5din6qb8hin4g1nkzzwmg6"))))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-bh" ,r-bh)
+       ("r-rcpp" ,r-rcpp)
+       ("r-bigmemory-sri" ,r-bigmemory-sri)
+       ("r-r-utils" ,r-r-utils)))
+    (home-page "http://www.bigmemory.org")
+    (synopsis "Manage large matrices with shared memory or memory-mapped files")
+    (description "This package provides methods to create, store, access, and
+manipulate large matrices.  Matrices are allocated to shared memory and may use
+memory-mapped files.")
+    ;; Users can choose either LGPLv3 or ASL2.0.
+    (license (list license:lgpl3 license:asl2.0))))
+
 (define-public r-nmf
   (package
     (name "r-nmf")
@@ -2804,6 +2875,8 @@ computation, bagged clustering, naive Bayes classifier, and more.")
     (build-system r-build-system)
     (propagated-inputs
      `(("r-cluster" ,r-cluster)
+       ("r-bigmemory" ,r-bigmemory)
+       ("r-synchronicity" ,r-synchronicity)
        ("r-colorspace" ,r-colorspace)
        ("r-digest" ,r-digest)
        ("r-doparallel" ,r-doparallel)
@@ -2884,13 +2957,13 @@ want to migrate to S4.")
 (define-public r-r-oo
   (package
     (name "r-r-oo")
-    (version "1.20.0")
+    (version "1.21.0")
     (source (origin
               (method url-fetch)
               (uri (cran-uri "R.oo" version))
               (sha256
                (base32
-                "1l1x4r69mdchjyi6sq52p580fz3b3bqv6dpn1706y9n4vq47qx24"))))
+                "0723gxjazgqq7v3lwnl7axw3brzcnizvhbd71ijkkv8mz31fwp34"))))
     (properties `((upstream-name . "R.oo")))
     (build-system r-build-system)
     (propagated-inputs
@@ -3232,17 +3305,37 @@ distribution).")
 classification, regression and survival trees.")
     (license (list license:gpl2+ license:gpl3+))))
 
+(define-public r-survival
+  (package
+    (name "r-survival")
+    (version "2.40-1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "survival" version))
+       (sha256
+        (base32
+         "10pf0kq0g66k5rgizrvh29mq3r84acljw2jgrv5yp6z38xw23mci"))))
+    (build-system r-build-system)
+    (home-page "https://github.com/therneau/survival")
+    (synopsis "Survival analysis")
+    (description
+     "This package contains the core survival analysis routines, including
+definition of Surv objects, Kaplan-Meier and Aalen-Johansen (multi-state)
+curves, Cox models, and parametric accelerated failure time models.")
+    (license license:lgpl2.0+)))
+
 (define-public r-hmisc
   (package
     (name "r-hmisc")
-    (version "3.17-4")
+    (version "4.0-0")
     (source
      (origin
        (method url-fetch)
        (uri (cran-uri "Hmisc" version))
        (sha256
         (base32
-         "1hr2kycpm0h3li9gnlbx9pl6h13das7g2wqfk6cip1kx6lv00ypw"))))
+         "0azxmg9h9c456biydc0wpi9xhljmd37m8bv0zaadbvc93g7x0l4b"))))
     (properties `((upstream-name . "Hmisc")))
     (build-system r-build-system)
     (native-inputs
@@ -3257,7 +3350,13 @@ classification, regression and survival trees.")
        ("r-gridextra" ,r-gridextra)
        ("r-gtable" ,r-gtable)
        ("r-lattice" ,r-lattice)
+       ;; Hmisc needs survival >= 2.40.1, so it cannot use the survival
+       ;; package that comes with R 3.3.1.
+       ("r-survival" ,r-survival)
        ("r-latticeextra" ,r-latticeextra)
+       ("r-htmltable" ,r-htmltable)
+       ("r-htmltools" ,r-htmltools)
+       ("r-viridis" ,r-viridis)
        ("r-nnet" ,r-nnet)
        ("r-rpart" ,r-rpart)))
     (home-page "http://biostat.mc.vanderbilt.edu/Hmisc")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c77b769c0c..2e336dd048 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com>
 ;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
+;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1684,3 +1685,31 @@ specifications.")
     (description "libaacs is a library which implements the Advanced Access
 Content System specification.")
     (license license:lgpl2.1+)))
+
+(define-public mps-youtube
+  (package
+    (name "mps-youtube")
+    (version "0.2.7.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/mps-youtube/mps-youtube/"
+                           "archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "1s7h35yx6f0szf8mm8612ic913w3v05m2kwphjfcxnpq0ammhyci"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pafy" ,python-pafy)
+       ("python-pygobject" ,python-pygobject))) ; For mpris2 support
+    (home-page "https://github.com/mps-youtube/mps-youtube")
+    (synopsis "Terminal based YouTube player and downloader")
+    (description
+     "@code{mps-youtube} is based on mps, a terminal based program to
+search, stream and download music.  This implementation uses YouTube as
+a source of content and can play and download video as well as audio.
+It can use either mpv or mplayer for playback, and for conversion of
+formats ffmpeg or libav is used.  Users should install one of the
+supported players in addition to this package.")
+    (license license:gpl3+)))
diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm
index afda239356..5f0fb56b0c 100644
--- a/gnu/packages/w3m.scm
+++ b/gnu/packages/w3m.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -28,37 +29,29 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages)
   #:use-module (guix packages)
-  #:use-module (guix download)
+  #:use-module (guix git-download)
   #:use-module (guix build-system gnu))
 
 (define-public w3m
   (package
     (name "w3m")
-    (version "0.5.3")
+    (version "0.5.3+git20161031")
     (source (origin
-             (method url-fetch)
-             (uri (string-append "mirror://sourceforge/" name "/" name "/"
-                                 name "-" version "/"
-                                 name "-" version ".tar.gz"))
-             (sha256
-              (base32
-               "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579"))
-
-             ;; cf. https://bugs.archlinux.org/task/33397
-             (patches (search-patches "w3m-libgc.patch"
-                                      "w3m-force-ssl_verify_server-on.patch"
-                                      "w3m-disable-sslv2-and-sslv3.patch"
-                                      "w3m-disable-weak-ciphers.patch"))))
+              (method git-fetch)
+              ;; Debian's fork of w3m is the only one that is still
+              ;; maintained.
+              (uri (git-reference
+                    (url "https://anonscm.debian.org/cgit/collab-maint/w3m.git")
+                    (commit (string-append "v" version))))
+              (file-name (string-append "w3m-" version "-checkout"))
+              (sha256
+               (base32
+                "142vkkmsk76wj9w6r4y2pa1hmy1kkzmc73an9zchx0ikm2z92x6s"))))
     (build-system gnu-build-system)
     (arguments `(#:tests? #f  ; no check target
                  #:phases (alist-cons-before
                            'configure 'fix-perl
                            (lambda _
-                             ;; https://launchpad.net/bugs/935540
-                             ;; 'struct file_handle' is used by 'glibc'
-                             (substitute* '("istream.c" "istream.h")
-                              (("struct[[:blank:]]+file_handle")
-                               "struct w3m_file_handle"))
                              (substitute* '("scripts/w3mmail.cgi.in"
                                             "scripts/dirlist.cgi.in")
                                (("@PERL@") (which "perl"))))
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 8ef041a2fd..c6ad0b117f 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -3310,6 +3310,35 @@ various contexts including the R console, R Markdown documents, and Shiny web
 applications.")
     (license l:expat)))
 
+(define-public r-htmltable
+  (package
+    (name "r-htmltable")
+    (version "1.7")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (cran-uri "htmlTable" version))
+       (sha256
+        (base32
+         "0x2f2hrbhvm53zqwn0ny9wxbk34nwf6zww8cx4bjy5ax15asdllm"))))
+    (properties `((upstream-name . "htmlTable")))
+    (build-system r-build-system)
+    (propagated-inputs
+     `(("r-knitr" ,r-knitr)
+       ("r-magrittr" ,r-magrittr)
+       ("r-stringr" ,r-stringr)))
+    (home-page "http://gforge.se/packages/")
+    (synopsis "Advanced tables for Markdown/HTML")
+    (description
+     "This package provides functions to build tables with advanced layout
+elements such as row spanners, column spanners, table spanners, zebra
+striping, and more.  While allowing advanced layout, the underlying
+CSS-structure is simple in order to maximize compatibility with word
+processors such as LibreOffice.  The package also contains a few text
+formatting functions that help outputting text compatible with HTML or
+LaTeX.")
+    (license l:gpl3+)))
+
 (define-public r-curl
   (package
     (name "r-curl")
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index fde5ff2c6f..79b49f0a85 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -53,14 +53,14 @@
 (define-public webkitgtk
   (package
     (name "webkitgtk")
-    (version "2.14.1")
+    (version "2.14.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://www.webkitgtk.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "1dffnz20psgc604azhbzn9a6cdhafar9dw74w3bbwrfy531pcb9f"))))
+                "0mjmcxhafh6l6j062z2nwfqbbvfyx16iqrzrbajswijh23awpnrf"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f ; no tests
diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm
index 81e0934889..708b31bf8e 100644
--- a/gnu/packages/xiph.scm
+++ b/gnu/packages/xiph.scm
@@ -229,8 +229,8 @@ meaning that audio is compressed in FLAC without any loss in quality.")
    (version "0.4.1")
    (source (origin
             (method url-fetch)
-            (uri (string-append "http://libkate.googlecode.com/files/libkate-"
-                                version ".tar.gz"))
+            (uri (string-append "http://downloads.xiph.org/releases/kate/"
+                                "libkate-" version ".tar.gz"))
             (sha256
              (base32
               "0s3vr2nxfxlf1k75iqpp4l78yf4gil3f0v778kvlngbchvaq23n4"))))
@@ -241,7 +241,7 @@ meaning that audio is compressed in FLAC without any loss in quality.")
    (inputs `(("bison" ,bison)
              ("libogg" ,libogg)
              ("libpng" ,libpng)
-("python" ,python-wrapper)
+             ("python" ,python-wrapper)
              ("zlib" ,zlib)))
    (synopsis "Karaoke and text codec for embedding in ogg")
    (description
@@ -257,7 +257,7 @@ This allows scrolling or fading text to be defined.  This can even be used
 to draw arbitrary shapes, so hand drawing can also be represented by a
 Kate stream.")
    (license license:bsd-3)
-   (home-page "http://code.google.com/p/libkate/")))
+   (home-page "https://wiki.xiph.org/OggKate")))
 
 (define vorbis-tools
   (package
diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index e839af5de2..3fb2e213b0 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -231,7 +231,7 @@ s-expression corresponding to that package, or #f on failure."
                     (start (string-rindex url #\/)))
                 ;; The URL ends on
                 ;; (string-append "/" name "_" version ".tar.gz")
-                (substring url start end)))
+                (substring url (+ start 1) end)))
              (_ #f)))
           (_ #f)))))
 
diff --git a/po/guix/pt_BR.po b/po/guix/pt_BR.po
index 664cf249ad..c4661a57f4 100644
--- a/po/guix/pt_BR.po
+++ b/po/guix/pt_BR.po
@@ -1,55 +1,182 @@
 # Brazilian Portuguese translation of the guix
-# Copyright (C) 2013 Free Software Foundation, Inc.
-# Copyright (C) 2013 Ludovic Courtès
+# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016 Ludovic Courtès
 # This file is distributed under the same license as the guix package.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2013.
-#
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2013, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: guix 0.4-pre2\n"
+"Project-Id-Version: guix 0.11.0\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2014-07-25 00:55+0200\n"
-"PO-Revision-Date: 2013-09-28 21:29-0300\n"
-"Last-Translator: Rafael Ferreira <rafael.f.f1@gmail.com>\n"
+"POT-Creation-Date: 2016-07-29 10:16+0200\n"
+"PO-Revision-Date: 2016-11-01 17:32-0200\n"
+"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge.net>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: gnu/packages.scm:102
+#: gnu/packages.scm:79
+#, scheme-format
+msgid "~a: patch not found"
+msgstr "~a: patch não localizado"
+
+#: gnu/packages.scm:95
+#, scheme-format
+msgid "could not find bootstrap binary '~a' for system '~a'"
+msgstr "não foi possível localizar binário de inicialização \"~a\" para o sistema \"~a\""
+
+#: gnu/packages.scm:147
 #, scheme-format
 msgid "cannot access `~a': ~a~%"
 msgstr "não foi possível acessar \"~a\": ~a~%"
 
-#: guix/scripts/build.scm:54 guix/scripts/package.scm:349
+#: gnu/packages.scm:301
 #, scheme-format
 msgid "ambiguous package specification `~a'~%"
 msgstr "especificação ambígua de pacote \"~a\"~%"
 
-#: guix/scripts/build.scm:55 guix/scripts/package.scm:351
+#: gnu/packages.scm:302
 #, scheme-format
 msgid "choosing ~a from ~a~%"
 msgstr "escolhendo ~a de ~a~%"
 
-#: guix/scripts/build.scm:61
+#: gnu/packages.scm:306
+#, scheme-format
+msgid "deprecated NAME-VERSION syntax; use NAME@VERSION instead~%"
+msgstr "sintaxe NOME-VERSÃO obsoleta; em vez disso, use NOME@VERSÃO~%"
+
+#: gnu/packages.scm:311
 #, scheme-format
 msgid "~A: package not found for version ~a~%"
 msgstr "~A: pacote não encontrado para versão ~a~%"
 
-#: guix/scripts/build.scm:63
+#: gnu/packages.scm:321
 #, scheme-format
 msgid "~A: unknown package~%"
 msgstr "~A: pacote desconhecido~%"
 
-#: guix/scripts/build.scm:86
+#: gnu/packages.scm:349
+#, scheme-format
+msgid "package `~a' lacks output `~a'~%"
+msgstr "pacote \"~a\" carece de mensagem de saída \"~a\"~%"
+
+#: gnu/services.scm:540
+#, scheme-format
+msgid "no target of type '~a' for service ~s"
+msgstr "nenhum alvo do tipo \"~a\" para o serviço ~s"
+
+#: gnu/services.scm:551 gnu/services.scm:612
+#, scheme-format
+msgid "more than one target service of type '~a'"
+msgstr "mais de um serviço alvo do tipo \"~a\""
+
+#: gnu/services.scm:602
+#, scheme-format
+msgid "service of type '~a' not found"
+msgstr "serviço do tipo \"~a\" não localizado"
+
+#: gnu/system.scm:500
+#, scheme-format
+msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%"
+msgstr "usando um texto para arquivo \"~a\" está obsoleto; em vez disso, use \"plain-file\"~%"
+
+#: gnu/system.scm:516
+#, scheme-format
+msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%"
+msgstr "usando um valor monádico para \"~a\" está obsoleto; em vez disso, use \"plain-file\"~%"
+
+#: gnu/system.scm:650
+#, scheme-format
+msgid "~a: invalid locale name"
+msgstr "~a: nome de localidade inválido"
+
+#: gnu/system.scm:770
+#, scheme-format
+msgid "unrecognized boot parameters for '~a'~%"
+msgstr "parâmetros de inicialização não reconhecidos para \"~a\"~%"
+
+#: gnu/services/shepherd.scm:162
+#, scheme-format
+msgid "service '~a' provided more than once"
+msgstr "serviço \"~a\" fornecido mais de uma vez"
+
+#: gnu/services/shepherd.scm:177
+#, scheme-format
+msgid "service '~a' requires '~a', which is not provided by any service"
+msgstr "serviço \"~a\" requer \"~a\", o que não é fornecido por nenhum serviço"
+
+#: gnu/system/shadow.scm:240
+#, scheme-format
+msgid "supplementary group '~a' of user '~a' is undeclared"
+msgstr "grupo suplementar \"~a\" do usuário \"~a\" não está declarado"
+
+#: gnu/system/shadow.scm:250
+#, scheme-format
+msgid "primary group '~a' of user '~a' is undeclared"
+msgstr "grupo primário \"~a\" do usuário \"~a\" não está declarado"
+
+#: guix/scripts.scm:52
+#, scheme-format
+msgid "invalid argument: ~a~%"
+msgstr "argumento inválido: ~a~%"
+
+#: guix/scripts.scm:78 guix/scripts/download.scm:99 guix/scripts/gc.scm:164
+#: guix/scripts/import/cran.scm:78 guix/scripts/import/elpa.scm:77
+#: guix/scripts/pull.scm:219 guix/scripts/lint.scm:916
+#: guix/scripts/publish.scm:549 guix/scripts/graph.scm:383
+#, scheme-format
+msgid "~A: unrecognized option~%"
+msgstr "~A: opção não reconhecida~%"
+
+#: guix/scripts/build.scm:121
 #, scheme-format
 msgid "failed to create GC root `~a': ~a~%"
 msgstr "falha ao criar raiz de GC \"~a\": ~a~%"
 
-#: guix/scripts/build.scm:123
+#: guix/scripts/build.scm:198
+#, scheme-format
+msgid "invalid replacement specification: ~s~%"
+msgstr "especificação de substituição inválida: ~s~%"
+
+#: guix/scripts/build.scm:246
+msgid ""
+"\n"
+"      --with-source=SOURCE\n"
+"                         use SOURCE when building the corresponding package"
+msgstr ""
+"\n"
+"      --with-source=FONTE\n"
+"                         usa FONTE ao compilar o pacote correspondente"
+
+#: guix/scripts/build.scm:249
+msgid ""
+"\n"
+"      --with-input=PACKAGE=REPLACEMENT\n"
+"                         replace dependency PACKAGE by REPLACEMENT"
+msgstr ""
+"\n"
+"      --with-input=PACOTE=SUBSTITUIÇÃO\n"
+"                         substitui a dependência PACOTE por SUBSTITUIÇÃO"
+
+#: guix/scripts/build.scm:274
+#, scheme-format
+msgid "transformation '~a' had no effect on ~a~%"
+msgstr "a transformação \"~a\" não obteve efeito em ~a~%"
+
+#: guix/scripts/build.scm:292
+msgid ""
+"\n"
+"  -L, --load-path=DIR    prepend DIR to the package module search path"
+msgstr ""
+"\n"
+"  -L, --load-path=DIR    insere DIR no início do caminho de pesquisa do\n"
+"                         módulo do pacote"
+
+#: guix/scripts/build.scm:294
 msgid ""
 "\n"
 "  -K, --keep-failed      keep build tree of failed builds"
@@ -57,7 +184,15 @@ msgstr ""
 "\n"
 "  -K, --keep-failed      mantém a árvore de compilado de pacotes falhos"
 
-#: guix/scripts/build.scm:125
+#: guix/scripts/build.scm:296
+msgid ""
+"\n"
+"  -k, --keep-going       keep going when some of the derivations fail"
+msgstr ""
+"\n"
+"  -k, --keep-going       continua mesmo se algumas das derivações falharem"
+
+#: guix/scripts/build.scm:298
 msgid ""
 "\n"
 "  -n, --dry-run          do not build the derivations"
@@ -65,7 +200,7 @@ msgstr ""
 "\n"
 "  -n, --dry-run          não compila as derivações"
 
-#: guix/scripts/build.scm:127
+#: guix/scripts/build.scm:300
 msgid ""
 "\n"
 "      --fallback         fall back to building when the substituter fails"
@@ -73,7 +208,7 @@ msgstr ""
 "\n"
 "      --fallback         volta para compilação quando o substituto falhar"
 
-#: guix/scripts/build.scm:129
+#: guix/scripts/build.scm:302
 msgid ""
 "\n"
 "      --no-substitutes   build instead of resorting to pre-built substitutes"
@@ -82,13 +217,34 @@ msgstr ""
 "      --no-substitutes   compila, em vez de recorrer a substitutos\n"
 "                         pré-construídos"
 
-#: guix/scripts/build.scm:131
+#: guix/scripts/build.scm:304 guix/scripts/size.scm:217
+msgid ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         fetch substitute from URLS if they are authorized"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         obtém substituto a partir das URLS se autorizadas"
+
+#: guix/scripts/build.scm:307
+msgid ""
+"\n"
+"      --no-grafts        do not graft packages"
+msgstr ""
+"\n"
+"      --no-grafts        não faz gráficos de pacotes"
+
+#: guix/scripts/build.scm:309
 msgid ""
 "\n"
 "      --no-build-hook    do not attempt to offload builds via the build hook"
 msgstr ""
+"\n"
+"      --no-build-hook    não tenta descarregar compilações via hook de\n"
+"                         compilação"
 
-#: guix/scripts/build.scm:133
+#: guix/scripts/build.scm:311
 msgid ""
 "\n"
 "      --max-silent-time=SECONDS\n"
@@ -96,19 +252,20 @@ msgid ""
 msgstr ""
 "\n"
 "      --max-silent-time=SEGUNDOS\n"
-"                         marca compilação como falha após SEGUNDOS de silêncio"
+"                         marca a compilação como falha após transcorridos\n"
+"                         SEGUNDOS de silêncio"
 
-#: guix/scripts/build.scm:136
-#, fuzzy
+#: guix/scripts/build.scm:314
 msgid ""
 "\n"
 "      --timeout=SECONDS  mark the build as failed after SECONDS of activity"
 msgstr ""
 "\n"
-"      --max-silent-time=SEGUNDOS\n"
-"                         marca compilação como falha após SEGUNDOS de silêncio"
+"      --timeout=SEGUNDOS\n"
+"                         marca a compilação como falha após transcorridos\n"
+"                         SEGUNDOS de atividade"
 
-#: guix/scripts/build.scm:138
+#: guix/scripts/build.scm:316
 msgid ""
 "\n"
 "      --verbosity=LEVEL  use the given verbosity LEVEL"
@@ -116,20 +273,37 @@ msgstr ""
 "\n"
 "      --verbosity=NÍVEL  usa o NÍVEL de detalhamento dado"
 
-#: guix/scripts/build.scm:140
+#: guix/scripts/build.scm:318
+msgid ""
+"\n"
+"      --rounds=N         build N times in a row to detect non-determinism"
+msgstr ""
+"\n"
+"      --rounds=N         compila N vezes de uma vez para detectar\n"
+"                         não determinismo"
+
+#: guix/scripts/build.scm:320
 msgid ""
 "\n"
 "  -c, --cores=N          allow the use of up to N CPU cores for the build"
 msgstr ""
 "\n"
-"  -c, --cores=N          permite o uso de até N núcleos de CPU para compilação"
+"  -c, --cores=N          permite uso de até N núcleos de CPU para compilação"
 
-#: guix/scripts/build.scm:206
+#: guix/scripts/build.scm:322
+msgid ""
+"\n"
+"  -M, --max-jobs=N       allow at most N build jobs"
+msgstr ""
+"\n"
+"  -M, --max-jobs=N       permite no máximo N trabalhos de compilação"
+
+#: guix/scripts/build.scm:428 guix/scripts/build.scm:435
 #, scheme-format
-msgid "~a: not a number~%"
-msgstr "~a: não é um número~%"
+msgid "not a number: '~a' option argument: ~a~%"
+msgstr "não é um número: argumento da opção \"~a\": ~a~%"
 
-#: guix/scripts/build.scm:223
+#: guix/scripts/build.scm:455
 msgid ""
 "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n"
 "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"
@@ -137,16 +311,25 @@ msgstr ""
 "Uso: guix build [OPÇÃO]... PACOTE-OU-DERIVAÇÃO...\n"
 "Compila o PACOTE-OU-DERIVAÇÃO dado e returna seus caminhos de saída.\n"
 
-#: guix/scripts/build.scm:225
-#, fuzzy
+#: guix/scripts/build.scm:457
 msgid ""
 "\n"
 "  -e, --expression=EXPR  build the package or derivation EXPR evaluates to"
 msgstr ""
 "\n"
-"  -e, --expression=EXPR  compila o pacote que EXPR corresponder"
+"  -e, --expression=EXPR  compila o pacote ou derivação que EXPR corresponder"
 
-#: guix/scripts/build.scm:227
+#: guix/scripts/build.scm:459
+msgid ""
+"\n"
+"  -f, --file=FILE        build the package or derivation that the code within\n"
+"                         FILE evaluates to"
+msgstr ""
+"\n"
+"  -f, --file=ARQUIVO     compila o pacote ou derivação que o código dentro\n"
+"                         de ARQUIVO avaliar"
+
+#: guix/scripts/build.scm:462
 msgid ""
 "\n"
 "  -S, --source           build the packages' source derivations"
@@ -154,30 +337,33 @@ msgstr ""
 "\n"
 "  -S, --source           compila as derivações de fontes do pacote"
 
-#: guix/scripts/build.scm:229
+#: guix/scripts/build.scm:464
 msgid ""
 "\n"
-"  -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""
+"      --sources[=TYPE]   build source derivations; TYPE may optionally be one\n"
+"                         of \"package\", \"all\" (default), or \"transitive\""
 msgstr ""
 "\n"
-"  -s, --system=SISTEMA   tenta compilar para SISTEMA. ex.: \"i686-linux\""
+"      --sources[=TIPO]   compila derivações de fonte; como opção, TIPO pode\n"
+"                         um entre \"package\", \"all\" (padrão) ou \"transitive\""
 
-#: guix/scripts/build.scm:231
+#: guix/scripts/build.scm:467
 msgid ""
 "\n"
-"      --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""
+"  -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""
 msgstr ""
 "\n"
-"      --target=TRIO      compilação cruzada para TRIO. ex.: \"armel-linux-gnu\""
+"  -s, --system=SISTEMA   tenta compilar para SISTEMA (ex.: \"i686-linux\")"
 
-#: guix/scripts/build.scm:233
+#: guix/scripts/build.scm:469
 msgid ""
 "\n"
-"      --with-source=SOURCE\n"
-"                         use SOURCE when building the corresponding package"
+"      --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""
 msgstr ""
+"\n"
+"      --target=TRIO      compilação cruzada para TRIO (ex: \"armel-linux-gnu\")"
 
-#: guix/scripts/build.scm:236
+#: guix/scripts/build.scm:471
 msgid ""
 "\n"
 "  -d, --derivations      return the derivation paths of the given packages"
@@ -185,26 +371,51 @@ msgstr ""
 "\n"
 "  -d, --derivations      retorna os caminhos de derivação dos pacotes dados"
 
-#: guix/scripts/build.scm:238
+#: guix/scripts/build.scm:473
+msgid ""
+"\n"
+"      --check            rebuild items to check for non-determinism issues"
+msgstr ""
+"\n"
+"      --check            recompila itens para verificar questões de\n"
+"                         não determinismo"
+
+#: guix/scripts/build.scm:475
 msgid ""
 "\n"
 "  -r, --root=FILE        make FILE a symlink to the result, and register it\n"
 "                         as a garbage collector root"
 msgstr ""
 "\n"
-"  -r, --root=ARQUIVO     faz do ARQUIVO um link simbólico para o resultado e\n"
-"                         registra-o, como um coletor de lixo"
+"  -r, --root=ARQUIVO     faz do ARQUIVO um link simbólico para o resultado\n"
+"                          e o registra, como um coletor de lixo"
 
-#: guix/scripts/build.scm:241
+#: guix/scripts/build.scm:478
+msgid ""
+"\n"
+"  -q, --quiet            do not show the build log"
+msgstr ""
+"\n"
+"  -q, --quiet            não mostra o log de compilação"
+
+#: guix/scripts/build.scm:480
 msgid ""
 "\n"
 "      --log-file         return the log file names for the given derivations"
 msgstr ""
+"\n"
+"      --log-file         retorna o os nomes de arquivos de log para as\n"
+"                         derivações fornecidas"
 
-#: guix/scripts/build.scm:246 guix/scripts/download.scm:53
-#: guix/scripts/package.scm:525 guix/scripts/gc.scm:58
-#: guix/scripts/hash.scm:55 guix/scripts/pull.scm:82
-#: guix/scripts/substitute-binary.scm:564 guix/scripts/system.scm:362
+#: guix/scripts/build.scm:487 guix/scripts/download.scm:56
+#: guix/scripts/package.scm:388 guix/scripts/gc.scm:74
+#: guix/scripts/hash.scm:56 guix/scripts/import.scm:91
+#: guix/scripts/import/cran.scm:46 guix/scripts/pull.scm:83
+#: guix/scripts/substitute.scm:827 guix/scripts/system.scm:695
+#: guix/scripts/lint.scm:865 guix/scripts/publish.scm:73
+#: guix/scripts/edit.scm:44 guix/scripts/size.scm:225
+#: guix/scripts/graph.scm:364 guix/scripts/challenge.scm:182
+#: guix/scripts/container.scm:33 guix/scripts/container/exec.scm:43
 msgid ""
 "\n"
 "  -h, --help             display this help and exit"
@@ -212,10 +423,15 @@ msgstr ""
 "\n"
 "  -h, --help             exibe esta ajuda e sai"
 
-#: guix/scripts/build.scm:248 guix/scripts/download.scm:55
-#: guix/scripts/package.scm:527 guix/scripts/gc.scm:60
-#: guix/scripts/hash.scm:57 guix/scripts/pull.scm:84
-#: guix/scripts/substitute-binary.scm:566 guix/scripts/system.scm:364
+#: guix/scripts/build.scm:489 guix/scripts/download.scm:58
+#: guix/scripts/package.scm:390 guix/scripts/gc.scm:76
+#: guix/scripts/hash.scm:58 guix/scripts/import.scm:93
+#: guix/scripts/import/cran.scm:48 guix/scripts/pull.scm:85
+#: guix/scripts/substitute.scm:829 guix/scripts/system.scm:697
+#: guix/scripts/lint.scm:869 guix/scripts/publish.scm:75
+#: guix/scripts/edit.scm:46 guix/scripts/size.scm:227
+#: guix/scripts/graph.scm:366 guix/scripts/challenge.scm:184
+#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:45
 msgid ""
 "\n"
 "  -V, --version          display version information and exit"
@@ -223,24 +439,26 @@ msgstr ""
 "\n"
 "  -V, --version          exibe informações da versão e sai"
 
-#: guix/scripts/build.scm:368
+#: guix/scripts/build.scm:516
 #, scheme-format
-msgid "sources do not match any package:~{ ~a~}~%"
+msgid ""
+"invalid argument: '~a' option argument: ~a, ~\n"
+"must be one of 'package', 'all', or 'transitive'~%"
 msgstr ""
+"argumento inválido: argumento da opção \"~a\": ~a, ~\n"
+"deve ser um entre \"package\", \"all\" ou \"transitive\"~%"
 
-#: guix/scripts/build.scm:397 guix/scripts/download.scm:96
-#: guix/scripts/package.scm:763 guix/scripts/gc.scm:122
-#: guix/scripts/pull.scm:115 guix/scripts/system.scm:414
+#: guix/scripts/build.scm:563
 #, scheme-format
-msgid "~A: unrecognized option~%"
-msgstr "~A: opção desconhecida~%"
+msgid "~s: not something we can build~%"
+msgstr "~s: não é algo que podemos compilar~%"
 
-#: guix/scripts/build.scm:425
+#: guix/scripts/build.scm:643
 #, scheme-format
 msgid "no build log for '~a'~%"
-msgstr ""
+msgstr "nenhum log de compilação para \"~a\"~%"
 
-#: guix/scripts/download.scm:44
+#: guix/scripts/download.scm:47
 msgid ""
 "Usage: guix download [OPTION] URL\n"
 "Download the file at URL, add it to the store, and print its store path\n"
@@ -256,7 +474,7 @@ msgstr ""
 "Suporte a formatos: \"nix-base32\" (padrão), \"base32\" e \"base16\"\n"
 "(\"hex\" e \"hexadecimal\" também podem ser usados).\n"
 
-#: guix/scripts/download.scm:50 guix/scripts/hash.scm:50
+#: guix/scripts/download.scm:53 guix/scripts/hash.scm:51
 msgid ""
 "\n"
 "  -f, --format=FMT       write the hash in the given format"
@@ -264,105 +482,110 @@ msgstr ""
 "\n"
 "  -f, --format=FMT       escreve o hash no formato FMT dado"
 
-#: guix/scripts/download.scm:73 guix/scripts/hash.scm:75
+#: guix/scripts/download.scm:76 guix/scripts/hash.scm:76
 #, scheme-format
 msgid "unsupported hash format: ~a~%"
 msgstr "sem suporte ao formato de hash: ~a~%"
 
-#: guix/scripts/download.scm:106
+#: guix/scripts/download.scm:102 guix/scripts/package.scm:842
+#: guix/scripts/publish.scm:551
+#, scheme-format
+msgid "~A: extraneous argument~%"
+msgstr "~A: argumento estranho~%"
+
+#: guix/scripts/download.scm:111
+#, scheme-format
+msgid "no download URI was specified~%"
+msgstr "nenhuma URI de download foi especificada~%"
+
+#: guix/scripts/download.scm:113
 #, scheme-format
 msgid "~a: failed to parse URI~%"
 msgstr "~a: falha ao analisar URI~%"
 
-#: guix/scripts/download.scm:117
+#: guix/scripts/download.scm:126
 #, scheme-format
 msgid "~a: download failed~%"
 msgstr "~a: falha no download~%"
 
-#: guix/scripts/package.scm:88
+#: guix/scripts/package.scm:104
 #, scheme-format
-msgid "failed to build the empty profile~%"
-msgstr "falha ao compilar o perfil vazio~%"
+msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
+msgstr "Tente \"info '(guix) Invoking guix package'\" para mais informações.~%"
 
-# geração, criação?
-#: guix/scripts/package.scm:97
+#: guix/scripts/package.scm:126
 #, scheme-format
-msgid "switching from generation ~a to ~a~%"
-msgstr "trocando para geração de ~a para ~a~%"
+msgid "error: while creating directory `~a': ~a~%"
+msgstr "erro: ao criar diretório \"~a\": ~a~%"
 
-#: guix/scripts/package.scm:108 guix/scripts/package.scm:873
-#: guix/scripts/package.scm:985
+#: guix/scripts/package.scm:130
 #, scheme-format
-msgid "profile '~a' does not exist~%"
-msgstr "perfil \"~a\" não existe~%"
+msgid "Please create the `~a' directory, with you as the owner.~%"
+msgstr "Por favor, crie o diretório \"~a\", com você sendo o proprietário.~%"
 
-#: guix/scripts/package.scm:112
+#: guix/scripts/package.scm:137
 #, scheme-format
-msgid "nothing to do: already at the empty profile~%"
-msgstr "nada a ser feito: já está no perfil vazio~%"
-
-#: guix/scripts/package.scm:197
-#, fuzzy, scheme-format
-msgid "The following package would be removed:~%~{~a~%~}~%"
-msgstr "O seguinte pacote seria removido:~% ~{~a~%~}~%"
-
-#: guix/scripts/package.scm:202
-#, fuzzy, scheme-format
-msgid "The following package will be removed:~%~{~a~%~}~%"
-msgstr "O seguinte pacote será removido:~% ~{~a~%~}~%"
+msgid "error: directory `~a' is not owned by you~%"
+msgstr "erro: diretório \"~a\" não tem você como proprietário~%"
 
-#: guix/scripts/package.scm:214
+#: guix/scripts/package.scm:140
 #, scheme-format
-msgid "The following package would be installed:~%~{~a~%~}~%"
-msgstr "O seguinte pacote seria instalado:~%~{~a~%~}~%"
+msgid "Please change the owner of `~a' to user ~s.~%"
+msgstr "Por favor, altere o proprietário d \"~a\" para o usuário ~s.~%"
 
-#: guix/scripts/package.scm:219
+#: guix/scripts/package.scm:175
 #, scheme-format
-msgid "The following package will be installed:~%~{~a~%~}~%"
-msgstr "O seguinte pacote será instalado:~%~{~a~%~}~%"
+msgid "not removing generation ~a, which is current~%"
+msgstr "não será removida a geração ~a, que é o atual~%"
 
-#: guix/scripts/package.scm:339
+# geração, criação?
+#: guix/scripts/package.scm:182
 #, scheme-format
-msgid "package `~a' lacks output `~a'~%"
-msgstr "pacote \"~a\" carece de mensagem de saída \"~a\"~%"
+msgid "no matching generation~%"
+msgstr "nenhuma geração correspondente~%"
 
-#: guix/scripts/package.scm:356
+#: guix/scripts/package.scm:185 guix/scripts/package.scm:659
+#: guix/scripts/system.scm:502
 #, scheme-format
-msgid "~a: package not found~%"
-msgstr "~a: pacote não encontrado~%"
+msgid "invalid syntax: ~a~%"
+msgstr "sintaxe inválida: ~a~%"
 
-#: guix/scripts/package.scm:391
+#: guix/scripts/package.scm:210
 #, scheme-format
-msgid "looking for the latest release of GNU ~a..."
-msgstr "procurando pelo último lançamento do GNU ~a..."
+msgid "nothing to be done~%"
+msgstr "nada para ser feito~%"
 
-#: guix/scripts/package.scm:395
+#: guix/scripts/package.scm:224
 #, scheme-format
-msgid "~a: note: using ~a but ~a is available upstream~%"
-msgstr "~a: nota: usando ~a, mas ~a está disponível no upstream~%"
+msgid "~a package in profile~%"
+msgid_plural "~a packages in profile~%"
+msgstr[0] "~a pacote no perfil~%"
+msgstr[1] "~a pacotes no perfil~%"
 
-#: guix/scripts/package.scm:467
+#: guix/scripts/package.scm:313
 #, scheme-format
 msgid "The following environment variable definitions may be needed:~%"
 msgstr "As seguintes definições de variável de ambiente podem ser necessárias:~%"
 
-#: guix/scripts/package.scm:483
+#: guix/scripts/package.scm:329
 msgid ""
-"Usage: guix package [OPTION]... PACKAGES...\n"
-"Install, remove, or upgrade PACKAGES in a single transaction.\n"
+"Usage: guix package [OPTION]...\n"
+"Install, remove, or upgrade packages in a single transaction.\n"
 msgstr ""
-"Uso: guix package [OPÇÃO]... PACOTES...\n"
-"Instala, remove ou atualiza PACOTES em uma única transação.\n"
+"Uso: guix package [OPÇÃO]...\n"
+"Instala, remove ou atualiza pacotes em uma única transação.\n"
 
-#: guix/scripts/package.scm:485
+#: guix/scripts/package.scm:331
 msgid ""
 "\n"
-"  -i, --install=PACKAGE  install PACKAGE"
+"  -i, --install PACKAGE ...\n"
+"                         install PACKAGEs"
 msgstr ""
 "\n"
-"  -i, --install=PACOTE   instala PACOTE"
+"  -i, --install PACOTE ...\n"
+"                         instala PACOTEs"
 
-#: guix/scripts/package.scm:487
+#: guix/scripts/package.scm:334
 msgid ""
 "\n"
 "  -e, --install-from-expression=EXP\n"
@@ -372,15 +595,29 @@ msgstr ""
 "  -e, --install-from-expression=EXP\n"
 "                         instala o pacote que EXPR corresponder"
 
-#: guix/scripts/package.scm:490
+#: guix/scripts/package.scm:337
 msgid ""
 "\n"
-"  -r, --remove=PACKAGE   remove PACKAGE"
+"  -f, --install-from-file=FILE\n"
+"                         install the package that the code within FILE\n"
+"                         evaluates to"
 msgstr ""
 "\n"
-"  -r, --remove=PACOTE    remove PACOTE"
+"  -f, --install-from-file=ARQUIVO\n"
+"                         instala o pacote que o código dentro de\n"
+"                         ARQUIVO corresponder"
 
-#: guix/scripts/package.scm:492
+#: guix/scripts/package.scm:341
+msgid ""
+"\n"
+"  -r, --remove PACKAGE ...\n"
+"                         remove PACKAGEs"
+msgstr ""
+"\n"
+"  -r, --remove PACOTE ...\n"
+"                         remove PACOTEs"
+
+#: guix/scripts/package.scm:344
 msgid ""
 "\n"
 "  -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP"
@@ -389,44 +626,73 @@ msgstr ""
 "  -u, --upgrade[=REGEXP] atualiza todos os pacotes instalados correspondendo\n"
 "                         à REGEXP"
 
-#: guix/scripts/package.scm:494
+#: guix/scripts/package.scm:346
+msgid ""
+"\n"
+"  -m, --manifest=FILE    create a new profile generation with the manifest\n"
+"                         from FILE"
+msgstr ""
+"\n"
+"  -m, --manifest=ARQUIVO cria a geração de um novo perfil com o manifesto\n"
+"                         do ARQUIVO"
+
+#: guix/scripts/package.scm:349
+msgid ""
+"\n"
+"      --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP"
+msgstr ""
+"\n"
+"      --do-not-upgrade[=REGEXP] não atualiza pacotes correspondente a REGEXP"
+
+#: guix/scripts/package.scm:351
 msgid ""
 "\n"
 "      --roll-back        roll back to the previous generation"
 msgstr ""
 "\n"
-"      --roll-back        Reverte para a geração anterior"
+"      --roll-back        reverte para a geração anterior"
 
-#: guix/scripts/package.scm:496
+#: guix/scripts/package.scm:353
 msgid ""
 "\n"
-"      --search-paths     display needed environment variable definitions"
+"      --search-paths[=KIND]\n"
+"                         display needed environment variable definitions"
 msgstr ""
 "\n"
-"      --search-paths     exibe definições necessárias de variável de ambiente"
+"      --search-paths[=TIPO]\n"
+"                         exibe definições necessárias de variável de ambiente"
 
-#: guix/scripts/package.scm:498
+#: guix/scripts/package.scm:356
 msgid ""
 "\n"
 "  -l, --list-generations[=PATTERN]\n"
 "                         list generations matching PATTERN"
 msgstr ""
 "\n"
-"  -I, --list-generations[=PADRÃO]\n"
-"                         lista criações correspondendo ao PADRÃO"
+"  -l, --list-generations[=PADRÃO]\n"
+"                         lista criações correspondendo a PADRÃO"
 
-#: guix/scripts/package.scm:501
-#, fuzzy
+#: guix/scripts/package.scm:359
 msgid ""
 "\n"
 "  -d, --delete-generations[=PATTERN]\n"
 "                         delete generations matching PATTERN"
 msgstr ""
 "\n"
-"  -I, --list-generations[=PADRÃO]\n"
-"                         lista criações correspondendo ao PADRÃO"
+"  -d, --delete-generations[=PADRÃO]\n"
+"                         exclui gerações correspondendo a PADRÃO"
 
-#: guix/scripts/package.scm:504
+#: guix/scripts/package.scm:362
+msgid ""
+"\n"
+"  -S, --switch-generation=PATTERN\n"
+"                         switch to a generation matching PATTERN"
+msgstr ""
+"\n"
+"  -S, --switch-generations=PADRÃO\n"
+"                         alterna para a geração correspondendo a PADRÃO"
+
+#: guix/scripts/package.scm:365
 msgid ""
 "\n"
 "  -p, --profile=PROFILE  use PROFILE instead of the user's default profile"
@@ -434,7 +700,7 @@ msgstr ""
 "\n"
 "  -p, --profile=PERFIL   usa PERFIL em vez do perfil padrão do usuário"
 
-#: guix/scripts/package.scm:507
+#: guix/scripts/package.scm:368
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap Guile to build the profile"
@@ -442,7 +708,7 @@ msgstr ""
 "\n"
 "      --bootstrap        usa a inicialização do Guile para compilar o perfil"
 
-#: guix/scripts/package.scm:509 guix/scripts/pull.scm:75
+#: guix/scripts/package.scm:370 guix/scripts/pull.scm:76
 msgid ""
 "\n"
 "      --verbose          produce verbose output"
@@ -450,7 +716,7 @@ msgstr ""
 "\n"
 "      --verbose          produz uma saída mais detalhada"
 
-#: guix/scripts/package.scm:512
+#: guix/scripts/package.scm:373
 msgid ""
 "\n"
 "  -s, --search=REGEXP    search in synopsis and description using REGEXP"
@@ -458,7 +724,7 @@ msgstr ""
 "\n"
 "  -s, --search=REGEXP    pesquisa na sinopse e descrição usando REGEXP"
 
-#: guix/scripts/package.scm:514
+#: guix/scripts/package.scm:375
 msgid ""
 "\n"
 "  -I, --list-installed[=REGEXP]\n"
@@ -468,7 +734,7 @@ msgstr ""
 "  -I, --list-installed[=REGEXP]\n"
 "                         lista pacotes instalados correspondentes a REGEXP"
 
-#: guix/scripts/package.scm:517
+#: guix/scripts/package.scm:378
 msgid ""
 "\n"
 "  -A, --list-available[=REGEXP]\n"
@@ -478,76 +744,36 @@ msgstr ""
 "  -A, --list-available[=REGEXP]\n"
 "                         lista pacotes disponíveis correspondentes a REGEXP"
 
-#: guix/scripts/package.scm:520
-#, fuzzy
+#: guix/scripts/package.scm:381
 msgid ""
 "\n"
-"  --show=PACKAGE         show details about PACKAGE"
+"      --show=PACKAGE     show details about PACKAGE"
 msgstr ""
 "\n"
-"  -i, --install=PACOTE   instala PACOTE"
-
-#: guix/scripts/package.scm:767
-#, scheme-format
-msgid "~A: extraneous argument~%"
-msgstr "~A: argumento estranho~%"
-
-#: guix/scripts/package.scm:782
-#, scheme-format
-msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
-msgstr "Tente \"info '(guix) Invoking guix package'\" para mais informações.~%"
-
-#: guix/scripts/package.scm:804
-#, scheme-format
-msgid "error: while creating directory `~a': ~a~%"
-msgstr "erro: ao criar diretório \"~a\": ~a~%"
+"      --show=PACOTE      mostra detalhes sobre o PACOTE"
 
-#: guix/scripts/package.scm:808
+#: guix/scripts/package.scm:476
 #, scheme-format
-msgid "Please create the `~a' directory, with you as the owner.~%"
-msgstr "Por favor, crie o diretório \"~a\", com você sendo o proprietário.~%"
+msgid "~a: unsupported kind of search path~%"
+msgstr "~a: sem suporte ao tipo de caminho de pesquisa~%"
 
-#: guix/scripts/package.scm:815
-#, scheme-format
-msgid "error: directory `~a' is not owned by you~%"
-msgstr "erro: diretório \"~a\" não tem você como proprietário~%"
-
-#: guix/scripts/package.scm:818
-#, scheme-format
-msgid "Please change the owner of `~a' to user ~s.~%"
-msgstr "Por favor, altere o proprietário d \"~a\" para o usuário ~s.~%"
-
-#: guix/scripts/package.scm:843
-#, fuzzy, scheme-format
-msgid "deleting ~a~%"
-msgstr "Criação ~a\t~a~%"
-
-#: guix/scripts/package.scm:896 guix/scripts/package.scm:1001
+# geração, criação?
+#: guix/scripts/package.scm:755
 #, scheme-format
-msgid "invalid syntax: ~a~%"
-msgstr "sintaxe inválida: ~a~%"
+msgid "cannot switch to generation '~a'~%"
+msgstr "não foi possível alternar para a geração \"~a\"~%"
 
-#: guix/scripts/package.scm:925
+#: guix/scripts/package.scm:771
 #, scheme-format
-msgid "nothing to be done~%"
-msgstr "nada para ser feito~%"
+msgid "would install new manifest from '~a' with ~d entries~%"
+msgstr "instalaria novo manifesto a partir de \"~a\" com entradas ~d~%"
 
-#: guix/scripts/package.scm:948
+#: guix/scripts/package.scm:773
 #, scheme-format
-msgid "~a package in profile~%"
-msgstr "pacote ~a no perfil~%"
-
-#: guix/scripts/package.scm:963
-#, fuzzy, scheme-format
-msgid "Generation ~a\t~a"
-msgstr "Criação ~a\t~a~%"
+msgid "installing new manifest from '~a' with ~d entries~%"
+msgstr "instalando novo manifesto a partir de \"~a\" com entradas ~d~%"
 
-#: guix/scripts/package.scm:970
-#, scheme-format
-msgid "~a\t(current)~%"
-msgstr ""
-
-#: guix/scripts/gc.scm:39
+#: guix/scripts/gc.scm:42
 msgid ""
 "Usage: guix gc [OPTION]... PATHS...\n"
 "Invoke the garbage collector.\n"
@@ -555,7 +781,7 @@ msgstr ""
 "Uso: guix gc [OPÇÃO]... CAMINHOS...\n"
 "Chama o coletor de lixo.\n"
 
-#: guix/scripts/gc.scm:41
+#: guix/scripts/gc.scm:44
 msgid ""
 "\n"
 "  -C, --collect-garbage[=MIN]\n"
@@ -565,7 +791,15 @@ msgstr ""
 "  -C, --collect-garbage[=MÍN]\n"
 "                         coleta pelo menos MÍN bytes de lixo"
 
-#: guix/scripts/gc.scm:44
+#: guix/scripts/gc.scm:47
+msgid ""
+"\n"
+"  -F, --free-space=FREE  attempt to reach FREE available space in the store"
+msgstr ""
+"\n"
+"  -F, --free-space=LIVRE tenta alcançar LIVRE espaço disponível no                         armazenamento"
+
+#: guix/scripts/gc.scm:49
 msgid ""
 "\n"
 "  -d, --delete           attempt to delete PATHS"
@@ -573,8 +807,16 @@ msgstr ""
 "\n"
 "  -d, --delete           tente excluir CAMINHOS"
 
+#: guix/scripts/gc.scm:51
+msgid ""
+"\n"
+"      --optimize         optimize the store by deduplicating identical files"
+msgstr ""
+"\n"
+"      --optimize         otimiza o armazenamento deduplicando arquivos iguais"
+
 # são "arquivos inalcançáveis", segundo 'info guix', sobre o 'gc'
-#: guix/scripts/gc.scm:46
+#: guix/scripts/gc.scm:53
 msgid ""
 "\n"
 "      --list-dead        list dead paths"
@@ -583,7 +825,7 @@ msgstr ""
 "      --list-dead        lista caminhos mortos (inalcançáveis)"
 
 # são arquivos no armazenamento alcançáveis, segundo 'info guix', sobre o 'gc'
-#: guix/scripts/gc.scm:48
+#: guix/scripts/gc.scm:55
 msgid ""
 "\n"
 "      --list-live        list live paths"
@@ -591,7 +833,7 @@ msgstr ""
 "\n"
 "      --list-live        lista caminhos vivos (ativos)"
 
-#: guix/scripts/gc.scm:51
+#: guix/scripts/gc.scm:58
 msgid ""
 "\n"
 "      --references       list the references of PATHS"
@@ -599,7 +841,7 @@ msgstr ""
 "\n"
 "      --references       lista as referências de CAMINHOS"
 
-#: guix/scripts/gc.scm:53
+#: guix/scripts/gc.scm:60
 msgid ""
 "\n"
 "  -R, --requisites       list the requisites of PATHS"
@@ -607,7 +849,7 @@ msgstr ""
 "\n"
 "  -R, --requisites       lista os requisitos de CAMINHOS"
 
-#: guix/scripts/gc.scm:55
+#: guix/scripts/gc.scm:62
 msgid ""
 "\n"
 "      --referrers        list the referrers of PATHS"
@@ -615,13 +857,58 @@ msgstr ""
 "\n"
 "      --referrers        lista as referências de CAMINHOS"
 
-#: guix/scripts/gc.scm:84
+#: guix/scripts/gc.scm:65
+msgid ""
+"\n"
+"      --verify[=OPTS]    verify the integrity of the store; OPTS is a\n"
+"                         comma-separated combination of 'repair' and\n"
+"                         'contents'"
+msgstr ""
+"\n"
+"      --verify[=OPTS]    verifica a integridade do armazenamento; OPTS\n"
+"                         é uma combinação separada por vírgula de\n"
+"                         \"repair\" e \"contents\""
+
+# são "arquivos inalcançáveis", segundo 'info guix', sobre o 'gc'
+#: guix/scripts/gc.scm:69
+msgid ""
+"\n"
+"      --list-failures    list cached build failures"
+msgstr ""
+"\n"
+"      --list-failures    lista falhas de compilação em cache"
+
+#: guix/scripts/gc.scm:71
+msgid ""
+"\n"
+"      --clear-failures   remove PATHS from the set of cached failures"
+msgstr ""
+"\n"
+"      --clear-failures   remove CAMINHOS do conjunto de falhas em cache"
+
+#: guix/scripts/gc.scm:100
 #, scheme-format
 msgid "invalid amount of storage: ~a~%"
 msgstr "quantidade inválida de armazenamento: ~a~%"
 
-#: guix/scripts/hash.scm:45
-#, fuzzy
+#: guix/scripts/gc.scm:191
+msgid "already ~h bytes available on ~a, nothing to do~%"
+msgstr "~h bytes já disponíveis em ~a, nada para fazer~%"
+
+#: guix/scripts/gc.scm:194
+msgid "freeing ~h bytes~%"
+msgstr "liberando ~h bytes~%"
+
+#: guix/scripts/gc.scm:206
+#, scheme-format
+msgid "extraneous arguments: ~{~a ~}~%"
+msgstr "argumentos estranhos: ~{~a ~}~%"
+
+#: guix/scripts/gc.scm:226 guix/scripts/gc.scm:229
+msgid "freed ~h bytes~%"
+msgstr "~h bytes liberados~%"
+
+#: guix/scripts/hash.scm:46
 msgid ""
 "Usage: guix hash [OPTION] FILE\n"
 "Return the cryptographic hash of FILE.\n"
@@ -635,28 +922,125 @@ msgstr ""
 "Suporte a formatos: \"nix-base32\" (padrão), \"base32\" e \"base16\"\n"
 "(\"hex\" e \"hexadecimal\" também podem ser usados).\n"
 
-#: guix/scripts/hash.scm:52
+#: guix/scripts/hash.scm:53
 msgid ""
 "\n"
 "  -r, --recursive        compute the hash on FILE recursively"
 msgstr ""
+"\n"
+"  -r, --recursive        computa o hash no AQUIVO recursivamente"
 
-#: guix/scripts/hash.scm:103
+#: guix/scripts/hash.scm:104
 #, scheme-format
 msgid "unrecognized option: ~a~%"
-msgstr "opção desconhecida: ~a~%"
+msgstr "opção não reconhecida: ~a~%"
 
-#: guix/scripts/hash.scm:134 guix/ui.scm:233
+#: guix/scripts/hash.scm:135 guix/ui.scm:477
 #, scheme-format
 msgid "~a~%"
 msgstr "~a~%"
 
-#: guix/scripts/hash.scm:137
+#: guix/scripts/hash.scm:138 guix/scripts/system.scm:825
 #, scheme-format
 msgid "wrong number of arguments~%"
 msgstr "número errado de argumentos~%"
 
-#: guix/scripts/pull.scm:73
+#: guix/scripts/import.scm:85
+msgid ""
+"Usage: guix import IMPORTER ARGS ...\n"
+"Run IMPORTER with ARGS.\n"
+msgstr ""
+"Uso: guix import IMPORTADOR ARGUMENTOS ...\n"
+"Executa IMPORTADOR com ARGUMENTOS.\n"
+
+#: guix/scripts/import.scm:88
+msgid "IMPORTER must be one of the importers listed below:\n"
+msgstr "IMPORTADOR deve ser um dos importadores listados abaixo:\n"
+
+#: guix/scripts/import.scm:102
+#, scheme-format
+msgid "guix import: missing importer name~%"
+msgstr "guix: import: faltando o nome de um importador~%"
+
+#: guix/scripts/import.scm:115
+#, scheme-format
+msgid "'~a' import failed~%"
+msgstr "importação de \"~a\" falhou~%"
+
+#: guix/scripts/import.scm:116
+#, scheme-format
+msgid "~a: invalid importer~%"
+msgstr "~a: importador inválido~%"
+
+#: guix/scripts/import/cran.scm:42
+msgid ""
+"Usage: guix import cran PACKAGE-NAME\n"
+"Import and convert the CRAN package for PACKAGE-NAME.\n"
+msgstr ""
+"Uso: guix import cran NOME-PACOTE\n"
+"Importa e converte o pacote CRAN para NOME-PACOTE.\n"
+
+#: guix/scripts/import/cran.scm:44
+msgid ""
+"\n"
+"  -a, --archive=ARCHIVE  specify the archive repository"
+msgstr ""
+"\n"
+"  -a, --archive=PACOTE   especifica o repositório de pacote"
+
+#: guix/scripts/import/cran.scm:94
+#, scheme-format
+msgid "failed to download description for package '~a'~%"
+msgstr "falha ao baixar descrição para o pacote \"~a\"~%"
+
+#: guix/scripts/import/cran.scm:98 guix/scripts/import/elpa.scm:95
+#, scheme-format
+msgid "too few arguments~%"
+msgstr "poucos argumentos~%"
+
+#: guix/scripts/import/cran.scm:100 guix/scripts/import/elpa.scm:97
+#, scheme-format
+msgid "too many arguments~%"
+msgstr "número excessivo de argumentos~%"
+
+#: guix/scripts/import/elpa.scm:41
+msgid ""
+"Usage: guix import elpa PACKAGE-NAME\n"
+"Import the latest package named PACKAGE-NAME from an ELPA repository.\n"
+msgstr ""
+"Uso: guix import elpa NOME-PACOTE\n"
+"Importa o último pacote chamado NOME-PACOTE de um repositório ELPA.\n"
+
+#: guix/scripts/import/elpa.scm:43
+msgid ""
+"\n"
+"  -a, --archive=ARCHIVE          specify the archive repository"
+msgstr ""
+"\n"
+"  -a, --archive=PACOTE           especifica o repositório de pacote"
+
+#: guix/scripts/import/elpa.scm:45
+msgid ""
+"\n"
+"  -h, --help                     display this help and exit"
+msgstr ""
+"\n"
+"  -h, --help                     exibe esta ajuda e sai"
+
+#: guix/scripts/import/elpa.scm:47
+msgid ""
+"\n"
+"  -V, --version                  display version information and exit"
+msgstr ""
+"\n"
+"  -V, --version                  exibe informações da versão e sai"
+
+#: guix/scripts/import/elpa.scm:92
+#, scheme-format
+msgid "failed to download package '~a'~%"
+msgstr "falha ao baixar localidade: \"~a\"~%"
+
+#: guix/scripts/pull.scm:74
 msgid ""
 "Usage: guix pull [OPTION]...\n"
 "Download and deploy the latest version of Guix.\n"
@@ -664,143 +1048,199 @@ msgstr ""
 "Uso: guix pull [OPÇÃO]...\n"
 "Baixa e implanta a última versão do Guix.\n"
 
-#: guix/scripts/pull.scm:77
+#: guix/scripts/pull.scm:78
 msgid ""
 "\n"
 "      --url=URL          download the Guix tarball from URL"
 msgstr ""
+"\n"
+"      --url=URL          baixa o tarball do Guix a partir da URL"
 
-#: guix/scripts/pull.scm:79
+#: guix/scripts/pull.scm:80
 msgid ""
 "\n"
 "      --bootstrap        use the bootstrap Guile to build the new Guix"
 msgstr ""
 "\n"
-"      --bootstrap        usa a inicialização do Guile para compilar o novo Guix"
+"      --bootstrap        usa inicialização do Guile para compilar o novo Guix"
 
-#: guix/scripts/pull.scm:117
+#: guix/scripts/pull.scm:134
+msgid "tarball did not produce a single source directory"
+msgstr "tarball não produziu um diretório fonte"
+
+#: guix/scripts/pull.scm:152
 #, scheme-format
-msgid "~A: unexpected argument~%"
-msgstr "~A: argumento inesperado~%"
+msgid "unpacking '~a'...~%"
+msgstr "desempacotando \"~a\"...~%"
 
-#: guix/scripts/pull.scm:126
-msgid "failed to download up-to-date source, exiting\n"
-msgstr "falha ao baixar fonte atualizada; saindo\n"
+#: guix/scripts/pull.scm:161
+msgid "failed to unpack source code"
+msgstr "falha ao desempacotar o código fonte"
+
+#: guix/scripts/pull.scm:204
+msgid "Guix already up to date\n"
+msgstr "Guix já está atualizado\n"
 
-#: guix/scripts/pull.scm:145
+#: guix/scripts/pull.scm:209
 #, scheme-format
 msgid "updated ~a successfully deployed under `~a'~%"
 msgstr "~a atualizado foi implantado com sucesso em \"~a\"~%"
 
-#: guix/scripts/pull.scm:148
+#: guix/scripts/pull.scm:212
 #, scheme-format
 msgid "failed to update Guix, check the build log~%"
 msgstr "falha ao atualizar Guix; verifique o log de compilação~%"
 
-#: guix/scripts/pull.scm:150
-msgid "Guix already up to date\n"
-msgstr "Guix já está atualizado\n"
+#: guix/scripts/pull.scm:221
+#, scheme-format
+msgid "~A: unexpected argument~%"
+msgstr "~A: argumento inesperado~%"
+
+#: guix/scripts/pull.scm:230
+msgid "failed to download up-to-date source, exiting\n"
+msgstr "falha ao baixar fonte atualizada; saindo\n"
 
-#: guix/scripts/substitute-binary.scm:80
+#: guix/scripts/substitute.scm:113
 #, scheme-format
 msgid "authentication and authorization of substitutes disabled!~%"
-msgstr ""
+msgstr "autenticação e autorização de substitutos desabilitado!~%"
 
-#: guix/scripts/substitute-binary.scm:163
-#, fuzzy, scheme-format
+#: guix/scripts/substitute.scm:188
+#, scheme-format
 msgid "download from '~a' failed: ~a, ~s~%"
-msgstr "~a: falha no download~%"
+msgstr "download de \"~a\" falhou: ~a, ~s~%"
 
-#: guix/scripts/substitute-binary.scm:178
+#: guix/scripts/substitute.scm:201
 #, scheme-format
-msgid "while fetching ~a: server is unresponsive~%"
-msgstr "enquanto obtinha ~a: servidor não está respondendo~%"
+msgid "while fetching ~a: server is somewhat slow~%"
+msgstr "enquanto obtinha ~a: servidor está um pouco lento~%"
 
-#: guix/scripts/substitute-binary.scm:180
+#: guix/scripts/substitute.scm:203
 #, scheme-format
 msgid "try `--no-substitutes' if the problem persists~%"
 msgstr "Tente \"--no-substitutes\" se o problema persistir~%"
 
-#: guix/scripts/substitute-binary.scm:244
-#, fuzzy, scheme-format
-msgid "signature version must be a number: ~a~%"
-msgstr "Falha na verificação de assinatura de \"~a\"~%"
+#: guix/scripts/substitute.scm:219
+#, scheme-format
+msgid "unsupported substitute URI scheme: ~a~%"
+msgstr "sem suporte ao esquema de URI de substituto: ~a~%"
+
+#: guix/scripts/substitute.scm:252
+#, scheme-format
+msgid "while fetching '~a': ~a (~s)~%"
+msgstr "enquanto obtinha \"~a\": ~a (~s)~%"
 
-#: guix/scripts/substitute-binary.scm:248
-#, fuzzy, scheme-format
+#: guix/scripts/substitute.scm:257
+#, scheme-format
+msgid "ignoring substitute server at '~s'~%"
+msgstr "ignorando servidor substituto em \"~s\"~%"
+
+#: guix/scripts/substitute.scm:306
+#, scheme-format
+msgid "signature version must be a number: ~s~%"
+msgstr "a versão de assinatura deve ser um número: ~s~%"
+
+#: guix/scripts/substitute.scm:310
+#, scheme-format
 msgid "unsupported signature version: ~a~%"
-msgstr "sem suporte ao formato de hash: ~a~%"
+msgstr "sem suporte à versão da assinatura: ~a~%"
 
-#: guix/scripts/substitute-binary.scm:256
-#, fuzzy, scheme-format
+#: guix/scripts/substitute.scm:318
+#, scheme-format
 msgid "signature is not a valid s-expression: ~s~%"
-msgstr "falha ao ler a expressão ~s: ~s~%"
+msgstr "a assinatura não é uma expressão-s válida: ~s~%"
 
-#: guix/scripts/substitute-binary.scm:260
-#, fuzzy, scheme-format
+#: guix/scripts/substitute.scm:322
+#, scheme-format
 msgid "invalid format of the signature field: ~a~%"
-msgstr "quantidade inválida de armazenamento: ~a~%"
+msgstr "formato inválido do campo de assinatura: ~a~%"
 
-#: guix/scripts/substitute-binary.scm:295
-#, fuzzy, scheme-format
+#: guix/scripts/substitute.scm:357
+#, scheme-format
 msgid "invalid signature for '~a'~%"
-msgstr "número inválido: ~a~%"
+msgstr "assinatura inválida para \"~a\"~%"
 
-#: guix/scripts/substitute-binary.scm:297
+#: guix/scripts/substitute.scm:359
 #, scheme-format
 msgid "hash mismatch for '~a'~%"
-msgstr ""
+msgstr "hash incompatível para \"~a\"~%"
 
-#: guix/scripts/substitute-binary.scm:299
+#: guix/scripts/substitute.scm:361
 #, scheme-format
 msgid "'~a' is signed with an unauthorized key~%"
-msgstr ""
+msgstr "\"~a\" está assinado com uma chave não autorizada~%"
 
-#: guix/scripts/substitute-binary.scm:301
+#: guix/scripts/substitute.scm:363
 #, scheme-format
 msgid "signature on '~a' is corrupt~%"
-msgstr ""
+msgstr "a assinatura em \"~a\" está corrompida~%"
 
-#: guix/scripts/substitute-binary.scm:338
+#: guix/scripts/substitute.scm:401
 #, scheme-format
 msgid "substitute at '~a' lacks a signature~%"
-msgstr ""
+msgstr "o substituto em \"~a\" carece de uma assinatura~%"
 
-#: guix/scripts/substitute-binary.scm:526
+#: guix/scripts/substitute.scm:409
 #, scheme-format
-msgid "Downloading, please wait...~%"
-msgstr "Baixando, por favor aguarde...~%"
+msgid "~%Found valid signature for ~a~%"
+msgstr "~%Localizada assinatura válida para ~a~%"
 
-#: guix/scripts/substitute-binary.scm:528
+#: guix/scripts/substitute.scm:412
 #, scheme-format
-msgid "(Please consider upgrading Guile to get proper progress report.)~%"
-msgstr "(Por favor, considere atualizar o Guile para obter o relatório adequado do progresso.)~%"
+msgid "From ~a~%"
+msgstr "De ~a~%"
 
-#: guix/scripts/substitute-binary.scm:545
+#: guix/scripts/substitute.scm:452
+#, scheme-format
+msgid "'~a' does not name a store item~%"
+msgstr "\"~a\" não é o nome de um item do armazenamento~%"
+
+#: guix/scripts/substitute.scm:596
+#, scheme-format
+msgid "updating list of substitutes from '~a'... ~5,1f%"
+msgstr "atualizando a lista de substitutos de \"~a\"... ~5,1f%"
+
+#: guix/scripts/substitute.scm:646
+#, scheme-format
+msgid "~s: unsupported server URI scheme~%"
+msgstr "~s: sem suporte ao esquema de URI de servidor~%"
+
+#: guix/scripts/substitute.scm:656
+#, scheme-format
+msgid "'~a' uses different store '~a'; ignoring it~%"
+msgstr "\"~a\" usa um armazenamento diferente \"~a\""
+
+#: guix/scripts/substitute.scm:801
 #, scheme-format
 msgid "host name lookup error: ~a~%"
 msgstr "erro na busca pelo nome da máquina: ~a~%"
 
-#: guix/scripts/substitute-binary.scm:554
+#: guix/scripts/substitute.scm:806
+#, scheme-format
+msgid "TLS error in procedure '~a': ~a~%"
+msgstr "erro TLS no procedimento \"~a\": ~a~%"
+
+#: guix/scripts/substitute.scm:817
 msgid ""
-"Usage: guix substitute-binary [OPTION]...\n"
+"Usage: guix substitute [OPTION]...\n"
 "Internal tool to substitute a pre-built binary to a local build.\n"
 msgstr ""
-"Uso: guix substitute-binary [OPÇÃO]...\n"
-"Ferramenta interna para substituir um binário pré-compilado para uma compilação local.\n"
+"Uso: guix substitute [OPÇÃO]...\n"
+"Ferramenta interna para substituir um binário pré-compilado para\n"
+"uma compilação local.\n"
 
-#: guix/scripts/substitute-binary.scm:556
+#: guix/scripts/substitute.scm:819
 msgid ""
 "\n"
 "      --query            report on the availability of substitutes for the\n"
 "                         store file names passed on the standard input"
 msgstr ""
 "\n"
-"      --query            relata a disponibilidade de substitutos para os nomes\n"
-"                         de arquivos de armazenamento passados na entrada\n"
-"                         padrão"
+"      --query            relata a disponibilidade de substitutos para os\n"
+"                         nomes de arquivos de armazenamento passados na\n"
+"                         entrada padrão"
 
-#: guix/scripts/substitute-binary.scm:559
+#: guix/scripts/substitute.scm:822
 msgid ""
 "\n"
 "      --substitute STORE-FILE DESTINATION\n"
@@ -809,19 +1249,22 @@ msgid ""
 msgstr ""
 "\n"
 "      --substitute ARQUIVO-ARMAZENAMENTO DESTINO\n"
-"                         baixa ARQUIVO-ARMAZENAMENTO e armazena-o como um Nar\n"
-"                         no arquivo DESTINO"
+"                         baixa ARQUIVO-ARMAZENAMENTO e armazena-o como um\n"
+"                          Nar no arquivo DESTINO"
 
-#: guix/scripts/substitute-binary.scm:604
-msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n"
-msgstr ""
-
-#: guix/scripts/substitute-binary.scm:625
+#. TRANSLATORS: The second part of this message looks like
+#. "(4.1MiB installed)"; it shows the size of the package once
+#. installed.
+#: guix/scripts/substitute.scm:895
 #, scheme-format
-msgid "failed to look up host '~a' (~a), substituter disabled~%"
-msgstr ""
+msgid "Downloading ~a~:[~*~; (~a installed)~]...~%"
+msgstr "Baixando ~a~:[~*~; (~a instalado)~]...~%"
+
+#: guix/scripts/substitute.scm:951
+msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n"
+msgstr "ACL para importações de pacote parece não estar inicializado, substitutos podem estar indisponíveis\n"
 
-#: guix/scripts/substitute-binary.scm:732
+#: guix/scripts/substitute.scm:1047
 #, scheme-format
 msgid "~a: unrecognized options~%"
 msgstr "~a: opções desconhecidas~%"
@@ -829,175 +1272,1016 @@ msgstr "~a: opções desconhecidas~%"
 #: guix/scripts/authenticate.scm:58
 #, scheme-format
 msgid "cannot find public key for secret key '~a'~%"
-msgstr ""
+msgstr "não foi possível localizar a chave pública da chave privada \"~a\"~%"
 
 #: guix/scripts/authenticate.scm:78
-#, fuzzy, scheme-format
+#, scheme-format
 msgid "error: invalid signature: ~a~%"
-msgstr "sintaxe inválida: ~a~%"
+msgstr "erro: assinatura inválida: ~a~%"
 
 #: guix/scripts/authenticate.scm:80
 #, scheme-format
 msgid "error: unauthorized public key: ~a~%"
-msgstr ""
+msgstr "erro: chave pública não autorizada: ~a~%"
 
 #: guix/scripts/authenticate.scm:82
 #, scheme-format
 msgid "error: corrupt signature data: ~a~%"
-msgstr ""
+msgstr "erro: dados de assinatura corrompidos: ~a~%"
 
-#: guix/scripts/authenticate.scm:126
+#: guix/scripts/authenticate.scm:120
 msgid ""
 "Usage: guix authenticate OPTION...\n"
 "Sign or verify the signature on the given file.  This tool is meant to\n"
 "be used internally by 'guix-daemon'.\n"
 msgstr ""
+"Uso: guix authenticate OPÇÃO...\n"
+"Assina ou verifica a assinatura no arquivo dado. Essa ferramenta é\n"
+"feita para ser usada internamente por \"guix-daemon\".\n"
 
-#: guix/scripts/authenticate.scm:132
-#, fuzzy
+#: guix/scripts/authenticate.scm:126
 msgid "wrong arguments"
-msgstr "número errado de argumentos~%"
-
-#: guix/scripts/system.scm:74
-#, fuzzy, scheme-format
-msgid "failed to open operating system file '~a': ~a~%"
-msgstr "falha ao conectar em \"~a\": ~a~%"
+msgstr "argumentos errados"
 
-#: guix/scripts/system.scm:78 guix/ui.scm:238
-#, fuzzy, scheme-format
-msgid "~a: ~a~%"
-msgstr "~a~%"
-
-#: guix/scripts/system.scm:81
-#, fuzzy, scheme-format
-msgid "failed to load operating system file '~a': ~s~%"
-msgstr "falha ao conectar em \"~a\": ~a~%"
-
-#: guix/scripts/system.scm:116
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:111
+#, scheme-format
 msgid "failed to register '~a' under '~a'~%"
-msgstr "falha ao criar raiz de GC \"~a\": ~a~%"
+msgstr "falha ao registrar \"~a\" sob \"~a\"~%"
 
 #: guix/scripts/system.scm:144
 #, scheme-format
+msgid "failed to install GRUB on device '~a'~%"
+msgstr "falha ao instalar GRUB no dispositivo \"~a\"~%"
+
+#: guix/scripts/system.scm:162
+#, scheme-format
 msgid "initializing the current root file system~%"
-msgstr ""
+msgstr "inicialização do sistema de arquivos raiz atual~%"
 
-#: guix/scripts/system.scm:162 guix/scripts/system.scm:318
-#, fuzzy, scheme-format
-msgid "failed to install GRUB on device '~a'~%"
-msgstr "falha ao instalar local: ~a~%"
+#: guix/scripts/system.scm:176
+#, scheme-format
+msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%"
+msgstr "execução como não \"root\", então o dono de \"~a\" pode estar incorreto!~%"
+
+#: guix/scripts/system.scm:234
+#, scheme-format
+msgid "while talking to shepherd: ~a~%"
+msgstr "enquanto falava com o shepherd: ~a~%"
+
+#: guix/scripts/system.scm:248
+#, scheme-format
+msgid "service '~a' could not be found~%"
+msgstr "o serviço \"~a\" não pôde ser localizado~%"
+
+#: guix/scripts/system.scm:251
+#, scheme-format
+msgid "service '~a' does not have an action '~a'~%"
+msgstr "o serviço \"~a\" não possui uma ação \"~a\"~%"
+
+#: guix/scripts/system.scm:255
+#, scheme-format
+msgid "exception caught while executing '~a' on service '~a':~%"
+msgstr "exceção encontrada ao executar \"~a\" no serviço \"~a\":~%"
+
+#: guix/scripts/system.scm:263
+#, scheme-format
+msgid "something went wrong: ~s~%"
+msgstr "algo deu errado: ~s~%"
+
+#: guix/scripts/system.scm:266
+#, scheme-format
+msgid "shepherd error~%"
+msgstr "erro do shepherd~%"
+
+#: guix/scripts/system.scm:302
+#, scheme-format
+msgid "failed to obtain list of shepherd services~%"
+msgstr "falha ao obter lista de serviços do shepherd~%"
 
-#: guix/scripts/system.scm:197
+#: guix/scripts/system.scm:322
+#, scheme-format
+msgid "unloading service '~a'...~%"
+msgstr "descarregando serviço \"~a\"...~%"
+
+#: guix/scripts/system.scm:330
+#, scheme-format
+msgid "loading new services:~{ ~a~}...~%"
+msgstr "carregando novos serviços:~{ ~a~}...~%"
+
+#: guix/scripts/system.scm:354
 #, scheme-format
 msgid "activating system...~%"
-msgstr ""
+msgstr "ativando sistema...~%"
 
-#: guix/scripts/system.scm:236
-#, fuzzy, scheme-format
-msgid "unrecognized boot parameters for '~a'~%"
-msgstr "opção desconhecida: ~a~%"
+#: guix/scripts/system.scm:445
+msgid "the DAG of services"
+msgstr "o DAG de serviços"
+
+#: guix/scripts/system.scm:458
+msgid "the dependency graph of shepherd services"
+msgstr "o gráfico de dependência de serviços do shepherd"
+
+#: guix/scripts/system.scm:479
+#, scheme-format
+msgid "  file name: ~a~%"
+msgstr "  nome de arquivo: ~a~%"
+
+#: guix/scripts/system.scm:480
+#, scheme-format
+msgid "  canonical file name: ~a~%"
+msgstr "  nome de arquivo canônico: ~a~%"
+
+#. TRANSLATORS: Please preserve the two-space indentation.
+#: guix/scripts/system.scm:482
+#, scheme-format
+msgid "  label: ~a~%"
+msgstr "  rótulo: ~a~%"
 
-#: guix/scripts/system.scm:323
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:483
+#, scheme-format
+msgid "  root device: ~a~%"
+msgstr "  dispositivo raiz: ~a~%"
+
+#: guix/scripts/system.scm:484
+#, scheme-format
+msgid "  kernel: ~a~%"
+msgstr "  kernel: ~a~%"
+
+#: guix/scripts/system.scm:541
+#, scheme-format
+msgid "~a not found: 'guix pull' was never run~%"
+msgstr "~a não localizado: \"guix pull\" nunca foi executado~%"
+
+#: guix/scripts/system.scm:542
+#, scheme-format
+msgid "Consider running 'guix pull' before 'reconfigure'.~%"
+msgstr "Considere executar \"guix pull\" antes de \"reconfigure\".~%"
+
+#: guix/scripts/system.scm:543
+#, scheme-format
+msgid "Failing to do that may downgrade your system!~%"
+msgstr "Falhar em fazer isso pode fazer um downgrade de seu sistema!~%"
+
+#: guix/scripts/system.scm:613
+#, scheme-format
 msgid "initializing operating system under '~a'...~%"
-msgstr "falha ao conectar em \"~a\": ~a~%"
+msgstr "inicializando sistema operacional sob \"~a\"...~%"
 
-#: guix/scripts/system.scm:339
+#: guix/scripts/system.scm:652
 msgid ""
-"Usage: guix system [OPTION] ACTION FILE\n"
+"Usage: guix system [OPTION] ACTION [FILE]\n"
 "Build the operating system declared in FILE according to ACTION.\n"
 msgstr ""
+"Uso: guix system [OPÇÃO] AÇÃO [ARQUIVO]\n"
+"Compilação do sistema operacional declarado em ARQUIVO de acordo com AÇÃO.\n"
 
-#: guix/scripts/system.scm:342
+#: guix/scripts/system.scm:655 guix/scripts/container.scm:28
 msgid "The valid values for ACTION are:\n"
+msgstr "Os valores válidos para AÇÃO são:\n"
+
+#: guix/scripts/system.scm:657
+msgid "   reconfigure      switch to a new operating system configuration\n"
+msgstr "   reconfigure      alterna para configuração de um novo sistema de arquivos\n"
+
+#: guix/scripts/system.scm:659
+msgid "   list-generations list the system generations\n"
+msgstr "   list-generations lista as gerações do sistema\n"
+
+#: guix/scripts/system.scm:661
+msgid "   build            build the operating system without installing anything\n"
+msgstr "   build            compila o sistema operacional sem instalador nada\n"
+
+#: guix/scripts/system.scm:663
+msgid "   container        build a container that shares the host's store\n"
 msgstr ""
+"   container        compila um contêiner que compartilha o armazenamento\n"
+"                    da máquina\n"
 
-#: guix/scripts/system.scm:343
-msgid "  - 'reconfigure', switch to a new operating system configuration\n"
+#: guix/scripts/system.scm:665
+msgid "   vm               build a virtual machine image that shares the host's store\n"
 msgstr ""
+"   vm               compila uma imagem de máquina virtual que compartilha\n"
+"                    o armazenamento da máquina\n"
+
+#: guix/scripts/system.scm:667
+msgid "   vm-image         build a freestanding virtual machine image\n"
+msgstr "   vm-image         compila uma imagem de máquina virtual independente\n"
+
+#: guix/scripts/system.scm:669
+msgid "   disk-image       build a disk image, suitable for a USB stick\n"
+msgstr "   disk-image       compila uma imagem de disco, adequada para pendrive USB\n"
+
+#: guix/scripts/system.scm:671
+msgid "   init             initialize a root file system to run GNU\n"
+msgstr "   init             inicializa um sistema de arquivos raiz para executar GNU\n"
 
-#: guix/scripts/system.scm:345
-msgid "  - 'build', build the operating system without installing anything\n"
+#: guix/scripts/system.scm:673
+msgid "   extension-graph  emit the service extension graph in Dot format\n"
+msgstr "   extension-graph  emite o gráfico da extensão de serviço no formato Dot\n"
+
+#: guix/scripts/system.scm:675
+msgid "   shepherd-graph   emit the graph of shepherd services in Dot format\n"
+msgstr "   shepherd-graph   emite o gráfico de serviços do shepherd no formato Dot\n"
+
+#: guix/scripts/system.scm:679
+msgid ""
+"\n"
+"  -d, --derivation       return the derivation of the given system"
 msgstr ""
+"\n"
+"  -d, --derivation       retorna a derivação do sistema dado"
 
-#: guix/scripts/system.scm:347
-msgid "  - 'vm', build a virtual machine image that shares the host's store\n"
+#: guix/scripts/system.scm:681
+msgid ""
+"\n"
+"      --on-error=STRATEGY\n"
+"                         apply STRATEGY when an error occurs while reading FILE"
 msgstr ""
+"\n"
+"      --on-error=ESTRATÉGIA\n"
+"                         aplica ESTRATÉGIA ao ocorrer um erro ao ler ARQUIVO"
 
-#: guix/scripts/system.scm:349
-msgid "  - 'vm-image', build a freestanding virtual machine image\n"
+#: guix/scripts/system.scm:684
+msgid ""
+"\n"
+"      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
 msgstr ""
+"\n"
+"      --image-size=TAM   para \"vm-image\", produz uma imagem de TAM"
 
-#: guix/scripts/system.scm:351
-msgid "  - 'disk-image', build a disk image, suitable for a USB stick\n"
+#: guix/scripts/system.scm:686
+msgid ""
+"\n"
+"      --no-grub          for 'init', do not install GRUB"
 msgstr ""
+"\n"
+"      --no-grub          para \"init\", não instala GRUB"
 
-#: guix/scripts/system.scm:353
-msgid "  - 'init', initialize a root file system to run GNU.\n"
+#: guix/scripts/system.scm:688
+msgid ""
+"\n"
+"      --share=SPEC       for 'vm', share host file system according to SPEC"
 msgstr ""
+"\n"
+"      --share=ESPEC      para \"vm\", compartilha o sistema de arquivos do\n"
+"                         hospedeiro de acordo com ESPEC"
 
-#: guix/scripts/system.scm:357
+#: guix/scripts/system.scm:690
 msgid ""
 "\n"
-"      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
+"      --expose=SPEC      for 'vm', expose host file system according to SPEC"
 msgstr ""
+"\n"
+"      --expose=ESPEC     para \"vm\", expõe o sistema de arquivos do\n"
+"                         hospedeiro de acordo com ESPEC"
 
-#: guix/scripts/system.scm:359
+#: guix/scripts/system.scm:692
 msgid ""
 "\n"
-"      --no-grub          for 'init', do not install GRUB"
+"      --full-boot        for 'vm', make a full boot sequence"
 msgstr ""
+"\n"
+"      --full-boot        para \"vm\", faz uma sequência completa de\n"
+"                         inicialização"
+
+#: guix/scripts/system.scm:777
+#, scheme-format
+msgid "no configuration file specified~%"
+msgstr "nenhum arquivo de configuração especificado~%"
 
-#: guix/scripts/system.scm:422
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:840
+#, scheme-format
 msgid "~a: unknown action~%"
-msgstr "~A: pacote desconhecido~%"
+msgstr "~a: ação desconhecida~%"
 
-#: guix/scripts/system.scm:439
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:855
+#, scheme-format
 msgid "wrong number of arguments for action '~a'~%"
-msgstr "número errado de argumentos~%"
+msgstr "número errado de argumentos para a ação \"~a\"~%"
 
-#: guix/scripts/system.scm:459
+#: guix/scripts/system.scm:860
 #, scheme-format
-msgid "no configuration file specified~%"
+msgid "guix system: missing command name~%"
+msgstr "guix system: faltando um nome de comando~%"
+
+#: guix/scripts/system.scm:862
+#, scheme-format
+msgid "Try 'guix system --help' for more information.~%"
+msgstr "Tente \"guix system --help\" para mais informações.~%"
+
+#: guix/scripts/lint.scm:130
+#, scheme-format
+msgid "Available checkers:~%"
+msgstr "Verificadores disponíveis:~%"
+
+#: guix/scripts/lint.scm:150
+msgid "description should not be empty"
+msgstr "a descrição deve não estar vazia"
+
+#: guix/scripts/lint.scm:160
+msgid "Texinfo markup in description is invalid"
+msgstr "Marcação Texinfo na descrição é inválida"
+
+#: guix/scripts/lint.scm:168
+msgid "description should start with an upper-case letter or digit"
+msgstr "a descrição deve iniciar com uma letra maiúscula ou dígito"
+
+#: guix/scripts/lint.scm:184
+#, scheme-format
+msgid ""
+"sentences in description should be followed ~\n"
+"by two spaces; possible infraction~p at ~{~a~^, ~}"
+msgstr ""
+"sentenças nas descrição devem ser seguidas ~\n"
+"por dois espaços; possível infração~p em ~{~a~^, ~}"
+
+#: guix/scripts/lint.scm:200
+#, scheme-format
+msgid "invalid description: ~s"
+msgstr "a descrição inválida: ~s"
+
+#: guix/scripts/lint.scm:220
+#, scheme-format
+msgid "'~a' should probably be a native input"
+msgstr "\"~a\" provavelmente é uma entrada nativa"
+
+#: guix/scripts/lint.scm:238
+msgid "synopsis should not be empty"
+msgstr "a sinopse deve não estar vazia"
+
+#: guix/scripts/lint.scm:246
+msgid "no period allowed at the end of the synopsis"
+msgstr "nenhum ponto permitido ao final da sinopse"
+
+#: guix/scripts/lint.scm:258
+msgid "no article allowed at the beginning of the synopsis"
+msgstr "nenhum artigo permitido no início da sinopse"
+
+#: guix/scripts/lint.scm:265
+msgid "synopsis should be less than 80 characters long"
+msgstr "a sinopse deve ser menor que 80 caracteres"
+
+#: guix/scripts/lint.scm:271
+msgid "synopsis should start with an upper-case letter or digit"
+msgstr "a sinopse deve iniciar com uma letra maiúscula ou dígito"
+
+#: guix/scripts/lint.scm:278
+msgid "synopsis should not start with the package name"
+msgstr "a sinopse deve não iniciar com o nome do pacote"
+
+#: guix/scripts/lint.scm:292
+#, scheme-format
+msgid "invalid synopsis: ~s"
+msgstr "sinopse inválida: ~s"
+
+#: guix/scripts/lint.scm:383
+#, scheme-format
+msgid "URI ~a returned suspiciously small file (~a bytes)"
+msgstr "a URI ~a retornou um arquivo suspeitosamente pequeno (~a bytes)"
+
+#: guix/scripts/lint.scm:392 guix/scripts/lint.scm:404
+#, scheme-format
+msgid "URI ~a not reachable: ~a (~s)"
+msgstr "a URI ~a não é alcançável: ~a (~s)"
+
+#: guix/scripts/lint.scm:411
+#, scheme-format
+msgid "URI ~a domain not found: ~a"
+msgstr "o domínio da URI ~a não foi localizado: ~a"
+
+#: guix/scripts/lint.scm:419
+#, scheme-format
+msgid "URI ~a unreachable: ~a"
+msgstr "URI ~a inalcançável: ~a"
+
+#: guix/scripts/lint.scm:445
+msgid "invalid value for home page"
+msgstr "valor inválido para página inicial"
+
+#: guix/scripts/lint.scm:448
+#, scheme-format
+msgid "invalid home page URL: ~s"
+msgstr "URL de página inicial inválida: ~s"
+
+#: guix/scripts/lint.scm:468
+msgid "file names of patches should start with the package name"
+msgstr "nomes de arquivos de patches devem iniciar com o nome do pacote"
+
+#: guix/scripts/lint.scm:507
+#, scheme-format
+msgid "~a: ~a: proposed synopsis: ~s~%"
+msgstr "~a: ~a: sinopse proposta: ~s~%"
+
+#: guix/scripts/lint.scm:520
+#, scheme-format
+msgid "~a: ~a: proposed description:~%     \"~a\"~%"
+msgstr "~a: ~a: descrição proposta:~%     \"~a\"~%"
+
+#: guix/scripts/lint.scm:557
+msgid "all the source URIs are unreachable:"
+msgstr "todas as URIs fontes estão inalcançáveis:"
+
+#: guix/scripts/lint.scm:580
+msgid "the source file name should contain the package name"
+msgstr "o nome de arquivo fonte deve conter o nome do pacote"
+
+#: guix/scripts/lint.scm:589 guix/scripts/lint.scm:593
+#, scheme-format
+msgid "failed to create derivation: ~a"
+msgstr "falha ao criar a derivação: ~a"
+
+#: guix/scripts/lint.scm:607
+#, scheme-format
+msgid "failed to create derivation: ~s~%"
+msgstr "falha ao criar a derivação: ~s~%"
+
+#: guix/scripts/lint.scm:617
+msgid "invalid license field"
+msgstr "campo de licença inválido"
+
+#: guix/scripts/lint.scm:634
+#, scheme-format
+msgid "failed to retrieve CVE vulnerabilities from ~s: ~a (~s)~%"
+msgstr "falha ao obter vulnerabilidades CVE de ~s: ~a (~s)~%"
+
+#: guix/scripts/lint.scm:639 guix/scripts/lint.scm:647
+#, scheme-format
+msgid "assuming no CVE vulnerabilities~%"
+msgstr "presumindo haver nenhuma vulnerabilidade CVE~%"
+
+#: guix/scripts/lint.scm:645
+#, scheme-format
+msgid "failed to lookup NIST host: ~a~%"
+msgstr "falha ao procurar o servidor do NIST: ~a~%"
+
+#: guix/scripts/lint.scm:683
+#, scheme-format
+msgid "probably vulnerable to ~a"
+msgstr "provavelmente vulnerável a ~a"
+
+#: guix/scripts/lint.scm:698
+#, scheme-format
+msgid "tabulation on line ~a, column ~a"
+msgstr "tabulação na linha ~a, coluna ~a"
+
+#: guix/scripts/lint.scm:707
+#, scheme-format
+msgid "trailing white space on line ~a"
+msgstr "espaço ao final da linha ~a"
+
+#: guix/scripts/lint.scm:717
+#, scheme-format
+msgid "line ~a is way too long (~a characters)"
+msgstr "a linha ~a está grande demais (~a caracteres)"
+
+#: guix/scripts/lint.scm:728
+#, scheme-format
+msgid "line ~a: parentheses feel lonely, move to the previous or next line"
+msgstr "linha ~a: parênteses está solitário, mova-o para a linha anterior ou a seguinte"
+
+#: guix/scripts/lint.scm:783
+msgid "Validate package descriptions"
+msgstr "Valida descrições dos pacotes"
+
+#: guix/scripts/lint.scm:787
+msgid "Validate synopsis & description of GNU packages"
+msgstr "Valida sinopse & descrição de pacotes GNU"
+
+#: guix/scripts/lint.scm:791
+msgid "Identify inputs that should be native inputs"
+msgstr "Identifica entradas que devem ser nativas"
+
+#: guix/scripts/lint.scm:795
+msgid "Validate file names and availability of patches"
+msgstr "Valida nomes de arquivos e disponibilidade de patches"
+
+#: guix/scripts/lint.scm:799
+msgid "Validate home-page URLs"
+msgstr "Valida URLs de site"
+
+#. TRANSLATORS: <license> is the name of a data type and must not be
+#. translated.
+#: guix/scripts/lint.scm:805
+msgid "Make sure the 'license' field is a <license> or a list thereof"
+msgstr "Certifica que o campo \"license\" é um <license> ou uma lista disto"
+
+#: guix/scripts/lint.scm:810
+msgid "Validate source URLs"
+msgstr "Valida URLs fonte"
+
+#: guix/scripts/lint.scm:814
+msgid "Validate file names of sources"
+msgstr "Valida nomes de arquivos dos fontes"
+
+#: guix/scripts/lint.scm:818
+msgid "Report failure to compile a package to a derivation"
+msgstr "Relata falha ao compilar um pacote para uma derivação"
+
+#: guix/scripts/lint.scm:822
+msgid "Validate package synopses"
+msgstr "Valida sinopses do pacotes"
+
+#: guix/scripts/lint.scm:826
+msgid "Check the Common Vulnerabilities and Exposures (CVE) database"
+msgstr "Verifica o banco de dados de Vulnerabilidades e Exposições Comuns (CVE)"
+
+#: guix/scripts/lint.scm:831
+msgid "Look for formatting issues in the source"
+msgstr "Procura por problemas de formatação no fonte"
+
+#: guix/scripts/lint.scm:859
+msgid ""
+"Usage: guix lint [OPTION]... [PACKAGE]...\n"
+"Run a set of checkers on the specified package; if none is specified,\n"
+"run the checkers on all packages.\n"
+msgstr ""
+"Uso: guix lint [OPÇÃO]... [PACOTE]...\n"
+"Executa uma série de verificadores no pacote especificado; se nenhum\n"
+"for especificado, executa-os em todos pacote.\n"
+
+#: guix/scripts/lint.scm:862
+msgid ""
+"\n"
+"  -c, --checkers=CHECKER1,CHECKER2...\n"
+"                         only run the specified checkers"
+msgstr ""
+"\n"
+"  -c, --checkers=CHECKER1,CHECKER2...\n"
+"                         executa apenas os verificadores especificados"
+
+#: guix/scripts/lint.scm:867
+msgid ""
+"\n"
+"  -l, --list-checkers    display the list of available lint checkers"
+msgstr ""
+"\n"
+"  -l, --list-checkers    exibe a lista de verificações lint disponíveis"
+
+#: guix/scripts/lint.scm:887
+#, scheme-format
+msgid "~a: invalid checker~%"
+msgstr "~a: verificador inválido~%"
+
+#: guix/scripts/publish.scm:57
+#, scheme-format
+msgid ""
+"Usage: guix publish [OPTION]...\n"
+"Publish ~a over HTTP.\n"
+msgstr ""
+"Uso: guix publish [OPÇÃO]...\n"
+"Publica ~a por HTTP.\n"
+
+#: guix/scripts/publish.scm:59
+msgid ""
+"\n"
+"  -p, --port=PORT        listen on PORT"
+msgstr ""
+"\n"
+"  -p, --port=PORTA       Ouve na PORTA"
+
+#: guix/scripts/publish.scm:61
+msgid ""
+"\n"
+"      --listen=HOST      listen on the network interface for HOST"
+msgstr ""
+"\n"
+"      --listen=MÁQUINA   ouve na interface de rede pela MÁQUINA"
+
+#: guix/scripts/publish.scm:63
+msgid ""
+"\n"
+"  -u, --user=USER        change privileges to USER as soon as possible"
+msgstr ""
+"\n"
+"  -u, --user=USUÁRIO     altera privilégios para o USUÁRIO assim que possível"
+
+#: guix/scripts/publish.scm:65
+msgid ""
+"\n"
+"  -C, --compression[=LEVEL]\n"
+"                         compress archives at LEVEL"
+msgstr ""
+"\n"
+"  -C, --compression[=NÍVEL]\n"
+"                         comprime pacotes no NÍVEL"
+
+# Abreviei segundos para a linha caber em 80 caracteres -- Rafael 
+#: guix/scripts/publish.scm:68
+msgid ""
+"\n"
+"      --ttl=TTL          announce narinfos can be cached for TTL seconds"
+msgstr ""
+"\n"
+"      --ttl=TTL          anuncia que narinfos podem usar cache por TTL segs."
+
+#: guix/scripts/publish.scm:70
+msgid ""
+"\n"
+"  -r, --repl[=PORT]      spawn REPL server on PORT"
+msgstr ""
+"\n"
+"  -r, --repl[=PORTA]      faz um servidor de REPL na PORTA"
+
+#: guix/scripts/publish.scm:86
+#, scheme-format
+msgid "lookup of host '~a' failed: ~a~%"
+msgstr "a procura da máquina \"~a\" falhou: ~a~%"
+
+#: guix/scripts/publish.scm:124
+#, scheme-format
+msgid "lookup of host '~a' returned nothing"
+msgstr "a procura da máquina \"~a\" retornou nada"
+
+#: guix/scripts/publish.scm:137
+#, scheme-format
+msgid "zlib support is missing; compression disabled~%"
+msgstr "suporte a zlib está faltando; compressão desabilitada~%"
+
+#: guix/scripts/publish.scm:144
+#, scheme-format
+msgid "~a: invalid duration~%"
+msgstr "~a: duração inválida~%"
+
+#: guix/scripts/publish.scm:537
+#, scheme-format
+msgid "user '~a' not found: ~a~%"
+msgstr "usuário \"~a\" não localizado: ~a~%"
+
+#: guix/scripts/publish.scm:574
+#, scheme-format
+msgid "server running as root; consider using the '--user' option!~%"
+msgstr "servidor executado como root; considere usar a opção \"--user\"!~%"
+
+#: guix/scripts/publish.scm:576
+#, scheme-format
+msgid "publishing ~a on ~a, port ~d~%"
+msgstr "publicando ~a em ~a, porta ~d~%"
+
+#: guix/scripts/edit.scm:41
+msgid ""
+"Usage: guix edit PACKAGE...\n"
+"Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"
+msgstr ""
+"Uso: guix edit PACOTE...\n"
+"Inicia $VISUAL ou $EDITOR para editar as definições de PACOTE...\n"
+
+#: guix/scripts/edit.scm:62
+#, scheme-format
+msgid "file '~a' not found in search path ~s~%"
+msgstr "arquivo \"~a\" não localizado no caminho de pesquisa ~s~%"
+
+#: guix/scripts/edit.scm:83
+#, scheme-format
+msgid "source location of package '~a' is unknown~%"
+msgstr "localização fonte de pacote \"~a\" é desconhecida~%"
+
+#: guix/scripts/edit.scm:96
+#, scheme-format
+msgid "failed to launch '~a': ~a~%"
+msgstr "falha ao iniciar \"~a\": ~a~%"
+
+#: guix/scripts/size.scm:76
+#, scheme-format
+msgid "no available substitute information for '~a'~%"
+msgstr "nenhuma informação de substituto disponível para \"~a\"~%"
+
+#: guix/scripts/size.scm:84
+msgid "store item"
+msgstr "item do armazenamento"
+
+#: guix/scripts/size.scm:84
+msgid "total"
+msgstr "total"
+
+#: guix/scripts/size.scm:84
+msgid "self"
+msgstr "próprio"
+
+#: guix/scripts/size.scm:95
+#, scheme-format
+msgid "total: ~,1f MiB~%"
+msgstr "total: ~,1f MB~%"
+
+#. TRANSLATORS: This is the title of a graph, meaning that the graph
+#. represents a profile of the store (the "store" being the place where
+#. packages are stored.)
+#: guix/scripts/size.scm:206
+msgid "store profile"
+msgstr "perfil do armazenamento"
+
+#: guix/scripts/size.scm:215
+msgid ""
+"Usage: guix size [OPTION]... PACKAGE\n"
+"Report the size of PACKAGE and its dependencies.\n"
+msgstr ""
+"Uso: guix size [OPÇÃO]... PACOTES...\n"
+"Relata o tamanho do PACOTE e suas dependências.\n"
+
+#: guix/scripts/size.scm:220
+msgid ""
+"\n"
+"  -s, --system=SYSTEM    consider packages for SYSTEM--e.g., \"i686-linux\""
+msgstr ""
+"\n"
+"  -s, --system=SISTEMA   considera pacotes para SISTEMA (ex.: \"i686-linux\")"
+
+#: guix/scripts/size.scm:222
+msgid ""
+"\n"
+"  -m, --map-file=FILE    write to FILE a graphical map of disk usage"
 msgstr ""
+"\n"
+"  -m, --map-file=ARQUIVO escreve para ARQUIVO um mapa gráfico do uso do disco"
+
+#: guix/scripts/size.scm:276
+msgid "missing store item argument\n"
+msgstr "faltando argumento de item do armazenamento\n"
+
+#: guix/scripts/graph.scm:82
+#, scheme-format
+msgid "~a: invalid argument (package name expected)"
+msgstr "~a: argumento inválido (esperava-se nome de pacote)"
+
+#: guix/scripts/graph.scm:93
+msgid "the DAG of packages, excluding implicit inputs"
+msgstr "o DAG dos pacotes, excluindo entradas implícitas"
+
+#: guix/scripts/graph.scm:150
+msgid "the DAG of packages, including implicit inputs"
+msgstr "o DAG dos pacotes, incluindo entradas implícitas"
+
+#: guix/scripts/graph.scm:160
+msgid "the DAG of packages and origins, including implicit inputs"
+msgstr "o DAG dos pacotes e origens, incluindo entradas implícitas"
+
+#: guix/scripts/graph.scm:191
+msgid "same as 'bag', but without the bootstrap nodes"
+msgstr "mesmo que \"bag\", mas sem o nós de inicialização"
+
+#: guix/scripts/graph.scm:237
+msgid "the DAG of derivations"
+msgstr "o DAG de derivações"
+
+#: guix/scripts/graph.scm:249
+msgid "unsupported argument for derivation graph"
+msgstr "sem suporte ao argumento para gráfico de derivação"
+
+#: guix/scripts/graph.scm:270
+#, scheme-format
+msgid "references for '~a' are not known~%"
+msgstr "referências para \"~a\" não são conhecidas~%"
 
-#: guix/gnu-maintenance.scm:373
+#: guix/scripts/graph.scm:277
+msgid "the DAG of run-time dependencies (store references)"
+msgstr "o DAG de dependências de tempo real (referências de armazenamento)"
+
+#: guix/scripts/graph.scm:290
+msgid "unsupported argument for reference graph"
+msgstr "sem suporte ao argumento para gráfico de referência"
+
+#: guix/scripts/graph.scm:315
+#, scheme-format
+msgid "~a: unknown node type~%"
+msgstr "~a: tipo de nó desconhecido~%"
+
+#: guix/scripts/graph.scm:319
+msgid "The available node types are:\n"
+msgstr "Os tipos de nós disponíveis são:\n"
+
+#. TRANSLATORS: Here 'dot' is the name of a program; it must not be
+#. translated.
+#: guix/scripts/graph.scm:355
+msgid ""
+"Usage: guix graph PACKAGE...\n"
+"Emit a Graphviz (dot) representation of the dependencies of PACKAGE...\n"
+msgstr ""
+"Uso: guix graph PACOTE...\n"
+"Emite uma representação em Graphviz (dot) das dependências do PACOTE...\n"
+
+#: guix/scripts/graph.scm:357
+msgid ""
+"\n"
+"  -t, --type=TYPE        represent nodes of the given TYPE"
+msgstr ""
+"\n"
+"  -t, --type=TIPO        representa nós do TIPO dado"
+
+#: guix/scripts/graph.scm:359
+msgid ""
+"\n"
+"      --list-types       list the available graph types"
+msgstr ""
+"\n"
+"      --list-types       lista os tipos de gráficos disponíveis"
+
+#: guix/scripts/graph.scm:361
+msgid ""
+"\n"
+"  -e, --expression=EXPR  consider the package EXPR evaluates to"
+msgstr ""
+"\n"
+"  -e, --expression=EXPR  considera o pacote que EXPR corresponder"
+
+#: guix/scripts/challenge.scm:105
+#, scheme-format
+msgid "~a: no substitute at '~a'~%"
+msgstr "~a: nenhum substituto em \"~a\"'~%"
+
+#: guix/scripts/challenge.scm:121
+#, scheme-format
+msgid "no substitutes for '~a'~%"
+msgstr "nenhum substituto para \"~a\"'~%"
+
+#: guix/scripts/challenge.scm:138 guix/scripts/challenge.scm:158
+#, scheme-format
+msgid "no local build for '~a'~%"
+msgstr "nenhuma compilação local para \"~a\"~%"
+
+#: guix/scripts/challenge.scm:155
+#, scheme-format
+msgid "~a contents differ:~%"
+msgstr "conteúdo de ~a  diverge:~%"
+
+#: guix/scripts/challenge.scm:157
+#, scheme-format
+msgid "  local hash: ~a~%"
+msgstr "  hash local: ~a~%"
+
+#: guix/scripts/challenge.scm:162
+#, scheme-format
+msgid "  ~50a: ~a~%"
+msgstr "  ~50a: ~a~%"
+
+#: guix/scripts/challenge.scm:166
+#, scheme-format
+msgid "  ~50a: unavailable~%"
+msgstr "  ~50a: indisponível~%"
+
+#: guix/scripts/challenge.scm:176
+msgid ""
+"Usage: guix challenge [PACKAGE...]\n"
+"Challenge the substitutes for PACKAGE... provided by one or more servers.\n"
+msgstr ""
+"Uso: guix challenge [PACOTE...]\n"
+"Compara os substitutos por PACOTE... fornecido por um ou mais servidores.\n"
+
+#: guix/scripts/challenge.scm:178
+msgid ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         compare build results with those at URLS"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         compara resultados da compilação com os de URLS"
+
+#: guix/gnu-maintenance.scm:532
+msgid "Updater for GNU packages"
+msgstr "Atualizador para pacotes GNU"
+
+#: guix/gnu-maintenance.scm:539
+msgid "Updater for GNOME packages"
+msgstr "Atualizador para pacotes GNOME"
+
+#: guix/gnu-maintenance.scm:546
+msgid "Updater for X.org packages"
+msgstr "Atualizador para pacotes X.org"
+
+#: guix/scripts/container.scm:25
+msgid ""
+"Usage: guix container ACTION ARGS...\n"
+"Build and manipulate Linux containers.\n"
+msgstr ""
+"Uso: guix container AÇÃO ARGUMENTOS...\n"
+"Compila e manipula contêineres Linux.\n"
+
+#: guix/scripts/container.scm:30
+msgid "   exec            execute a command inside of an existing container\n"
+msgstr "   exec            executa comando dentro de um contêiner existente\n"
+
+#: guix/scripts/container.scm:53
+#, scheme-format
+msgid "guix container: missing action~%"
+msgstr "guix container: faltando uma ação~%"
+
+#: guix/scripts/container.scm:63
+#, scheme-format
+msgid "guix container: invalid action~%"
+msgstr "guix container: ação inválida~%"
+
+#: guix/scripts/container/exec.scm:40
+msgid ""
+"Usage: guix container exec PID COMMAND [ARGS...]\n"
+"Execute COMMMAND within the container process PID.\n"
+msgstr ""
+"Uso: guix container exec PID COMANDO [ARGUMENTOS...]\n"
+"Executa COMANDO dentro do contêiner de processo PID.\n"
+
+#: guix/scripts/container/exec.scm:69
+#, scheme-format
+msgid "~a: extraneous argument~%"
+msgstr "~a: argumento estranho~%"
+
+#: guix/scripts/container/exec.scm:80
+#, scheme-format
+msgid "no pid specified~%"
+msgstr "nenhum pid especificado~%"
+
+#: guix/scripts/container/exec.scm:83
+#, scheme-format
+msgid "no command specified~%"
+msgstr "nenhum comando foi especificado~%"
+
+#: guix/scripts/container/exec.scm:86
+#, scheme-format
+msgid "no such process ~d~%"
+msgstr "processo inexistente ~d~%"
+
+#: guix/scripts/container/exec.scm:94
+#, scheme-format
+msgid "exec failed with status ~d~%"
+msgstr "execução falhou com status ~d~%"
+
+#: guix/upstream.scm:157
 #, scheme-format
 msgid "signature verification failed for `~a'~%"
-msgstr "Falha na verificação de assinatura de \"~a\"~%"
+msgstr "verificação de assinatura falhou para \"~a\"~%"
 
-#: guix/gnu-maintenance.scm:375
+#: guix/upstream.scm:159
 #, scheme-format
 msgid "(could be because the public key is not in your keyring)~%"
-msgstr "(poderia ser porque a chave pública não está no seu chaveiro)~%"
+msgstr "(pode ser porque a chave pública não está no seu chaveiro)~%"
+
+#: guix/upstream.scm:191
+msgid "gz"
+msgstr "gz"
 
-#: guix/gnu-maintenance.scm:450
+#: guix/upstream.scm:234
 #, scheme-format
 msgid "~a: could not locate source file"
 msgstr "~a: não foi possível localizar um arquivo fonte"
 
-#: guix/gnu-maintenance.scm:455
+#: guix/upstream.scm:239
 #, scheme-format
 msgid "~a: ~a: no `version' field in source; skipping~%"
 msgstr "~a: ~a: sem o campo \"version\" no fonte; pulando~%"
 
-#: guix/ui.scm:131
+#: guix/ui.scm:238
+msgid "entering debugger; type ',bt' for a backtrace\n"
+msgstr "entrando no depurador; digite \",bt\" para o \"backtrace\"\n"
+
+#: guix/ui.scm:254 guix/ui.scm:271
+#, scheme-format
+msgid "failed to load '~a': ~a~%"
+msgstr "falha ao carregar \"~a\": ~a~%"
+
+#: guix/ui.scm:257
+#, scheme-format
+msgid "~a: error: ~a~%"
+msgstr "~a: erro: ~a~%"
+
+#: guix/ui.scm:260 guix/ui.scm:529
+#, scheme-format
+msgid "exception thrown: ~s~%"
+msgstr "excepção lançada: ~s~%"
+
+#: guix/ui.scm:262 guix/ui.scm:280
+#, scheme-format
+msgid "failed to load '~a':~%"
+msgstr "falha ao carregar \"~a\":~%"
+
+#: guix/ui.scm:274
+#, scheme-format
+msgid "~a: warning: ~a~%"
+msgstr "~a: aviso: ~a~%"
+
+#: guix/ui.scm:277
+#, scheme-format
+msgid "failed to load '~a': exception thrown: ~s~%"
+msgstr "falha ao carregar \"~a\": exceção lançada: ~s~%"
+
+#: guix/ui.scm:289
 #, scheme-format
 msgid "failed to install locale: ~a~%"
-msgstr "falha ao instalar local: ~a~%"
+msgstr "falha ao instalar localidade: ~a~%"
 
-#: guix/ui.scm:150
+#: guix/ui.scm:308
 msgid ""
-"Copyright (C) 2014 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 ""
+"Copyright (C) 2016 os autores do Guix\n"
+"Licença GPLv3+: GNU GPLv3 ou posterior <http://gnu.org/licenses/gpl.html>\n"
+"Esse é um software livre: você é livre para modificar ou redistribuí-lo .\n"
+"NÃO HÁ GARANTIA, na máxima extensão permitida pela lei.\n"
 
-#: guix/ui.scm:158
+#. TRANSLATORS: The placeholder indicates the bug-reporting address for this
+#. package.  Please add another line saying "Report translation bugs to
+#. ...\n" with the address for translation bugs (typically your translation
+#. team's web or email address).
+#: guix/ui.scm:320
 #, scheme-format
 msgid ""
 "\n"
@@ -1006,7 +2290,7 @@ msgstr ""
 "\n"
 "Relate erros para: ~a."
 
-#: guix/ui.scm:160
+#: guix/ui.scm:322
 #, scheme-format
 msgid ""
 "\n"
@@ -1015,7 +2299,7 @@ msgstr ""
 "\n"
 "Site do ~a: <~a>"
 
-#: guix/ui.scm:162
+#: guix/ui.scm:324
 msgid ""
 "\n"
 "General help using GNU software: <http://www.gnu.org/gethelp/>"
@@ -1023,100 +2307,228 @@ msgstr ""
 "\n"
 "Ajuda em geral usando softwares GNU: <http://www.gnu.org/gethelp/>"
 
-#: guix/ui.scm:169
+#: guix/ui.scm:369
+#, scheme-format
+msgid "'~a' is not a valid regular expression: ~a~%"
+msgstr "\"~a\" não é uma expressão regular válida: ~a~%"
+
+#: guix/ui.scm:375
 #, scheme-format
 msgid "~a: invalid number~%"
 msgstr "~a: número inválido~%"
 
-#: guix/ui.scm:186
+#: guix/ui.scm:392
 #, scheme-format
 msgid "invalid number: ~a~%"
 msgstr "número inválido: ~a~%"
 
-#: guix/ui.scm:201
+#: guix/ui.scm:415
 #, scheme-format
 msgid "unknown unit: ~a~%"
 msgstr "unidade desconhecida: ~a~%"
 
-#: guix/ui.scm:212
+#: guix/ui.scm:432
 #, scheme-format
 msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%"
-msgstr "~a:~a:~a: pacote \"~a\" tem uma entrada inválida: ~s~%"
+msgstr "~a:~a:~a: o pacote \"~a\" tem uma entrada inválida: ~s~%"
 
-#: guix/ui.scm:219
+#: guix/ui.scm:439
 #, scheme-format
 msgid "~a: ~a: build system `~a' does not support cross builds~%"
-msgstr "~a: ~a: sistema de compilação de \"~a\" não tem suporte a compilações cruzadas~%"
+msgstr "~a: ~a: o sistema de compilação de \"~a\" não oferece suporte a compilações cruzadas~%"
+
+#: guix/ui.scm:444
+#, scheme-format
+msgid "profile '~a' does not exist~%"
+msgstr "o perfil \"~a\" não existe~%"
+
+#: guix/ui.scm:447
+#, scheme-format
+msgid "generation ~a of profile '~a' does not exist~%"
+msgstr "a geração ~a do perfil \"~a\" não existe~%"
 
-#: guix/ui.scm:224
+#: guix/ui.scm:454
+#, scheme-format
+msgid "corrupt input while restoring '~a' from ~s~%"
+msgstr "entrada corrompida ao restaurar \"~a\" de ~s~%"
+
+#: guix/ui.scm:456
+#, scheme-format
+msgid "corrupt input while restoring archive from ~s~%"
+msgstr "entrada corrompida ao restaurar um pacote de ~s~%"
+
+#: guix/ui.scm:459
 #, scheme-format
 msgid "failed to connect to `~a': ~a~%"
 msgstr "falha ao conectar em \"~a\": ~a~%"
 
-#: guix/ui.scm:229
+#: guix/ui.scm:464
 #, scheme-format
 msgid "build failed: ~a~%"
 msgstr "compilação falhou: ~a~%"
 
-#: guix/ui.scm:257
+#: guix/ui.scm:467
+#, scheme-format
+msgid "reference to invalid output '~a' of derivation '~a'~%"
+msgstr "referência a uma saída inválida \"~a\" da derivação \"~a\"~%"
+
+#: guix/ui.scm:471
+#, scheme-format
+msgid "file '~a' could not be found in these directories:~{ ~a~}~%"
+msgstr "o arquivo \"~a\" não pôde ser localizado nesses diretórios:~{ ~a~}~%"
+
+#: guix/ui.scm:483
+#, scheme-format
+msgid "~a: ~a~%"
+msgstr "~a: ~a~%"
+
+#: guix/ui.scm:518
 #, scheme-format
 msgid "failed to read expression ~s: ~s~%"
 msgstr "falha ao ler a expressão ~s: ~s~%"
 
-#: guix/ui.scm:263
+#: guix/ui.scm:524
 #, scheme-format
-msgid "failed to evaluate expression `~a': ~s~%"
-msgstr "falha ao avaliar a expressão \"~a\": ~s~%"
+msgid "failed to evaluate expression '~a':~%"
+msgstr "falha ao avaliar a expressão \"~a\":~%"
 
-#: guix/ui.scm:272
-#, fuzzy, scheme-format
+#: guix/ui.scm:527
+#, scheme-format
+msgid "syntax error: ~a~%"
+msgstr "erro de sintaxe: ~a~%"
+
+#: guix/ui.scm:541
+#, scheme-format
 msgid "expression ~s does not evaluate to a package~%"
-msgstr "expressão \"~s\" não corresponde a um pacote~%"
+msgstr "a expressão ~s não corresponde a um pacote~%"
 
-#: guix/ui.scm:319
+#: guix/ui.scm:603
 #, scheme-format
 msgid "~:[The following derivation would be built:~%~{   ~a~%~}~;~]"
-msgstr "~:[A seguinte derivação será compilada:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following derivations would be built:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[A seguinte derivação seria compilada:~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[As seguintes derivações seriam compiladas:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:324
+#: guix/ui.scm:608
 #, scheme-format
 msgid "~:[The following file would be downloaded:~%~{   ~a~%~}~;~]"
-msgstr "~:[O seguinte arquivo será baixado:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following files would be downloaded:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[O seguinte arquivo seria baixado:~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[Os seguintes arquivos seriam baixados:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:330
+#: guix/ui.scm:614
 #, scheme-format
 msgid "~:[The following derivation will be built:~%~{   ~a~%~}~;~]"
-msgstr "~:[A seguinte derivação será compilada:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following derivations will be built:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[A seguinte derivação será compilada:~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[As seguintes derivações serão compiladas:~%~{   ~a~%~}~;~]"
 
-#: guix/ui.scm:335
+#: guix/ui.scm:619
 #, scheme-format
 msgid "~:[The following file will be downloaded:~%~{   ~a~%~}~;~]"
-msgstr "~:[O seguinte arquivo será baixado:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following files will be downloaded:~%~{   ~a~%~}~;~]"
+msgstr[0] "~:[O seguinte arquivo será baixado:~%~{   ~a~%~}~;~]"
+msgstr[1] "~:[Os seguintes arquivos serão baixados:~%~{   ~a~%~}~;~]"
+
+#: guix/ui.scm:674
+#, scheme-format
+msgid "The following package would be removed:~%~{~a~%~}~%"
+msgid_plural "The following packages would be removed:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote seria removido:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes seriam removidos:~%~{~a~%~}~%"
 
-#: guix/ui.scm:352
+#: guix/ui.scm:679
+#, scheme-format
+msgid "The following package will be removed:~%~{~a~%~}~%"
+msgid_plural "The following packages will be removed:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote será removido:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes serão removidos:~%~{~a~%~}~%"
+
+#: guix/ui.scm:692
+#, scheme-format
+msgid "The following package would be downgraded:~%~{~a~%~}~%"
+msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote sofreria um downgrade:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes sofreriam um downgrade:~%~{~a~%~}~%"
+
+#: guix/ui.scm:697
+#, scheme-format
+msgid "The following package will be downgraded:~%~{~a~%~}~%"
+msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote sofrerá um downgrade:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes sofrerão um downgrade:~%~{~a~%~}~%"
+
+#: guix/ui.scm:710
+#, scheme-format
+msgid "The following package would be upgraded:~%~{~a~%~}~%"
+msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote seria atualizado:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes seriam atualizados:~%~{~a~%~}~%"
+
+#: guix/ui.scm:715
+#, scheme-format
+msgid "The following package will be upgraded:~%~{~a~%~}~%"
+msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote será atualizado:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes serão atualizados:~%~{~a~%~}~%"
+
+#: guix/ui.scm:726
+#, scheme-format
+msgid "The following package would be installed:~%~{~a~%~}~%"
+msgid_plural "The following packages would be installed:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote seria instalado:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes seriam instalados:~%~{~a~%~}~%"
+
+#: guix/ui.scm:731
+#, scheme-format
+msgid "The following package will be installed:~%~{~a~%~}~%"
+msgid_plural "The following packages will be installed:~%~{~a~%~}~%"
+msgstr[0] "O seguinte pacote será instalado:~%~{~a~%~}~%"
+msgstr[1] "Os seguintes pacotes serão instalados:~%~{~a~%~}~%"
+
+#: guix/ui.scm:748
 msgid "<unknown location>"
 msgstr "<local desconhecido>"
 
-#: guix/ui.scm:380
+#: guix/ui.scm:767
 #, scheme-format
 msgid "failed to create configuration directory `~a': ~a~%"
 msgstr "falha ao criar o diretório de compilação \"~a\": ~a~%"
 
-#: guix/ui.scm:475 guix/ui.scm:489
+#: guix/ui.scm:890 guix/ui.scm:904
 msgid "unknown"
 msgstr "desconhecido"
 
-#: guix/ui.scm:598
+#: guix/ui.scm:1062
 #, scheme-format
-msgid "invalid argument: ~a~%"
-msgstr "argumento inválido: ~a~%"
+msgid "Generation ~a\t~a"
+msgstr "Geração ~a\t~a"
 
-#: guix/ui.scm:603
+#. TRANSLATORS: The word "current" here is an adjective for
+#. "Generation", as in "current generation".  Use the appropriate
+#. gender where applicable.
+#: guix/ui.scm:1072
+#, scheme-format
+msgid "~a\t(current)~%"
+msgstr "~a\t(atual)~%"
+
+# geração, criação?
+#: guix/ui.scm:1089
+#, scheme-format
+msgid "switched from generation ~a to ~a~%"
+msgstr "trocado da geração ~a para ~a~%"
+
+#: guix/ui.scm:1105
+#, scheme-format
+msgid "deleting ~a~%"
+msgstr "excluindo ~a~%"
+
+#: guix/ui.scm:1153
 #, scheme-format
 msgid "Try `guix --help' for more information.~%"
 msgstr "Tente \"guix --help\" para mais informações.~%"
 
-#: guix/ui.scm:633
+#: guix/ui.scm:1180
 msgid ""
 "Usage: guix COMMAND ARGS...\n"
 "Run COMMAND with ARGS.\n"
@@ -1124,124 +2536,634 @@ msgstr ""
 "Uso: guix COMANDO ARGUMENTOS...\n"
 "Executa COMANDO com ARGUMENTOS.\n"
 
-#: guix/ui.scm:636
+#: guix/ui.scm:1183
 msgid "COMMAND must be one of the sub-commands listed below:\n"
 msgstr "COMANDO deve ser um dos subcomandos listados abaixo:\n"
 
-#: guix/ui.scm:656
+#: guix/ui.scm:1203
 #, scheme-format
 msgid "guix: ~a: command not found~%"
 msgstr "guix: ~a: comando não encontrado~%"
 
-#: guix/ui.scm:674
+#: guix/ui.scm:1220
 #, scheme-format
 msgid "guix: missing command name~%"
 msgstr "guix: faltando um nome de comando~%"
 
-#: guix/ui.scm:682
+#: guix/ui.scm:1228
 #, scheme-format
 msgid "guix: unrecognized option '~a'~%"
 msgstr "guix: opção \"~a\" desconhecida~%"
 
-#: guix/http-client.scm:217
-#, scheme-format
-msgid "using Guile ~a, which does not support ~s encoding~%"
-msgstr "usando Guile ~a, o qual não oferece suporte codificação ~s~%"
-
-#: guix/http-client.scm:220
-#, scheme-format
-msgid "download failed; use a newer Guile~%"
-msgstr "download falhou; use um Guile mais novo~%"
-
-#: guix/http-client.scm:232
+#: guix/http-client.scm:266
 #, scheme-format
 msgid "following redirection to `~a'...~%"
 msgstr "seguindo redirecionamento para \"~a\"...~%"
 
-#: guix/http-client.scm:241
-#, fuzzy
+#: guix/http-client.scm:275
 msgid "download failed"
-msgstr "~a: falha no download~%"
-
-#: guix/nar.scm:134
-msgid "unexpected executable file marker"
-msgstr ""
-
-#: guix/nar.scm:141
-msgid "unsupported nar file type"
-msgstr ""
-
-#: guix/nar.scm:209
-msgid "unsupported file type"
-msgstr ""
-
-#: guix/nar.scm:219
-#, fuzzy
-msgid "invalid nar signature"
-msgstr "argumento inválido: ~a~%"
-
-#: guix/nar.scm:230
-msgid "invalid nar end-of-file marker"
-msgstr ""
-
-#: guix/nar.scm:244
-msgid "invalid symlink tokens"
-msgstr ""
-
-#: guix/nar.scm:263
-msgid "unexpected directory entry termination"
-msgstr ""
-
-#: guix/nar.scm:272
-msgid "unexpected directory inter-entry marker"
-msgstr ""
-
-#: guix/nar.scm:277
-msgid "unsupported nar entry type"
-msgstr ""
+msgstr "download falhou"
 
-#: guix/nar.scm:376
+#: guix/nar.scm:155
 msgid "signature is not a valid s-expression"
-msgstr ""
+msgstr "a assinatura não é uma expressão-s válida"
 
-#: guix/nar.scm:385
+#: guix/nar.scm:164
 msgid "invalid signature"
-msgstr ""
+msgstr "assinatura inválida"
 
-#: guix/nar.scm:389
+#: guix/nar.scm:168
 msgid "invalid hash"
-msgstr ""
+msgstr "hash inválido"
 
-#: guix/nar.scm:397
+#: guix/nar.scm:176
 msgid "unauthorized public key"
-msgstr ""
+msgstr "chave pública não autorizada"
 
-#: guix/nar.scm:402
+#: guix/nar.scm:181
 msgid "corrupt signature data"
-msgstr ""
+msgstr "dados de assinatura corrompidos"
 
-#: guix/nar.scm:422
+#: guix/nar.scm:201
 msgid "corrupt file set archive"
-msgstr ""
+msgstr "pacote de conjunto de arquivos corrompido"
 
-#: guix/nar.scm:432
-#, fuzzy, scheme-format
+#: guix/nar.scm:211
+#, scheme-format
 msgid "importing file or directory '~a'...~%"
-msgstr "seguindo redirecionamento para \"~a\"...~%"
+msgstr "importando arquivo ou diretório \"~a\"...~%"
 
-#: guix/nar.scm:441
-#, fuzzy, scheme-format
+#: guix/nar.scm:222
+#, scheme-format
 msgid "found valid signature for '~a'~%"
-msgstr "número inválido: ~a~%"
+msgstr "localizada assinatura válida para \"~a\"~%"
 
-#: guix/nar.scm:448
+#: guix/nar.scm:229
 msgid "imported file lacks a signature"
-msgstr ""
+msgstr "arquivo importado carece de uma assinatura"
 
-#: guix/nar.scm:487
+#: guix/nar.scm:268
 msgid "invalid inter-file archive mark"
-msgstr ""
+msgstr "marca inválida de pacote interarquivo"
+
+#: nix/nix-daemon/guix-daemon.cc:61
+msgid "guix-daemon -- perform derivation builds and store accesses"
+msgstr "guix-daemon -- realiza compilações de derivação e acessos a armazenamento"
+
+#: nix/nix-daemon/guix-daemon.cc:63
+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 "Esse programa é um daemon feito para executar em segundo plano. Ele atende a requisições enviadas por um soquete. Ele acessa o armazenamento e compila derivações em nome de seus clientes."
+
+#: nix/nix-daemon/guix-daemon.cc:87
+msgid "SYSTEM"
+msgstr "SISTEMA"
+
+#: nix/nix-daemon/guix-daemon.cc:88
+msgid "assume SYSTEM as the current system type"
+msgstr "presume SISTEMA como o tipo de sistema atual"
+
+#: nix/nix-daemon/guix-daemon.cc:89 nix/nix-daemon/guix-daemon.cc:92
+msgid "N"
+msgstr "N"
+
+#: nix/nix-daemon/guix-daemon.cc:90
+msgid "use N CPU cores to build each derivation; 0 means as many as available"
+msgstr "usa N núcleos de CPU para compilar cada derivação; 0 significa todos disponíveis"
+
+#: nix/nix-daemon/guix-daemon.cc:93
+msgid "allow at most N build jobs"
+msgstr "permite no máximo N trabalhos de compilação"
+
+#: nix/nix-daemon/guix-daemon.cc:95
+msgid "disable chroot builds"
+msgstr "desabilita compilações em chroot"
+
+#: nix/nix-daemon/guix-daemon.cc:96
+msgid "DIR"
+msgstr "DIR"
+
+#: nix/nix-daemon/guix-daemon.cc:97
+msgid "add DIR to the build chroot"
+msgstr "adiciona DIR ao chroot de compilação"
 
-#, fuzzy
-#~ msgid "failed to load machine file '~a': ~s~%"
-#~ msgstr "falha ao conectar em \"~a\": ~a~%"
+#: nix/nix-daemon/guix-daemon.cc:98
+msgid "GROUP"
+msgstr "GRUPO"
+
+#: nix/nix-daemon/guix-daemon.cc:99
+msgid "perform builds as a user of GROUP"
+msgstr "realiza compilações como um usuário de GRUPO"
+
+#: nix/nix-daemon/guix-daemon.cc:101
+msgid "do not use substitutes"
+msgstr "não usa substitutos"
+
+#: nix/nix-daemon/guix-daemon.cc:102
+msgid "URLS"
+msgstr "URLS"
+
+#: nix/nix-daemon/guix-daemon.cc:103
+msgid "use URLS as the default list of substitute providers"
+msgstr "usa URLS como lista padrão de fornecedores de substituto"
+
+#: nix/nix-daemon/guix-daemon.cc:105
+msgid "do not use the 'build hook'"
+msgstr "não usa o \"hook de compilação\""
+
+#: nix/nix-daemon/guix-daemon.cc:107
+msgid "cache build failures"
+msgstr "armazena em cache as falhas de compilação"
+
+#: nix/nix-daemon/guix-daemon.cc:109
+msgid "build each derivation N times in a row"
+msgstr "compila cada derivação N vezes de uma vez"
+
+#: nix/nix-daemon/guix-daemon.cc:111
+msgid "do not keep build logs"
+msgstr "não mantém logs de compilação"
+
+#: nix/nix-daemon/guix-daemon.cc:113
+msgid "disable compression of the build logs"
+msgstr "desabilita compressão de logs de compilação"
+
+#: nix/nix-daemon/guix-daemon.cc:118
+msgid "disable automatic file \"deduplication\" in the store"
+msgstr "desabilita \"deduplicação\" automática de arquivo no armazenamento"
+
+#: nix/nix-daemon/guix-daemon.cc:128
+msgid "impersonate Linux 2.6"
+msgstr "personifica Linux 2.6"
+
+#: nix/nix-daemon/guix-daemon.cc:132
+msgid "tell whether the GC must keep outputs of live derivations"
+msgstr "diz se o GC deve manter as saídas das derivações vivas"
+
+#: nix/nix-daemon/guix-daemon.cc:135
+msgid "tell whether the GC must keep derivations corresponding to live outputs"
+msgstr "diz se o GC deve manter as derivações correspondentes às saídas vivas"
+
+#: nix/nix-daemon/guix-daemon.cc:138
+msgid "SOCKET"
+msgstr "SOQUETE"
+
+#: nix/nix-daemon/guix-daemon.cc:139
+msgid "listen for connections on SOCKET"
+msgstr "ouve conexões no SOQUETE"
+
+#: nix/nix-daemon/guix-daemon.cc:141
+msgid "produce debugging output"
+msgstr "produz saída de depuração"
+
+#: nix/nix-daemon/guix-daemon.cc:201
+#, c-format
+msgid "error: %s: invalid number of rounds\n"
+msgstr "erro: %s: número inválido de vezes\n"
+
+#: nix/nix-daemon/guix-daemon.cc:220 nix/nix-daemon/guix-daemon.cc:396
+#, c-format
+msgid "error: %s\n"
+msgstr "erro: %s\n"
+
+#: nix/nix-daemon/guix-daemon.cc:281
+#, c-format
+msgid "error: libgcrypt version mismatch\n"
+msgstr "erro: versão do libgcrypt não confere\n"
+
+#: 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 "aviso: daemon está sendo executado como root, então o uso de \"--build-users-group\" é fortemente recomendado\n"
+
+#~ msgid "Hello, GNU world: An example GNU package"
+#~ msgstr "Olá, mundo GNU: Um exemplo de pacote GNU"
+
+#~ msgid "Yeah..."
+#~ msgstr "Sim..."
+
+#~ msgid "Print lines matching a pattern"
+#~ msgstr "Exibe linhas correspondendo a um padrão"
+
+#~ msgid ""
+#~ "The grep command searches one or more input files for lines containing a\n"
+#~ "match to a specified pattern.  By default, grep prints the matching\n"
+#~ "lines."
+#~ msgstr ""
+#~ "O comando grep pesquisa por um ou mais arquivos de entrada para linhas\n"
+#~ "contendo uma correspondência a um padrão especificado. Por padrão, grep\n"
+#~ "exibe as linhas correspondentes."
+
+#~ msgid "Stream editor"
+#~ msgstr "Editor de fluxo"
+
+#~ msgid ""
+#~ "Sed (stream editor) isn't really a true text editor or text processor.\n"
+#~ "Instead, it is used to filter text, i.e., it takes text input and performs\n"
+#~ "some operation (or set of operations) on it and outputs the modified text.\n"
+#~ "Sed is typically used for extracting part of a file using pattern matching or\n"
+#~ "substituting multiple occurrences of a string within a file."
+#~ msgstr ""
+#~ "Sed (editor de fluxo) não é exatamente um editor de texto ou um processador\n"
+#~ "de texto de verdade. Em vez disso, ele é usado para filtrar textos, isto é,\n"
+#~ "ele pega uma entrada de texto e realiza alguma operação (ou conjunto de\n"
+#~ "operações) nela e retorna o texto modificado. Sed é normalmente usado para\n"
+#~ "extrair parte de um arquivo usando um padrão de correspondência ou\n"
+#~ "substituindo múltiplas ocorrências de um texto dentro de um arquivo."
+
+#~ msgid "Managing tar archives"
+#~ msgstr "Gerenciando de arquivos-tar"
+
+#~ msgid ""
+#~ "The Tar program provides the ability to create tar archives, as well as\n"
+#~ "various other kinds of manipulation.  For example, you can use Tar on\n"
+#~ "previously created archives to extract files, to store additional files, or\n"
+#~ "to update or list files which were already stored.\n"
+#~ "\n"
+#~ "Initially, tar archives were used to store files conveniently on magnetic\n"
+#~ "tape.  The name \"Tar\" comes from this use; it stands for tape archiver.\n"
+#~ "Despite the utility's name, Tar can direct its output to available devices,\n"
+#~ "files, or other programs (using pipes), it can even access remote devices or\n"
+#~ "files (as archives)."
+#~ msgstr ""
+#~ "O programa Tar provê a habilidade de criar arquivos-tar, assim como\n"
+#~ "vários outros tipos de manipulação. Por exemplo, você pode usar Tar em\n"
+#~ "pacotes criados anteriormente para extrair arquivos, para armazenar arquivos\n"
+#~ "adicionais ou para atualizar uma lista de arquivos que já estão armazenados.\n"
+#~ "\n"
+#~ "Inicialmente, arquivos-tar eram usados para armazenar arquivos\n"
+#~ "convenientemente em fitas magnéticas. O nome \"Tar\" vem deste uso; ele\n"
+#~ "significa \"tape archiver\", em inglês. Apesar do nome do utilitário, Tar\n"
+#~ "pode direcionar sua saída para dispositivos disponíveis, arquivos ou outros\n"
+#~ "programas (usando redirecionamentos), el pode até mesmo acessar dispositivos\n"
+#~ "remotos ou arquivos (como arquivos-tar)."
+
+#~ msgid "Apply differences to originals, with optional backups"
+#~ msgstr "Aplica diferenças aos originais, com backups opcionais"
+
+#~ msgid ""
+#~ "GNU Patch takes a patch file containing a difference listing produced by\n"
+#~ "the diff program and applies those differences to one or more original files,\n"
+#~ "producing patched versions."
+#~ msgstr ""
+#~ "GNU Patch leva um arquivo patch contendo uma lista de diferenças produzida\n"
+#~ "pelo programa diff e aplica aquelas diferenças em um ou mais arquivos\n"
+#~ "originais, produzindo versões com patch."
+
+#~ msgid "Comparing and merging files"
+#~ msgstr "Comparando e mesclando arquivos"
+
+#~ msgid ""
+#~ "GNU Diffutils is a package of several programs related to finding\n"
+#~ "differences between files.\n"
+#~ "\n"
+#~ "Computer users often find occasion to ask how two files differ. Perhaps one\n"
+#~ "file is a newer version of the other file. Or maybe the two files started out\n"
+#~ "as identical copies but were changed by different people.\n"
+#~ "\n"
+#~ "You can use the diff command to show differences between two files, or each\n"
+#~ "corresponding file in two directories. diff outputs differences between files\n"
+#~ "line by line in any of several formats, selectable by command line\n"
+#~ "options. This set of differences is often called a ‘diff’ or ‘patch’. For\n"
+#~ "files that are identical, diff normally produces no output; for\n"
+#~ "binary (non-text) files, diff normally reports only that they are different.\n"
+#~ "\n"
+#~ "You can use the cmp command to show the offsets and line numbers where two\n"
+#~ "files differ. cmp can also show all the characters that differ between the\n"
+#~ "two files, side by side.\n"
+#~ "\n"
+#~ "You can use the diff3 command to show differences among three files. When two\n"
+#~ "people have made independent changes to a common original, diff3 can report\n"
+#~ "the differences between the original and the two changed versions, and can\n"
+#~ "produce a merged file that contains both persons' changes together with\n"
+#~ "warnings about conflicts.\n"
+#~ "\n"
+#~ "You can use the sdiff command to merge two files interactively."
+#~ msgstr ""
+#~ "GNU Diffutils é um pacote com vários programas relacionados a localizar\n"
+#~ "diferenças entre arquivos.\n"
+#~ "\n"
+#~ "Usuários de computador normalmente encontram ocasiões em que se perguntam em\n"
+#~ "que se diferem dois arquivos. Talvez um arquivo seja mais novo que o outro.\n"
+#~ "Ou talvez os dois arquivos começaram como cópias idênticas, mas foram\n"
+#~ "alterados por diferentes pessoas.\n"
+#~ "\n"
+#~ "Você pode usar o comando diff para mostrar as diferenças entre dos arquivos\n"
+#~ "ou cada arquivo correspondente em dois diretórios. O diff retorna as\n"
+#~ "diferenças entre arquivos linha por linha em quaisquer dos vários formatos,\n"
+#~ "selecionáveis por opções de linha de comando. Este conjunto de diferenças é\n"
+#~ "normalmente chamado de \"diff\" ou \"patch\". Para arquivos que são idênticos,\n"
+#~ "diff normalmente produz nenhuma saída; para arquivos binários (não texto),\n"
+#~ "diff normalmente relata apenas que eles são diferentes.\n"
+#~ "\n"
+#~ "Você pode usar o comando cmp para mostrar os deslocamentos e números de\n"
+#~ "linhas nas quais dois arquivos divergem. cmp também pode mostrar todos os\n"
+#~ "caracteres que diferem entre os dois arquivos, lado a lado.\n"
+#~ "\n"
+#~ "você pode usar o comando diff3 para mostrar diferenças entre três arquivos.\n"
+#~ "Quando duas pessoas tiverem feito alterações em um arquivo original em comum,\n"
+#~ "diff3 pode relatar as diferenças entre o original  e as duas verões alteradas\n"
+#~ "e pode produzir um arquivo mesclado que contém as alterações do arquivo de\n"
+#~ "ambas pessoas com aviso sobre conflitos.\n"
+#~ "\n"
+#~ "Você pode usar o comando sdiff para mesclar dois arquivos interativamente."
+
+#~ msgid "Operating on files matching given criteria"
+#~ msgstr "Operação em arquivos correspondendo aos critérios dados"
+
+#~ msgid ""
+#~ "The GNU Find Utilities are the basic directory searching utilities of\n"
+#~ "the GNU operating system.  These programs are typically used in conjunction\n"
+#~ "with other programs to provide modular and powerful directory search and file\n"
+#~ "locating capabilities to other commands.\n"
+#~ "\n"
+#~ "The tools supplied with this package are:\n"
+#~ "\n"
+#~ "  * find - search for files in a directory hierarchy;\n"
+#~ "  * locate - list files in databases that match a pattern;\n"
+#~ "  * updatedb - update a file name database;\n"
+#~ "  * xargs - build and execute command lines from standard input.\n"
+#~ msgstr ""
+#~ "O GNU Find Utilities são os utilitários básicos para pesquisa em diretórios\n"
+#~ "da sistema operacional GNU. Esses programas são tipicamente usados em conjunto\n"
+#~ "com outros programas para fornecer capacidades de localização de arquivos e\n"
+#~ "pesquisa em diretórios poderosa e modular para outros comandos.\n"
+#~ "\n"
+#~ "As ferramentas fornecidas com este pacote são:\n"
+#~ "\n"
+#~ "  * find - pesquisa por arquivos em uma hierarquia de pacotes;\n"
+#~ "  * locate - lista arquivos em banco de dados que correspondem a um padrão;\n"
+#~ "  * updatedb - atualiza um banco de dados de nomes de arquivos;\n"
+#~ "  * xargs - compila e executa linhas de comando de uma entrada padrão.\n"
+
+#~ msgid "Core GNU utilities (file, text, shell)"
+#~ msgstr "Utilitários centrais do GNU (file, text, shell)"
+
+#~ msgid ""
+#~ "The GNU Core Utilities are the basic file, shell and text manipulation\n"
+#~ "utilities of the GNU operating system.  These are the core utilities which\n"
+#~ "are expected to exist on every operating system."
+#~ msgstr ""
+#~ "Os GNU Core Utilities são os utilitários básicos para manipulação de texto,\n"
+#~ "shell e arquivo no sistema operacional GNU. Eles são os utilitários centrais\n"
+#~ "que se espera existir em todo sistema operacional."
+
+#~ msgid "Remake files automatically"
+#~ msgstr "Refaz arquivos automaticamente"
+
+#~ msgid ""
+#~ "Make is a tool which controls the generation of executables and other\n"
+#~ "non-source files of a program from the program's source files.\n"
+#~ "\n"
+#~ "Make gets its knowledge of how to build your program from a file called the\n"
+#~ "makefile, which lists each of the non-source files and how to compute it from\n"
+#~ "other files. When you write a program, you should write a makefile for it, so\n"
+#~ "that it is possible to use Make to build and install the program."
+#~ msgstr ""
+#~ "Make é uma ferramenta que controla a criação de executáveis e outros arquivo\n"
+#~ "não-fontes de um programa a partir dos arquivos fontes do programa.\n"
+#~ "\n"
+#~ "Make obtém seu conhecimento de como compilar seu programa de um arquivo\n"
+#~ "chamado de makefile, que lista cada um dos arquivos não-fonte e como\n"
+#~ "computá-lo de outros arquivos. Quando você escreve um programa, você\n"
+#~ "deveria escrever um makefile para ele, de forma que seja possível usar\n"
+#~ "Make para compilar e instalar o programa."
+
+#~ msgid "Binary utilities: bfd gas gprof ld"
+#~ msgstr "Utilitários de binários: bfd gas gprof ld"
+
+#~ msgid ""
+#~ "The GNU Binutils are a collection of binary tools.  The main ones are\n"
+#~ "`ld' (the GNU linker) and `as' (the GNU assembler).  They also include the\n"
+#~ "BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc."
+#~ msgstr ""
+#~ "O GNU Binutils são uma coleção de ferramentas de binários. Os principais são\n"
+#~ "\"ld\" (o GNU linker) e \"as\" (o GNU assembler).  Eles também incluem a\n"
+#~ "biblioteca BFD (Binary File Descriptor), \"gprof\", \"nm\", \"strip\", etc."
+
+#~ msgid "The GNU C Library"
+#~ msgstr "A GNU C Library"
+
+#~ 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"
+#~ "printf, exit...\n"
+#~ "\n"
+#~ "The GNU C library is used as the C library in the GNU system and most systems\n"
+#~ "with the Linux kernel."
+#~ msgstr ""
+#~ "Qualquer sistema operacional tipo Unix precisa de uma biblioteca C: a\n"
+#~ "biblioteca que define as \"chamadas de sistema\" e outras funcionalidades\n"
+#~ " básicas como open, malloc, printf, exit ...\n"
+#~ "\n"
+#~ "A biblioteca C do GNU é usada como uma biblioteca C no sistema GNU e na\n"
+#~ "maioria dos sistemas com kernel Linux."
+
+#~ msgid "Database of current and historical time zones"
+#~ msgstr "Banco de dados de fusos horários históricos e atuais"
+
+#~ 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"
+#~ "representative locations around the globe. It is updated periodically to\n"
+#~ "reflect changes made by political bodies to time zone boundaries, UTC offsets,\n"
+#~ "and daylight-saving rules."
+#~ msgstr ""
+#~ "O Time Zone Database (geralmente chamado de tz ou zoneinfo)\n"
+#~ "contém códigos e dados que representam o histórico dos horários locais de\n"
+#~ "muitas localizações representativas pelo mundo. É atualizado periodicamente\n"
+#~ "para refletir as alterações feitas por corpos políticos nos limites de fusos\n"
+#~ "horários, posição do UTC e regras de horário de verão."
+
+#~ msgid "The linker wrapper"
+#~ msgstr "A interface do linker"
+
+# Desconheço tradução para o 'linker', sendo ele amplamente conhecido com este nome. Além do mais, o binutils não foi traduzido até a tradução inicial do guix. Portanto, mantive 'linker' - Rafael
+#~ 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 ""
+#~ "o linker wrapper (ou `ld-wrapper') atua como interface do linker para\n"
+#~ "adicionar quaisquer opções \"-rpath\" faltando e para detectar qualquer\n"
+#~ "uso incorreto de bibliotecas fora do armazenamento."
+
+#~ msgid "Scheme implementation intended especially for extensions"
+#~ msgstr "Implementação de Scheme com intenção especialmente para extensões"
+
+#~ msgid ""
+#~ "GNU Guile 1.8 is an interpreter for the Scheme programming language,\n"
+#~ "packaged as a library that can be embedded into programs to make them\n"
+#~ "extensible.  It supports many SRFIs."
+#~ msgstr ""
+#~ "GNU Guile 1.8 é um interpretador para a linguagem de programação Scheme,\n"
+#~ " empacotada como uma biblioteca que pode ser embarcada em programas para\n"
+#~ "fazê-los extensíveis. Ele provê suporte a muitos SRFIs."
+
+#~ msgid ""
+#~ "GNU Guile is an implementation of the Scheme programming language, with\n"
+#~ "support for many SRFIs, packaged for use in a wide variety of environments.\n"
+#~ "In addition to implementing the R5RS Scheme standard and a large subset of\n"
+#~ "R6RS, Guile includes a module system, full access to POSIX system calls,\n"
+#~ "networking support, multiple threads, dynamic linking, a foreign function\n"
+#~ "call interface, and powerful string processing."
+#~ msgstr ""
+#~ "GNU Guile é uma implementação da linguagem de programação Scheme, com suporte\n"
+#~ "a muitos SRFIs, empacotados para uso em uma ampla variedade de ambientes. Além\n"
+#~ "da implementação de R5S5 Scheme e uma grande sub-coleção de R6RS, Guile inclui\n"
+#~ "um sistema de módulos, acesso completo a chamadas de sistemas POSIX, suporte a\n"
+#~ "rede, múltiplas threads, link dinâmico, uma interface para chamada de função\n"
+#~ "externa e processamento de string poderoso."
+
+#~ msgid "Framework for building readers for GNU Guile"
+#~ msgstr "Infraestrutura para compilação de leitores para GNU Guile"
+
+#~ msgid ""
+#~ "Guile-Reader is a simple framework for building readers for GNU Guile.\n"
+#~ "\n"
+#~ "The idea is to make it easy to build procedures that extend Guile’s read\n"
+#~ "procedure. Readers supporting various syntax variants can easily be written,\n"
+#~ "possibly by re-using existing “token readers” of a standard Scheme\n"
+#~ "readers. For example, it is used to implement Skribilo’s R5RS-derived\n"
+#~ "document syntax.\n"
+#~ "\n"
+#~ "Guile-Reader’s approach is similar to Common Lisp’s “read table”, but\n"
+#~ "hopefully more powerful and flexible (for instance, one may instantiate as\n"
+#~ "many readers as needed)."
+#~ msgstr ""
+#~ "Guile-Reader é uma infraestrutura simples de compilação de leitores GNU Guile.\n"
+#~ "\n"
+#~ "A ideia é facilitar a compilação de procedimentos que estendam o procedimento\n"
+#~ "de leitura do Guile. Leitores que tenham suporte a diversas variantes de\n"
+#~ "sintaxe podem ser escritos facilmente, possivelmente reusando \"leitores de\n"
+#~ "token\" de Scheme padrão de leitores. Por exemplo, ele é usado para implementar\n"
+#~ "sintaxe de documentos derivados do R5RS do Skribilo.\n"
+#~ "\n"
+#~ "A abordagem do Guile-Readers é similar ao \"read table\" do Common Lisps,\n"
+#~ "mas muito mais poderoso e flexível (por exemplo, é possível instanciar com\n"
+#~ "quantos leitores quiser)."
+
+#~ msgid "Guile bindings to ncurses"
+#~ msgstr "Bindings de Guile para ncurses"
+
+#~ msgid ""
+#~ "GNU Guile-Ncurses is a library for the Guile Scheme interpreter that\n"
+#~ "provides functions for creating text user interfaces.  The text user interface\n"
+#~ "functionality is built on the ncurses libraries: curses, form, panel, and\n"
+#~ "menu."
+#~ msgstr ""
+#~ "GNU Guile-Ncurses é uma biblioteca para o interpretador Guile Scheme que\n"
+#~ "fornece funções para criação de interfaces de texto de usuário (TUI). A\n"
+#~ "funcionalidade da é compilada nas bibliotecas do ncurses: curses, form, panel\n"
+#~ "e menu."
+
+#~ msgid "Run jobs at scheduled times"
+#~ msgstr "Executa trabalhos no horário agendado"
+
+# Mantive scheme por ser uma referência ao Guile Scheme. -- Rafael
+#~ msgid ""
+#~ "The GNU package mcron (Mellor's cron) is a 100% compatible replacement\n"
+#~ "for Vixie cron.  It is written in pure Guile, and allows configuration files\n"
+#~ "to be written in scheme (as well as Vixie's original format) for infinite\n"
+#~ "flexibility in specifying when jobs should be run.  Mcron was written by Dale\n"
+#~ "Mellor."
+#~ msgstr ""
+#~ "O pacote GNU mcron (Mellor's cron) é uma substituição 100% compatível do Vixie\n"
+#~ "cron. É escrito em apenas Guile e permite que arquivos de configuração sejam\n"
+#~ "escrito em scheme (assim como o formato original do Vixie) para uma\n"
+#~ "flexibilidade infinita em especificar quando os trabalhos deveriam ser\n"
+#~ "executados. Mcron foi escrito por Dale Mellor."
+
+#~ msgid "Collection of useful Guile Scheme modules"
+#~ msgstr "Coleção de módulos úteis de Scheme de Guile"
+
+#~ 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"
+#~ "modules into a coherent library.  Think \"a down-scaled, limited-scope CPAN\n"
+#~ "for Guile\"."
+#~ msgstr "guile-lib tem a intenção de ser um lugar acumulado para módulos Guile de pure-scheme, permitindo que pessoas cooperem com integração de seus módulos genéricos de Guile em uma biblioteca coerente. Pense \"um CPAN de escopo limitado, objetivo para Guile\"."
+
+#~ msgid "Lout, a document layout system similar in style to LaTeX"
+#~ msgstr "Lout, um sistema de layout de documentos similar em estilo ao LaTeX"
+
+#~ msgid ""
+#~ "The Lout document formatting system is now reads a high-level description of\n"
+#~ "a document similar in style to LaTeX and produces a PostScript or plain text\n"
+#~ "output file.\n"
+#~ "\n"
+#~ "Lout offers an unprecedented range of advanced features, including optimal\n"
+#~ "paragraph and page breaking, automatic hyphenation, PostScript EPS file\n"
+#~ "inclusion and generation, equation formatting, tables, diagrams, rotation and\n"
+#~ "scaling, sorted indexes, bibliographic databases, running headers and\n"
+#~ "odd-even pages, automatic cross referencing, multilingual documents including\n"
+#~ "hyphenation (most European languages are supported), formatting of computer\n"
+#~ "programs, and much more, all ready to use.  Furthermore, Lout is easily\n"
+#~ "extended with definitions which are very much easier to write than troff of\n"
+#~ "TeX macros because Lout is a high-level, purely functional language, the\n"
+#~ "outcome of an eight-year research project that went back to the\n"
+#~ "beginning."
+#~ msgstr ""
+#~ "O sistema de formatação de texto Lout agora lê uma descrição de alto nível de\n"
+#~ "documentos similar em estilo ao LaTeX e produz um arquivo de saída em texto\n"
+#~ "simples ou em PostScript.\n"
+#~ "\n"
+#~ "Lout oferece uma faixa sem precedente de recursos avançados, incluindo uma\n"
+#~ "ótima quebra de parágrafo e página, hifenização automática, inclusão e\n"
+#~ "criação de arquivo EPS de PostScript, formatação de equação, tabelas,\n"
+#~ "diagramas, rotação e escalas, índices ordenados, banco de dados\n"
+#~ "bibliográficos, executar cabeçalhos e páginas ímpar-par, referência cruzada\n"
+#~ "automática, documentos multilíngues incluindo hifenização (há suporte à\n"
+#~ "maioria dos idiomas europeus), formatação de programas de computador, e muito\n"
+#~ "mais, tudo pronto para uso. Além disso, Lout pode ser estendido facilmente com\n"
+#~ "definições que são muito fácil de escrever do que troff das macros TeX porque\n"
+#~ "Lout é uma linguagem puramente funcional de alto nível, sendo o resultado de\n"
+#~ "oito anos de um projeto de pesquisa que voltou para o começo."
+
+#~ msgid "Manipulate plain text files as databases"
+#~ msgstr "Manipula arquivos texto simples como banco de dados"
+
+#~ msgid ""
+#~ "GNU recutils is a set of tools and libraries to access human-editable,\n"
+#~ "text-based databases called recfiles.  The data is stored as a sequence of\n"
+#~ "records, each record containing an arbitrary number of named fields."
+#~ msgstr ""
+#~ "GNU recutils é uma coleção de ferramentas e bibliotecas para acessar bancos\n"
+#~ "de dados em textos, legíveis por ser humano, chamados recfiles.  Os dados\n"
+#~ "são armazenados como uma sequência de registros, cada registro contendo um\n"
+#~ "número arbitrário de campos nomeados."
+
+#~ msgid "package `~a' has no source~%"
+#~ msgstr "pacote \"~a\" não possui fontes~%"
+
+#~ msgid "~a: not a number~%"
+#~ msgstr "~a: não é um número~%"
+
+#~ msgid "profile `~a' does not exist~%"
+#~ msgstr "perfil \"~a\" não existe~%"
+
+#~ msgid "nothing to do: already at the empty profile~%"
+#~ msgstr "nada a ser feito: já está no perfil vazio~%"
+
+#~ msgid "failed to build the empty profile~%"
+#~ msgstr "falha ao compilar o perfil vazio~%"
+
+#~ msgid "looking for the latest release of GNU ~a..."
+#~ msgstr "procurando pelo último lançamento do GNU ~a..."
+
+#~ msgid "~a: note: using ~a but ~a is available upstream~%"
+#~ msgstr "~a: nota: usando ~a, mas ~a está disponível no upstream~%"
+
+#~ msgid ""
+#~ "\n"
+#~ "  -n, --dry-run          show what would be done without actually doing it"
+#~ msgstr ""
+#~ "\n"
+#~ "  -n, --dry-run          mostra o que seria feito sem fazê-lo"
+
+#~ msgid "(Please consider upgrading Guile to get proper progress report.)~%"
+#~ msgstr "(Por favor, considere atualizar o Guile para obter o relatório adequado do progresso.)~%"
+
+#~ msgid "using Guile ~a, which does not support ~s encoding~%"
+#~ msgstr "usando Guile ~a, o qual não oferece suporte codificação ~s~%"
+
+#~ msgid "download failed; use a newer Guile~%"
+#~ msgstr "download falhou; use um Guile mais novo~%"