Merge branch 'master' into core-updates

Conflicts:
	gnu-system.am

49 files changed, 944 insertions, 181 deletions

diff --git a/build-aux/sync-descriptions.scm b/build-aux/sync-descriptions.scm
index 61362a1f88..6ff549c309 100644
--- a/build-aux/sync-descriptions.scm
+++ b/build-aux/sync-descriptions.scm
@@ -47,6 +47,16 @@
                          result))
                    '())))
 
+(define (escape-quotes str)
+  "Replace any quote character in STR by an escaped quote character."
+  (list->string
+   (string-fold-right (lambda (chr result)
+                        (match chr
+                          (#\" (cons* #\\ #\"result))
+                          (_   (cons chr result))))
+                      '()
+                      str)))
+
 ;; Iterate over GNU packages.  Report those whose synopsis defers from that
 ;; found upstream.
 (for-each (match-lambda
@@ -69,7 +79,7 @@
                          (not (string=? (fill-paragraph upstream 100)
                                         (fill-paragraph downstream 100))))
                 (format (guix-warning-port)
-                        "~a: ~a: proposed description:~%      ~a~%"
+                        "~a: ~a: proposed description:~%     \"~a\"~%"
                         (location->string loc) (package-name package)
-                        (fill-paragraph upstream 77 7))))))
+                        (fill-paragraph (escape-quotes upstream) 77 7))))))
           gnus)
diff --git a/gnu-system.am b/gnu-system.am
index dbdaf53d6f..93afd9fb50 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -320,6 +320,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/doxygen-test.patch			\
   gnu/packages/patches/doxygen-tmake.patch			\
   gnu/packages/patches/emacs-configure-sh.patch			\
+  gnu/packages/patches/eudev-rules-directory.patch		\
   gnu/packages/patches/file-CVE-2014-3587.patch			\
   gnu/packages/patches/findutils-absolute-paths.patch		\
   gnu/packages/patches/flashrom-use-libftdi1.patch		\
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm
index 04dd19f3e1..16805b9bc6 100644
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@ -236,8 +236,13 @@ copy SOURCE to TARGET."
   "Return the '--system' argument passed on the kernel command line."
   (find-long-option "--system" (linux-command-line)))
 
-(define* (activate-current-system #:optional (system (boot-time-system)))
+(define* (activate-current-system
+          #:optional (system (or (getenv "GUIX_NEW_SYSTEM")
+                                 (boot-time-system))))
   "Atomically make SYSTEM the current system."
+  ;; The 'GUIX_NEW_SYSTEM' environment variable is used as a way for 'guix
+  ;; system reconfigure' to pass the file name of the new system.
+
   (format #t "making '~a' the current system...~%" system)
 
   ;; Atomically make SYSTEM current.
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index a255ff1b74..ffeab07bde 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -886,7 +886,7 @@ development, not the kernel implementation of ACPI.")
                 "1v9vnzlihqfjsxa93hdbrq72pqqk00dkylmlg8jpxhm7s1w9qfl1"))))
     (build-system gnu-build-system)
     (home-page "http://packages.debian.org/wheezy/stress")
-    (synopsis "A tool to impose load on and stress test a computer system")
+    (synopsis "Impose load on and stress test a computer system")
     (description
      "'stress' is a tool that imposes a configurable amount of CPU, memory, I/O,
 or disk stress on a POSIX-compliant operating system and reports any errors it
@@ -986,10 +986,10 @@ recover lost partitions and/or make non-booting disks bootable again.")
     (synopsis "Daemon to monitor directories for events such as file removal")
     (description
      "A daemon that monitors directories for events, such as creating,
-deleting or modifying files.  It can monitor different sets of directories for
+deleting or modifying files. It can monitor different sets of directories for
 different events.  When an event is detected, direvent calls a specified
 external program with information about the event, such as the location
-within the file system where it occurred.  Thus, \"direvent\" provides an easy
-way to react immediately if given files undergo changes, for example, to
+within the file system where it occurred.  Thus, \"direvent\" provides an
+easy way to react immediately if given files undergo changes, for example, to
 track changes in important system configuration files.")
     (license gpl3+)))
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 8c12eb604e..7fc31abae7 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -154,6 +154,57 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
    (license gpl2)
    (home-page "http://pari.math.u-bordeaux.fr/")))
 
+(define-public flint
+  (package
+   (name "flint")
+   (version "2.4.4")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append
+                  "http://flintlib.org/flint-"
+                  version ".tar.gz"))
+            (sha256 (base32
+                     "1isv1sfv8sg3qvf0d99apdfi3jnql95xfzszcawdf1pgjj9rwyf4"))))
+   (build-system gnu-build-system)
+   (inputs
+    `(("gmp" ,gmp)
+      ("mpfr" ,mpfr)))
+   (arguments
+    `(#:phases
+        (alist-replace
+         'configure
+         (lambda* (#:key inputs outputs #:allow-other-keys)
+           (let ((out (assoc-ref outputs "out"))
+                 (gmp (assoc-ref inputs "gmp"))
+                 (mpfr (assoc-ref inputs "mpfr")))
+             ;; Drop test failing with gmp-6 due to changed invertibility
+             ;; of 0 in Z/1 Z, which according to the flint authors has no
+             ;; impact on flint.
+             ;; FIXME: Drop with later version.
+             (delete-file "fmpz/test/t-invmod.c")
+             ;; do not pass "--enable-fast-install", which makes the
+             ;; homebrew configure process fail
+             (zero? (system*
+                     "./configure"
+                     (string-append "--prefix=" out)
+                     (string-append "--with-gmp=" gmp)
+                     (string-append "--with-mpfr=" mpfr)))))
+         %standard-phases)))
+   (synopsis "Fast library for number theory")
+   (description
+    "FLINT is a C library for number theory.  It supports arithmetic
+with numbers, polynomials, power series and matrices over many base
+rings, including multiprecision integers and rationals, integers
+modulo n, p-adic numbers, finite fields (prime and non-prime order)
+and real and complex numbers (via the Arb extension library).
+
+Operations that can be performed include conversions, arithmetic,
+GCDs, factoring, solving linear systems, and evaluating special
+functions.  In addition, FLINT provides various low-level routines for
+fast arithmetic.")
+   (license gpl2+)
+   (home-page "http://flintlib.org/")))
+
 (define-public bc
   (package
     (name "bc")
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 5ecff76252..fe2f0f07e8 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -347,10 +347,11 @@ change.  GNU make offers many powerful extensions over the standard utility.")
    (synopsis "Binary utilities: bfd gas gprof ld")
    (description
     "GNU Binutils is a collection of tools for working with binary files.
-Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler. Other
-tools include programs to display binary profiling information, list the
-strings in a binary file, and utilities for working with archives.  The \"bfd\"
-library for working with executable and object formats is also included.")
+Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler.
+Other tools include programs to display binary profiling information, list
+the strings in a binary file, and utilities for working with archives.  The
+\"bfd\" library for working with executable and object formats is also
+included.")
    (license gpl3+)
    (home-page "http://www.gnu.org/software/binutils/")))
 
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 11e8d2bc17..dbaed6155d 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -228,7 +228,7 @@ than gzip and 15 % smaller output than bzip2.")
     (arguments '(#:configure-flags '("--enable-shared")))
     (home-page "http://www.oberhumer.com/opensource/lzo")
     (synopsis
-     "A data compresion library suitable for real-time data de-/compression")
+     "Data compresion library suitable for real-time data de-/compression")
     (description
      "LZO is a data compression library which is suitable for data
 de-/compression in real-time.  This means it favours speed over
diff --git a/gnu/packages/cook.scm b/gnu/packages/cook.scm
index b82c8aae30..c1799e7887 100644
--- a/gnu/packages/cook.scm
+++ b/gnu/packages/cook.scm
@@ -75,7 +75,7 @@
                      ;; ("inetutils" ,inetutils)
                      ("ed" ,ed)))
     (home-page "http://miller.emu.id.au/pmiller/software/cook")
-    (synopsis "A tool for constructing files")
+    (synopsis "Tool for constructing files")
     (description "Cook is a tool for constructing files. It is given a set of
 files to create, and recipes of how to create them. In any non-trivial program
 there will be prerequisites to performing the actions necessary to creating
diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm
index 2c6e5efdba..eff146ded5 100644
--- a/gnu/packages/cpio.scm
+++ b/gnu/packages/cpio.scm
@@ -39,9 +39,9 @@
     (home-page "https://www.gnu.org/software/cpio/")
     (synopsis "Manage cpio and tar file archives")
     (description
-     "GNU cpio copies files into or out of cpio or tar archives. Indeed,
+     "GNU cpio copies files into or out of cpio or tar archives.  Indeed,
 many formats are supported, including legacy formats.  The format is
-determined automatically by the program and is handled appropriately. 
+determined automatically by the program and is handled appropriately.
 Furthermore, the location of the archive is not important.  It can be another
 file on the drive, a tape, or data on a pipe.")
     (license gpl3+)))
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 01d9cbdd62..d04a3320ad 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -139,7 +139,7 @@ SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
                                (string-append out "/share/info/mysql.info")))))
                  %standard-phases)))
     (home-page "http://www.mysql.com/")
-    (synopsis "A fast, easy to use, and popular database")
+    (synopsis "Fast, easy to use, and popular database")
     (description
      "MySQL is a fast, reliable, and easy to use relational database
 management system that supports the standardized Structured Query
@@ -204,8 +204,8 @@ pictures, sounds, or video.")
      "GNU Recutils is a set of tools and libraries for creating and
 manipulating text-based, human-editable databases.  Despite being text-based,
 databases created with Recutils carry all of the expected features such as
-unique fields, primary keys, time stamps and more. Many different field types
-are supported, as is encryption.")
+unique fields, primary keys, time stamps and more.  Many different field
+types are supported, as is encryption.")
     (license gpl3+)
     (home-page "http://www.gnu.org/software/recutils/")))
 
diff --git a/gnu/packages/ed.scm b/gnu/packages/ed.scm
index dd0250647a..c2b19292f0 100644
--- a/gnu/packages/ed.scm
+++ b/gnu/packages/ed.scm
@@ -50,6 +50,6 @@
      "Ed is a line-oriented text editor: rather than offering an overview of
 a document, ed performs editing one line at a time.  It can be executed both
 interactively and via shell scripts.  Its method of command input allows
-complex tasks to be performed in an automated way. GNU ed offers several
+complex tasks to be performed in an automated way.  GNU ed offers several
 extensions over the standard utility.")
     (license gpl3+)))
diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm
index a9f2ab5351..a63a00f97c 100644
--- a/gnu/packages/elf.scm
+++ b/gnu/packages/elf.scm
@@ -80,7 +80,7 @@ addr2line, and more.")
                                          (string-append "--prefix=" out)))))
                            %standard-phases)))
     (home-page "http://www.mr511.de/software/english.html")
-    (synopsis "An ELF object file access library")
+    (synopsis "ELF object file access library")
     (description "libelf is a C library to access ELF object files.")
     (license lgpl2.0+)))
 
diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 76a8cc566f..1a37bef657 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -114,6 +114,7 @@ languages.")
 
 (define-public emacs-no-x-toolkit
   (package (inherit emacs)
+    (location (source-properties->location (current-source-location)))
     (name "emacs-no-x-toolkit")
     (synopsis "The extensible, customizable, self-documenting text
 editor (without an X toolkit)" )
diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm
index 9318331f60..82a2e98d98 100644
--- a/gnu/packages/flex.scm
+++ b/gnu/packages/flex.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -62,7 +62,7 @@
          ("indent" ,indent))))
     (propagated-inputs `(("m4" ,m4)))
     (home-page "http://flex.sourceforge.net/")
-    (synopsis "A fast lexical analyser generator")
+    (synopsis "Fast lexical analyser generator")
     (description
      "Flex is a tool for generating scanners. A scanner, sometimes
 called a tokenizer, is a program which recognizes lexical patterns in
diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm
index d17843ec34..a67b0a2230 100644
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@ -87,7 +87,7 @@ anti-aliased glyph bitmap generation with 256 gray levels.")
               (string-append "--with-add-fonts="
                              (assoc-ref %build-inputs "gs-fonts")
                              "/share/fonts"))))
-   (synopsis "Fontconfig, a library for configuring and customising font access.")
+   (synopsis "Library for configuring and customizing font access")
    (description
     "Fontconfig can discover new fonts when installed automatically;
 perform font name substitution, so that appropriate alternative fonts can
@@ -118,7 +118,7 @@ high quality, anti-aliased and subpixel rendered text on a display.")
     `(#:tests? #f ; no test target
       #:make-flags
       '("without_doc")))
-   (synopsis "T1lib, a library for generating bitmaps from type 1 fonts.")
+   (synopsis "Library for generating bitmaps from Type 1 fonts")
    (description
     "T1lib is a library for generating/rasterising bitmaps from Type 1 fonts.
 It is based on the code of the X11 rasteriser of the X11 project.
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index f3c88c92d4..1a911b76a9 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -100,7 +100,7 @@ representation of the playing board.")
      "GNUbik is a puzzle game in which you must manipulate a cube to make
 each of its faces have a uniform color.  The game is customizable, allowing
 you to set the size of the cube (the default is 3x3) or to change the colors.
- You may even apply photos to the faces instead of colors.  The game is
+You may even apply photos to the faces instead of colors.  The game is
 scriptable with Guile.")
     (license gpl3+)))
 
diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm
index 84b5bd17a7..10506197f3 100644
--- a/gnu/packages/gawk.scm
+++ b/gnu/packages/gawk.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -72,10 +72,10 @@
                    '())))
 
    (home-page "http://www.gnu.org/software/gawk/")
-   (synopsis "A text scanning and processing language")
+   (synopsis "Text scanning and processing language")
    (description
     "Gawk is the GNU implementation of Awk, a specialized programming
 language for the easy manipulation of formatted text, such as tables of data.
- Gawk features many extensions beyond the traditional implementation,
+Gawk features many extensions beyond the traditional implementation,
 including network access, sorting, and large libraries.")
    (license gpl3+)))
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 938c38e670..66888389d4 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -336,8 +336,8 @@ Go.  It also includes runtime support libraries for these languages.")
     (inputs `(("gmp" ,gmp)))
     (home-page "http://isl.gforge.inria.fr/")
     (synopsis
-     "A library for manipulating sets and relations of integer points bounded
-by linear constraints")
+     "Manipulating sets and relations of integer points \
+bounded by linear constraints")
     (description
      "isl is a library for manipulating sets and relations of integer points
 bounded by linear constraints. Supported operations on sets include
@@ -371,7 +371,7 @@ dependence analysis and bounds on piecewise step-polynomials.")
               ("isl" ,isl)))
     (arguments '(#:configure-flags '("--with-isl=system")))
     (home-page "http://www.cloog.org/")
-    (synopsis "A library to generate code for scanning Z-polyhedra")
+    (synopsis "Library to generate code for scanning Z-polyhedra")
     (description
      "CLooG is a free software library to generate code for scanning
 Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f684d24627..cf690da25a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -484,7 +484,7 @@ the API")
                      ("glib" ,glib "bin")))
     (propagated-inputs `(("pangox-compat" ,pangox-compat)))
     (home-page "https://projects.gnome.org/gtkglext")
-    (synopsis "OpenGL extension to GTK+.")
+    (synopsis "OpenGL extension to GTK+")
     (description "GtkGLExt is an OpenGL extension to GTK+. It provides
 additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget
 API add-ons to make GTK+ widgets OpenGL-capable.")
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 14f75bff45..311ebbee8b 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -137,6 +137,6 @@
     (synopsis "Entirely free browser derived from Mozilla Firefox")
     (description
      "IceCat is the GNU version of the Firefox browser.  It is entirely free
-software, which does not recommend non-free plugins and addons. It also
+software, which does not recommend non-free plugins and addons.  It also
 features built-in privacy-protecting features.")
     (license license:mpl2.0))) ; and others, see toolkit/content/license.html
diff --git a/gnu/packages/gperf.scm b/gnu/packages/gperf.scm
index d9e80337d4..9d9aaba3ce 100644
--- a/gnu/packages/gperf.scm
+++ b/gnu/packages/gperf.scm
@@ -39,8 +39,8 @@
     (home-page "http://www.gnu.org/software/gperf/")
     (synopsis "Perfect hash function generator")
     (description
-     "gperf is a perfect hash function generator.  For a given list of strings,
-it produces a hash function and hash table in C or C++ code. That the hash
-function is perfect means that no collisions can exist and that look-ups can be
-made by single string comparisons.")
+     "gperf is a perfect hash function generator.  For a given list of
+strings, it produces a hash function and hash table in C or C++ code.  That
+the hash function is perfect means that no collisions can exist and that
+look-ups can be made by single string comparisons.")
     (license gpl3+)))
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index fabbbc439d..398a6d4e49 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -101,7 +101,7 @@
     (description
      "GRUB is a multiboot bootloader.  It is used for initially loading the
 kernel of an operating system and then transferring control to it. The kernel
-then goes on to load the rest of the operating system. As a multiboot
+then goes on to load the rest of the operating system.  As a multiboot
 bootloader, GRUB handles the presence of multiple operating systems installed
 on the same computer; upon booting the computer, the user is presented with a
 menu to select one of the installed operating systems.")
diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm
index b59adb1cdc..5e813e55c1 100644
--- a/gnu/packages/libunwind.scm
+++ b/gnu/packages/libunwind.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,8 +39,7 @@
      ;; Report them upstream.
      '(#:tests? #f))
     (home-page "http://www.nongnu.org/libunwind")
-    (synopsis
-     "A portable and efficient API to determine the call-chain of a program")
+    (synopsis "Determining the call chain of a program")
     (description
      "The primary goal of this project is to define a portable and efficient C
 programming interface (API) to determine the call-chain of a program.  The API
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 04d0458dc9..dd4ed85a64 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -49,6 +49,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix utils)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system python)
@@ -509,7 +510,12 @@ slabtop, and skill.")
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("texinfo" ,texinfo)))    ; for the libext2fs Info manual
     (arguments
-     '(#:phases (alist-cons-before
+     '(;; The 'blkid' command and library are already provided by util-linux,
+       ;; which is the preferred source for them (see, e.g.,
+       ;; <http://git.buildroot.net/buildroot/commit/?id=e1ffc2f791b336339909c90559b7db40b455f172>.)
+       #:configure-flags '("--disable-blkid")
+
+       #:phases (alist-cons-before
                  'configure 'patch-shells
                  (lambda _
                    (substitute* "configure"
@@ -717,7 +723,7 @@ packet filter.")
     (home-page
      "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2")
     (synopsis
-     "A collection of utilities for controlling TCP/IP networking and traffic control in Linux")
+     "Utilities for controlling TCP/IP networking and traffic in Linux")
     (description
      "Iproute2 is a collection of utilities for controlling TCP/IP
 networking and traffic with the Linux kernel.
@@ -1013,9 +1019,11 @@ processes currently causing I/O.")
                                (string-append "INIT_D_PATH="
                                               (assoc-ref %outputs "out")
                                               "/etc/init.d")
+
+                               ;; The rule makes /dev/fuse 666.
                                (string-append "UDEV_RULES_PATH="
                                               (assoc-ref %outputs "out")
-                                              "/etc/udev"))
+                                              "/lib/udev/rules.d"))
       #:phases (alist-cons-before
                 'build 'set-file-names
                 (lambda* (#:key inputs #:allow-other-keys)
@@ -1321,6 +1329,7 @@ from the module-init-tools project.")
     (license gpl2+))) ; library under lgpl2.1+
 
 (define-public udev
+  ;; The last pre-systemd version.
   (package
     (name "udev")
     (version "182")
@@ -1365,6 +1374,26 @@ device nodes from /dev/, handles hotplug events and loads drivers at boot
 time.")
     (license gpl2+))) ; libudev is under lgpl2.1+
 
+(define-public eudev
+  ;; The post-systemd fork, maintained by Gentoo.
+  (package (inherit udev)
+    (name "eudev")
+    (version "1.9")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "http://dev.gentoo.org/~blueness/eudev/eudev-"
+                    version ".tar.gz"))
+              (sha256
+               (base32
+                "1w6f8h7fhjz3prs630f8gawv7jx74zi600z0pm997kkp24pyj5wg"))
+              (patches (list (search-patch "eudev-rules-directory.patch")))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments udev)
+       ((#:configure-flags flags)
+        `(cons "--enable-libkmod" ,flags))))
+    (home-page "http://www.gentoo.org/proj/en/eudev/")))
+
 (define-public lvm2
   (package
     (name "lvm2")
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 065bb46b7e..c2edaaf0b2 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -71,7 +71,7 @@
        ("texinfo" ,texinfo)
        ("texlive" ,texlive)))
     (home-page "http://www.gnu.org/software/gcl")
-    (synopsis "A Common Lisp implementation")
+    (synopsis "Common Lisp implementation")
     (description "GCL is an implementation of the Common Lisp language.  It
 features the ability to compile to native object code and to load native
 object code modules directly into its lisp core.  It also features a
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 92ffc22c14..2bc627a3e4 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -57,7 +57,7 @@
                                                      "/share/man/man1")))))
                   (alist-delete 'configure %standard-phases)))))
     (home-page "http://www.lua.org/")
-    (synopsis "An embeddable scripting language.")
+    (synopsis "Embeddable scripting language")
     (description
      "Lua is a powerful, fast, lightweight, embeddable scripting language.  Lua
 combines simple procedural syntax with powerful data description constructs
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 774686310f..5f30afe433 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -179,11 +179,11 @@ LP/MIP solver is included in the package.")
     (synopsis "Statistical analysis")
     (description
      "GNU PSPP is a statistical analysis program.  It can perform
-descriptive statistics, T-tests, linear regression and non-parametric tests. 
-It features both a graphical interface as well as command-line input. PSPP is
-designed to interoperate with Gnumeric, LibreOffice and OpenOffice.  Data can
-be imported from spreadsheets, text files and database sources and it can be
-output in text, PostScript, PDF or HTML.")
+descriptive statistics, T-tests, linear regression and non-parametric tests.
+It features both a graphical interface as well as command-line input.  PSPP
+is designed to interoperate with Gnumeric, LibreOffice and OpenOffice.  Data
+can be imported from spreadsheets, text files and database sources and it can
+be output in text, PostScript, PDF or HTML.")
     (license license:gpl3+)))
 
 (define-public lapack
@@ -472,6 +472,7 @@ scientific applications modeled by partial differential equations.")
 
 (define-public petsc-complex
   (package (inherit petsc)
+    (location (source-properties->location (current-source-location)))
     (name "petsc-complex")
     (arguments
      (substitute-keyword-arguments (package-arguments petsc)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 634bc7c6bd..0accc5edef 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -144,7 +144,7 @@ protocol.")
               ("libmpdclient" ,libmpdclient)
               ("ncurses" ,ncurses)))
     (native-inputs `(("pkg-config" ,pkg-config)))
-    (synopsis "A curses Music Player Daemon client")
+    (synopsis "Curses Music Player Daemon client")
     (description "ncmpc is a fully featured MPD client, which runs in a
 terminal using ncurses.")
     (home-page "http://www.musicpd.org/clients/ncmpc/")
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 9f35de1819..b789b333b8 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -103,10 +103,10 @@
     (synopsis "Functional package manager for installed software packages and versions")
     (description
      "GNU Guix is a functional package manager for the GNU system, and is
-also a distribution thereof.  It includes a virtual machine image. Besides
+also a distribution thereof.  It includes a virtual machine image.  Besides
 the usual package management features, it also supports transactional
-upgrades and roll-backs, per-user profiles, and much more. It is based on the
-Nix package manager.")
+upgrades and roll-backs, per-user profiles, and much more.  It is based on
+the Nix package manager.")
     (license gpl3+)))
 
 (define-public guix guix-0.7)
diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch
new file mode 100644
index 0000000000..9173e22f76
--- /dev/null
+++ b/gnu/packages/patches/eudev-rules-directory.patch
@@ -0,0 +1,36 @@
+Add $EUDEV_RULES_DIRECTORY to the list of rules directories.
+
+The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed
+the search path to be customized, but eudev no longer has this, hence
+this hack.
+
+--- eudev-1.9/src/udev/udev-rules.c	2014-09-13 10:21:59.615980259 +0200
++++ eudev-1.9/src/udev/udev-rules.c	2014-09-13 10:24:13.839976335 +0200
+@@ -46,15 +46,11 @@
+         };
+ };
+ 
+-static const char* const rules_dirs[] = {
++static const char* rules_dirs[] = {
+         UDEV_CONF_DIR "/rules.d",
+         UDEV_RULES_DIR,
+-        "/run/udev/rules.d",
+         UDEV_LIBEXEC_DIR "/rules.d",
+-#ifdef HAVE_SPLIT_USR
+-        "/lib/udev/rules.d",
+-        "/usr/lib/udev/rules.d",
+-#endif
++	NULL,			  /* placeholder for $EUDEV_RULES_DIRECTORY */
+         NULL};
+ 
+ struct udev_rules {
+@@ -1637,6 +1633,9 @@
+ 
+         udev_rules_check_timestamp(rules);
+ 
++	/* Allow the user to specify an additional rules directory.  */
++	rules_dirs[3] = getenv("EUDEV_RULES_DIRECTORY");
++
+         r = conf_files_list_strv(&files, ".rules", NULL, rules_dirs);
+         if (r < 0) {
+                 log_error("failed to enumerate rules files: %s", strerror(-r));
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 73c5f06a97..82331a1d0a 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -121,7 +121,7 @@
                  (string-append gs-fonts "/share/fonts/type1/ghostscript"))
                 (("#fontFile") "fontFile"))))
         %standard-phases)))
-   (synopsis "Viewer for pdf files based on the Motif toolkit.")
+   (synopsis "Viewer for PDF files based on the Motif toolkit")
    (description
     "Xpdf is a viewer for Portable Document Format (PDF) files")
    (license license:gpl3) ; or gpl2, but not gpl2+
diff --git a/gnu/packages/pth.scm b/gnu/packages/pth.scm
index fd4aba142c..ba5fb8216d 100644
--- a/gnu/packages/pth.scm
+++ b/gnu/packages/pth.scm
@@ -48,7 +48,7 @@
     (description
      "GNU Pth is a portable library providing non-preemptive, priority-based
 scheduling for multiple execution threads.  Each thread has its own
-program-counter, run-time stack, signal mask and errno variable. Threads are
+program-counter, run-time stack, signal mask and errno variable.  Threads are
 scheduled in a cooperative way, rather than in the standard preemptive way,
 such that they are managed according to priority and events.  However, Pth
 also features emulation of POSIX.1c threads (\"pthreads\") for backwards
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 3046c3b1e1..5195f66394 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -256,7 +256,7 @@ data types.")
     (build-system python-build-system)
     (arguments `(#:tests? #f)) ; no test target
     (home-page "https://launchpad.net/pytz")
-    (synopsis "The Python timezone library.")
+    (synopsis "Python timezone library")
     (description
      "This library allows accurate and cross platform timezone calculations
 using Python 2.4 or higher and provides access to the Olson timezone database.")
@@ -336,7 +336,7 @@ API for locking files.")
     (build-system python-build-system)
     (arguments '(#:test-target "check"))
     (home-page "http://code.google.com/m/mock/")
-    (synopsis "A Python Mocking and Patching Library for Testing")
+    (synopsis "Python mocking and patching library for testing")
     (description
      "Mock is a library for testing in Python.  It allows you to replace parts
 of your system under test with mock objects and make assertions about how they
@@ -714,8 +714,7 @@ Python 3.3+.")
                           ; linking with libpython3.3m
        #:tests? #f)) ; no check target
     (home-page "http://pyicu.osafoundation.org/")
-    (synopsis
-     "Python extension wrapping the ICU C++ API.")
+    (synopsis "Python extension wrapping the ICU C++ API")
     (description
      "PyICU is a python extension wrapping the ICU C++ API.")
     (license x11)))
@@ -987,7 +986,7 @@ software.")
      '(#:tests? #f)) ; no setup.py test command
     (home-page
      "https://github.com/dbtsai/python-mimeparse")
-    (synopsis "Python library for parsing MIME types.")
+    (synopsis "Python library for parsing MIME types")
     (description
      "Mimeparse provides basic functions for parsing MIME type names and
 matching them against a list of media-ranges.")
diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm
index aabd1d330c..61c68b557f 100644
--- a/gnu/packages/ratpoison.scm
+++ b/gnu/packages/ratpoison.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -57,7 +57,7 @@
       `(("perl" ,perl)
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.nongnu.org/ratpoison/")
-    (synopsis "A simple mouse-free tiling window manager")
+    (synopsis "Simple mouse-free tiling window manager")
     (description
      "Ratpoison is a simple window manager with no fat library
 dependencies, no fancy graphics, no window decorations, and no
diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm
index c0450834f6..0a65599e24 100644
--- a/gnu/packages/rush.scm
+++ b/gnu/packages/rush.scm
@@ -42,7 +42,7 @@
     (synopsis "Restricted user (login) shell")
     (description
      "GNU Rush is a restricted user shell, for systems on which users are to
-be provided with only limited functionality or resources. Administrators set
+be provided with only limited functionality or resources.  Administrators set
 user rights via a configuration file which can be used to limit, for example,
 the commands that can be executed, CPU time, or virtual memory usage.")
     (license gpl3+)))
diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 98a28e79a0..0341d0c011 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -261,7 +261,7 @@ Scheme and C programs and between Scheme and Java programs.")
               ("which" ,which)
               ("patchelf" ,patchelf)))
     (home-page "http://hop.inria.fr/")
-    (synopsis "A multi-tier programming language for the Web 2.0")
+    (synopsis "Multi-tier programming language for the Web 2.0")
     (description
      "HOP is a multi-tier programming language for the Web 2.0 and the
 so-called diffuse Web.  It is designed for programming interactive web
diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm
index 110cf52e1d..02e9c29024 100644
--- a/gnu/packages/sdl.scm
+++ b/gnu/packages/sdl.scm
@@ -104,7 +104,7 @@ joystick, and graphics hardware.")
     (build-system gnu-build-system)
     (inputs `(("alsa-lib" ,alsa-lib)
               ("libx11" ,libx11)))
-    (synopsis "Library for module sound formats.")
+    (synopsis "Library for module sound formats")
     (description
      "MikMod is able to play a wide range of module formats, as well as
 digital sound files. It can take advantage of particular features of your
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index f9805d3316..a22468affd 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -272,7 +272,7 @@ libssh library.")
                           flags))))
         %standard-phases)))
     (home-page "http://www.agroman.net/corkscrew")
-    (synopsis "A tool for tunneling SSH through HTTP proxies")
+    (synopsis "Tunneling SSH through HTTP proxies")
     (description
      "Corkscrew allows creating TCP tunnels through HTTP proxies.  WARNING:
 At the moment only plain text authentication is supported, should you require
diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 6dfd3b23b9..d7ac10cb16 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;;
@@ -118,8 +118,7 @@
 
        #:test-target "test"))
     (home-page "http://expect.nist.gov/")
-    (synopsis
-     "A tool for automating interactive applications")
+    (synopsis "Tool for automating interactive applications")
     (description
      "Expect is a tool for automating interactive applications such as
 telnet, ftp, passwd, fsck, rlogin, tip, etc.  Expect really makes this
diff --git a/gnu/packages/tcsh.scm b/gnu/packages/tcsh.scm
index 04f8139c0c..d29087af81 100644
--- a/gnu/packages/tcsh.scm
+++ b/gnu/packages/tcsh.scm
@@ -68,7 +68,7 @@
              (symlink "tcsh" "csh"))))
          %standard-phases))))
     (home-page "http://www.tcsh.org/")
-    (synopsis "A Unix shell based on csh")
+    (synopsis "Unix shell based on csh")
     (description
      "Tcsh is an enhanced, but completely compatible version of the Berkeley
 UNIX C shell (csh). It is a command language interpreter usable both as an
diff --git a/gnu/packages/tmux.scm b/gnu/packages/tmux.scm
index bbfc6cf9bf..636b56e0db 100644
--- a/gnu/packages/tmux.scm
+++ b/gnu/packages/tmux.scm
@@ -42,7 +42,7 @@
      `(("libevent" ,libevent)
        ("ncurses" ,ncurses)))
     (home-page "http://tmux.sourceforge.net/")
-    (synopsis "A terminal multiplexer")
+    (synopsis "Terminal multiplexer")
     (description
      "tmux is a terminal multiplexer: it enables a number of terminals (or
 windows), each running a separate program, to be created, accessed, and
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index a756ebdba3..bcf8edfb25 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -49,7 +49,7 @@
     ;; TODO: Recommend `torsocks' since `torify' needs it.
 
     (home-page "http://www.torproject.org/")
-    (synopsis "An anonymous network router to improve privacy on the Internet")
+    (synopsis "Anonymous network router to improve privacy on the Internet")
     (description
      "Tor protects you by bouncing your communications around a distributed
 network of relays run by volunteers all around the world: it prevents
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 35659032dd..d070a8d4db 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -45,7 +45,7 @@
                "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"))))
     (build-system gnu-build-system)
     (home-page "http://www.libexpat.org/")
-    (synopsis "A stream-oriented XML parser library written in C")
+    (synopsis "Stream-oriented XML parser library written in C")
     (description
      "Expat is an XML parser library written in C.  It is a
 stream-oriented parser in which an application registers handlers for
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index ce3c4ec2e1..d5d4a15618 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -70,7 +70,7 @@
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (home-page "http://xeyes.sourcearchive.com/")
-    (synopsis "A follow the mouse X demo")
+    (synopsis "Follow-the-mouse X demo")
     (description "Xeyes is a demo program for x.org. It shows eyes
 following the mouse.")
     (license license:x11)))
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 014eef053b..c40bc1a4c2 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -25,7 +25,7 @@
   #:use-module (gnu system linux)                 ; 'pam-service', etc.
   #:use-module (gnu packages admin)
   #:use-module ((gnu packages linux)
-                #:select (udev kbd e2fsprogs lvm2))
+                #:select (eudev kbd e2fsprogs lvm2 fuse alsa-utils))
   #:use-module ((gnu packages base)
                 #:select (canonical-package glibc))
   #:use-module (gnu packages package-management)
@@ -510,7 +510,7 @@ item of @var{packages}."
                                 (guix build utils))
                     #:local-build? #t))
 
-(define* (udev-service #:key (udev udev) (rules '()))
+(define* (udev-service #:key (udev eudev) (rules '()))
   "Run @var{udev}, which populates the @file{/dev} directory dynamically.  Get
 extra rules from the packages listed in @var{rules}."
   (mlet* %store-monad ((rules     (udev-rules-union (cons udev rules)))
@@ -527,8 +527,16 @@ extra rules from the packages listed in @var{rules}."
 
              (documentation "Populate the /dev directory, dynamically.")
              (start #~(lambda ()
+                        (define find
+                          (@ (srfi srfi-1) find))
+
                         (define udevd
-                          (string-append #$udev "/libexec/udev/udevd"))
+                          ;; Choose the right 'udevd'.
+                          (find file-exists?
+                                (map (lambda (suffix)
+                                       (string-append #$udev suffix))
+                                     '("/libexec/udev/udevd" ;udev
+                                       "/sbin/udevd"))))     ;eudev
 
                         (define (wait-for-udevd)
                           ;; Wait until someone's listening on udevd's control
@@ -548,7 +556,9 @@ extra rules from the packages listed in @var{rules}."
                         (setenv "LINUX_MODULE_DIRECTORY"
                                 "/run/booted-system/kernel/lib/modules")
 
+                        ;; The first one is for udev, the second one for eudev.
                         (setenv "UDEV_CONFIG_FILE" #$udev.conf)
+                        (setenv "EUDEV_RULES_DIRECTORY" #$rules)
 
                         (let ((pid (primitive-fork)))
                           (case pid
@@ -608,8 +618,9 @@ This is the GNU operating system, welcome!\n\n")))
           (guix-service)
           (nscd-service)
 
-          ;; By default, enable the udev rules of LVM2.  They are needed as
-          ;; soon as LVM2 or the device-mapper is used.
-          (udev-service #:rules (list lvm2)))))
+          ;; The LVM2 rules are needed as soon as LVM2 or the device-mapper is
+          ;; used, so enable them by default.  The FUSE and ALSA rules are
+          ;; less critical, but handy.
+          (udev-service #:rules (list lvm2 fuse alsa-utils)))))
 
 ;;; base.scm ends here
diff --git a/gnu/system.scm b/gnu/system.scm
index 9bdf227eca..db7b7e7a2f 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -36,6 +36,9 @@
   #:use-module (gnu packages zile)
   #:use-module (gnu packages nano)
   #:use-module (gnu packages lsof)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages compression)
+  #:autoload   (gnu packages cryptsetup) (cryptsetup)
   #:use-module (gnu services)
   #:use-module (gnu services dmd)
   #:use-module (gnu services base)
@@ -44,7 +47,6 @@
   #:use-module (gnu system linux)
   #:use-module (gnu system linux-initrd)
   #:use-module (gnu system file-systems)
-  #:autoload   (gnu packages cryptsetup) (cryptsetup)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
@@ -246,19 +248,20 @@ explicitly appear in OS."
   (cons* procps psmisc which less zile nano
          (@ (gnu packages admin) dmd) guix
          lsof                                 ;for Guix's 'list-runtime-roots'
-         util-linux inetutils isc-dhcp
+         util-linux inetutils isc-dhcp wireless-tools
          net-tools                        ; XXX: remove when Inetutils suffices
 
          ;; Get 'insmod' & co. from kmod, not module-init-tools, since udev
          ;; already depends on it anyway.
-         kmod udev
+         kmod eudev
 
          e2fsprogs kbd
 
          ;; The packages below are also in %FINAL-INPUTS, so take them from
          ;; there to avoid duplication.
          (map canonical-package
-              (list guile-2.0 bash coreutils findutils grep sed))))
+              (list guile-2.0 bash coreutils findutils grep sed
+                    diffutils gawk tar gzip bzip2 xz lzip))))
 
 (define %default-issue
   ;; Default contents for /etc/issue.
@@ -268,8 +271,8 @@ This is the GNU system.  Welcome.\n")
 (define (default-/etc/hosts host-name)
   "Return the default /etc/hosts file."
   (text-file "hosts"
-             (string-append "localhost 127.0.0.1\n"
-                            host-name " 127.0.0.1\n")))
+             (string-append "127.0.0.1 localhost " host-name "\n"
+                            "::1       localhost " host-name "\n")))
 
 (define* (etc-directory #:key
                         (locale "C") (timezone "Europe/Paris")
@@ -291,6 +294,10 @@ This is the GNU system.  Welcome.\n")
 /run/current-system/profile/bin/bash\n"))
        (issue      (text-file "issue" issue))
 
+       ;; For now, generate a basic config so that /etc/hosts is honored.
+       (nsswitch   (text-file "nsswitch.conf"
+                              "hosts: files dns\n"))
+
        ;; TODO: Generate bashrc from packages' search-paths.
        (bashrc    (text-file* "bashrc"  "
 export PS1='\\u@\\h \\w\\$ '
@@ -317,6 +324,7 @@ alias ll='ls -l'
                   ("pam.d" ,#~#$pam.d)
                   ("login.defs" ,#~#$login.defs)
                   ("issue" ,#~#$issue)
+                  ("nsswitch.conf" ,#~#$nsswitch)
                   ("skel" ,#~#$skel)
                   ("shells" ,#~#$shells)
                   ("profile" ,#~#$bashrc)
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index 7c0dde9030..056c8e6d30 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -199,6 +199,9 @@ it atomically, and then run OS's activation script."
       ;; The activation script may change $PATH, among others, so protect
       ;; against that.
       (return (save-environment-excursion
+               ;; Tell 'activate-current-system' what the new system is.
+               (setenv "GUIX_NEW_SYSTEM" system)
+
                (primitive-load (derivation->output-path script))))
 
       ;; TODO: Run 'deco reload ...'.
diff --git a/po/guix/sr.po b/po/guix/sr.po
index 28bdc170ae..1404a4466e 100644
--- a/po/guix/sr.po
+++ b/po/guix/sr.po
@@ -1,13 +1,13 @@
 # Serbian translation of guix.
 # Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the guix package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013-2014.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-0.6-pre1\n"
+"Project-Id-Version: guix-0.7-pre1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2014-07-25 00:55+0200\n"
-"PO-Revision-Date: 2014-06-19 08:51+0200\n"
+"POT-Creation-Date: 2014-07-13 17:06+0200\n"
+"PO-Revision-Date: 2014-09-13 11:19+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: gnu/packages.scm:102
+#: gnu/packages.scm:95
 #, scheme-format
 msgid "cannot access `~a': ~a~%"
 msgstr "не могу да приступим „~a“: ~a~%"
@@ -203,9 +203,9 @@ msgstr ""
 "      --log-file         исписује називе датотеке дневника за дате изведенице"
 
 #: guix/scripts/build.scm:246 guix/scripts/download.scm:53
-#: guix/scripts/package.scm:525 guix/scripts/gc.scm:58
+#: guix/scripts/package.scm:523 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/substitute-binary.scm:564 guix/scripts/system.scm:334
 msgid ""
 "\n"
 "  -h, --help             display this help and exit"
@@ -214,9 +214,9 @@ msgstr ""
 "  -h, --help                  приказује ову помоћ и излази"
 
 #: guix/scripts/build.scm:248 guix/scripts/download.scm:55
-#: guix/scripts/package.scm:527 guix/scripts/gc.scm:60
+#: guix/scripts/package.scm:525 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/substitute-binary.scm:566 guix/scripts/system.scm:336
 msgid ""
 "\n"
 "  -V, --version          display version information and exit"
@@ -230,8 +230,8 @@ msgid "sources do not match any package:~{ ~a~}~%"
 msgstr "извори не одговарају ниједном пакету:~{ ~a~}~%"
 
 #: 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/package.scm:756 guix/scripts/gc.scm:122
+#: guix/scripts/pull.scm:115 guix/scripts/system.scm:386
 #, scheme-format
 msgid "~A: unrecognized option~%"
 msgstr "~A: непозната опција~%"
@@ -290,8 +290,8 @@ msgstr "нисам успео да изградим празан профил~%"
 msgid "switching from generation ~a to ~a~%"
 msgstr "пребацујем се са генерације ~a на ~a~%"
 
-#: guix/scripts/package.scm:108 guix/scripts/package.scm:873
-#: guix/scripts/package.scm:985
+#: guix/scripts/package.scm:108 guix/scripts/package.scm:866
+#: guix/scripts/package.scm:978
 #, scheme-format
 msgid "profile '~a' does not exist~%"
 msgstr "профил „~a“ не постоји~%"
@@ -476,71 +476,62 @@ msgstr ""
 "  -A, --list-available[=РЕГИЗР]\n"
 "                         исписује доступне пакете који одговарају РЕГИЗРАЗУ"
 
-#: guix/scripts/package.scm:520
-#, fuzzy
-msgid ""
-"\n"
-"  --show=PACKAGE         show details about PACKAGE"
-msgstr ""
-"\n"
-"  -i, --install=ПАКЕТ  инсталира ПАКЕТ"
-
-#: guix/scripts/package.scm:767
+#: guix/scripts/package.scm:760
 #, scheme-format
 msgid "~A: extraneous argument~%"
 msgstr "~A: страни аргумент~%"
 
-#: guix/scripts/package.scm:782
+#: guix/scripts/package.scm:775
 #, scheme-format
 msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
 msgstr "Покушајте „info '(guix) Invoking guix package'“ за више података.~%"
 
-#: guix/scripts/package.scm:804
+#: guix/scripts/package.scm:797
 #, scheme-format
 msgid "error: while creating directory `~a': ~a~%"
 msgstr "грешка: приликом стварања директоријума „~a“: ~a~%"
 
-#: guix/scripts/package.scm:808
+#: guix/scripts/package.scm:801
 #, scheme-format
 msgid "Please create the `~a' directory, with you as the owner.~%"
 msgstr "Направите директоријум „~a“, у вашем власништву.~%"
 
-#: guix/scripts/package.scm:815
+#: guix/scripts/package.scm:808
 #, scheme-format
 msgid "error: directory `~a' is not owned by you~%"
 msgstr "грешка: директоријум „~a“ није у вашем власништву~%"
 
-#: guix/scripts/package.scm:818
+#: guix/scripts/package.scm:811
 #, scheme-format
 msgid "Please change the owner of `~a' to user ~s.~%"
 msgstr "Поставите као власника ~s над „~a“.~%"
 
-#: guix/scripts/package.scm:843
+#: guix/scripts/package.scm:836
 #, scheme-format
 msgid "deleting ~a~%"
 msgstr "бришем ~a~%"
 
-#: guix/scripts/package.scm:896 guix/scripts/package.scm:1001
+#: guix/scripts/package.scm:889 guix/scripts/package.scm:994
 #, scheme-format
 msgid "invalid syntax: ~a~%"
 msgstr "неисправна синтакса: ~a~%"
 
-#: guix/scripts/package.scm:925
+#: guix/scripts/package.scm:918
 #, scheme-format
 msgid "nothing to be done~%"
 msgstr "ништа неће бити урађено~%"
 
-#: guix/scripts/package.scm:948
+#: guix/scripts/package.scm:941
 #, scheme-format
 msgid "~a package in profile~%"
 msgstr "~a пакет у профилу~%"
 
-#: guix/scripts/package.scm:963
+#: guix/scripts/package.scm:956
 #, scheme-format
 msgid "Generation ~a\t~a"
 msgstr "Генерација ~a\t~a"
 
-#: guix/scripts/package.scm:970
+#: guix/scripts/package.scm:963
 #, scheme-format
 msgid "~a\t(current)~%"
 msgstr "~a\t(текуће)~%"
@@ -761,9 +752,9 @@ msgid "signature on '~a' is corrupt~%"
 msgstr "потпис на „~a“ је оштећен~%"
 
 #: guix/scripts/substitute-binary.scm:338
-#, fuzzy, scheme-format
+#, scheme-format
 msgid "substitute at '~a' lacks a signature~%"
-msgstr "нарподацима за „~a“ недостаје потпис~%"
+msgstr "замени на „~a“ недостаје потпис~%"
 
 #: guix/scripts/substitute-binary.scm:526
 #, scheme-format
@@ -869,41 +860,41 @@ msgid "~a: ~a~%"
 msgstr "~a: ~a~%"
 
 #: guix/scripts/system.scm:81
-#, fuzzy, scheme-format
+#, scheme-format
 msgid "failed to load operating system file '~a': ~s~%"
-msgstr "нисам успео да отворим датотеку оперативног система „~a“: ~a~%"
+msgstr "нисам успео да учитам датотеку оперативног система „~a“: ~s~%"
 
-#: guix/scripts/system.scm:116
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:111
+#, scheme-format
 msgid "failed to register '~a' under '~a'~%"
-msgstr "нисам успео да направим ГЦ корен „~a“: ~a~%"
+msgstr "нисам успео да убележим „~a“ под „~a“~%"
 
-#: guix/scripts/system.scm:144
+#: guix/scripts/system.scm:127
 #, scheme-format
 msgid "initializing the current root file system~%"
-msgstr ""
+msgstr "покрећем текући корени систем датотека~%"
 
-#: guix/scripts/system.scm:162 guix/scripts/system.scm:318
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:151 guix/scripts/system.scm:291
+#, scheme-format
 msgid "failed to install GRUB on device '~a'~%"
-msgstr "нисам успео да инсталирам локалитет: ~a~%"
+msgstr "нисам успео да инсталирам ГРУБ на уређају „~a“~%"
 
-#: guix/scripts/system.scm:197
+#: guix/scripts/system.scm:176
 #, scheme-format
 msgid "activating system...~%"
-msgstr ""
+msgstr "покрећем систем...~%"
 
-#: guix/scripts/system.scm:236
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:211
+#, scheme-format
 msgid "unrecognized boot parameters for '~a'~%"
-msgstr "непозната опција: ~a~%"
+msgstr "непознати подизни параметри за „~a“~%"
 
-#: guix/scripts/system.scm:323
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:295
+#, scheme-format
 msgid "initializing operating system under '~a'...~%"
-msgstr "нисам успео да отворим датотеку оперативног система „~a“: ~a~%"
+msgstr "покрећем оперативни систем под „~a“...~%"
 
-#: guix/scripts/system.scm:339
+#: guix/scripts/system.scm:311
 msgid ""
 "Usage: guix system [OPTION] ACTION FILE\n"
 "Build the operating system declared in FILE according to ACTION.\n"
@@ -911,57 +902,61 @@ msgstr ""
 "Употреба: guix system [ОПЦИЈА] РАДЊА ДАТОТЕКА\n"
 "Изграђује оперативни систем објављен у ДАТОТЕЦИ у складу са РАДЊОМ.\n"
 
-#: guix/scripts/system.scm:342
+#: guix/scripts/system.scm:314
 msgid "The valid values for ACTION are:\n"
-msgstr ""
+msgstr "Исправне вредности за РАДЊУ су:\n"
 
-#: guix/scripts/system.scm:343
+#: guix/scripts/system.scm:315
 msgid "  - 'reconfigure', switch to a new operating system configuration\n"
-msgstr ""
+msgstr "  — „reconfigure“, пребацује на подешавање новог оперативног система\n"
 
-#: guix/scripts/system.scm:345
+#: guix/scripts/system.scm:317
 msgid "  - 'build', build the operating system without installing anything\n"
-msgstr ""
+msgstr "  — „build“, изграђује оперативни систем а не инсталира ништа\n"
 
-#: guix/scripts/system.scm:347
+#: guix/scripts/system.scm:319
 msgid "  - 'vm', build a virtual machine image that shares the host's store\n"
-msgstr ""
+msgstr "  — „vm“, изграђује слику виртуелне машине која дели складиште домаћина\n"
 
-#: guix/scripts/system.scm:349
+#: guix/scripts/system.scm:321
 msgid "  - 'vm-image', build a freestanding virtual machine image\n"
-msgstr ""
+msgstr "  — „vm-image“, изграђује самостојећу слику виртуелне машине\n"
 
-#: guix/scripts/system.scm:351
+#: guix/scripts/system.scm:323
 msgid "  - 'disk-image', build a disk image, suitable for a USB stick\n"
-msgstr ""
+msgstr "  — „disk-image“, изграђује слику диска, погодну за УСБ штапиће\n"
 
-#: guix/scripts/system.scm:353
+#: guix/scripts/system.scm:325
 msgid "  - 'init', initialize a root file system to run GNU.\n"
-msgstr ""
+msgstr "  — „init“, покреће корени систем датотека за покретање Гнуа.\n"
 
-#: guix/scripts/system.scm:357
+#: guix/scripts/system.scm:329
 msgid ""
 "\n"
 "      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
 msgstr ""
+"\n"
+"      --image-size=ВЕЛИЧИНА за „vm-image“, даје слику ВЕЛИЧИНЕ"
 
-#: guix/scripts/system.scm:359
+#: guix/scripts/system.scm:331
 msgid ""
 "\n"
 "      --no-grub          for 'init', do not install GRUB"
 msgstr ""
+"\n"
+"      --no-grub             за „init“, не инсталира ГРУБ"
 
-#: guix/scripts/system.scm:422
+#: guix/scripts/system.scm:394
 #, scheme-format
 msgid "~a: unknown action~%"
 msgstr "~a: непозната радња~%"
 
-#: guix/scripts/system.scm:439
-#, fuzzy, scheme-format
+#: guix/scripts/system.scm:411
+#, scheme-format
 msgid "wrong number of arguments for action '~a'~%"
-msgstr "погрешан број аргумената~%"
+msgstr "погрешан број аргумената за радњу „~a“~%"
 
-#: guix/scripts/system.scm:459
+#: guix/scripts/system.scm:431
 #, scheme-format
 msgid "no configuration file specified~%"
 msgstr "није наведена датотека подешавања~%"
@@ -1108,21 +1103,21 @@ msgstr "<непознато место>"
 msgid "failed to create configuration directory `~a': ~a~%"
 msgstr "нисам успео да направим директоријум подешавања „~a“: ~a~%"
 
-#: guix/ui.scm:475 guix/ui.scm:489
+#: guix/ui.scm:461 guix/ui.scm:475
 msgid "unknown"
 msgstr "непознато"
 
-#: guix/ui.scm:598
+#: guix/ui.scm:584
 #, scheme-format
 msgid "invalid argument: ~a~%"
 msgstr "неисправан аргумент: ~a~%"
 
-#: guix/ui.scm:603
+#: guix/ui.scm:589
 #, scheme-format
 msgid "Try `guix --help' for more information.~%"
 msgstr "Пробајте „guix --help“ за више података.~%"
 
-#: guix/ui.scm:633
+#: guix/ui.scm:619
 msgid ""
 "Usage: guix COMMAND ARGS...\n"
 "Run COMMAND with ARGS.\n"
@@ -1130,21 +1125,21 @@ msgstr ""
 "Употреба: guix НАРЕДБА АРГУМЕНТИ...\n"
 "Покрените НАРЕДБУ са АРГУМЕНТИМА.\n"
 
-#: guix/ui.scm:636
+#: guix/ui.scm:622
 msgid "COMMAND must be one of the sub-commands listed below:\n"
 msgstr "НАРЕДБА мора бити једна од подкоманди наведених испод:\n"
 
-#: guix/ui.scm:656
+#: guix/ui.scm:642
 #, scheme-format
 msgid "guix: ~a: command not found~%"
 msgstr "guix: ~a: нисам пронашао наредбу~%"
 
-#: guix/ui.scm:674
+#: guix/ui.scm:660
 #, scheme-format
 msgid "guix: missing command name~%"
 msgstr "guix: недостаје назив наредбе~%"
 
-#: guix/ui.scm:682
+#: guix/ui.scm:668
 #, scheme-format
 msgid "guix: unrecognized option '~a'~%"
 msgstr "guix: непозната опција „~a“~%"
@@ -1246,6 +1241,368 @@ msgstr "увезеној датотеци недостаје потпис"
 msgid "invalid inter-file archive mark"
 msgstr "неисправан знак архиве унутрашње датотеке"
 
+#~ msgid "Hello, GNU world: An example GNU package"
+#~ msgstr "Поздрав, Гну народе: Пример Гну пакета"
+
+#~ msgid ""
+#~ "GNU Hello prints the message \"Hello, world!\" and then exits.  It\n"
+#~ "serves as an example of standard GNU coding practices.  As such, it supports\n"
+#~ "command-line arguments, multiple languages, and so on."
+#~ msgstr ""
+#~ "Гнуов Поздравник исписује поруку „Поздрав, народе!“ и излази.  Служи\n"
+#~ "као пример стандардног увежбавања Гнуовог кодирања.  Као такав, подржава\n"
+#~ "аргументе линије наредби, вишеструке језике, и тако редом."
+
+#~ msgid "Print lines matching a pattern"
+#~ msgstr "Исписује редове који одговарају шаблону"
+
+#~ msgid ""
+#~ "grep is a tool for finding text inside files.  Text is found by\n"
+#~ "matching a pattern provided by the user in one or many files.  The pattern\n"
+#~ "may be provided as a basic or extended regular expression, or as fixed\n"
+#~ "strings.  By default, the matching text is simply printed to the screen,\n"
+#~ "however the output can be greatly customized to include, for example, line\n"
+#~ "numbers.  GNU grep offers many extensions over the standard utility,\n"
+#~ "including, for example, recursive directory searching."
+#~ msgstr ""
+#~ "греп је алат за проналажење текста унутар датотека.  Текст се проналази\n"
+#~ "упоређивањем са обрасцем који достави корисник у једној или више датотека.\n"
+#~ "Образац може бити достављен као основни или проширени регуларни израз, или\n"
+#~ "као стална ниска.  По основи, одговарајући текст се једноставно исписује\n"
+#~ "на екрану, међутим излаз може бити прилагођен да садржи, рецимо бројеве\n"
+#~ "редова.  Гнуов греп нуди многа проширења преко уобичајеног помагала,\n"
+#~ "укључујући, на пример, дубинско претраживање директоријума."
+
+#~ msgid "Stream editor"
+#~ msgstr "Уређивач протока"
+
+#~ msgid ""
+#~ "Sed is a non-interactive, text stream editor.  It receives a text\n"
+#~ "input from a file or from standard input and it then applies a series of text\n"
+#~ "editing commands to the stream and prints its output to standard output.  It\n"
+#~ "is often used for substituting text patterns in a stream.  The GNU\n"
+#~ "implementation offers several extensions over the standard utility."
+#~ msgstr ""
+#~ "Сед је не-међудејствени, уређивач тока текста.  Он прихвата текстуални\n"
+#~ "улаз из датотеке или са стандардног улаза и затим примењује низ наредби\n"
+#~ "за уређивање текста над токим и исписује његов излаз на стандардни излаз.\n"
+#~ "Често се користи за замену текстуалних образаца у току.  Гнуова примена\n"
+#~ "нуди неколико проширења поред уобичајеног помагала."
+
+#~ msgid "Managing tar archives"
+#~ msgstr "Управљање тар архивама"
+
+#~ msgid ""
+#~ "Tar provides the ability to create tar archives, as well as the\n"
+#~ "ability to extract, update or list files in an existing archive.  It is\n"
+#~ "useful for combining many files into one larger file, while maintaining\n"
+#~ "directory structure and file information such as permissions and\n"
+#~ "creation/modification dates.  GNU tar offers many extensions over the\n"
+#~ "standard utility."
+#~ msgstr ""
+#~ "Тар обезбеђује способност за стварање тар архива, као и способност\n"
+#~ "за извлачење, освежавање или исписивање датотека у постојећој архиви.\n"
+#~ "Користан је за обједињавање више датотека у једну већу датотеку, док\n"
+#~ "задржава структуру директоријума и податке о датотеци као што су\n"
+#~ "овлашћења и датуми стварања/измена.  Гнуов тар нуди многа проширења\n"
+#~ "поред стандардног помагала."
+
+#~ msgid "Apply differences to originals, with optional backups"
+#~ msgstr "Примењивање разлика на оригинале, са опционалним резервама"
+
+#~ msgid ""
+#~ "Patch is a program that applies changes to files based on differences\n"
+#~ "laid out as by the program \"diff\".  The changes may be applied to one or more\n"
+#~ "files depending on the contents of the diff file.  It accepts several\n"
+#~ "different diff formats.  It may also be used to revert previously applied\n"
+#~ "differences."
+#~ msgstr ""
+#~ "Закрпко је програм који примењује измене над датотекама на основу разлика\n"
+#~ "изнесених програмом различник.  Измене могу бити примењене над једном или\n"
+#~ "више датотека у зависности од садржаја датотеке разлика.  Прихвата више\n"
+#~ "различитих записа различника.  Такође може бити коришћен за враћање претходно примењених разлика."
+
+#~ msgid "Comparing and merging files"
+#~ msgstr "Упоређивање и стапање датотека"
+
+#~ msgid ""
+#~ "GNU Diffutils is a package containing tools for finding the\n"
+#~ "differences between files.  The \"diff\" command is used to show how two files\n"
+#~ "differ, while \"cmp\" shows the offsets and line numbers where they differ. \n"
+#~ "\"diff3\" allows you to compare three files.  Finally, \"sdiff\" offers an\n"
+#~ "interactive means to merge two files."
+#~ msgstr ""
+#~ "Гнуова помагала разлика је пакет који садржи алате за проналажење разлика\n"
+#~ "између датотека.  Наредба „diff“ се користи за приказивање разлика двеју\n"
+#~ "датотека, док „cmp“ приказује помераје и бројеве редова на којима се\n"
+#~ "разликују.  „diff3“ вам омогућава упоређивање три датотеке.  На крају,\n"
+#~ "„sdiff“ нуди међудејствени начин за стапање две датотеке."
+
+#~ msgid "Operating on files matching given criteria"
+#~ msgstr "Радње над датотекама према датим условима"
+
+#~ msgid ""
+#~ "Findutils supplies the basic file directory searching utilities of the\n"
+#~ "GNU system.  It consists of two primary searching utilities: \"find\"\n"
+#~ "recursively searches for files in a directory according to given criteria and\n"
+#~ "\"locate\" lists files in a database that match a query.  Two auxiliary tools\n"
+#~ "are included: \"updatedb\" updates the file name database and \"xargs\" may be\n"
+#~ "used to apply commands with arbitrarily long arguments."
+#~ msgstr ""
+#~ "Помагала проналажења достављају основна помагала за претраживање датотеке\n"
+#~ "Гнуовог система.  Састоји се од два основна помагала претраживања: „find“\n"
+#~ "дубински тражи датотеке у директоријуму према задатом мерилу а „locate“\n"
+#~ "исписује датотеке у бази података које одговарају упиту.  Укључена су два\n"
+#~ "помоћна алата: „updatedb“ освежава назив датотеке базе података а „xargs“\n"
+#~ "се може користити за примењивање наредби са произвољно дугим аргументима."
+
+#~ msgid "Core GNU utilities (file, text, shell)"
+#~ msgstr "Гнуова кључна помагала (датотека, текст, шкољка)"
+
+#~ msgid ""
+#~ "GNU Coreutils includes all of the basic command-line tools that are\n"
+#~ "expected in a POSIX system.  These provide the basic file, shell and text\n"
+#~ "manipulation functions of the GNU system.  Most of these tools offer extended\n"
+#~ "functionality beyond that which is outlined in the POSIX standard."
+#~ msgstr ""
+#~ "Гнуова кључна помагала укључују све основне алате линије наредби који се\n"
+#~ "очекују у ПОСИКС систему.  Обезбеђују основне функције управљања датотеком,\n"
+#~ "шкољком и текстом на Гнуовом систему.  Већина ових алата нуди проширене\n"
+#~ "функционалности изван оних које су наведене у ПОСИКС стандарду."
+
+#~ msgid "Remake files automatically"
+#~ msgstr "Самостално поновно стварање датотека"
+
+#~ msgid ""
+#~ "Make is a program that is used to control the production of\n"
+#~ "executables or other files from their source files.  The process is\n"
+#~ "controlled from a Makefile, in which the developer specifies how each file is\n"
+#~ "generated from its source.  It has powerful dependency resolution and the\n"
+#~ "ability to determine when files have to be regenerated after their sources\n"
+#~ "change.  GNU make offers many powerful extensions over the standard utility."
+#~ msgstr ""
+#~ "Мејк је програм који се користи за управљање стварањем извршних или других\n"
+#~ "датотека из њихових изворних.  Поступком се управља из „Makefile“-а, у коме\n"
+#~ "програмери наводе како се свака датотека ствара из свог извора.  Поседује\n"
+#~ "моћно решавање зависности и способност одређивања када датотеке треба да\n"
+#~ "буду поново створене након измена њихових извора.  Гнуов мејк нуди много\n"
+#~ "моћних проширења поред стандардног помагала."
+
+#~ msgid "Binary utilities: bfd gas gprof ld"
+#~ msgstr "Бинарна помагала: bfd gas gprof ld"
+
+#~ msgid ""
+#~ "GNU Binutils is a collection of tools for working with binary files.\n"
+#~ "Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler. Other\n"
+#~ "tools include programs to display binary profiling information, list the\n"
+#~ "strings in a binary file, and utilities for working with archives.  The \"bfd\"\n"
+#~ "library for working with executable and object formats is also included."
+#~ msgstr ""
+#~ "Гнуова бинарна помагала јесте збирка алата за рад са извршним датотекама.\n"
+#~ "Можда је најпознатији „ld“, повезивач, и „as“, саставник.  Остали алати\n"
+#~ "садрже програме за приказивање података бинарног профилисања, исписивање\n"
+#~ "ниски у извршној датотеци, и помагала за рад са архивама.  Ту је такође и \n"
+#~ "библиотека „bfd“ за рад са извршним и записима објеката."
+
+#~ msgid "The GNU C Library"
+#~ msgstr "Гну Ц библиотека"
+
+#~ 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 ""
+#~ "Сваком Јуниксоликом оперативном систему је потребна Ц библиотека: библиотека\n"
+#~ "која одређује „системске позиве“ и остале основне олакшице као што су\n"
+#~ "„open, malloc, printf, exit...“\n"
+#~ "\n"
+#~ "Гнуова Ц библиотека се користи као Ц библиотека у Гнуовом систему и већини\n"
+#~ "система са Линукс језгром."
+
+#~ msgid "Database of current and historical time zones"
+#~ msgstr "База података о текућим и застарелим временским зонама"
+
+#~ 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 ""
+#~ "База података временске зоне (често називана „tz“ или „zoneinfo“)\n"
+#~ "садржи код и податке који представљају историјат месног времена за\n"
+#~ "многа представљајућа места широм света. Повремено се освежава како\n"
+#~ "би осликала промене на границама временских зона које доносе политичка\n"
+#~ "тела, помераје КУВ-а, и правила уштеде дневног светла."
+
+#~ msgid "GNU C++ standard library (intermediate)"
+#~ msgstr "Гнуова Ц++ стандардна библиотека (посредничка)"
+
+#~ msgid "The linker wrapper"
+#~ msgstr "Омотач повезивача"
+
+#~ 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 ""
+#~ "Омотач повезивача (или „ld-wrapper“) обмотава повезивача да би додао\n"
+#~ "недостајућу опцију „-rpath“, и да би открио лоше коришћење библиотека\n"
+#~ "изван складишта."
+
+#~ msgid "Scheme implementation intended especially for extensions"
+#~ msgstr "Примена шеме нарочито осмишљена за проширења"
+
+#~ msgid ""
+#~ "Guile is the GNU Ubiquitous Intelligent Language for Extensions, the\n"
+#~ "official extension language of the GNU system.  It is an implementation of\n"
+#~ "the Scheme language which can be easily embedded in other applications to\n"
+#~ "provide a convenient means of extending the functionality of the application\n"
+#~ "without requiring the source code to be rewritten."
+#~ msgstr ""
+#~ "Гуиле је Гнуов свеприсутан паметан језик за проширења, званични језик\n"
+#~ "проширења за Гнуов систем.  То је примена Шеме језика који може лако\n"
+#~ "бити уграђен у друге програме како би обезбедио исплатив начин проширивања\n"
+#~ "функционалности програма без потребе поновног писања изворног кода."
+
+#~ msgid "Framework for building readers for GNU Guile"
+#~ msgstr "Радни склоп за изградњу читача за Гну Гуила"
+
+#~ 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 ""
+#~ "Гуиле-читач је једноставан радни склоп за изградњу читача за Гну Гуила.\n"
+#~ "\n"
+#~ "Замисао је олакшати изградњу поступака који проширују Гуилов поступак\n"
+#~ "читања. Читачи који подржавају разне варијанте синтаксе могу бити лако\n"
+#~ "написани, по могућству поновним коришћењем постојећих „читача “ читача\n"
+#~ "стандардне Шеме. На пример, користи се за примену синтаксе документа која произилази из Р5РС Скрибилоа.\n"
+#~ "\n"
+#~ "Приступ Гуиле-читача је сличан Општем Лисповом „читању табеле“, али је на\n"
+#~ "срећу много моћнији и прилагодљивији (на пример, неко може да покрене\n"
+#~ "онолико читача колико му је потребно)."
+
+#~ msgid "Guile bindings to ncurses"
+#~ msgstr "Гуилеово повезивање са ен-курсом"
+
+#~ msgid ""
+#~ "guile-ncurses provides Guile language bindings for the ncurses\n"
+#~ "library."
+#~ msgstr ""
+#~ "гуиле-нкурсис обезбеђује повезивање Гуиле језика за нкурсис\n"
+#~ "библиотеку."
+
+#~ msgid "Run jobs at scheduled times"
+#~ msgstr "Покретање послова у заказано време"
+
+#~ msgid ""
+#~ "GNU Mcron is a complete replacement for Vixie cron.  It is used to run\n"
+#~ "tasks on a schedule, such as every hour or every Monday.  Mcron is written in\n"
+#~ "Guile, so its configuration can be written in Scheme; the original cron\n"
+#~ "format is also supported."
+#~ msgstr ""
+#~ "Гнуов Мкрон је потпуна замена за Викси крон.  Користи се за покретање\n"
+#~ "задатака на заказивање, рецимо сваког сата или сваког понедељка.  Мкрон\n"
+#~ "је написан у Гуилеу, тако да његово подешавање може бити написано у Шеми;\n"
+#~ "изворни кронов запис је такође подржан."
+
+#~ msgid "Collection of useful Guile Scheme modules"
+#~ msgstr "Збирка корисних модула Гуиле Шеме"
+
+#~ 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 ""
+#~ "гуиле-библ је замишљена као место скупљања за Гуиле модуле чисте-шеме,\n"
+#~ "омогућавајући људима да сарађују сједињавајући њихове опште Гуиле модуле\n"
+#~ "у обједињену библиотеку. Сетите се само „down-scaled, limited-scope CPAN\n"
+#~ "for Guile“."
+
+#~ msgid "JSON module for Guile"
+#~ msgstr "ЈСОН модул за Гуила"
+
+#~ msgid ""
+#~ "Guile-json supports parsing and building JSON documents according to the\n"
+#~ "http:://json.org specification. These are the main features:\n"
+#~ "- Strictly complies to http://json.org specification.\n"
+#~ "- Build JSON documents programmatically via macros.\n"
+#~ "- Unicode support for strings.\n"
+#~ "- Allows JSON pretty printing."
+#~ msgstr ""
+#~ "Гуиле-јсон подршка обраде и изградње ЈСОН докумената према\n"
+#~ "одредби „http:://json.org“-а. Ово су главне функције:\n"
+#~ "— Изричита скадност са одредбом „http://json.org“-а.\n"
+#~ "— Изградња ЈСОН докумената програмљиво путем макроа.\n"
+#~ "— Подршка јуникода за ниске.\n"
+#~ "— Допушта фино ЈСОН штампање."
+
+#~ msgid "Lout, a document layout system similar in style to LaTeX"
+#~ msgstr "Лоут, систем изгледа документа сличан у стилу ЛаТеХ-у"
+
+#~ 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 ""
+#~ "Лоут систем обликовања докумената сада чита опис документа виоког нивоа\n"
+#~ "сличан по стилу ЛаТеХ-у и даје излазну датотеку у Постскрипту или\n"
+#~ "обичном тексту. \n"
+#~ "\n"
+#~ "Лоут нуди опсег напредних функција без премца, укључујући оптималан\n"
+#~ "завршетак пасуса и странице, самосталан прелом реда, укључивање и\n"
+#~ "стварање Постскрипт ЕПС датотеке, обликовање једначине, табеле,\n"
+#~ "дијаграме, окретање и промену величине, поређане пописе, библиографске\n"
+#~ "базе података, покретања заглавља и парних-непарних страница, самостално\n"
+#~ "унакрсно упућивање, вишејезичне документе укључујући завршетак реда\n"
+#~ "(већина европских језика је подржана), обликовање рачунарских програма,\n"
+#~ "и још много тога, све спремно за употребу. Такође, Лоут је лако проширив\n"
+#~ "одредницама које су много лакше за писање него трофф ТеХ макроа зато што\n"
+#~ "је Лоут језик високог нивоа, потпуно функционалан, резултат пројекта\n"
+#~ "осмогодишњег истраживања који се вратио на почетак."
+
+#~ msgid "Manipulate plain text files as databases"
+#~ msgstr "Управљајте датотекама обичног текста као базама подтака"
+
+#~ msgid ""
+#~ "GNU Recutils is a set of tools and libraries for creating and\n"
+#~ "manipulating text-based, human-editable databases.  Despite being text-based,\n"
+#~ "databases created with Recutils carry all of the expected features such as\n"
+#~ "unique fields, primary keys, time stamps and more. Many different field types\n"
+#~ "are supported, as is encryption."
+#~ msgstr ""
+#~ "Гнуово Рекпомагало је скуп алата и библиотека за стварање и руковање\n"
+#~ "базама података заснованим на тексту које се могу уређивати.  Иако су\n"
+#~ "засноване на тексту, базе података створене Рекпомагалом садрже све\n"
+#~ "очекиване функције као што су јединствена поља, основни кључеви, ознаке\n"
+#~ "времена и још неке. Многе различите врсте поља су подржане, као у шифровању."
+
 #~ msgid "failed to load machine file '~a': ~s~%"
 #~ msgstr "нисам успео да учитам датотеку машине „~a“: ~s~%"
 
@@ -1258,3 +1615,252 @@ msgstr "неисправан знак архиве унутрашње датот
 
 #~ msgid "~a: extraneous argument~%"
 #~ msgstr "~a: страни аргумент~%"
+
+#~ msgid "Guile bindings to libssh"
+#~ msgstr "Гуилеово повезивање са библбш-ом"
+
+#~ msgid ""
+#~ "Guile-SSH is a library that provides access to the SSH protocol for\n"
+#~ "programs written in GNU Guile interpreter.  It is a wrapper to the underlying\n"
+#~ "libssh library."
+#~ msgstr ""
+#~ "Гуиле-БШ је библиотека која обезбеђује приступ протоколу безбедне шкољке\n"
+#~ "за програме написане у Гнуовом Гуиле преводиоцу.  То је омотач основне\n"
+#~ "библиотеке либссх."
+
+#~ msgid "package `~a' has no source~%"
+#~ msgstr "пакет „~a“ нема извор~%"
+
+#~ msgid ""
+#~ "\n"
+#~ "  -n, --dry-run          show what would be done without actually doing it"
+#~ msgstr ""
+#~ "\n"
+#~ "  -n, --dry-run          показује шта би требало да се уради а да заправо ништа не ради"
+
+#~ msgid "Yeah..."
+#~ msgstr "Да..."
+
+#~ 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 ""
+#~ "Наредба греп претражује једну или више улазних датоотека за редовима који\n"
+#~ "садрже поклапање са наведеним шаблоном.  По основи, греп исписује поклопљене\n"
+#~ "редове."
+
+#~ 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 ""
+#~ "Сед (уређивач протока) није стварно прави уређивач или обрађивач текста.\n"
+#~ "Напротив, користи се за издвајање текста, тј. узима улаз текста и обавља\n"
+#~ "неке радње (или скуп радњи) на њему и даје излаз измењеног текста.\n"
+#~ "Сед се углавном користи за издвајање дела датотеке користећи поклапање\n"
+#~ "шаблона или замењује више појава ниске унутар датотеке."
+
+#~ 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 ""
+#~ "Програм Тар обезбеђује способност стварања тар архива, као и разне друге\n"
+#~ "врсте управљања. На пример, можете да користите Тар на већ направљеним\n"
+#~ "архивама за извлачење датотека, за ускладиштење додатних датотека, или\n"
+#~ "за освежавање или исписивање датотека које су већ ускладиштене.\n"
+#~ "\n"
+#~ "На почетку, тар архиве су биле коришћене за пригодно чување датотека на\n"
+#~ "магнетским тракама. Назив „Тар“ је настао из такве употребе; и значи\n"
+#~ "архивар трака. Без обзира на назив помагала, Тар може да успери свој излаз\n"
+#~ "ка доступним уређајима, датотекама, или другим програмима (употребом спојки)\n"
+#~ "чак може и да приступи удаљеним уређајима или датотекама (као архивама)."
+
+#~ 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 ""
+#~ "Гнуова закрпа узима датотеку закрпе која садржи списак разлика произведен\n"
+#~ "програмом за разлике (diff) и примењује те разлике на једној или више\n"
+#~ "изворних датотека, стварајући прикрпљена издања."
+
+#~ 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“ је пакет неколико програма намењених за проналажење\n"
+#~ "разлика између датотека.\n"
+#~ "\n"
+#~ "Корисници рачунара често желе да знају у чему се разликују две датотеке.\n"
+#~ "Можда је једна датотека новије издање оне друге. Или су можда обе датотеке\n"
+#~ "започете као истоветни умношци али су их измениле другачије особе.\n"
+#~ "\n"
+#~ "Можете да користите наредбу „diff“ да покажете разлике између две датотеке\n"
+#~ "или сваку одговарајућу датотеку у два директоријума. дифф исписује разлике\n"
+#~ "између датотека ред по ред у било ком од неколико записа, бирањем опција\n"
+#~ "линије наредби. Овај скуп разлика се често назива „diff“ или „patch“. За\n"
+#~ "датотеке које су исте, дифф обично не даје резултат; за извршне (не-текстуалне)\n"
+#~ "датотеке, дифф обично извештава само о томе да се оне разликују.\n"
+#~ "\n"
+#~ "\n"
+#~ "Можете да користите наредбу „cmp“ да прикажете помераје и бројеве редова\n"
+#~ "где се две датотеке разликују. цмп може такође да покаже све знакове који\n"
+#~ "се разликују између две датотеке, један поред другог.\n"
+#~ "\n"
+#~ "Можете да користите наредбу „diff3“ да прикажете разлике између три датотеке.\n"
+#~ "Када два корисника направе независне измене у заједничком оригиналу, дифф3\n"
+#~ "може да извести о разликама између оригинала и два измењена издања, и може да\n"
+#~ "направи стопљену датотеку која заједно садржи измене обе особе са упозорењима о сукобима.\n"
+#~ "\n"
+#~ "Можете да користите наредбу „sdiff“ да међудејствено стопите две датотеке."
+
+#~ 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 ""
+#~ "„GNU Find Utilities“ су основна помагала за претраживање директоријума\n"
+#~ "Гнуовог оперативног система.  Ови програми се обично користе у спрези\n"
+#~ "са другим програмима да обезбеде модуларне и моћне могућности претраге\n"
+#~ "директоријума и налажења датотека другим наредбама.\n"
+#~ "\n"
+#~ "Алати који иду уз овај пакет су:\n"
+#~ "\n"
+#~ "  * find — тражи датотеке у хијерархији директоријума;\n"
+#~ "  * locate — исписује датотеке у базама података које одговарају шаблону;\n"
+#~ "  * updatedb — освежава базу података назива датотеке;\n"
+#~ "  * xargs — гради редове извршавања наредбе са стандардног улаза.\n"
+
+#~ 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 ""
+#~ "Гнуова кључна помагала су основни алати за управљање датотекама, шкољком\n"
+#~ "и текстом за Гнуов оперативни систем.  То су кључна помагала за која се\n"
+#~ "очекује да постоје на сваком оперативном систему."
+
+#~ 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 ""
+#~ "Мејк је алат који управља стварањем извршних и других не-изворних датотека\n"
+#~ "програма из изворних датотека програма.\n"
+#~ "\n"
+#~ "Мејк сазнаје како да изгради ваш програм из датотеке зване „makefile“, која\n"
+#~ "исписује сваку не-изворну датотеку и како да је прорчуна из других датотека.\n"
+#~ "Када пишете програм треба да напишете и његову „makefile“ датотеку, тако\n"
+#~ "да буде могуће користити Мејк за изградњу и инсталацију програма."
+
+#~ 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 ""
+#~ "Гнуова бинпомагала јесу скуп бинарних алата.  Главни су „ld“ (Гнуов везник) и „as“ (Гнуов асемблер). У њих такође спадају библиотека „BFD“\n"
+#~ "(Binary File Descriptor), „gprof“, „nm“, „strip“, итд."
+
+#~ 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 ""
+#~ "Гну Гуиле 1.8 је преводилац програмског језика Шеме, запакован као\n"
+#~ "библиотека која може бити уграђена у програме како би их учинила\n"
+#~ "проширивим.  Подржава многе СРФИ-ове."
+
+#~ 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 ""
+#~ "Гну Гуиле је примена програмског језика Шеме, са подршком за многе\n"
+#~ "СРФИ-ове запакован за коришћење у разним окружењима.\n"
+#~ "Као додатак примене Р5РС стандарда Шеме и великог подскупа Р6РС, Гуиле\n"
+#~ "обухвата систем модула, потпун приступ системским позивима ПОСИКС-а, пподршку умрежавања, вишеструке нити, динамичко повезивање, сучеље позива\n"
+#~ "страних функција, и моћну обраду ниске."
+
+#~ 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 ""
+#~ "Гну Гуиле Ен-курсис је библиотека за преводиоца Гуле Шеме која обезбеђује\n"
+#~ "функције за стварање текстуалног корисничког сучеља. Функционалност текстуалног\n"
+#~ "корисничког сучеља је изграђена на ен-курсис библиотекама: „curses, form,\n"
+#~ "panel, и menu“."
+
+#~ 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 ""
+#~ "Гнуов пакет „mcron“ (Мелоров крон) је 100% сагласна замена за Викси крон.\n"
+#~ "Написан је у чистом Гуилу, и допушта да датотеке подешавања буду записане\n"
+#~ "у шеми (као и у Виксијевом изворном запису) са бескрајном сагласношћу у\n"
+#~ "навођењу када послови требају да се покрену.  Написао га је Дејл Мелор."
+
+#~ 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 ""
+#~ "Гну рекутилс је скуп алата и библиотека за приступ базама података заснованим на\n"
+#~ "тексту, званим „recfiles“ које корисници могу да мењају.  Подаци су ускладиштени\n"
+#~ "као низ снимака, сваки снимак садржи одговарајући број именованих поља."
+
+#~ msgid "profile `~a' does not exist~%"
+#~ msgstr "профил „~a“ не постоји~%"
diff --git a/po/packages/sr.po b/po/packages/sr.po
index c49787a5b6..7b4fb629d9 100644
--- a/po/packages/sr.po
+++ b/po/packages/sr.po
@@ -1,13 +1,13 @@
-# Serbian translation of guix.
+# Serbian translation of guix-packages.
 # Copyright (C) 2014 Free Software Foundation, Inc.
 # This file is distributed under the same license as the guix package.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013-2014.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2013—2014.
 msgid ""
 msgstr ""
-"Project-Id-Version: guix-0.6-pre1\n"
+"Project-Id-Version: guix-packages-0.7-pre1\n"
 "Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2014-07-14 11:59+0200\n"
-"PO-Revision-Date: 2014-06-19 08:51+0200\n"
+"POT-Creation-Date: 2014-06-25 22:55+0200\n"
+"PO-Revision-Date: 2014-09-13 11:01+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
 "Language: sr\n"
@@ -257,7 +257,7 @@ msgstr ""
 
 #: gnu/packages/base.scm:1264
 msgid "Complete GCC tool chain for C/C++ development"
-msgstr ""
+msgstr "Потпуни ГЦЦ скуп алата за Ц/Ц++ развој"
 
 #: gnu/packages/base.scm:1266
 msgid ""
@@ -265,6 +265,9 @@ msgid ""
 "be installed in user profiles.  This includes GCC, as well as libc (headers\n"
 "and binaries, plus debugging symbols in the 'debug' output), and Binutils."
 msgstr ""
+"Овај пакет садржи потпуни ГЦЦ скуп алата за Ц/Ц++ развој\n"
+"за инсталирање у корисничким профилима.  Укључује ГЦЦ, као и „libc“ (заглавља\n"
+"и извршне, плус симболе прочишћавања у „debug“ излазу), и „Binutils“."
 
 #: gnu/packages/guile.scm:99 gnu/packages/guile.scm:166
 msgid "Scheme implementation intended especially for extensions"