nls: Update 'zh_CN' translations.

3 files changed, 42093 insertions, 19638 deletions

diff --git a/po/doc/guix-manual.zh_CN.po b/po/doc/guix-manual.zh_CN.po
index c24900da31..a7b737cdb3 100644
--- a/po/doc/guix-manual.zh_CN.po
+++ b/po/doc/guix-manual.zh_CN.po
@@ -1,267 +1,409 @@
 # Chinese (simplified) translation of the Guix manual.
 # Copyright (C) 2013-2019 the authors of Guix (msgids)
-# This file is distributed under the same license as the guix package.
+# This file is distributed under the same license as the guix manual package.
 # Meiyo Peng <meiyo@riseup.net>, 2019.
-#
+# 郑俊杰 <873216071@qq.com>, 2021.
+# Liu Tao <lyuutau@outlook.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: guix-manual 1.0.1-pre1\n"
-"Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2019-05-10 20:53+0200\n"
-"PO-Revision-Date: 2019-05-14 14:31+0800\n"
-"Last-Translator: Meiyo Peng <meiyo@riseup.net>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
+"POT-Creation-Date: 2021-04-06 13:33+0200\n"
+"PO-Revision-Date: 2021-03-23 18:26+0000\n"
+"Last-Translator: Liu Tao <lyuutau@outlook.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/projects/guix/documentation-manual/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.5.1\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#. #-#-#-#-#  contributing.pot (guix 1.0.1-pre1)  #-#-#-#-#
+#. #-#-#-#-#  contributing.pot (guix manual checkout)  #-#-#-#-#
 #. type: chapter
-#. #-#-#-#-#  guix.pot (guix 1.0.1-pre1)  #-#-#-#-#
+#. #-#-#-#-#  guix.pot (guix manual checkout)  #-#-#-#-#
 #. type: menuentry
-#: doc/contributing.texi:1 doc/contributing.texi:2 doc/guix.texi:139
+#: guix-git/doc/contributing.texi:1 guix-git/doc/contributing.texi:2
+#: guix-git/doc/guix.texi:168
 #, no-wrap
 msgid "Contributing"
 msgstr "贡献"
 
 #. type: Plain text
-#: doc/contributing.texi:9
+#: guix-git/doc/contributing.texi:9
 msgid "This project is a cooperative effort, and we need your help to make it grow! Please get in touch with us on @email{guix-devel@@gnu.org} and @code{#guix} on the Freenode IRC network.  We welcome ideas, bug reports, patches, and anything that may be helpful to the project.  We particularly welcome help on packaging (@pxref{Packaging Guidelines})."
 msgstr "这个项目是大家合作的成果，我们需要你的帮助以更好地发展。请通过@email{guix-devel@@gnu.org} 和 Freenode IRC 上的 @code{#guix} 联系我们。我们欢迎您的想法、bug反馈、补丁，以及任何可能对项目有帮助的贡献。我们特别欢迎帮助我们打包（@pxref{Packaging Guidelines}）。"
 
 #. type: cindex
-#: doc/contributing.texi:10
+#: guix-git/doc/contributing.texi:10
 #, no-wrap
 msgid "code of conduct, of contributors"
 msgstr "行为准则和贡献者"
 
 #. type: cindex
-#: doc/contributing.texi:11
+#: guix-git/doc/contributing.texi:11
 #, no-wrap
 msgid "contributor covenant"
 msgstr "贡献者契约"
 
 #. type: Plain text
-#: doc/contributing.texi:17
-msgid "We want to provide a warm, friendly, and harassment-free environment, so that anyone can contribute to the best of their abilities.  To this end our project uses a ``Contributor Covenant'', which was adapted from @url{http://contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree."
-msgstr "我们希望提供一个温暖、友好，并且没有骚扰的的环境，这样每个人都能尽最大努力贡献。为了这个目的，我们的项目遵循“贡献者契约”，这个契约是根据@url{http://contributor-covenant.org/}制定的。你可以在源代码目录里的@file{CODE-OF-CONDUCT}文件里找到一份本地版。"
+#: guix-git/doc/contributing.texi:17
+msgid "We want to provide a warm, friendly, and harassment-free environment, so that anyone can contribute to the best of their abilities.  To this end our project uses a ``Contributor Covenant'', which was adapted from @url{https://contributor-covenant.org/}.  You can find a local version in the @file{CODE-OF-CONDUCT} file in the source tree."
+msgstr "我们希望提供一个温暖、友好，并且没有骚扰的的环境，这样每个人都能尽最大努力贡献。为了这个目的，我们的项目遵循“贡献者契约”，这个契约是根据 @url{https://contributor-covenant.org/} 制定的。你可以在源代码目录里的 @file{CODE-OF-CONDUCT} 文件里找到一份本地版。"
 
 #. type: Plain text
-#: doc/contributing.texi:21
+#: guix-git/doc/contributing.texi:21
 msgid "Contributors are not required to use their legal name in patches and on-line communication; they can use any name or pseudonym of their choice."
 msgstr "贡献者在提交补丁和网上交流时不需要使用法律认可的名字。他们可以使用任何名字或者假名。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:31 doc/contributing.texi:32
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:34
+#: guix-git/doc/contributing.texi:35
 #, no-wrap
 msgid "Building from Git"
 msgstr "从Git构建"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "The latest and greatest."
 msgstr "最新的并且最好的。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:103
-#: doc/contributing.texi:104
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:160
+#: guix-git/doc/contributing.texi:161
 #, no-wrap
 msgid "Running Guix Before It Is Installed"
 msgstr "在安装之前运行Guix"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "Hacker tricks."
 msgstr "黑客技巧。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:167
-#: doc/contributing.texi:168
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:234
+#: guix-git/doc/contributing.texi:235
 #, no-wrap
 msgid "The Perfect Setup"
 msgstr "完美的配置"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "The right tools."
 msgstr "正确的工具。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:231
-#: doc/contributing.texi:232
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:325
+#: guix-git/doc/contributing.texi:326
 #, no-wrap
 msgid "Packaging Guidelines"
 msgstr "打包指导"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "Growing the distribution."
 msgstr "帮助发行版成长。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:680
-#: doc/contributing.texi:681
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:873
+#: guix-git/doc/contributing.texi:874
 #, no-wrap
 msgid "Coding Style"
 msgstr "代码风格"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "Hygiene of the contributor."
-msgstr "开发者的卫生情况"
+msgstr "出资者的卫生状况。"
 
 #. type: section
-#: doc/contributing.texi:29 doc/contributing.texi:778
-#: doc/contributing.texi:779
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:972
+#: guix-git/doc/contributing.texi:973
 #, no-wrap
 msgid "Submitting Patches"
 msgstr "提交补丁"
 
 #. type: menuentry
-#: doc/contributing.texi:29
+#: guix-git/doc/contributing.texi:32
 msgid "Share your work."
 msgstr "分享你的工作。"
 
+#. type: section
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:1198
+#: guix-git/doc/contributing.texi:1199
+#, no-wrap
+msgid "Tracking Bugs and Patches"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:32
+msgid "Using Debbugs."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:1249
+#: guix-git/doc/contributing.texi:1250
+#, no-wrap
+msgid "Commit Access"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:32
+msgid "Pushing to the official repository."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/contributing.texi:32 guix-git/doc/contributing.texi:1396
+#: guix-git/doc/contributing.texi:1397
+#, fuzzy, no-wrap
+#| msgid "Invoking guix package"
+msgid "Updating the Guix Package"
+msgstr "调用guix package"
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:32
+#, fuzzy
+#| msgid "Updating package definitions."
+msgid "Updating the Guix package definition."
+msgstr "更新软件包定义。"
+
 #. type: Plain text
-#: doc/contributing.texi:36
+#: guix-git/doc/contributing.texi:39
 msgid "If you want to hack Guix itself, it is recommended to use the latest version from the Git repository:"
 msgstr "如果你想折腾Guix本身，建议使用Git仓库里最新的版本："
 
 #. type: example
-#: doc/contributing.texi:39
+#: guix-git/doc/contributing.texi:42
 #, no-wrap
 msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
 msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n"
 
+#. type: cindex
+#: guix-git/doc/contributing.texi:44
+#, no-wrap
+msgid "authentication, of a Guix checkout"
+msgstr ""
+
 #. type: Plain text
-#: doc/contributing.texi:44
-msgid "When building Guix from a checkout, the following packages are required in addition to those mentioned in the installation instructions (@pxref{Requirements})."
-msgstr "当从Git检出构建Guix时，除安装指导（@pxref{Requirements}）里提及的软件包之外还需要这些包。"
+#: guix-git/doc/contributing.texi:49
+msgid "How do you ensure that you obtained a genuine copy of the repository? To do that, run @command{guix git authenticate}, passing it the commit and OpenPGP fingerprint of the @dfn{channel introduction} (@pxref{Invoking guix git authenticate}):"
+msgstr ""
 
-#. type: item
-#: doc/contributing.texi:46
+#. type: example
+#: guix-git/doc/contributing.texi:56
 #, no-wrap
-msgid "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
-msgstr "@url{http://gnu.org/software/autoconf/, GNU Autoconf};"
+msgid ""
+"git fetch origin keyring:keyring\n"
+"guix git authenticate 9edb3f66fd807b096b48283debdcddccfea34bad \\\n"
+"  \"BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA\"\n"
+msgstr ""
 
-#. type: item
-#: doc/contributing.texi:47
+#. type: Plain text
+#: guix-git/doc/contributing.texi:61
+msgid "This command completes with exit code zero on success; it prints an error message and exits with a non-zero code otherwise."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:68
+msgid "As you can see, there is a chicken-and-egg problem: you first need to have Guix installed.  Typically you would install Guix System (@pxref{System Installation}) or Guix on top of another distro (@pxref{Binary Installation}); in either case, you would verify the OpenPGP signature on the installation medium.  This ``bootstraps'' the trust chain."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:73
+msgid "The easiest way to set up a development environment for Guix is, of course, by using Guix! The following command starts a new shell where all the dependencies and appropriate environment variables are set up to hack on Guix:"
+msgstr "设置Guix开发环境的最简单的方式当然是使用Guix！下面这些命令启动一个shell，所有的依赖和环境变量都为折腾Guix设置好了："
+
+#. type: example
+#: guix-git/doc/contributing.texi:76
 #, no-wrap
-msgid "@url{http://gnu.org/software/automake/, GNU Automake};"
-msgstr "@url{http://gnu.org/software/automake/, GNU Automake};"
+msgid "guix environment guix --pure\n"
+msgstr "guix environment guix --pure\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:79
+#, fuzzy
+#| msgid "@xref{Invoking guix pack}, for more info on this handy tool."
+msgid "@xref{Invoking guix environment}, for more information on that command."
+msgstr "@xref{Invoking guix pack}，了解这个方便的工具。"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:83
+#, fuzzy
+#| msgid "When building Guix from a checkout, the following packages are required in addition to those mentioned in the installation instructions (@pxref{Requirements})."
+msgid "If you are unable to use Guix when building Guix from a checkout, the following are the required packages in addition to those mentioned in the installation instructions (@pxref{Requirements})."
+msgstr "当从Git检出构建Guix时，除安装指导（@pxref{Requirements}）里提及的软件包之外还需要这些包。"
 
 #. type: item
-#: doc/contributing.texi:48
+#: guix-git/doc/contributing.texi:85
 #, no-wrap
-msgid "@url{http://gnu.org/software/gettext/, GNU Gettext};"
-msgstr "@url{http://gnu.org/software/gettext/, GNU Gettext};"
+msgid "@url{https://gnu.org/software/autoconf/, GNU Autoconf};"
+msgstr "@url{https://gnu.org/software/autoconf/, GNU Autoconf};"
 
 #. type: item
-#: doc/contributing.texi:49
+#: guix-git/doc/contributing.texi:86
 #, no-wrap
-msgid "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
-msgstr "@url{http://gnu.org/software/texinfo/, GNU Texinfo};"
+msgid "@url{https://gnu.org/software/automake/, GNU Automake};"
+msgstr "@url{https://gnu.org/software/automake/, GNU Automake};"
 
 #. type: item
-#: doc/contributing.texi:50
+#: guix-git/doc/contributing.texi:87
 #, no-wrap
-msgid "@url{http://www.graphviz.org/, Graphviz};"
-msgstr "@url{http://www.graphviz.org/, Graphviz};"
+msgid "@url{https://gnu.org/software/gettext/, GNU Gettext};"
+msgstr "@url{https://gnu.org/software/gettext/, GNU Gettext};"
 
 #. type: item
-#: doc/contributing.texi:51
+#: guix-git/doc/contributing.texi:88
 #, no-wrap
-msgid "@url{http://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
-msgstr "@url{http://www.gnu.org/software/help2man/, GNU Help2man （可选）}。"
+msgid "@url{https://gnu.org/software/texinfo/, GNU Texinfo};"
+msgstr "@url{https://gnu.org/software/texinfo/, GNU Texinfo};"
 
-#. type: Plain text
-#: doc/contributing.texi:58
-msgid "The easiest way to set up a development environment for Guix is, of course, by using Guix! The following command starts a new shell where all the dependencies and appropriate environment variables are set up to hack on Guix:"
-msgstr "设置Guix开发环境的最简单的方式当然是使用Guix！下面这些命令启动一个shell，所有的依赖和环境变量都为折腾Guix设置好了："
+#. type: item
+#: guix-git/doc/contributing.texi:89
+#, no-wrap
+msgid "@url{https://www.graphviz.org/, Graphviz};"
+msgstr "@url{https://www.graphviz.org/, Graphviz};"
 
-#. type: example
-#: doc/contributing.texi:61
+#. type: item
+#: guix-git/doc/contributing.texi:90
 #, no-wrap
-msgid "guix environment guix\n"
-msgstr "guix environment guix\n"
+msgid "@url{https://www.gnu.org/software/help2man/, GNU Help2man (optional)}."
+msgstr "@url{https://www.gnu.org/software/help2man/, GNU Help2man（可选）}。"
 
 #. type: Plain text
-#: doc/contributing.texi:65
-msgid "@xref{Invoking guix environment}, for more information on that command.  Extra dependencies can be added with @option{--ad-hoc}:"
-msgstr "这个命令更多的信息请参考@xref{Invoking guix environment}。额外的依赖可以通过@option{--ad-hoc}选项添加："
+#: guix-git/doc/contributing.texi:95
+msgid "On Guix, extra dependencies can be added by instead running @command{guix environment} with @option{--ad-hoc}:"
+msgstr ""
 
 #. type: example
-#: doc/contributing.texi:68
+#: guix-git/doc/contributing.texi:98
 #, no-wrap
-msgid "guix environment guix --ad-hoc help2man git strace\n"
-msgstr "guix environment guix --ad-hoc help2man git strace\n"
+msgid "guix environment guix --pure --ad-hoc help2man git strace\n"
+msgstr "guix environment guix --pure --ad-hoc help2man git strace\n"
 
 #. type: Plain text
-#: doc/contributing.texi:72
+#: guix-git/doc/contributing.texi:102
 msgid "Run @command{./bootstrap} to generate the build system infrastructure using Autoconf and Automake.  If you get an error like this one:"
 msgstr "运行 @command{./bootstrap} 以使用Autoconf和Automake生成构建系统的基础框架。如果你的得到这样的错误："
 
 #. type: example
-#: doc/contributing.texi:75
+#: guix-git/doc/contributing.texi:105
 #, no-wrap
 msgid "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
 msgstr "configure.ac:46: error: possibly undefined macro: PKG_CHECK_MODULES\n"
 
 #. type: Plain text
-#: doc/contributing.texi:84
+#: guix-git/doc/contributing.texi:114
 msgid "it probably means that Autoconf couldn’t find @file{pkg.m4}, which is provided by pkg-config.  Make sure that @file{pkg.m4} is available.  The same holds for the @file{guile.m4} set of macros provided by Guile.  For instance, if you installed Automake in @file{/usr/local}, it wouldn’t look for @file{.m4} files in @file{/usr/share}.  In that case, you have to invoke the following command:"
 msgstr "它可能意味着Autoconf无法找到由pkg-config提供的@file{pkg.m4}。请确保@file{pkg.m4}可用。由Guile提供的@file{guile.m4}宏也类似。假如你的Automake安装在@file{/usr/local}，那么它不会从@file{/usr/share}里寻找@file{.m4}文件。这种情况下，你必须执行下面这个命令："
 
 #. type: example
-#: doc/contributing.texi:87
+#: guix-git/doc/contributing.texi:117
 #, no-wrap
 msgid "export ACLOCAL_PATH=/usr/share/aclocal\n"
 msgstr "export ACLOCAL_PATH=/usr/share/aclocal\n"
 
 #. type: Plain text
-#: doc/contributing.texi:91
+#: guix-git/doc/contributing.texi:121
 msgid "@xref{Macro Search Path,,, automake, The GNU Automake Manual}, for more information."
 msgstr "参考@xref{Macro Search Path,,, automake, The GNU Automake Manual}."
 
 #. type: Plain text
-#: doc/contributing.texi:96
-msgid "Then, run @command{./configure} as usual.  Make sure to pass @code{--localstatedir=@var{directory}} where @var{directory} is the @code{localstatedir} value used by your current installation (@pxref{The Store}, for information about this)."
-msgstr "然后，像正常一样运行@command{./configure}。确保提供@code{--localstatedir=@var{directory}}参数，@var{directory}是你当前系统的@code{localstatedir}的值。（@pxref{The Store}）"
+#: guix-git/doc/contributing.texi:128
+msgid "Then, run @command{./configure} as usual.  Make sure to pass @code{--localstatedir=@var{directory}} where @var{directory} is the @code{localstatedir} value used by your current installation (@pxref{The Store}, for information about this), usually @file{/var}.  Note that you will probably not run @command{make install} at the end (you don't have to) but it's still important to pass the right @code{localstatedir}."
+msgstr ""
 
 #. type: Plain text
-#: doc/contributing.texi:101
-msgid "Finally, you have to invoke @code{make check} to run tests (@pxref{Running the Test Suite}).  If anything fails, take a look at installation instructions (@pxref{Installation})  or send a message to the @email{guix-devel@@gnu.org, mailing list}."
+#: guix-git/doc/contributing.texi:133
+#, fuzzy
+#| msgid "Finally, you have to invoke @code{make check} to run tests (@pxref{Running the Test Suite}).  If anything fails, take a look at installation instructions (@pxref{Installation})  or send a message to the @email{guix-devel@@gnu.org, mailing list}."
+msgid "Finally, you have to invoke @code{make && make check} to build Guix and run the tests (@pxref{Running the Test Suite}).  If anything fails, take a look at installation instructions (@pxref{Installation}) or send a message to the @email{guix-devel@@gnu.org, mailing list}."
 msgstr "最后，用@code{make check}执行测试（@pxref{Running the Test Suite}）。如果遇到任何错误，请参考“安装指导”（@pxref{Installation}）或者给@email{guix-devel@@gnu.org, 邮件列表}发邮件。"
 
 #. type: Plain text
-#: doc/contributing.texi:110
+#: guix-git/doc/contributing.texi:136
+msgid "From there on, you can authenticate all the commits included in your checkout by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:139
+#, fuzzy, no-wrap
+#| msgid "make check\n"
+msgid "make authenticate\n"
+msgstr "make check\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:142
+msgid "The first run takes a couple of minutes, but subsequent runs are faster."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:148
+msgid "Or, when your configuration for your local Git repository doesn't match the default one, you can provide the reference for the @code{keyring} branch through the variable @code{GUIX_GIT_KEYRING}.  The following example assumes that you have a Git remote called @samp{myremote} pointing to the official repository:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:151
+#, no-wrap
+msgid "make authenticate GUIX_GIT_KEYRING=myremote/keyring\n"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:153 guix-git/doc/contributing.texi:1316
+#: guix-git/doc/guix.texi:565 guix-git/doc/guix.texi:614
+#: guix-git/doc/guix.texi:1763 guix-git/doc/guix.texi:2010
+#: guix-git/doc/guix.texi:2218 guix-git/doc/guix.texi:2439
+#: guix-git/doc/guix.texi:2640 guix-git/doc/guix.texi:3757
+#: guix-git/doc/guix.texi:4493 guix-git/doc/guix.texi:4507
+#: guix-git/doc/guix.texi:4589 guix-git/doc/guix.texi:4819
+#: guix-git/doc/guix.texi:5669 guix-git/doc/guix.texi:5915
+#: guix-git/doc/guix.texi:6036 guix-git/doc/guix.texi:6088
+#: guix-git/doc/guix.texi:8775 guix-git/doc/guix.texi:8845
+#: guix-git/doc/guix.texi:10510 guix-git/doc/guix.texi:10550
+#: guix-git/doc/guix.texi:10823 guix-git/doc/guix.texi:10835
+#: guix-git/doc/guix.texi:13080 guix-git/doc/guix.texi:13707
+#: guix-git/doc/guix.texi:14490 guix-git/doc/guix.texi:15465
+#: guix-git/doc/guix.texi:17781 guix-git/doc/guix.texi:17930
+#: guix-git/doc/guix.texi:25526 guix-git/doc/guix.texi:29135
+#: guix-git/doc/guix.texi:31092 guix-git/doc/guix.texi:32585
+#: guix-git/doc/guix.texi:32819 guix-git/doc/guix.texi:32989
+#: guix-git/doc/guix.texi:33142 guix-git/doc/guix.texi:33244
+#: guix-git/doc/guix.texi:33345
+#, no-wrap
+msgid "Note"
+msgstr "注"
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:157
+msgid "You are advised to run @command{make authenticate} after every @command{git pull} invocation.  This ensures you keep receiving valid changes to the repository."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:167
 msgid "In order to keep a sane working environment, you will find it useful to test the changes made in your local source tree checkout without actually installing them.  So that you can distinguish between your ``end-user'' hat and your ``motley'' costume."
 msgstr "为了保持一个合适的工作环境，你会发现在你的本地代码树里测试修改而不用安装它们会很有用。TODO: So that you can distinguish between your ``end-user'' hat and your ``motley'' costume."
 
 #. type: Plain text
-#: doc/contributing.texi:121
-msgid "To that end, all the command-line tools can be used even if you have not run @code{make install}.  To do that, you first need to have an environment with all the dependencies available (@pxref{Building from Git}), and then simply prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top build tree of Guix; it is generated by @command{./configure}), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and the tools it uses can find the Guile modules they need.}:"
+#: guix-git/doc/contributing.texi:178
+#, fuzzy
+#| msgid "To that end, all the command-line tools can be used even if you have not run @code{make install}.  To do that, you first need to have an environment with all the dependencies available (@pxref{Building from Git}), and then simply prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top build tree of Guix; it is generated by @command{./configure}), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and the tools it uses can find the Guile modules they need.}:"
+msgid "To that end, all the command-line tools can be used even if you have not run @code{make install}.  To do that, you first need to have an environment with all the dependencies available (@pxref{Building from Git}), and then simply prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top build tree of Guix; it is generated by running @command{./bootstrap} followed by @command{./configure}).  As an example, here is how you would build the @code{hello} package as defined in your working tree (this assumes @command{guix-daemon} is already running on your system; it's OK if it's a different version):"
 msgstr "这样，即使你没有运行@code{make install}，所有的命令行工具都可以使用。为此，你先要有一个包含全部依赖的环境（@pxref{Building from Git}），然后，为所有的命令添加前缀@command{./pre-inst-env}（@file{pre-inst-env}脚本在Guix构建树的最顶层，它由@command{./configure}生成），如@footnote{@command{sudo}命令的@option{-E}参数确保@code{GUILE_LOAD_PATH}被正确设置，从而@command{guix-daemon}和它使用的工具可以找到它们需要的Guile模块。}："
 
 #. type: example
-#: doc/contributing.texi:125
-#, no-wrap
-msgid ""
-"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
-"$ ./pre-inst-env guix build hello\n"
-msgstr ""
-"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
-"$ ./pre-inst-env guix build hello\n"
+#: guix-git/doc/contributing.texi:181
+#, fuzzy, no-wrap
+#| msgid "./pre-inst-env guix build gnew --keep-failed\n"
+msgid "$ ./pre-inst-env guix build hello\n"
+msgstr "./pre-inst-env guix build gnew --keep-failed\n"
 
 #. type: Plain text
-#: doc/contributing.texi:129
-msgid "Similarly, for a Guile session using the Guix modules:"
-msgstr "类似的，对于使用Guix模块的Guile会话："
+#: guix-git/doc/contributing.texi:185
+msgid "Similarly, an example for a Guile session using the Guix modules:"
+msgstr "同样，一个使用 Guix 模块的 Guile 会话的例子："
 
 #. type: example
-#: doc/contributing.texi:132
+#: guix-git/doc/contributing.texi:188
 #, no-wrap
 msgid ""
 "$ ./pre-inst-env guile -c '(use-modules (guix utils)) (pk (%current-system))'\n"
@@ -271,30 +413,30 @@ msgstr ""
 "\n"
 
 #. type: example
-#: doc/contributing.texi:134
+#: guix-git/doc/contributing.texi:190
 #, no-wrap
 msgid ";;; (\"x86_64-linux\")\n"
 msgstr ";;; (\"x86_64-linux\")\n"
 
 #. type: cindex
-#: doc/contributing.texi:137
+#: guix-git/doc/contributing.texi:193
 #, no-wrap
 msgid "REPL"
 msgstr "REPL"
 
 #. type: cindex
-#: doc/contributing.texi:138
+#: guix-git/doc/contributing.texi:194
 #, no-wrap
 msgid "read-eval-print loop"
 msgstr "read-eval-print loop"
 
 #. type: Plain text
-#: doc/contributing.texi:141
+#: guix-git/doc/contributing.texi:197
 msgid "@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile Reference Manual}):"
 msgstr "@dots{} and for a REPL (@pxref{Using Guile Interactively,,, guile, Guile Reference Manual}):"
 
 #. type: example
-#: doc/contributing.texi:156
+#: guix-git/doc/contributing.texi:212
 #, no-wrap
 msgid ""
 "$ ./pre-inst-env guile\n"
@@ -326,33 +468,51 @@ msgstr ""
 "$1 = 361\n"
 
 #. type: Plain text
-#: doc/contributing.texi:160
+#: guix-git/doc/contributing.texi:220
+#, fuzzy
+#| msgid "To that end, all the command-line tools can be used even if you have not run @code{make install}.  To do that, you first need to have an environment with all the dependencies available (@pxref{Building from Git}), and then simply prefix each command with @command{./pre-inst-env} (the @file{pre-inst-env} script lives in the top build tree of Guix; it is generated by @command{./configure}), as in@footnote{The @option{-E} flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and the tools it uses can find the Guile modules they need.}:"
+msgid "If you are hacking on the daemon and its supporting code or if @command{guix-daemon} is not already running on your system, you can launch it straight from the build tree@footnote{The @option{-E} flag to @command{sudo} guarantees that @code{GUILE_LOAD_PATH} is correctly set such that @command{guix-daemon} and the tools it uses can find the Guile modules they need.}:"
+msgstr "这样，即使你没有运行@code{make install}，所有的命令行工具都可以使用。为此，你先要有一个包含全部依赖的环境（@pxref{Building from Git}），然后，为所有的命令添加前缀@command{./pre-inst-env}（@file{pre-inst-env}脚本在Guix构建树的最顶层，它由@command{./configure}生成），如@footnote{@command{sudo}命令的@option{-E}参数确保@code{GUILE_LOAD_PATH}被正确设置，从而@command{guix-daemon}和它使用的工具可以找到它们需要的Guile模块。}："
+
+#. type: example
+#: guix-git/doc/contributing.texi:223
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+#| "$ ./pre-inst-env guix build hello\n"
+msgid "$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+msgstr ""
+"$ sudo -E ./pre-inst-env guix-daemon --build-users-group=guixbuild\n"
+"$ ./pre-inst-env guix build hello\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:227
 msgid "The @command{pre-inst-env} script sets up all the environment variables necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}."
 msgstr "@command{pre-inst-env}脚本设置为此好了所有必要的的环境变量，包括@env{PATH}和@env{GUILE_LOAD_PATH}。"
 
 #. type: Plain text
-#: doc/contributing.texi:165
+#: guix-git/doc/contributing.texi:232
 msgid "Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the local source tree; it simply updates the @file{~/.config/guix/current} symlink (@pxref{Invoking guix pull}).  Run @command{git pull} instead if you want to upgrade your local source tree."
 msgstr "@command{./pre-inst-env guix pull} @emph{不} 会更新本地源代码树，它只更新符号链接@file{~/.config/guix/current} (@pxref{Invoking guix pull})。如果你想更新本地源代码树，请运行@command{git pull}。"
 
 #. type: Plain text
-#: doc/contributing.texi:175
-msgid "The Perfect Setup to hack on Guix is basically the perfect setup used for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}).  First, you need more than an editor, you need @url{http://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful @url{http://nongnu.org/geiser/, Geiser}.  To set that up, run:"
-msgstr "折腾Guix的完美配置也是折腾Guile的完美配置@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual})。首先，你需要的不仅是一个编辑器，你需要@url{http://www.gnu.org/software/emacs, Emacs}，以及美妙的@url{http://nongnu.org/geiser/, Geiser}。为此，请运行："
+#: guix-git/doc/contributing.texi:242
+msgid "The Perfect Setup to hack on Guix is basically the perfect setup used for Guile hacking (@pxref{Using Guile in Emacs,,, guile, Guile Reference Manual}).  First, you need more than an editor, you need @url{https://www.gnu.org/software/emacs, Emacs}, empowered by the wonderful @url{https://nongnu.org/geiser/, Geiser}.  To set that up, run:"
+msgstr "折腾 Guix 的完美配置也是折腾 Guile 的完美配置 @pxref{Using Guile in Emacs,,, guile, Guile Reference Manual})。首先，你需要的不仅是一个编辑器，你需要 @url{https://www.gnu.org/software/emacs, Emacs}，以及美妙的 @url{http://nongnu.org/geiser/, Geiser}。为此，运行："
 
 #. type: example
-#: doc/contributing.texi:178
+#: guix-git/doc/contributing.texi:245
 #, no-wrap
 msgid "guix package -i emacs guile emacs-geiser\n"
 msgstr "guix package -i emacs guile emacs-geiser\n"
 
 #. type: Plain text
-#: doc/contributing.texi:187
+#: guix-git/doc/contributing.texi:254
 msgid "Geiser allows for interactive and incremental development from within Emacs: code compilation and evaluation from within buffers, access to on-line documentation (docstrings), context-sensitive completion, @kbd{M-.} to jump to an object definition, a REPL to try out your code, and more (@pxref{Introduction,,, geiser, Geiser User Manual}).  For convenient Guix development, make sure to augment Guile’s load path so that it finds source files from your checkout:"
-msgstr "Geiser允许在Emacs里进行交互式的、增长式的开发：buffer里的代码补全和执行，获取一行的文档（docstrings），上下文敏感的补全，@kbd{M-.}跳转到对象定义，测试代码的REPL，及更多（@pxref{Introduction,,, geiser, Geiser User Manual}）。为了方便的Guix开发，请确保修改Guile的加载路径（load path）以使其能从你的项目里找到源代码文件。"
+msgstr "Geiser 允许在 Emacs 里进行交互式的、增长式的开发：buffer 里的代码补全和执行，获取一行的文档 (docstrings)，上下文敏感的补全，@kbd{M-.} 跳转到对象定义，测试代码的 REPL，及更多（@pxref{Introduction,,, geiser, Geiser User Manual}）。为了方便的 Guix 开发，请确保修改 Guile 的加载路径 (load path) 以使其能从你的项目里找到源代码文件："
 
 #. type: lisp
-#: doc/contributing.texi:192
+#: guix-git/doc/contributing.texi:259
 #, no-wrap
 msgid ""
 ";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
@@ -364,35 +524,37 @@ msgstr ""
 "  (add-to-list 'geiser-guile-load-path \"~/src/guix\"))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:200
-msgid "To actually edit the code, Emacs already has a neat Scheme mode.  But in addition to that, you must not miss @url{http://www.emacswiki.org/emacs/ParEdit, Paredit}.  It provides facilities to directly operate on the syntax tree, such as raising an s-expression or wrapping it, swallowing or rejecting the following s-expression, etc."
-msgstr "真正编辑代码时别忘了Emacs自带了方便的Scheme模式。而且，一定不要错过@url{http://www.emacswiki.org/emacs/ParEdit, Paredit}。它提供了直接操作语法树的的功能，例如，用S-表达式替换父节点，为S-表达式添加、删除前后的括号，删除后面的S-表达式，等等。"
+#: guix-git/doc/contributing.texi:267
+msgid "To actually edit the code, Emacs already has a neat Scheme mode.  But in addition to that, you must not miss @url{https://www.emacswiki.org/emacs/ParEdit, Paredit}.  It provides facilities to directly operate on the syntax tree, such as raising an s-expression or wrapping it, swallowing or rejecting the following s-expression, etc."
+msgstr "真正编辑代码时别忘了 Emacs 自带了方便的 Scheme 模式。而且，一定不要错过 @url{https://www.emacswiki.org/emacs/ParEdit, Paredit}。它提供了直接操作语法树的的功能，例如，用 S- 表达式替换父节点，为 S- 表达式添加、删除前后的括号，删除后面的 S- 表达式，等等。"
 
 #. type: cindex
-#: doc/contributing.texi:201
+#: guix-git/doc/contributing.texi:268
 #, no-wrap
 msgid "code snippets"
 msgstr "代码片段"
 
 #. type: cindex
-#: doc/contributing.texi:202
+#: guix-git/doc/contributing.texi:269
 #, no-wrap
 msgid "templates"
 msgstr "模板"
 
 #. type: cindex
-#: doc/contributing.texi:203
+#: guix-git/doc/contributing.texi:270
 #, no-wrap
 msgid "reducing boilerplate"
 msgstr "减少样板"
 
 #. type: Plain text
-#: doc/contributing.texi:210
-msgid "We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory.  These templates can be used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand short trigger strings to interactive text snippets.  You may want to add the snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
+#: guix-git/doc/contributing.texi:277
+#, fuzzy
+#| msgid "We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory.  These templates can be used with @url{http://joaotavora.github.io/yasnippet/, YASnippet} to expand short trigger strings to interactive text snippets.  You may want to add the snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
+msgid "We also provide templates for common git commit messages and package definitions in the @file{etc/snippets} directory.  These templates can be used with @url{https://joaotavora.github.io/yasnippet/, YASnippet} to expand short trigger strings to interactive text snippets.  You may want to add the snippets directory to the @var{yas-snippet-dirs} variable in Emacs."
 msgstr "在@file{etc/snippets}文件夹里，我们还为普通的git commit信息和软件包定义提供模板。这些模板可以通过@url{http://joaotavora.github.io/yasnippet/, YASnippet}使用，它可以把短的触发字符串扩展成交互式的文字片段。你可能希望将这个文件夹添加到Emacs的@var{yas-snippet-dirs}变量里。"
 
 #. type: lisp
-#: doc/contributing.texi:215
+#: guix-git/doc/contributing.texi:282
 #, no-wrap
 msgid ""
 ";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
@@ -404,245 +566,346 @@ msgstr ""
 "  (add-to-list 'yas-snippet-dirs \"~/src/guix/etc/snippets\"))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:223
+#: guix-git/doc/contributing.texi:290
 msgid "The commit message snippets depend on @url{https://magit.vc/, Magit} to display staged files.  When editing a commit message type @code{add} followed by @kbd{TAB} to insert a commit message template for adding a package; type @code{update} followed by @kbd{TAB} to insert a template for updating a package; type @code{https} followed by @kbd{TAB} to insert a template for changing the home page URI of a package to HTTPS."
 msgstr "commit信息片段显示staged文件需要依赖@url{https://magit.vc/, Magit}。编辑commit信息时，输入@code{add}，然后按@kbd{TAB}就可以插入一段用于新增软件包的模板；输入@code{update}，然后按@kbd{TAB}可以插入一段更新软件包的模板；输入@code{https}然后按@kbd{TAB}可以插入一段修改主页URI为HTTPS的模板。"
 
 #. type: Plain text
-#: doc/contributing.texi:229
+#: guix-git/doc/contributing.texi:296
 msgid "The main snippet for @code{scheme-mode} is triggered by typing @code{package...} followed by @kbd{TAB}.  This snippet also inserts the trigger string @code{origin...}, which can be expanded further.  The @code{origin} snippet in turn may insert other trigger strings ending on @code{...}, which also can be expanded further."
 msgstr "@code{scheme-mode}最重要的模板可以通过输入@code{package...}，然后按@kbd{TAB}触发。这个片段还插入了触发字符串@code{origin...}，以进一步展开。@code{origin}片段更进一步的可能插入其它以@code{...}结尾的触发字符串，它们可以被继续展开。"
 
 #. type: cindex
-#: doc/contributing.texi:234
+#: guix-git/doc/contributing.texi:297
+#, no-wrap
+msgid "insert or update copyright"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/contributing.texi:298
+#, no-wrap
+msgid "M-x guix-copyright"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/contributing.texi:299
+#, no-wrap
+msgid "M-x copyright-update"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:303
+msgid "We additionally provide insertion and automatic update of a copyright in @file{etc/copyright.el}.  You may want to set your full name, mail, and load a file."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/contributing.texi:309
+#, no-wrap
+msgid ""
+"(setq user-full-name \"Alice Doe\")\n"
+"(setq user-mail-address \"alice@@mail.org\")\n"
+";; @r{Assuming the Guix checkout is in ~/src/guix.}\n"
+"(load-file \"~/src/guix/etc/copyright.el\")\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:312
+msgid "To insert a copyright at the current line invoke @code{M-x guix-copyright}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:314
+msgid "To update a copyright you need to specify a @code{copyright-names-regexp}."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/contributing.texi:318
+#, no-wrap
+msgid ""
+"(setq copyright-names-regexp\n"
+"      (format \"%s <%s>\" user-full-name user-mail-address))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:324
+msgid "You can check if your copyright is up to date by evaluating @code{M-x copyright-update}.  If you want to do it automatically after each buffer save then add @code{(add-hook 'after-save-hook 'copyright-update)} in Emacs."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:328
 #, no-wrap
 msgid "packages, creating"
 msgstr "软件包, 创建"
 
 #. type: Plain text
-#: doc/contributing.texi:238
+#: guix-git/doc/contributing.texi:332
 msgid "The GNU distribution is nascent and may well lack some of your favorite packages.  This section describes how you can help make the distribution grow."
 msgstr "这个GNU发行版正在开发的早期阶段，可能缺少一些你喜欢的软件。这个章节介绍你可以怎样帮助这个发行版成长。"
 
 #. type: Plain text
-#: doc/contributing.texi:246
+#: guix-git/doc/contributing.texi:340
 msgid "Free software packages are usually distributed in the form of @dfn{source code tarballs}---typically @file{tar.gz} files that contain all the source files.  Adding a package to the distribution means essentially two things: adding a @dfn{recipe} that describes how to build the package, including a list of other packages required to build it, and adding @dfn{package metadata} along with that recipe, such as a description and licensing information."
 msgstr "自由软件通常以@dfn{源代码包}的形式分发，通常是包含完整代码的@file{tar.gz}包。添加软件包到这个发行版意味着两件事：添加描述如何构建包的@dfn{配方}和一系列依赖软件，以及添加配方之外的@dfn{软件包元数据}，如一段文字描述和证书信息。"
 
 #. type: Plain text
-#: doc/contributing.texi:255
+#: guix-git/doc/contributing.texi:349
 msgid "In Guix all this information is embodied in @dfn{package definitions}.  Package definitions provide a high-level view of the package.  They are written using the syntax of the Scheme programming language; in fact, for each package we define a variable bound to the package definition, and export that variable from a module (@pxref{Package Modules}).  However, in-depth Scheme knowledge is @emph{not} a prerequisite for creating packages.  For more information on package definitions, @pxref{Defining Packages}."
 msgstr "在Guix里所有这些信息都包含在@dfn{软件包定义}里。软件包定义提供了软件包的高层视角。它们使用Scheme编程语言编写，事实上，对每个软件包我们都定义一个绑定到软件包定义的的变量，并且从模块（@pxref{Package Modules}）中导出那个变量。然而，深入的Scheme知识@emph{不}是创建软件包的前提条件。若要了解软件包的更多信息，@pxref{Defining Packages}。"
 
 #. type: Plain text
-#: doc/contributing.texi:261
+#: guix-git/doc/contributing.texi:355
 msgid "Once a package definition is in place, stored in a file in the Guix source tree, it can be tested using the @command{guix build} command (@pxref{Invoking guix build}).  For example, assuming the new package is called @code{gnew}, you may run this command from the Guix build tree (@pxref{Running Guix Before It Is Installed}):"
 msgstr "一旦软件包定义准备好了，并且包存在Guix代码树的一个文件里，你可以用@command{guix build} (@pxref{Invoking guix build})命令测试它。假设这个新软件包的名字叫做@code{gnew}，你可以在Guix构建树里运行这个命令(@pxref{Running Guix Before It Is Installed})："
 
 #. type: example
-#: doc/contributing.texi:264
+#: guix-git/doc/contributing.texi:358
 #, no-wrap
 msgid "./pre-inst-env guix build gnew --keep-failed\n"
 msgstr "./pre-inst-env guix build gnew --keep-failed\n"
 
 #. type: Plain text
-#: doc/contributing.texi:270
+#: guix-git/doc/contributing.texi:364
 msgid "Using @code{--keep-failed} makes it easier to debug build failures since it provides access to the failed build tree.  Another useful command-line option when debugging is @code{--log-file}, to access the build log."
 msgstr "使用@code{--keep-failed}参数会保留失败的构建树，这可以使调试构建错误更容易。@code{--log-file}也是一个调试时很有用的参数，它可以用来访问构建日志。"
 
 #. type: Plain text
-#: doc/contributing.texi:275
+#: guix-git/doc/contributing.texi:369
 msgid "If the package is unknown to the @command{guix} command, it may be that the source file contains a syntax error, or lacks a @code{define-public} clause to export the package variable.  To figure it out, you may load the module from Guile to get more information about the actual error:"
 msgstr "如果@command{guix}命令找不到这个软件包，那可能是因为源文件包含语法错误，或者缺少导出软件包的@code{define-public}语句。为了查找错误，你可以用Guile导入这个模块以了解这个错误的详情："
 
 #. type: example
-#: doc/contributing.texi:278
+#: guix-git/doc/contributing.texi:372
 #, no-wrap
 msgid "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 msgstr "./pre-inst-env guile -c '(use-modules (gnu packages gnew))'\n"
 
 #. type: Plain text
-#: doc/contributing.texi:286
-msgid "Once your package builds correctly, please send us a patch (@pxref{Submitting Patches}).  Well, if you need help, we will be happy to help you too.  Once the patch is committed in the Guix repository, the new package automatically gets built on the supported platforms by @url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration system}."
-msgstr "一旦你的软件包可以正确构建，请给我们发送补丁（@pxref{Submitting Patches}）。当然，如果你需要帮助，我们也会很乐意帮助你。一旦补丁被提交到Guix仓库里，这个新的软件包会被自动地在支持的平台上构建@url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration system}。"
+#: guix-git/doc/contributing.texi:379
+#, fuzzy
+#| msgid "Once your package builds correctly, please send us a patch (@pxref{Submitting Patches}).  Well, if you need help, we will be happy to help you too.  Once the patch is committed in the Guix repository, the new package automatically gets built on the supported platforms by @url{http://hydra.gnu.org/jobset/gnu/master, our continuous integration system}."
+msgid "Once your package builds correctly, please send us a patch (@pxref{Submitting Patches}).  Well, if you need help, we will be happy to help you too.  Once the patch is committed in the Guix repository, the new package automatically gets built on the supported platforms by @url{@value{SUBSTITUTE-URL}, our continuous integration system}."
+msgstr "一旦你的软件包可以正确构建，请给我们发送补丁（@pxref{Submitting Patches}）。当然，如果你需要帮助，我们也会很乐意帮助你。一旦补丁被提交到 Guix 仓库里，这个新的软件包会被自动地在支持的平台上构建 @url{@value{SUBSTITUTE-URL}, our continuous integration system}。"
 
 #. type: cindex
-#: doc/contributing.texi:287
+#: guix-git/doc/contributing.texi:380
 #, no-wrap
 msgid "substituter"
-msgstr ""
+msgstr "substitutes"
 
 #. type: Plain text
-#: doc/contributing.texi:294
+#: guix-git/doc/contributing.texi:387
 msgid "Users can obtain the new package definition simply by running @command{guix pull} (@pxref{Invoking guix pull}).  When @code{@value{SUBSTITUTE-SERVER}} is done building the package, installing the package automatically downloads binaries from there (@pxref{Substitutes}).  The only place where human intervention is needed is to review and apply the patch."
 msgstr "用户可以通过运行@command{guix pull}命令获取最新的软件包定义（@pxref{Invoking guix pull}）。当@code{@value{SUBSTITUTE-SERVER}}构建好这些软件包之后，安装这些软件包时会自动从服务器（@pxref{Substitutes}）上下载构建好的二进制包。唯一需要人工干预的地方是评审和应用代码补丁。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:307
-#: doc/contributing.texi:308
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:403
+#: guix-git/doc/contributing.texi:404
 #, no-wrap
 msgid "Software Freedom"
 msgstr "软件自由"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "What may go into the distribution."
 msgstr "什么可以进入这个发行版。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:335
-#: doc/contributing.texi:336
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:431
+#: guix-git/doc/contributing.texi:432
 #, no-wrap
 msgid "Package Naming"
 msgstr "软件包命名"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "What's in a name?"
 msgstr "名字里包含什么？"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:360
-#: doc/contributing.texi:361
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:464
+#: guix-git/doc/contributing.texi:465
 #, no-wrap
 msgid "Version Numbers"
 msgstr "版本号"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "When the name is not enough."
-msgstr "当名字不够时"
+msgstr "当名字不够时。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:451
-#: doc/contributing.texi:452
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:555
+#: guix-git/doc/contributing.texi:556
 #, no-wrap
 msgid "Synopses and Descriptions"
 msgstr "简介和描述"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "Helping users find the right package."
-msgstr "帮助用户寻找合适的软件包"
+msgstr "帮助用户寻找合适的软件包。"
+
+#. type: subsection
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:634
+#: guix-git/doc/contributing.texi:635
+#, no-wrap
+msgid "Snippets versus Phases"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:401
+msgid "Whether to use a snippet, or a build phase."
+msgstr ""
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:531
-#: doc/contributing.texi:532
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:649
+#: guix-git/doc/contributing.texi:650 guix-git/doc/guix.texi:1945
+#, no-wrap
+msgid "Emacs Packages"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:401
+msgid "Your Elisp fix."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:689
+#: guix-git/doc/contributing.texi:690
 #, no-wrap
 msgid "Python Modules"
 msgstr "Python模块"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "A touch of British comedy."
-msgstr "接触英式的喜剧"
+msgstr "接触英式的喜剧。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:606
-#: doc/contributing.texi:607
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:765
+#: guix-git/doc/contributing.texi:766
 #, no-wrap
 msgid "Perl Modules"
 msgstr "Perl模块"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "Little pearls."
 msgstr "小珍珠。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:622
-#: doc/contributing.texi:623
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:781
+#: guix-git/doc/contributing.texi:782
 #, no-wrap
 msgid "Java Packages"
 msgstr "Java包"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "Coffee break."
 msgstr "喝咖啡休息。"
 
 #. type: subsection
-#: doc/contributing.texi:305 doc/contributing.texi:642
-#: doc/contributing.texi:643
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:801
+#: guix-git/doc/contributing.texi:802
+#, no-wrap
+msgid "Rust Crates"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/contributing.texi:401
+msgid "Beware of oxidation."
+msgstr "谨防氧化。"
+
+#. type: subsection
+#: guix-git/doc/contributing.texi:401 guix-git/doc/contributing.texi:835
+#: guix-git/doc/contributing.texi:836
 #, no-wrap
 msgid "Fonts"
 msgstr "字体"
 
 #. type: menuentry
-#: doc/contributing.texi:305
+#: guix-git/doc/contributing.texi:401
 msgid "Fond of fonts."
 msgstr "字体的乐趣。"
 
 #. type: cindex
-#: doc/contributing.texi:311
+#: guix-git/doc/contributing.texi:407
 #, no-wrap
 msgid "free software"
 msgstr "自由软件"
 
 #. type: Plain text
-#: doc/contributing.texi:319
-msgid "The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning that users have the @url{http://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the GNU distribution provide only software that conveys these four freedoms."
-msgstr "开发GNU操作系统是为了用户拥有计算的自由。GNU是@dfn{自由软件}，这意味着它有@url{http://www.gnu.org/philosophy/free-sw.html,四项重要的自由}：运行程序的自由，以源代码形式学习和修改程序的自由，原样重新分发副本的自由，和分发修改后的版本的自由。GNU发行版里包含的软件包只提供遵守这四项自由的软件。"
+#: guix-git/doc/contributing.texi:415
+msgid "The GNU operating system has been developed so that users can have freedom in their computing.  GNU is @dfn{free software}, meaning that users have the @url{https://www.gnu.org/philosophy/free-sw.html,four essential freedoms}: to run the program, to study and change the program in source code form, to redistribute exact copies, and to distribute modified versions.  Packages found in the GNU distribution provide only software that conveys these four freedoms."
+msgstr "开发 GNU 操作系统是为了用户拥有计算的自由。GNU是@dfn{自由软件}，这意味着它有@url{https://www.gnu.org/philosophy/free-sw.html,四项重要的自由}：运行程序的自由，以源代码形式学习和修改程序的自由，原样重新分发副本的自由，和分发修改后的版本的自由。GNU 发行版里包含的软件包只提供遵守这四项自由的软件。"
 
 #. type: Plain text
-#: doc/contributing.texi:325
-msgid "In addition, the GNU distribution follow the @url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,free software distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and discuss ways to deal with trademarks and patents."
-msgstr "此外，GNU发行版遵循@url{http://www.gnu.org/distros/free-system-distribution-guidelines.html,自由软件发行版准则}。这些准则拒绝非自由的固件和对非自由软件的推荐，并讨论解决商标和专利的方法。"
+#: guix-git/doc/contributing.texi:421
+msgid "In addition, the GNU distribution follow the @url{https://www.gnu.org/distros/free-system-distribution-guidelines.html,free software distribution guidelines}.  Among other things, these guidelines reject non-free firmware, recommendations of non-free software, and discuss ways to deal with trademarks and patents."
+msgstr "此外，GNU 发行版遵循@url{https://www.gnu.org/distros/free-system-distribution-guidelines.html,自由软件发行版准则}。这些准则拒绝非自由的固件和对非自由软件的推荐，并讨论解决商标和专利的方法。"
 
 #. type: Plain text
-#: doc/contributing.texi:333
+#: guix-git/doc/contributing.texi:429
 msgid "Some otherwise free upstream package sources contain a small and optional subset that violates the above guidelines, for instance because this subset is itself non-free code.  When that happens, the offending items are removed with appropriate patches or code snippets in the @code{origin} form of the package (@pxref{Defining Packages}).  This way, @code{guix build --source} returns the ``freed'' source rather than the unmodified upstream source."
 msgstr "某些上游的软件包源代码包含一小部分违反上述准则的可选的子集，比如这个子集本身就是非自由代码。这时，这些讨厌的代码需要用合适的补丁或者软件包定义（@pxref{Defining Packages}）里的@code{origin}里的代码片段移除。这样，@code{guix build --source}就可以返回自由的源代码而不是未经修改的上游源代码。"
 
 #. type: cindex
-#: doc/contributing.texi:338
+#: guix-git/doc/contributing.texi:434
 #, no-wrap
 msgid "package name"
 msgstr "软件包名字"
 
 #. type: Plain text
-#: doc/contributing.texi:346
-msgid "A package has actually two names associated with it: First, there is the name of the @emph{Scheme variable}, the one following @code{define-public}.  By this name, the package can be made known in the Scheme code, for instance as input to another package.  Second, there is the string in the @code{name} field of a package definition.  This name is used by package management commands such as @command{guix package} and @command{guix build}."
+#: guix-git/doc/contributing.texi:442
+#, fuzzy
+#| msgid "A package has actually two names associated with it: First, there is the name of the @emph{Scheme variable}, the one following @code{define-public}.  By this name, the package can be made known in the Scheme code, for instance as input to another package.  Second, there is the string in the @code{name} field of a package definition.  This name is used by package management commands such as @command{guix package} and @command{guix build}."
+msgid "A package actually has two names associated with it.  First, there is the name of the @emph{Scheme variable}, the one following @code{define-public}.  By this name, the package can be made known in the Scheme code, for instance as input to another package.  Second, there is the string in the @code{name} field of a package definition.  This name is used by package management commands such as @command{guix package} and @command{guix build}."
 msgstr "一个软件包事实上有两个名字：第一个是@emph{Scheme变量}的名字，即用@code{define-public}定义的名字。通过这个名字，软件包可以被Scheme代码找到，如用作其它软件包的输入。第二个名字是软件包定义里的@code{name}属性的字符串值。这个名字用于软件包管理命令，如：@command{guix package}，@command{guix build}"
 
 #. type: Plain text
-#: doc/contributing.texi:351
+#: guix-git/doc/contributing.texi:447
 msgid "Both are usually the same and correspond to the lowercase conversion of the project name chosen upstream, with underscores replaced with hyphens.  For instance, GNUnet is available as @code{gnunet}, and SDL_net as @code{sdl-net}."
 msgstr "两个名字通常是相同的，常是上游项目名字转成小写字母并把下划线替换成连字符的结果。比如，GNUnet转成@code{gnunet}，SDL_net转成@code{sdl-net}。"
 
 #. type: Plain text
-#: doc/contributing.texi:356
+#: guix-git/doc/contributing.texi:455
+msgid "A noteworthy exception to this rule is when the project name is only a single character, or if an older maintained project with the same name already exists---regardless of whether it has already been packaged for Guix.  Use common sense to make such names unambiguous and meaningful.  For example, Guix's package for the shell called ``s'' upstream is @code{s-shell} and @emph{not} @code{s}.  Feel free to ask your fellow hackers for inspiration."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:460
 msgid "We do not add @code{lib} prefixes for library packages, unless these are already part of the official project name.  But @pxref{Python Modules} and @ref{Perl Modules} for special rules concerning modules for the Python and Perl languages."
 msgstr "我们不给库软件包添加@code{lib}前缀，除非它是项目官方名字的一部分。但是@pxref{Python Modules}和@ref{Perl Modules}有关于Python和Perl语言的特殊规则。"
 
 #. type: Plain text
-#: doc/contributing.texi:358
+#: guix-git/doc/contributing.texi:462
 msgid "Font package names are handled differently, @pxref{Fonts}."
 msgstr "字体软件包的名字处理起来不同，@pxref{Fonts}."
 
 #. type: cindex
-#: doc/contributing.texi:363
+#: guix-git/doc/contributing.texi:467
 #, no-wrap
 msgid "package version"
 msgstr "软件包版本"
 
 #. type: Plain text
-#: doc/contributing.texi:372
+#: guix-git/doc/contributing.texi:476
 msgid "We usually package only the latest version of a given free software project.  But sometimes, for instance for incompatible library versions, two (or more) versions of the same package are needed.  These require different Scheme variable names.  We use the name as defined in @ref{Package Naming} for the most recent version; previous versions use the same name, suffixed by @code{-} and the smallest prefix of the version number that may distinguish the two versions."
 msgstr "我们通常只为每个自由软件的最新版本打包。但是有时候，比如对于版本不兼容的库，需要有同一个软件包的两个或更多版本。它们需要使用不同的Scheme变量名。我们为最新的版本使用@ref{Package Naming}里规定的名字，旧的版本使用加上后缀的名字，后缀是@code{-}和可以区分开版本号的版本号的最小前缀。"
 
 #. type: Plain text
-#: doc/contributing.texi:375
+#: guix-git/doc/contributing.texi:479
 msgid "The name inside the package definition is the same for all versions of a package and does not contain any version number."
 msgstr "软件包定义里的名字对于同一个软件包的所有版本都是相同的，并且不含有版本号。"
 
 #. type: Plain text
-#: doc/contributing.texi:377
+#: guix-git/doc/contributing.texi:481
 msgid "For instance, the versions 2.24.20 and 3.9.12 of GTK+ may be packaged as follows:"
 msgstr "例如，GTK+的2.24.20和3.9.12两个版本可以这样打包："
 
-#. type: example
-#: doc/contributing.texi:389
+#. type: lisp
+#: guix-git/doc/contributing.texi:493
 #, no-wrap
 msgid ""
 "(define-public gtk+\n"
@@ -668,12 +931,12 @@ msgstr ""
 "    ...))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:391
+#: guix-git/doc/contributing.texi:495
 msgid "If we also wanted GTK+ 3.8.2, this would be packaged as"
 msgstr "如果我们还需要GTK+ 3.8.2，就这样打包"
 
-#. type: example
-#: doc/contributing.texi:397
+#. type: lisp
+#: guix-git/doc/contributing.texi:501
 #, no-wrap
 msgid ""
 "(define-public gtk+-3.8\n"
@@ -689,23 +952,23 @@ msgstr ""
 "    ...))\n"
 
 #. type: cindex
-#: doc/contributing.texi:401
+#: guix-git/doc/contributing.texi:505
 #, no-wrap
 msgid "version number, for VCS snapshots"
 msgstr "用于版本控制快照的版本号"
 
 #. type: Plain text
-#: doc/contributing.texi:407
+#: guix-git/doc/contributing.texi:511
 msgid "Occasionally, we package snapshots of upstream's version control system (VCS) instead of formal releases.  This should remain exceptional, because it is up to upstream developers to clarify what the stable release is.  Yet, it is sometimes necessary.  So, what should we put in the @code{version} field?"
 msgstr "有时候，我们为软件包上游的版本控制系统（VCS）的快照而不是正式发布版打包。这是特殊情况，因为决定哪个是稳定版的权力应该属于上游开发者。然而，有时候这是必须的。那么，我们该如何决定写在@code{version}里的版本号呢？"
 
 #. type: Plain text
-#: doc/contributing.texi:415
+#: guix-git/doc/contributing.texi:519
 msgid "Clearly, we need to make the commit identifier of the VCS snapshot visible in the version string, but we also need to make sure that the version string is monotonically increasing so that @command{guix package --upgrade} can determine which version is newer.  Since commit identifiers, notably with Git, are not monotonically increasing, we add a revision number that we increase each time we upgrade to a newer snapshot.  The resulting version string looks like this:"
 msgstr "显然，我们需要让VCS快照的commit ID在版本号中体现出来，但是我们也需要确保版本号单调递增，以便@command{guix package --upgrade}决定哪个版本号更新。由于commit ID，尤其是Git的commit ID，不是单调递增的，我们添加一个每次升级快照时都手动增长的revision数字。最后的版本号字符串看起来是这样："
 
 #. type: example
-#: doc/contributing.texi:424
+#: guix-git/doc/contributing.texi:528
 #, no-wrap
 msgid ""
 "2.0.11-3.cabba9e\n"
@@ -725,12 +988,14 @@ msgstr ""
 "最新的上游版本号\n"
 
 #. type: Plain text
-#: doc/contributing.texi:433
-msgid "It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux kernel.)  It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities.  A typical package definition may look like this:"
+#: guix-git/doc/contributing.texi:537
+#, fuzzy
+#| msgid "It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux kernel.)  It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities.  A typical package definition may look like this:"
+msgid "It is a good idea to strip commit identifiers in the @code{version} field to, say, 7 digits.  It avoids an aesthetic annoyance (assuming aesthetics have a role to play here) as well as problems related to OS limits such as the maximum shebang length (127 bytes for the Linux kernel).  It is best to use the full commit identifiers in @code{origin}s, though, to avoid ambiguities.  A typical package definition may look like this:"
 msgstr "把@code{版本号}里的commit ID截短，比如只取7个数字，是一个好主意。它避免了美学上的烦恼（假设美学在这里很重要），以及操作系统限制引起的问题（比如Linux内核的127字节）。尽管如此，在@code{origin}里最好使用完整的commit ID，以避免混淆。"
 
-#. type: example
-#: doc/contributing.texi:449
+#. type: lisp
+#: guix-git/doc/contributing.texi:553
 #, no-wrap
 msgid ""
 "(define my-package\n"
@@ -764,60 +1029,62 @@ msgstr ""
 "      )))\n"
 
 #. type: cindex
-#: doc/contributing.texi:454
+#: guix-git/doc/contributing.texi:558
 #, no-wrap
 msgid "package description"
 msgstr "软件包描述"
 
 #. type: cindex
-#: doc/contributing.texi:455
+#: guix-git/doc/contributing.texi:559
 #, no-wrap
 msgid "package synopsis"
 msgstr "软件包简介"
 
 #. type: Plain text
-#: doc/contributing.texi:462
+#: guix-git/doc/contributing.texi:566
 msgid "As we have seen before, each package in GNU@tie{}Guix includes a synopsis and a description (@pxref{Defining Packages}).  Synopses and descriptions are important: They are what @command{guix package --search} searches, and a crucial piece of information to help users determine whether a given package suits their needs.  Consequently, packagers should pay attention to what goes into them."
 msgstr "我们已经看到，GNU@tie{}Guix里的每个软件包都包含一个简介（synopsis）和一个描述（description）（@pxref{Defining Packages}）。简介和描述很重要：它们是@command{guix package --search}搜索的信息，并且是帮助用户决定一个软件包是否符合自己需求的重要信息。因此，打包的人应该关注怎样写它们的内容。"
 
 #. type: Plain text
-#: doc/contributing.texi:470
+#: guix-git/doc/contributing.texi:574
 msgid "Synopses must start with a capital letter and must not end with a period.  They must not start with ``a'' or ``the'', which usually does not bring anything; for instance, prefer ``File-frobbing tool'' over ``A tool that frobs files''.  The synopsis should say what the package is---e.g., ``Core GNU utilities (file, text, shell)''---or what it is used for---e.g., the synopsis for GNU@tie{}grep is ``Print lines matching a pattern''."
 msgstr "简介必须以大写字母开头，并且不能以句号结尾。它们不能以 ``a'' 或者 ``the'' 等没有意义的词开头。例如 ``File-frobbing tool'' 要比 ``A tool that frobs files'' 更好。简介需要说明软件包是什么－－如 ``Core GNU utilities (file, text, shell)''，或者它的用途－－如 GNU@tie{}grep 的简介是 ``Print lines matching a pattern''。"
 
 #. type: Plain text
-#: doc/contributing.texi:480
+#: guix-git/doc/contributing.texi:584
 msgid "Keep in mind that the synopsis must be meaningful for a very wide audience.  For example, ``Manipulate alignments in the SAM format'' might make sense for a seasoned bioinformatics researcher, but might be fairly unhelpful or even misleading to a non-specialized audience.  It is a good idea to come up with a synopsis that gives an idea of the application domain of the package.  In this example, this might give something like ``Manipulate nucleotide sequence alignments'', which hopefully gives the user a better idea of whether this is what they are looking for."
 msgstr "记住，简介必须能被广大的听众理解。例如，“以SAM格式修改对齐”可能对经验丰富的生物信息科研工作者来说能理解，但是对普通对听众则是无用的甚至是令人误解的。简介最好说明软件包应用的领域。在这个例子中，应该这样描述“修改核苷酸序列的对齐格式”，这会让用户更容易判断这是不是他们想要的。"
 
 #. type: Plain text
-#: doc/contributing.texi:488
+#: guix-git/doc/contributing.texi:592
 msgid "Descriptions should take between five and ten lines.  Use full sentences, and avoid using acronyms without first introducing them.  Please avoid marketing phrases such as ``world-leading'', ``industrial-strength'', and ``next-generation'', and avoid superlatives like ``the most advanced''---they are not helpful to users looking for a package and may even sound suspicious.  Instead, try to be factual, mentioning use cases and features."
 msgstr "描述应该在5至10句话之间。使用完整的句子，并且避免在未介绍的情况下使用缩写。请避免推广营销性对词汇，如“世界领先”，“行业最强”，“下一代”，并且避免高级的形容词，如“最先进的”--他们对用户寻找软件包是无用的，甚至是可疑的。相反的，尽量务实，提及用例和功能。"
 
 #. type: cindex
-#: doc/contributing.texi:489
+#: guix-git/doc/contributing.texi:593
 #, no-wrap
 msgid "Texinfo markup, in package descriptions"
 msgstr "软件包描述里的Texinfo标记"
 
 #. type: Plain text
-#: doc/contributing.texi:498
+#: guix-git/doc/contributing.texi:602
 msgid "Descriptions can include Texinfo markup, which is useful to introduce ornaments such as @code{@@code} or @code{@@dfn}, bullet lists, or hyperlinks (@pxref{Overview,,, texinfo, GNU Texinfo}).  However you should be careful when using some characters for example @samp{@@} and curly braces which are the basic special characters in Texinfo (@pxref{Special Characters,,, texinfo, GNU Texinfo}).  User interfaces such as @command{guix package --show} take care of rendering it appropriately."
 msgstr "描述可以含有Texinfo标记，这对格式化有帮助，如@code{@@code}、@code{@@dfn}、列表、超链接（@pxref{Overview,,, texinfo, GNU Texinfo}）。但是，在使用某些字符时应该小心，如@samp{@@}和花括号是基本的Texinfo特殊字符（@pxref{Special Characters,,, texinfo, GNU Texinfo}）。@command{guix package --show}之类的用户界面会解决渲染问题。"
 
 #. type: Plain text
-#: doc/contributing.texi:504
-msgid "Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
+#: guix-git/doc/contributing.texi:608
+#, fuzzy
+#| msgid "Synopses and descriptions are translated by volunteers @uref{http://translationproject.org/domain/guix-packages.html, at the Translation Project} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
+msgid "Synopses and descriptions are translated by volunteers @uref{https://translate.fedoraproject.org/projects/guix/packages, at Weblate} so that as many users as possible can read them in their native language.  User interfaces search them and display them in the language specified by the current locale."
 msgstr "简介和描述会由@uref{http://translationproject.org/domain/guix-packages.html, Translation Project}项目的志愿者翻译，从而使尽可能多的用户可以用母语阅读。用户界面用当前区域设置的语言搜索和展示这些信息。"
 
 #. type: Plain text
-#: doc/contributing.texi:509
+#: guix-git/doc/contributing.texi:613
 msgid "To allow @command{xgettext} to extract them as translatable strings, synopses and descriptions @emph{must be literal strings}.  This means that you cannot use @code{string-append} or @code{format} to construct these strings:"
 msgstr "为了让@command{xgettext}可以把它们提取成待翻译的字符串，简介和描述@emph{必须是文字字符串}。这意味着你不能使用@code{string-append}或@code{format}来合成字符串："
 
 #. type: lisp
-#: doc/contributing.texi:515
+#: guix-git/doc/contributing.texi:619
 #, no-wrap
 msgid ""
 "(package\n"
@@ -831,12 +1098,12 @@ msgstr ""
 "  (description (string-append \"这是\" \"*不可以*\" \"翻译的\")))\n"
 
 #. type: Plain text
-#: doc/contributing.texi:523
+#: guix-git/doc/contributing.texi:627
 msgid "Translation is a lot of work so, as a packager, please pay even more attention to your synopses and descriptions as every change may entail additional work for translators.  In order to help them, it is possible to make recommendations or instructions visible to them by inserting special comments like this (@pxref{xgettext Invocation,,, gettext, GNU Gettext}):"
 msgstr "翻译是很繁重的工作，所以，作为打包者请更加注意你的简介和介绍，每一个改动都会增加翻译的工作量。为了帮助他们，你可以插入这类可以被他们看到的建议和指示（@pxref{xgettext Invocation,,, gettext, GNU Gettext}）："
 
-#. type: example
-#: doc/contributing.texi:528
+#. type: lisp
+#: guix-git/doc/contributing.texi:632
 #, no-wrap
 msgid ""
 ";; TRANSLATORS: \"X11 resize-and-rotate\" should not be translated.\n"
@@ -847,349 +1114,443 @@ msgstr ""
 "(description \"ARandR为X11 resize-and-rotate (RandR)扩展提供简单的图形界面。@dots{}\")\n"
 
 #. type: cindex
-#: doc/contributing.texi:534
+#: guix-git/doc/contributing.texi:637
+#, no-wrap
+msgid "snippets, when to use"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:648
+msgid "The boundary between using an origin snippet versus a build phase to modify the sources of a package can be elusive.  Origin snippets are typically used to remove unwanted files such as bundled libraries, nonfree sources, or to apply simple substitutions.  The source derived from an origin should produce a source that can be used to build the package on any system that the upstream package supports (i.e., act as the corresponding source).  In particular, origin snippets must not embed store items in the sources; such patching should rather be done using build phases.  Refer to the @code{origin} record documentation for more information (@pxref{origin Reference})."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:652
+#, no-wrap
+msgid "emacs, packaging"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:653
+#, no-wrap
+msgid "elisp, packaging"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:665
+msgid "Emacs packages should preferably use the Emacs build system (@pxref{emacs-build-system}), for uniformity and the benefits provided by its build phases, such as the auto-generation of the autoloads file and the byte compilation of the sources.  Because there is no standardized way to run a test suite for Emacs packages, tests are disabled by default.  When a test suite is available, it should be enabled by setting the @code{#:tests?} argument to @code{#true}.  By default, the command to run the test is @command{make check}, but any command can be specified via the @code{#:test-command} argument.  The @code{#:test-command} argument expects a list containing a command and its arguments, to be invoked during the @code{check} phase."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:670
+msgid "The Elisp dependencies of Emacs packages are typically provided as @code{propagated-inputs} when required at run time.  As for other packages, build or test dependencies should be specified as @code{native-inputs}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:679
+msgid "Emacs packages sometimes depend on resources directories that should be installed along the Elisp files.  The @code{#:include} argument can be used for that purpose, by specifying a list of regexps to match.  The best practice when using the @code{#:include} argument is to extend rather than override its default value (accessible via the @code{%default-include} variable).  As an example, a yasnippet extension package typically include a @file{snippets} directory, which could be copied to the installation directory using:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/contributing.texi:682
+#, no-wrap
+msgid "#:include (cons \"^snippets/\" %default-include))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:688
+msgid "When encountering problems, it is wise to check for the presence of the @code{Package-Requires} extension header in the package main source file, and whether any dependencies and their versions listed therein are satisfied."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:692
 #, no-wrap
 msgid "python"
 msgstr "python"
 
 #. type: Plain text
-#: doc/contributing.texi:540
+#: guix-git/doc/contributing.texi:698
 msgid "We currently package Python 2 and Python 3, under the Scheme variable names @code{python-2} and @code{python} as explained in @ref{Version Numbers}.  To avoid confusion and naming clashes with other programming languages, it seems desirable that the name of a package for a Python module contains the word @code{python}."
 msgstr "我们目前为Python 2和Python 3打包，如@ref{Version Numbers}的规则所述，它们的Scheme变量名分别是@code{python-2}和@code{python}。为了避免和其他编程语言的冲突，Python模块的软件包名字最好含有@code{python}。"
 
 #. type: Plain text
-#: doc/contributing.texi:546
-msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo compiles only with Python 3, we name it @code{python-foo}; if it compiles only with Python 2, we name it @code{python2-foo}. If it is compatible with both versions, we create two packages with the corresponding names."
+#: guix-git/doc/contributing.texi:705
+#, fuzzy
+#| msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo compiles only with Python 3, we name it @code{python-foo}; if it compiles only with Python 2, we name it @code{python2-foo}. If it is compatible with both versions, we create two packages with the corresponding names."
+msgid "Some modules are compatible with only one version of Python, others with both.  If the package Foo is compiled with Python 3, we name it @code{python-foo}.  If it is compiled with Python 2, we name it @code{python2-foo}.  Packages should be added when they are necessary; we don't add Python 2 variants of the package unless we are going to use them."
 msgstr "某些模块仅和一个版本的Python兼容，其它的和两个版本都兼容。如果一个叫做Foo的软件包仅和Python 3兼容，我们把它命名为@code{python-foo}；如果它仅和Python 2兼容，我们把它命名为@code{python2-foo}。如果它和两个版本都兼容，我们创建两个软件包，名字如前所述。"
 
 #. type: Plain text
-#: doc/contributing.texi:552
+#: guix-git/doc/contributing.texi:711
 msgid "If a project already contains the word @code{python}, we drop this; for instance, the module python-dateutil is packaged under the names @code{python-dateutil} and @code{python2-dateutil}.  If the project name starts with @code{py} (e.g.@: @code{pytz}), we keep it and prefix it as described above."
 msgstr "如果一个项目的名字已经含有@code{python}这个单词，我们把它丢掉；例如，python-dateutil模块打包后的名字是@code{python-dateutil}和@code{python2-dateutil}。如果项目的名字以@code{py}开头（如@: @code{pytz}），我们把它保留，并且添加上面所述的前缀。"
 
 #. type: subsubsection
-#: doc/contributing.texi:553
+#: guix-git/doc/contributing.texi:712
 #, no-wrap
 msgid "Specifying Dependencies"
 msgstr "指定依赖"
 
 #. type: cindex
-#: doc/contributing.texi:554
+#: guix-git/doc/contributing.texi:713
 #, no-wrap
 msgid "inputs, for Python packages"
 msgstr "Python软件包的输入"
 
 #. type: Plain text
-#: doc/contributing.texi:559
+#: guix-git/doc/contributing.texi:718
 msgid "Dependency information for Python packages is usually available in the package source tree, with varying degrees of accuracy: in the @file{setup.py} file, in @file{requirements.txt}, or in @file{tox.ini}."
 msgstr "Python软件包的依赖信息通常在包的源代码树里，各种文件有不同的精确度：@file{setup.py}文件，@file{requirements.txt}文件，@file{tox.ini}文件。"
 
 #. type: Plain text
-#: doc/contributing.texi:565
+#: guix-git/doc/contributing.texi:724
 msgid "Your mission, when writing a recipe for a Python package, is to map these dependencies to the appropriate type of ``input'' (@pxref{package Reference, inputs}).  Although the @code{pypi} importer normally does a good job (@pxref{Invoking guix import}), you may want to check the following check list to determine which dependency goes where."
 msgstr "你在写软件包配方时的任务是把这些依赖转换成相应的“输入”（@pxref{package Reference, inputs}）。尽管@code{pypi}导入工具通常可以做得很好（@pxref{Invoking guix import}），你可能想检查下面这个清单，以决定每个依赖放在哪儿。"
 
 #. type: itemize
-#: doc/contributing.texi:573
+#: guix-git/doc/contributing.texi:732
 msgid "We currently package Python 2 with @code{setuptools} and @code{pip} installed like Python 3.4 has per default.  Thus you don't need to specify either of these as an input.  @command{guix lint} will warn you if you do."
 msgstr "默认地，我们为Python 2打包时像Python 3一样安装了@code{setuptools}和@code{pip}。所以你不需要把它们两个指定为依赖，否则@command{guix lint}会警告你。"
 
 #. type: itemize
-#: doc/contributing.texi:579
+#: guix-git/doc/contributing.texi:738
 msgid "Python dependencies required at run time go into @code{propagated-inputs}.  They are typically defined with the @code{install_requires} keyword in @file{setup.py}, or in the @file{requirements.txt} file."
 msgstr "运行时需要的Python依赖要放进@code{propagated-inputs}。它们通常由@file{setup.py}文件里的@code{install_requires}关键字或@file{requirements.txt}文件定义。"
 
 #. type: itemize
-#: doc/contributing.texi:587
+#: guix-git/doc/contributing.texi:746
 msgid "Python packages required only at build time---e.g., those listed with the @code{setup_requires} keyword in @file{setup.py}---or only for testing---e.g., those in @code{tests_require}---go into @code{native-inputs}.  The rationale is that (1) they do not need to be propagated because they are not needed at run time, and (2) in a cross-compilation context, it's the ``native'' input that we'd want."
 msgstr "仅在构建时依赖的Python包--如，@file{setup.py}里的@code{setup_requires}关键字列举的包--或仅在测试时依赖的包--如，@code{tests_require}里的包--要放进@code{native-inputs}。因为，（1）在运行时不需要它们，因此不需要propagate，并且（2）在交叉编译时，它们属于“native”输入。"
 
 #. type: itemize
-#: doc/contributing.texi:591
+#: guix-git/doc/contributing.texi:750
 msgid "Examples are the @code{pytest}, @code{mock}, and @code{nose} test frameworks.  Of course if any of these packages is also required at run-time, it needs to go to @code{propagated-inputs}."
 msgstr "例如@code{pytest}，@code{mock}，@code{nose}测试框架。当然，如果在运行时需要这里的任何一个包，它需要被加进@code{propagated-inputs}。"
 
 #. type: itemize
-#: doc/contributing.texi:596
+#: guix-git/doc/contributing.texi:755
 msgid "Anything that does not fall in the previous categories goes to @code{inputs}, for example programs or C libraries required for building Python packages containing C extensions."
 msgstr "任何不属于上述类别的包都要被加进@code{inputs}，如，构建含有C语言扩展的Python包所需的程序和C语言库。"
 
 #. type: itemize
-#: doc/contributing.texi:602
+#: guix-git/doc/contributing.texi:761
 msgid "If a Python package has optional dependencies (@code{extras_require}), it is up to you to decide whether to add them or not, based on their usefulness/overhead ratio (@pxref{Submitting Patches, @command{guix size}})."
 msgstr "如果一个Python软件包由可选的依赖（@code{extras_require}），由你根据它们的性价比（用处/负担）决定是否添加它们（@pxref{Submitting Patches, @command{guix size}}）。"
 
 #. type: cindex
-#: doc/contributing.texi:609
+#: guix-git/doc/contributing.texi:768
 #, no-wrap
 msgid "perl"
 msgstr "perl"
 
 #. type: Plain text
-#: doc/contributing.texi:620
+#: guix-git/doc/contributing.texi:779
 msgid "Perl programs standing for themselves are named as any other package, using the lowercase upstream name.  For Perl packages containing a single class, we use the lowercase class name, replace all occurrences of @code{::} by dashes and prepend the prefix @code{perl-}.  So the class @code{XML::Parser} becomes @code{perl-xml-parser}.  Modules containing several classes keep their lowercase upstream name and are also prepended by @code{perl-}.  Such modules tend to have the word @code{perl} somewhere in their name, which gets dropped in favor of the prefix.  For instance, @code{libwww-perl} becomes @code{perl-libwww}."
 msgstr "Perl程序和其它软件包的命名规则类似，用小写的上游名字命名。对于仅包含一个类的Perl包，我们使用小写的类名，把所有的@code{::}替换成破折号，并且添加@code{perl-}前缀。所以类@code{XML::Parser}变成@code{perl-xml-parser}。包含多个类的模块保留它们上游的名字，并且添加@code{perl-}前缀。这类模块的名字通常含有@code{perl}，这个单词需要被删掉。例如，@code{libwww-perl}变成@code{perl-libwww}。"
 
 #. type: cindex
-#: doc/contributing.texi:625
+#: guix-git/doc/contributing.texi:784
 #, no-wrap
 msgid "java"
 msgstr "java"
 
 #. type: Plain text
-#: doc/contributing.texi:628
+#: guix-git/doc/contributing.texi:787
 msgid "Java programs standing for themselves are named as any other package, using the lowercase upstream name."
 msgstr "Java程序和其它软件包的命名规则类似，用小写的上游名字命名。"
 
 #. type: Plain text
-#: doc/contributing.texi:634
+#: guix-git/doc/contributing.texi:793
 msgid "To avoid confusion and naming clashes with other programming languages, it is desirable that the name of a package for a Java package is prefixed with @code{java-}.  If a project already contains the word @code{java}, we drop this; for instance, the package @code{ngsjava} is packaged under the name @code{java-ngs}."
 msgstr "为了避免和其它编程语言混淆和命名冲突，Java软件包的名字最好有@code{java-}前缀。如果一个项目的名字已经含有@code{java}，我们把它删掉；例如，@code{ngsjava}打包后的名字是@code{java-ngs}。"
 
 #. type: Plain text
-#: doc/contributing.texi:640
+#: guix-git/doc/contributing.texi:799
 msgid "For Java packages containing a single class or a small class hierarchy, we use the lowercase class name, replace all occurrences of @code{.} by dashes and prepend the prefix @code{java-}.  So the class @code{apache.commons.cli} becomes package @code{java-apache-commons-cli}."
 msgstr "对于仅包含一个或很少几个类的Java软件包，我们使用小写的类名，把所有的@code{.}替换成破折号，并且添加@code{java-}前缀。因此，类@code{apache.commons.cli}打包后的名字是@code{java-apache-commons-cli}。"
 
 #. type: cindex
-#: doc/contributing.texi:645 doc/guix.texi:1665
+#: guix-git/doc/contributing.texi:804
+#, no-wrap
+msgid "rust"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:807
+msgid "Rust programs standing for themselves are named as any other package, using the lowercase upstream name."
+msgstr "Rust 程序和其它软件包的命名规则类似，用小写的上游名字命名。"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:811
+msgid "To prevent namespace collisions we prefix all other Rust packages with the @code{rust-} prefix.  The name should be changed to lowercase as appropriate and dashes should remain in place."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:817
+msgid "In the rust ecosystem it is common for multiple incompatible versions of a package to be used at any given time, so all package definitions should have a versioned suffix.  The versioned suffix is the left-most non-zero digit (and any leading zeros, of course).  This follows the ``caret'' version scheme intended by Cargo.  Examples@: @code{rust-clap-2}, @code{rust-rand-0.6}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:827
+msgid "Because of the difficulty in reusing rust packages as pre-compiled inputs for other packages the Cargo build system (@pxref{Build Systems, @code{cargo-build-system}}) presents the @code{#:cargo-inputs} and @code{cargo-development-inputs} keywords as build system arguments.  It would be helpful to think of these as similar to @code{propagated-inputs} and @code{native-inputs}.  Rust @code{dependencies} and @code{build-dependencies} should go in @code{#:cargo-inputs}, and @code{dev-dependencies} should go in @code{#:cargo-development-inputs}.  If a Rust package links to other libraries then the standard placement in @code{inputs} and the like should be used."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:833
+msgid "Care should be taken to ensure the correct version of dependencies are used; to this end we try to refrain from skipping the tests or using @code{#:skip-build?} when possible.  Of course this is not always possible, as the package may be developed for a different Operating System, depend on features from the Nightly Rust compiler, or the test suite may have atrophied since it was released."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:838 guix-git/doc/guix.texi:1880
 #, no-wrap
 msgid "fonts"
 msgstr "字体"
 
 #. type: Plain text
-#: doc/contributing.texi:651
+#: guix-git/doc/contributing.texi:844
 msgid "For fonts that are in general not installed by a user for typesetting purposes, or that are distributed as part of a larger software package, we rely on the general packaging rules for software; for instance, this applies to the fonts delivered as part of the X.Org system or fonts that are part of TeX Live."
 msgstr "对于通常不会被用户安装用于排版的字体，或者随更大的软件包分发的字体，我们使用通常的命名规则。例如，这适用于X.Org系统附带的字体或TeX Live附带的字体。"
 
 #. type: Plain text
-#: doc/contributing.texi:655
+#: guix-git/doc/contributing.texi:848
 msgid "To make it easier for a user to search for fonts, names for other packages containing only fonts are constructed as follows, independently of the upstream package name."
 msgstr "为了让用户更容易搜索字体，其它仅含有字体的软件包按以下规则命名，不管上游的包名是什么。"
 
 #. type: Plain text
-#: doc/contributing.texi:663
+#: guix-git/doc/contributing.texi:856
 msgid "The name of a package containing only one font family starts with @code{font-}; it is followed by the foundry name and a dash @code{-} if the foundry is known, and the font family name, in which spaces are replaced by dashes (and as usual, all upper case letters are transformed to lower case).  For example, the Gentium font family by SIL is packaged under the name @code{font-sil-gentium}."
 msgstr "仅含有一个字体家族的软件包需要以@code{font-}开头；如果作者名字已知，则添加作者名字和@code{-}，接着是字体家族名字（把空格替换成破折号），（和通常一样，把所有的大写字母转换成小写字母）。例如，由SIL设计的Gentium字体家族打包后的名字是@code{font-sil-gentium}。"
 
 #. type: Plain text
-#: doc/contributing.texi:672
+#: guix-git/doc/contributing.texi:865
 msgid "For a package containing several font families, the name of the collection is used in the place of the font family name.  For instance, the Liberation fonts consist of three families, Liberation Sans, Liberation Serif and Liberation Mono.  These could be packaged separately under the names @code{font-liberation-sans} and so on; but as they are distributed together under a common name, we prefer to package them together as @code{font-liberation}."
 msgstr "对于一个含有多个字体家族的软件包，用集合的名字替换字体家族的名字。例如，Liberation字体含有三个家族，Liberation Sans、Liberation Serif和Liberation Mono。它们可以用@code{font-liberation-sans}等名字分开打包；但是由于它们以一个共同的名字分发，我们倾向于以@code{font-liberation}名字统一打包。"
 
 #. type: Plain text
-#: doc/contributing.texi:678
+#: guix-git/doc/contributing.texi:871
 msgid "In the case where several formats of the same font family or font collection are packaged separately, a short form of the format, prepended by a dash, is added to the package name.  We use @code{-ttf} for TrueType fonts, @code{-otf} for OpenType fonts and @code{-type1} for PostScript Type 1 fonts."
 msgstr "当同一个字体家族或字体集合的不同格式分开打包时，把破折号和格式（缩写）添加在软件包名字后面。我们用@code{-ttf}代表TrueType字体，@code{-otf}代表OpenType字体，@code{-type1}代表PostScript Type 1字体。"
 
 #. type: Plain text
-#: doc/contributing.texi:686
+#: guix-git/doc/contributing.texi:879
 msgid "In general our code follows the GNU Coding Standards (@pxref{Top,,, standards, GNU Coding Standards}).  However, they do not say much about Scheme, so here are some additional rules."
 msgstr "总的来说，我们的代码遵循GNU代码规范（@pxref{Top,,, standards, GNU代码规范}）。但是，这个规范对Scheme的介绍不多，所以这儿提供一些额外的规则。"
 
 #. type: subsection
-#: doc/contributing.texi:692 doc/contributing.texi:694
-#: doc/contributing.texi:695
+#: guix-git/doc/contributing.texi:885 guix-git/doc/contributing.texi:887
+#: guix-git/doc/contributing.texi:888
 #, no-wrap
 msgid "Programming Paradigm"
 msgstr "编程范例"
 
 #. type: menuentry
-#: doc/contributing.texi:692
+#: guix-git/doc/contributing.texi:885
 msgid "How to compose your elements."
 msgstr "怎样合成元素。"
 
 #. type: subsection
-#: doc/contributing.texi:692 doc/contributing.texi:701
-#: doc/contributing.texi:702
+#: guix-git/doc/contributing.texi:885 guix-git/doc/contributing.texi:894
+#: guix-git/doc/contributing.texi:895
 #, no-wrap
 msgid "Modules"
 msgstr "模块"
 
 #. type: menuentry
-#: doc/contributing.texi:692
+#: guix-git/doc/contributing.texi:885
 msgid "Where to store your code?"
 msgstr "在哪里保存代码？"
 
 #. type: subsection
-#: doc/contributing.texi:692 doc/contributing.texi:712
-#: doc/contributing.texi:713
+#: guix-git/doc/contributing.texi:885 guix-git/doc/contributing.texi:905
+#: guix-git/doc/contributing.texi:906
 #, no-wrap
 msgid "Data Types and Pattern Matching"
 msgstr "数据类型和模式匹配"
 
 #. type: menuentry
-#: doc/contributing.texi:692
+#: guix-git/doc/contributing.texi:885
 msgid "Implementing data structures."
 msgstr "实现数据结构。"
 
 #. type: subsection
-#: doc/contributing.texi:692 doc/contributing.texi:726
-#: doc/contributing.texi:727
+#: guix-git/doc/contributing.texi:885 guix-git/doc/contributing.texi:920
+#: guix-git/doc/contributing.texi:921
 #, no-wrap
 msgid "Formatting Code"
 msgstr "格式化代码"
 
 #. type: menuentry
-#: doc/contributing.texi:692
+#: guix-git/doc/contributing.texi:885
 msgid "Writing conventions."
 msgstr "书写规范。"
 
 #. type: Plain text
-#: doc/contributing.texi:700
+#: guix-git/doc/contributing.texi:893
 msgid "Scheme code in Guix is written in a purely functional style.  One exception is code that involves input/output, and procedures that implement low-level concepts, such as the @code{memoize} procedure."
 msgstr "Guix里的Scheme代码是以纯函数的风格写的。一个例外是有关输入/输出的代码，和实现底层概念的过程，如@code{memoize}过程。"
 
 #. type: Plain text
-#: doc/contributing.texi:708
+#: guix-git/doc/contributing.texi:901
 msgid "Guile modules that are meant to be used on the builder side must live in the @code{(guix build @dots{})} name space.  They must not refer to other Guix or GNU modules.  However, it is OK for a ``host-side'' module to use a build-side module."
 msgstr "用于构建的Guile模块必须放在@code{(guix build @dots{})}命名空间里。它们不允许引用其它Guix或GNU模块。但是，主机端（host-side)模块可以使用构建端（build-side）模块。"
 
 #. type: Plain text
-#: doc/contributing.texi:711
+#: guix-git/doc/contributing.texi:904
 msgid "Modules that deal with the broader GNU system should be in the @code{(gnu @dots{})} name space rather than @code{(guix @dots{})}."
 msgstr "关于更广的GNU系统的模块应该在@code{(gnu @dots{})}命名空间里而不是@code{(guix @dots{})}。"
 
 #. type: Plain text
-#: doc/contributing.texi:720
+#: guix-git/doc/contributing.texi:913
 msgid "The tendency in classical Lisp is to use lists to represent everything, and then to browse them ``by hand'' using @code{car}, @code{cdr}, @code{cadr}, and co.  There are several problems with that style, notably the fact that it is hard to read, error-prone, and a hindrance to proper type error reports."
 msgstr "经典的Lisp倾向于用列表表示所有的东西，然后用@code{car}，@code{cdr}，@code{cadr}等手动浏览它们。这种风格有几个问题，特别是难以阅读，易出错，并且妨碍生成合适的类型错误报告。"
 
 #. type: Plain text
-#: doc/contributing.texi:725
-msgid "Guix code should define appropriate data types (for instance, using @code{define-record-type*}) rather than abuse lists.  In addition, it should use pattern matching, via Guile’s @code{(ice-9 match)} module, especially when matching lists."
+#: guix-git/doc/contributing.texi:919
+#, fuzzy
+#| msgid "Guix code should define appropriate data types (for instance, using @code{define-record-type*}) rather than abuse lists.  In addition, it should use pattern matching, via Guile’s @code{(ice-9 match)} module, especially when matching lists."
+msgid "Guix code should define appropriate data types (for instance, using @code{define-record-type*}) rather than abuse lists.  In addition, it should use pattern matching, via Guile’s @code{(ice-9 match)} module, especially when matching lists (@pxref{Pattern Matching,,, guile, GNU Guile Reference Manual})."
 msgstr "Guix代码应该定义合适的数据类型（例如，用@code{define-record-type*}）而不是滥用列表。而且，它应该利用Guile的@code{(ice-9 match)}模块使用模式匹配，特别是匹配列表的时候。"
 
 #. type: cindex
-#: doc/contributing.texi:729
+#: guix-git/doc/contributing.texi:923
 #, no-wrap
 msgid "formatting code"
 msgstr "格式化代码"
 
 #. type: cindex
-#: doc/contributing.texi:730
+#: guix-git/doc/contributing.texi:924
 #, no-wrap
 msgid "coding style"
 msgstr "代码风格"
 
 #. type: Plain text
-#: doc/contributing.texi:737
-msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
+#: guix-git/doc/contributing.texi:931
+#, fuzzy
+#| msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{http://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
+msgid "When writing Scheme code, we follow common wisdom among Scheme programmers.  In general, we follow the @url{https://mumble.net/~campbell/scheme/style.txt, Riastradh's Lisp Style Rules}.  This document happens to describe the conventions mostly used in Guile’s code too.  It is very thoughtful and well written, so please do read it."
 msgstr "在写Scheme代码时，我们遵循Scheme程序员的通用智慧。通常，我们遵循@url{http://mumble.net/~campbell/scheme/style.txt, Riastradh的Lisp风格}。这个文档碰巧描述了在Guile代码里大量使用的惯例。它很周到，而且写的很好，所以务必阅读。"
 
 #. type: Plain text
-#: doc/contributing.texi:744
+#: guix-git/doc/contributing.texi:938
 msgid "Some special forms introduced in Guix, such as the @code{substitute*} macro, have special indentation rules.  These are defined in the @file{.dir-locals.el} file, which Emacs automatically uses.  Also note that Emacs-Guix provides @code{guix-devel-mode} mode that indents and highlights Guix code properly (@pxref{Development,,, emacs-guix, The Emacs-Guix Reference Manual})."
 msgstr "一些Guix添加的special form，如@code{substitute*}宏，有特殊的缩进规则。它们的规则在@file{.dir-locals.el}文件里定义，Emacs会自动使用。另外，Emacs-Guix提供的@code{guix-devel-mode}模式可以正确地缩进和高亮Guix代码（@pxref{Development,,, emacs-guix, Emacs-Guix参考手册}）。"
 
 #. type: cindex
-#: doc/contributing.texi:745
+#: guix-git/doc/contributing.texi:939
 #, no-wrap
 msgid "indentation, of code"
 msgstr "代码缩进"
 
 #. type: cindex
-#: doc/contributing.texi:746
+#: guix-git/doc/contributing.texi:940
 #, no-wrap
 msgid "formatting, of code"
 msgstr "代码格式化"
 
 #. type: Plain text
-#: doc/contributing.texi:749
+#: guix-git/doc/contributing.texi:943
 msgid "If you do not use Emacs, please make sure to let your editor knows these rules.  To automatically indent a package definition, you can also run:"
 msgstr "如果你不使用Emacs，请确保让你的编辑器知道这些规则。为了自动地缩进软件包定义，你也可以运行："
 
 #. type: example
-#: doc/contributing.texi:752
+#: guix-git/doc/contributing.texi:946
 #, no-wrap
 msgid "./etc/indent-code.el gnu/packages/@var{file}.scm @var{package}\n"
 msgstr "./etc/indent-code.el gnu/packages/@var{文件}.scm @var{软件包}\n"
 
 #. type: Plain text
-#: doc/contributing.texi:758
+#: guix-git/doc/contributing.texi:952
 msgid "This automatically indents the definition of @var{package} in @file{gnu/packages/@var{file}.scm} by running Emacs in batch mode.  To indent a whole file, omit the second argument:"
 msgstr "这会调用Emacs以批处理模式自动地缩进@file{gnu/packages/@var{文件}.scm}里@var{软件包}的定义。如果想缩进整个文件，省略第二个参数："
 
 #. type: example
-#: doc/contributing.texi:761
+#: guix-git/doc/contributing.texi:955
 #, no-wrap
 msgid "./etc/indent-code.el gnu/services/@var{file}.scm\n"
 msgstr "./etc/indent-code.el gnu/services/@var{文件}.scm\n"
 
 #. type: cindex
-#: doc/contributing.texi:763
+#: guix-git/doc/contributing.texi:957
 #, no-wrap
 msgid "Vim, Scheme code editing"
 msgstr "Vim，编辑Scheme代码"
 
 #. type: Plain text
-#: doc/contributing.texi:769
+#: guix-git/doc/contributing.texi:963
 msgid "If you are editing code with Vim, we recommend that you run @code{:set autoindent} so that your code is automatically indented as you type.  Additionally, @uref{https://www.vim.org/scripts/script.php?script_id=3998, @code{paredit.vim}} may help you deal with all these parentheses."
 msgstr "如果你用Vim编辑代码，我们推荐你运行@code{:set autoindent}，以使你在输入时自动缩进代码。另外，@uref{https://www.vim.org/scripts/script.php?script_id=3998, @code{paredit.vim}}可以帮你处理括号。"
 
 #. type: Plain text
-#: doc/contributing.texi:773
+#: guix-git/doc/contributing.texi:967
 msgid "We require all top-level procedures to carry a docstring.  This requirement can be relaxed for simple private procedures in the @code{(guix build @dots{})} name space, though."
 msgstr "我们要求所有的顶级过程附带一个docstring。这个要求对@code{(guix build @dots{})}命名空间里的简单的私有过程可以放宽。"
 
 #. type: Plain text
-#: doc/contributing.texi:776
+#: guix-git/doc/contributing.texi:970
 msgid "Procedures should not have more than four positional parameters.  Use keyword parameters for procedures that take more than four parameters."
 msgstr "过程不应该有多于四个定位参数。对于接收多于四个定位参数的过程应使用关键字参数。"
 
 #. type: Plain text
-#: doc/contributing.texi:785
-msgid "Development is done using the Git distributed version control system.  Thus, access to the repository is not strictly necessary.  We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list."
+#: guix-git/doc/contributing.texi:981
+#, fuzzy
+#| msgid "Development is done using the Git distributed version control system.  Thus, access to the repository is not strictly necessary.  We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list."
+msgid "Development is done using the Git distributed version control system.  Thus, access to the repository is not strictly necessary.  We welcome contributions in the form of patches as produced by @code{git format-patch} sent to the @email{guix-patches@@gnu.org} mailing list.  Seasoned Guix developers may also want to look at the section on commit access (@pxref{Commit Access})."
 msgstr "开发是使用Git分布式版本控制系统完成的。因此，对仓库的访问权限不是必须的。我们欢迎以向@email{guix-patches@@gnu.org}邮件列表发送@code{git format-patch}补丁的方式共享代码。"
 
 #. type: Plain text
-#: doc/contributing.texi:792
-msgid "This mailing list is backed by a Debbugs instance accessible at @uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of submissions.  Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})."
+#: guix-git/doc/contributing.texi:988
+#, fuzzy
+#| msgid "This mailing list is backed by a Debbugs instance accessible at @uref{https://bugs.gnu.org/guix-patches}, which allows us to keep track of submissions.  Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})."
+msgid "This mailing list is backed by a Debbugs instance, which allows us to keep track of submissions (@pxref{Tracking Bugs and Patches}).  Each message sent to that mailing list gets a new tracking number assigned; people can then follow up on the submission by sending email to @code{@var{NNN}@@debbugs.gnu.org}, where @var{NNN} is the tracking number (@pxref{Sending a Patch Series})."
 msgstr "这个邮件列表的后端是一个Debbugs实例（可以从@uref{https://bugs.gnu.org/guix-patches}访问），它允许我们跟踪提交的bug。每个发送到那个邮件列表的消息都会被分配一个跟踪数字；之后人们可以通过向@code{@var{NNN}@@debbugs.gnu.org}发送邮件来跟进提交（@var{NNN}是跟踪数字，@pxref{Sending a Patch Series}）。"
 
 #. type: Plain text
-#: doc/contributing.texi:796
+#: guix-git/doc/contributing.texi:992
 msgid "Please write commit logs in the ChangeLog format (@pxref{Change Logs,,, standards, GNU Coding Standards}); you can check the commit history for examples."
 msgstr "请以ChangeLog格式（@pxref{Change Logs,,, standards, GNU代码规范}）写commit日志；你可以浏览commit历史里的例子。"
 
 #. type: Plain text
-#: doc/contributing.texi:799
+#: guix-git/doc/contributing.texi:995
 msgid "Before submitting a patch that adds or modifies a package definition, please run through this check list:"
 msgstr "提交添加或者修改软件包定义的补丁之前，请过一遍这个检查列表："
 
 #. type: enumerate
-#: doc/contributing.texi:806
+#: guix-git/doc/contributing.texi:1002
 msgid "If the authors of the packaged software provide a cryptographic signature for the release tarball, make an effort to verify the authenticity of the archive.  For a detached GPG signature file this would be done with the @code{gpg --verify} command."
-msgstr "如果软件包的作者为发布的文件包提供了密码学签名，请验证文件的真实性。对于独立的GPG签名文件，这可以通过@code{gpg --verify}命令完成："
+msgstr "如果软件包的作者为发布的文件包提供了密码学签名，请验证文件的真实性。对于独立的 GPG 签名文件，这可以通过 @code{gpg --verify} 命令完成。"
 
 #. type: enumerate
-#: doc/contributing.texi:810
+#: guix-git/doc/contributing.texi:1006
 msgid "Take some time to provide an adequate synopsis and description for the package.  @xref{Synopses and Descriptions}, for some guidelines."
 msgstr "花些时间为软件包提供一个合适的简介和描述。更多指导，@xref{Synopses and Descriptions}。"
 
 #. type: enumerate
-#: doc/contributing.texi:815
+#: guix-git/doc/contributing.texi:1011
 msgid "Run @code{guix lint @var{package}}, where @var{package} is the name of the new or modified package, and fix any errors it reports (@pxref{Invoking guix lint})."
 msgstr "运行@code{guix lint @var{软件包}}，@var{软件包}是新添加的或修改过的软件包的名字，修复它报告的错误（@pxref{Invoking guix lint}）。"
 
 #. type: enumerate
-#: doc/contributing.texi:819
+#: guix-git/doc/contributing.texi:1015
 msgid "Make sure the package builds on your platform, using @code{guix build @var{package}}."
 msgstr "用@code{guix build @var{软件包}}命令确保这个软件包可以在你的平台上构建。"
 
 #. type: enumerate
-#: doc/contributing.texi:826
+#: guix-git/doc/contributing.texi:1022
 msgid "We recommend you also try building the package on other supported platforms.  As you may not have access to actual hardware platforms, we recommend using the @code{qemu-binfmt-service-type} to emulate them.  In order to enable it, add the following service to the list of services in your @code{operating-system} configuration:"
 msgstr "我们建议你同时尝试在别的支持的平台上构建这个软件包。你可能没有别的平台的真实的硬件，我们推荐使用@code{qemu-binfmt-service-type}来模拟它们。为了启用这个功能，把下面这个服务添加到你的@code{操作系统}配置的服务列表里："
 
-#. type: example
-#: doc/contributing.texi:832
-#, no-wrap
+#. type: lisp
+#: guix-git/doc/contributing.texi:1027
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(service qemu-binfmt-service-type\n"
+#| " (qemu-binfmt-configuration\n"
+#| "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+#| "   (guix-support? #t)))\n"
 msgid ""
 "(service qemu-binfmt-service-type\n"
 " (qemu-binfmt-configuration\n"
-"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
-"   (guix-support? #t)))\n"
+"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\"))\n"
 msgstr ""
 "(service qemu-binfmt-service-type\n"
 " (qemu-binfmt-configuration\n"
@@ -1197,2231 +1558,3129 @@ msgstr ""
 "   (guix-support? #t)))\n"
 
 #. type: enumerate
-#: doc/contributing.texi:835
+#: guix-git/doc/contributing.texi:1030
 msgid "Then reconfigure your system."
 msgstr "然后重新配置你的系统。"
 
 #. type: enumerate
-#: doc/contributing.texi:840
+#: guix-git/doc/contributing.texi:1035
 msgid "You can then build packages for different platforms by specifying the @code{--system} option.  For example, to build the \"hello\" package for the armhf, aarch64, or mips64 architectures, you would run the following commands, respectively:"
 msgstr "你之后可以用@code{--system}参数为不同的平台构建软件包。例如，为armhf，aarch64，或mips64架构构建\"hello\"软件包，你可以依次运行如下的命令："
 
 #. type: example
-#: doc/contributing.texi:844
-#, no-wrap
+#: guix-git/doc/contributing.texi:1038
+#, fuzzy, no-wrap
+#| msgid ""
+#| "guix build --system=armhf-linux --rounds=2 hello\n"
+#| "guix build --system=aarch64-linux --rounds=2 hello\n"
+#| "guix build --system=mips64el-linux --rounds=2 hello\n"
 msgid ""
 "guix build --system=armhf-linux --rounds=2 hello\n"
 "guix build --system=aarch64-linux --rounds=2 hello\n"
-"guix build --system=mips64el-linux --rounds=2 hello\n"
 msgstr ""
 "guix build --system=armhf-linux --rounds=2 hello\n"
 "guix build --system=aarch64-linux --rounds=2 hello\n"
 "guix build --system=mips64el-linux --rounds=2 hello\n"
 
 #. type: cindex
-#: doc/contributing.texi:847
+#: guix-git/doc/contributing.texi:1041
 #, no-wrap
 msgid "bundling"
 msgstr "构建"
 
 #. type: enumerate
-#: doc/contributing.texi:850
+#: guix-git/doc/contributing.texi:1044
 msgid "Make sure the package does not use bundled copies of software already available as separate packages."
 msgstr "请确保软件包里不捆绑出现已经被打过包的软件的副本。"
 
 #. type: enumerate
-#: doc/contributing.texi:859
+#: guix-git/doc/contributing.texi:1053
 msgid "Sometimes, packages include copies of the source code of their dependencies as a convenience for users.  However, as a distribution, we want to make sure that such packages end up using the copy we already have in the distribution, if there is one.  This improves resource usage (the dependency is built and stored only once), and allows the distribution to make transverse changes such as applying security updates for a given software package in a single place and have them affect the whole system---something that bundled copies prevent."
 msgstr "有时，软件包为了方便用户，捆绑了依赖库的源代码。然而，当依赖库在发行版里已经存在时，做为一个发行版，我们希望确保这些软件包使用发行版里已有的副本。这提高资源使用率（依赖库只构建一次，存储一份），并且使发行版更容易管理，如仅在一个地方对某个软件包进行安全更新就可以影响整个系统－－捆绑软件会妨碍这么做。"
 
 #. type: enumerate
-#: doc/contributing.texi:868
-msgid "Take a look at the profile reported by @command{guix size} (@pxref{Invoking guix size}).  This will allow you to notice references to other packages unwillingly retained.  It may also help determine whether to split the package (@pxref{Packages with Multiple Outputs}), and which optional dependencies should be used.  In particular, avoid adding @code{texlive} as a dependency: because of its extreme size, use @code{texlive-tiny} or @code{texlive-union} instead."
+#: guix-git/doc/contributing.texi:1062
+#, fuzzy
+#| msgid "Take a look at the profile reported by @command{guix size} (@pxref{Invoking guix size}).  This will allow you to notice references to other packages unwillingly retained.  It may also help determine whether to split the package (@pxref{Packages with Multiple Outputs}), and which optional dependencies should be used.  In particular, avoid adding @code{texlive} as a dependency: because of its extreme size, use @code{texlive-tiny} or @code{texlive-union} instead."
+msgid "Take a look at the profile reported by @command{guix size} (@pxref{Invoking guix size}).  This will allow you to notice references to other packages unwillingly retained.  It may also help determine whether to split the package (@pxref{Packages with Multiple Outputs}), and which optional dependencies should be used.  In particular, avoid adding @code{texlive} as a dependency: because of its extreme size, use the @code{texlive-tiny} package or @code{texlive-union} procedure instead."
 msgstr "看一下@command{guix size}（@pxref{Invoking guix size}）的分析报告。这会让你注意到对其它软件包无意中的引用。它也可以帮助决定是否要把一个软件包分割成几个输出（@pxref{有多个输出的软件包}），以及需要使用哪些可选的依赖。特别地，避免把@code{texlive}添加为依赖：因为它太大了，请使用@code{texlive-tiny}或@code{texlive-union}代替它。"
 
 #. type: enumerate
-#: doc/contributing.texi:873
+#: guix-git/doc/contributing.texi:1067
 msgid "For important changes, check that dependent package (if applicable) are not affected by the change; @code{guix refresh --list-dependent @var{package}} will help you do that (@pxref{Invoking guix refresh})."
 msgstr "对于重要的更改，确保依赖它的软件包没有受到影响。@code{guix refresh --list-dependent @var{软件包}}会帮你检查（@pxref{Invoking guix refresh}）。"
 
 #. type: cindex
-#: doc/contributing.texi:875
+#: guix-git/doc/contributing.texi:1069
 #, no-wrap
 msgid "branching strategy"
 msgstr "分支策略"
 
 #. type: cindex
-#: doc/contributing.texi:876
+#: guix-git/doc/contributing.texi:1070
 #, no-wrap
 msgid "rebuild scheduling strategy"
 msgstr "重新构建的调度策略"
 
 #. type: enumerate
-#: doc/contributing.texi:879
+#: guix-git/doc/contributing.texi:1073
 msgid "Depending on the number of dependent packages and thus the amount of rebuilding induced, commits go to different branches, along these lines:"
 msgstr "取决于受影响的软件包的数量，即需要重新构建的数量，commit需要被提交到不同的分支，具体如下："
 
 #. type: item
-#: doc/contributing.texi:881
+#: guix-git/doc/contributing.texi:1075
 #, no-wrap
 msgid "300 dependent packages or less"
 msgstr "300个或更少的受影响的软件包"
 
 #. type: table
-#: doc/contributing.texi:883
+#: guix-git/doc/contributing.texi:1077
 msgid "@code{master} branch (non-disruptive changes)."
 msgstr "@code{master}分支（非破坏性的更改）。"
 
 #. type: item
-#: doc/contributing.texi:884
+#: guix-git/doc/contributing.texi:1078
 #, no-wrap
-msgid "between 300 and 1,200 dependent packages"
-msgstr "300至1200个受影响的软件包"
+msgid "between 300 and 1,800 dependent packages"
+msgstr "300 至 1800 个受影响的软件包"
 
 #. type: table
-#: doc/contributing.texi:889
-msgid "@code{staging} branch (non-disruptive changes).  This branch is intended to be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates})."
+#: guix-git/doc/contributing.texi:1083
+#, fuzzy
+#| msgid "@code{staging} branch (non-disruptive changes).  This branch is intended to be merged in @code{master} every 3 weeks or so.  Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates})."
+msgid "@code{staging} branch (non-disruptive changes).  This branch is intended to be merged in @code{master} every 6 weeks or so.  Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, @code{gnome-updates})."
 msgstr "@code{staging}分支（非破坏性的更改）。这个分支每隔大约3周会被合并进@code{master}。对某个主题的更改（如对GNOME系列的更新）可以放进一个特定的分支（如@code{gnome-updates}）。"
 
 #. type: item
-#: doc/contributing.texi:890
+#: guix-git/doc/contributing.texi:1084
 #, no-wrap
-msgid "more than 1,200 dependent packages"
-msgstr "超过1200个受影响的软件包"
+msgid "more than 1,800 dependent packages"
+msgstr "超过 1800 个受影响的软件包"
 
 #. type: table
-#: doc/contributing.texi:894
-msgid "@code{core-updates} branch (may include major and potentially disruptive changes).  This branch is intended to be merged in @code{master} every 2.5 months or so."
+#: guix-git/doc/contributing.texi:1088
+#, fuzzy
+#| msgid "@code{core-updates} branch (may include major and potentially disruptive changes).  This branch is intended to be merged in @code{master} every 2.5 months or so."
+msgid "@code{core-updates} branch (may include major and potentially disruptive changes).  This branch is intended to be merged in @code{master} every 6 months or so."
 msgstr "@code{core-updates}分支（可能含有重要的或破坏性的更改）。这个分支每隔大约2.5个月会被合并进@code{master}。"
 
 #. type: enumerate
-#: doc/contributing.texi:901
-msgid "All these branches are @uref{https://hydra.gnu.org/project/gnu, tracked by our build farm} and merged into @code{master} once everything has been successfully built.  This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available."
-msgstr "所有这些分支都被@uref{https://hydra.gnu.org/project/gnu, 构建农场}跟踪，并且当一切都被顺利构建时合并进@code{master}。这使我们在影响到用户之前就能改正问题，并且缩小没有准备好预构建的二进制包的窗口期。"
+#: guix-git/doc/contributing.texi:1095
+msgid "All these branches are @uref{@value{SUBSTITUTE-URL}, tracked by our build farm} and merged into @code{master} once everything has been successfully built.  This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available."
+msgstr "所有这些分支都@uref{@value{SUBSTITUTE-URL}, 被构建农场跟踪}，并且当一切都被顺利构建时合并进@code{master}。这使我们在影响到用户之前就能改正问题，并且缩小没有准备好预构建的二进制包的窗口期。"
 
 #. type: enumerate
-#: doc/contributing.texi:908
-msgid "Generally, branches other than @code{master} are considered @emph{frozen} if there has been a recent evaluation, or there is a corresponding @code{-next} branch.  Please ask on the mailing list or IRC if unsure where to place a patch."
-msgstr "通常，@code{master}之外的其它分支如果最近被评审过，或有一个对应的@code{-next}分支，则被视为@emph{冻结}状态。如果不清楚该把补丁放到哪里，请在邮件列表或IRC上提问。"
+#: guix-git/doc/contributing.texi:1104
+msgid "When we decide to start building the @code{staging} or @code{core-updates} branches, they will be forked and renamed with the suffix @code{-frozen}, at which time only bug fixes may be pushed to the frozen branches.  The @code{core-updates} and @code{staging} branches will remain open to accept patches for the next cycle.  Please ask on the mailing list or IRC if unsure where to place a patch."
+msgstr ""
 
 #. type: cindex
-#: doc/contributing.texi:910
+#: guix-git/doc/contributing.texi:1106
 #, no-wrap
 msgid "determinism, of build processes"
 msgstr "构建过程的确定性"
 
 #. type: cindex
-#: doc/contributing.texi:911
+#: guix-git/doc/contributing.texi:1107
 #, no-wrap
 msgid "reproducible builds, checking"
 msgstr "检查可复现的构建"
 
 #. type: enumerate
-#: doc/contributing.texi:915
+#: guix-git/doc/contributing.texi:1111
 msgid "Check whether the package's build process is deterministic.  This typically means checking whether an independent build of the package yields the exact same result that you obtained, bit for bit."
 msgstr "检查软件包的构建过程是不是确定性的。这通常意味着检查对软件包的独立构建是否能得到每一个比特都完全相同的结果。"
 
 #. type: enumerate
-#: doc/contributing.texi:918
+#: guix-git/doc/contributing.texi:1114
 msgid "A simple way to do that is by building the same package several times in a row on your machine (@pxref{Invoking guix build}):"
 msgstr "为此，一个简单的做法是在你的机器上多次构建同一个软件包（@pxref{Invoking guix build}）："
 
 #. type: example
-#: doc/contributing.texi:921
+#: guix-git/doc/contributing.texi:1117
 #, no-wrap
 msgid "guix build --rounds=2 my-package\n"
 msgstr "guix build --rounds=2 <我的软件包>\n"
 
 #. type: enumerate
-#: doc/contributing.texi:925
+#: guix-git/doc/contributing.texi:1121
 msgid "This is enough to catch a class of common non-determinism issues, such as timestamps or randomly-generated output in the build result."
 msgstr "这足以查出一批普通的不确定性问题，如构建结果里存在时间戳或随机生成的输出。"
 
 #. type: enumerate
-#: doc/contributing.texi:935
+#: guix-git/doc/contributing.texi:1131
 msgid "Another option is to use @command{guix challenge} (@pxref{Invoking guix challenge}).  You may run it once the package has been committed and built by @code{@value{SUBSTITUTE-SERVER}} to check whether it obtains the same result as you did.  Better yet: Find another machine that can build it and run @command{guix publish}.  Since the remote build machine is likely different from yours, this can catch non-determinism issues related to the hardware---e.g., use of different instruction set extensions---or to the operating system kernel---e.g., reliance on @code{uname} or @file{/proc} files."
 msgstr "另一个选择是使用@command{guix challenge}（@pxref{Invoking guix challenge}）。当软件包被提交并且被@code{@value{SUBSTITUTE-SERVER}}构建之后，你可以运行这个命令检查你是否得到相同的构建结果。更好的：找另一台可以构建的机器，运行@command{guix publish}。由于远程的构建机器很可能和你的机器不同，这可以捕捉到由硬件不同引起的不确定性问题－－如，使用不同的指令集－－或不同操作系统内核引起的问题－－如，对@code{uname}或@file{/proc}文件的依赖。"
 
 #. type: enumerate
-#: doc/contributing.texi:941
+#: guix-git/doc/contributing.texi:1137
 msgid "When writing documentation, please use gender-neutral wording when referring to people, such as @uref{https://en.wikipedia.org/wiki/Singular_they, singular ``they''@comma{} ``their''@comma{} ``them''}, and so forth."
 msgstr "在编写文档时，请用性别中立的词语指代人，如@uref{https://en.wikipedia.org/wiki/Singular_they, “他”@comma{} “他的”}，等。"
 
 #. type: enumerate
-#: doc/contributing.texi:945
+#: guix-git/doc/contributing.texi:1141
 msgid "Verify that your patch contains only one set of related changes.  Bundling unrelated changes together makes reviewing harder and slower."
 msgstr "检查你的补丁只包含一些相关的更改。把不相关的更改捆绑在一起会让评审更困难和更慢。"
 
 #. type: enumerate
-#: doc/contributing.texi:948
+#: guix-git/doc/contributing.texi:1144
 msgid "Examples of unrelated changes include the addition of several packages, or a package update along with fixes to that package."
 msgstr "不相关的更改的例子有：同时新增多个软件包，或更新软件包同时修补这个软件包。"
 
 #. type: enumerate
-#: doc/contributing.texi:953
+#: guix-git/doc/contributing.texi:1149
 msgid "Please follow our code formatting rules, possibly running the @command{etc/indent-code.el} script to do that automatically for you (@pxref{Formatting Code})."
 msgstr "请遵守我们的代码格式规范，最好运行@command{etc/indent-code.el}脚本以自动为你格式化（@pxref{Formatting Code}）。"
 
 #. type: enumerate
-#: doc/contributing.texi:961
+#: guix-git/doc/contributing.texi:1157
 msgid "When possible, use mirrors in the source URL (@pxref{Invoking guix download}).  Use reliable URLs, not generated ones.  For instance, GitHub archives are not necessarily identical from one generation to the next, so in this case it's often better to clone the repository.  Don't use the @command{name} field in the URL: it is not very useful and if the name changes, the URL will probably be wrong."
 msgstr "当可能时，请在源URL里使用镜像@pxref{Invoking guix download}。使用可靠的而不是生成的URL。例如，GitHub的下载文件每次生成时不一定是相同的，所以这时最好克隆仓库。不要在URL里使用@command{name}变量：这没有什么用，而且如果名字变了，URL很可能就错了。"
 
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1161
+msgid "Check if Guix builds (@pxref{Building from Git}) and address the warnings, especially those about use of undefined symbols."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1164
+msgid "Make sure your changes do not break Guix and simulate a @code{guix pull} with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1166
+#, no-wrap
+msgid "guix pull --url=/path/to/your/checkout --profile=/tmp/guix.master\n"
+msgstr ""
+
 #. type: Plain text
-#: doc/contributing.texi:971
-msgid "When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a subject.  You may use your email client or the @command{git send-email} command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain text messages, either inline or as MIME attachments.  You are advised to pay attention if your email client changes anything like line breaks or indentation which could potentially break the patches."
+#: guix-git/doc/contributing.texi:1179
+#, fuzzy
+#| msgid "When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a subject.  You may use your email client or the @command{git send-email} command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain text messages, either inline or as MIME attachments.  You are advised to pay attention if your email client changes anything like line breaks or indentation which could potentially break the patches."
+msgid "When posting a patch to the mailing list, use @samp{[PATCH] @dots{}} as a subject, if your patch is to be applied on a branch other than @code{master}, say @code{core-updates}, specify it in the subject like @samp{[PATCH core-updates] @dots{}}.  You may use your email client or the @command{git send-email} command (@pxref{Sending a Patch Series}).  We prefer to get patches in plain text messages, either inline or as MIME attachments.  You are advised to pay attention if your email client changes anything like line breaks or indentation which could potentially break the patches."
 msgstr "在提交补丁到邮件列表时，使用@samp{[PATCH] @dots{}}做为主题。你可以使用你的邮件客户端或者@command{git send-email}命令（@pxref{Sending a Patch Series}）。我们倾向于接收纯文本的邮件，无论是在正文里还是在MIME附件里。建议你注意你的邮件客户端是否会自动修改换行或缩进，这可能会损坏补丁。"
 
 #. type: Plain text
-#: doc/contributing.texi:974
+#: guix-git/doc/contributing.texi:1182
 msgid "When a bug is resolved, please close the thread by sending an email to @email{@var{NNN}-done@@debbugs.gnu.org}."
 msgstr "当一个bug被修复时，请通过向@email{@var{NNN}-done@@debbugs.gnu.org}发邮件的方式关闭thread。"
 
 #. type: anchor{#1}
-#: doc/contributing.texi:975 doc/contributing.texi:977
+#: guix-git/doc/contributing.texi:1183 guix-git/doc/contributing.texi:1185
 #, no-wrap
 msgid "Sending a Patch Series"
 msgstr "发送补丁系列"
 
 #. type: cindex
-#: doc/contributing.texi:977
+#: guix-git/doc/contributing.texi:1185
 #, no-wrap
 msgid "patch series"
 msgstr "补丁系列"
 
 #. type: code{#1}
-#: doc/contributing.texi:978
+#: guix-git/doc/contributing.texi:1186
 #, no-wrap
 msgid "git send-email"
 msgstr "git send-email"
 
 #. type: code{#1}
-#: doc/contributing.texi:979
+#: guix-git/doc/contributing.texi:1187
 #, no-wrap
 msgid "git-send-email"
 msgstr "git-send-email"
 
 #. type: Plain text
-#: doc/contributing.texi:987
-msgid "When sending a patch series (e.g., using @code{git send-email}), please first send one message to @email{guix-patches@@gnu.org}, and then send subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation} for more information."
+#: guix-git/doc/contributing.texi:1197
+#, fuzzy
+#| msgid "When sending a patch series (e.g., using @code{git send-email}), please first send one message to @email{guix-patches@@gnu.org}, and then send subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation} for more information."
+msgid "When sending a patch series (e.g., using @code{git send-email}), please first send one message to @email{guix-patches@@gnu.org}, and then send subsequent patches to @email{@var{NNN}@@debbugs.gnu.org} to make sure they are kept together.  See @uref{https://debbugs.gnu.org/Advanced.html, the Debbugs documentation} for more information.  You can install @command{git send-email} with @command{guix install git:send-email}."
 msgstr "在发送补丁系列时（如，使用@code{git send-email}），请先向@email{guix-patches@@gnu.org}发送一封邮件，再把后续的补丁发送到@email{@var{NNN}@@debbugs.gnu.org}，以确保他们被归在一起。见@uref{https://debbugs.gnu.org/Advanced.html, Debbugs文档}以了解更多信息。"
 
+#. type: cindex
+#: guix-git/doc/contributing.texi:1201
+#, no-wrap
+msgid "bug reports, tracking"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1202
+#, no-wrap
+msgid "patch submissions, tracking"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1203
+#, no-wrap
+msgid "issue tracking"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1204
+#, no-wrap
+msgid "Debbugs, issue tracking system"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1211
+msgid "Bug reports and patch submissions are currently tracked using the Debbugs instance at @uref{https://bugs.gnu.org}.  Bug reports are filed against the @code{guix} ``package'' (in Debbugs parlance), by sending email to @email{bug-guix@@gnu.org}, while patch submissions are filed against the @code{guix-patches} package by sending email to @email{guix-patches@@gnu.org} (@pxref{Submitting Patches})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1214
+msgid "A web interface (actually @emph{two} web interfaces!) are available to browse issues:"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/contributing.texi:1223
+msgid "@url{https://issues.guix.gnu.org} provides a pleasant interface@footnote{The web interface at @url{https://issues.guix.gnu.org} is powered by Mumi, a nice piece of software written in Guile, and you can help! See @url{https://git.elephly.net/gitweb.cgi?p=software/mumi.git}.} to browse bug reports and patches, and to participate in discussions;"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/contributing.texi:1225
+#, fuzzy
+#| msgid "@url{https://gnupg.org/, GNU libgcrypt};"
+msgid "@url{https://bugs.gnu.org/guix} lists bug reports;"
+msgstr "@url{https://gnupg.org/, GNU libgcrypt}；"
+
+#. type: itemize
+#: guix-git/doc/contributing.texi:1227
+msgid "@url{https://bugs.gnu.org/guix-patches} lists patch submissions."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1232
+msgid "To view discussions related to issue number @var{n}, go to @indicateurl{https://issues.guix.gnu.org/@var{n}} or @indicateurl{https://bugs.gnu.org/@var{n}}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1235
+msgid "If you use Emacs, you may find it more convenient to interact with issues using @file{debbugs.el}, which you can install with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1238
+#, fuzzy, no-wrap
+#| msgid "guix install emacs-guix\n"
+msgid "guix install emacs-debbugs\n"
+msgstr "guix install emacs-guix\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1241
+msgid "For example, to list all open issues on @code{guix-patches}, hit:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1244
+#, no-wrap
+msgid "@kbd{C-u} @kbd{M-x} debbugs-gnu @kbd{RET} @kbd{RET} guix-patches @kbd{RET} n y\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1248
+#, fuzzy
+#| msgid "@xref{Invoking guix pack}, for more info on this handy tool."
+msgid "@xref{Top,,, debbugs-ug, Debbugs User Guide}, for more information on this nifty tool!"
+msgstr "@xref{Invoking guix pack}，了解这个方便的工具。"
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1252
+#, no-wrap
+msgid "commit access, for developers"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1256
+msgid "For frequent contributors, having write access to the repository is convenient.  When you deem it necessary, consider applying for commit access by following these steps:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1265
+msgid "Find three committers who would vouch for you.  You can view the list of committers at @url{https://savannah.gnu.org/project/memberlist.php?group=guix}.  Each of them should email a statement to @email{guix-maintainers@@gnu.org} (a private alias for the collective of maintainers), signed with their OpenPGP key."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1271
+msgid "Committers are expected to have had some interactions with you as a contributor and to be able to judge whether you are sufficiently familiar with the project's practices.  It is @emph{not} a judgment on the value of your work, so a refusal should rather be interpreted as ``let's try again later''."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1278
+msgid "Send @email{guix-maintainers@@gnu.org} a message stating your intent, listing the three committers who support your application, signed with the OpenPGP key you will use to sign commits, and giving its fingerprint (see below).  See @uref{https://emailselfdefense.fsf.org/en/}, for an introduction to public-key cryptography with GnuPG."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1284
+msgid "Set up GnuPG such that it never uses the SHA1 hash algorithm for digital signatures, which is known to be unsafe since 2019, for instance by adding the following line to @file{~/.gnupg/gpg.conf} (@pxref{GPG Esoteric Options,,, gnupg, The GNU Privacy Guard Manual}):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1287
+#, no-wrap
+msgid "digest-algo sha512\n"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1292
+msgid "Maintainers ultimately decide whether to grant you commit access, usually following your referrals' recommendation."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1294
+#, no-wrap
+msgid "OpenPGP, signed commits"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1299
+msgid "If and once you've been given access, please send a message to @email{guix-devel@@gnu.org} to say so, again signed with the OpenPGP key you will use to sign commits (do that before pushing your first commit).  That way, everyone can notice and ensure you control that OpenPGP key."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:1300
+#, no-wrap
+msgid "Important"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:1302
+msgid "Before you can push for the first time, maintainers must:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1306
+msgid "add your OpenPGP key to the @code{keyring} branch;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1309
+msgid "add your OpenPGP fingerprint to the @file{.guix-authorizations} file of the branch(es) you will commit to."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/contributing.texi:1314
+msgid "Make sure to read the rest of this section and... profit!"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:1320
+msgid "Maintainers are happy to give commit access to people who have been contributing for some time and have a track record---don't be shy and don't underestimate your work!"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/contributing.texi:1324
+msgid "However, note that the project is working towards a more automated patch review and merging system, which, as a consequence, may lead us to have fewer people with commit access to the main repository.  Stay tuned!"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1329
+msgid "If you get commit access, please make sure to follow the policy below (discussions of the policy can take place on @email{guix-devel@@gnu.org})."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:7
+#: guix-git/doc/contributing.texi:1334
+msgid "Non-trivial patches should always be posted to @email{guix-patches@@gnu.org} (trivial patches include fixing typos, etc.).  This mailing list fills the patch-tracking database (@pxref{Tracking Bugs and Patches})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1343
+msgid "For patches that just add a new package, and a simple one, it's OK to commit, if you're confident (which means you successfully built it in a chroot setup, and have done a reasonable copyright and license auditing).  Likewise for package upgrades, except upgrades that trigger a lot of rebuilds (for example, upgrading GnuTLS or GLib).  We have a mailing list for commit notifications (@email{guix-commits@@gnu.org}), so people can notice.  Before pushing your changes, make sure to run @code{git pull --rebase}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1349
+msgid "All commits that are pushed to the central repository on Savannah must be signed with an OpenPGP key, and the public key should be uploaded to your user account on Savannah and to public key servers, such as @code{keys.openpgp.org}.  To configure Git to automatically sign commits, run:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1353
+#, no-wrap
+msgid ""
+"git config commit.gpgsign true\n"
+"git config user.signingkey CABBA6EA1DC0FF33\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1358
+msgid "You can prevent yourself from accidentally pushing unsigned commits to Savannah by using the pre-push Git hook called located at @file{etc/git/pre-push}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1361
+#, no-wrap
+msgid "cp etc/git/pre-push .git/hooks/pre-push\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1367
+msgid "When pushing a commit on behalf of somebody else, please add a @code{Signed-off-by} line at the end of the commit log message---e.g., with @command{git am --signoff}.  This improves tracking of who did what."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1371
+msgid "When adding channel news entries (@pxref{Channels, Writing Channel News}), make sure they are well-formed by running the following command right before pushing:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1374
+#, fuzzy, no-wrap
+#| msgid "make check\n"
+msgid "make check-channel-news\n"
+msgstr "make check\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1380
+msgid "For anything else, please post to @email{guix-patches@@gnu.org} and leave time for a review, without committing anything (@pxref{Submitting Patches}).  If you didn’t receive any reply after two weeks, and if you're confident, it's OK to commit."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1383
+msgid "That last part is subject to being adjusted, allowing individuals to commit directly on non-controversial changes on parts they’re familiar with."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1389
+msgid "In order to reduce the possibility of mistakes, committers will have their Savannah account removed from the Guix Savannah project and their key removed from @file{.guix-authorizations} after 12 months of inactivity; they can ask to regain commit access by emailing the maintainers, without going through the vouching process."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1395
+msgid "One last thing: the project keeps moving forward because committers not only push their own awesome changes, but also offer some of their time @emph{reviewing} and pushing other people's changes.  As a committer, you're welcome to use your expertise and commit rights to help other contributors, too!"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/contributing.texi:1399
+#, fuzzy, no-wrap
+#| msgid "guix package: (guix)Invoking guix package"
+msgid "update-guix-package, updating the guix package"
+msgstr "guix package：调用guix package"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1405
+msgid "It is sometimes desirable to update the @code{guix} package itself (the package defined in @code{(gnu packages package-management)}), for example to make new daemon features available for use by the @code{guix-service-type} service type.  In order to simplify this task, the following command can be used:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1408
+#, no-wrap
+msgid "make update-guix-package\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1415
+msgid "The @code{update-guix-package} make target will use the last known @emph{commit} corresponding to @code{HEAD} in your Guix checkout, compute the hash of the Guix sources corresponding to that commit and update the @code{commit}, @code{revision} and hash of the @code{guix} package definition."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1419
+msgid "To validate that the updated @code{guix} package hashes are correct and that it can be built successfully, the following command can be run from the directory of your Guix checkout:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/contributing.texi:1422
+#, fuzzy, no-wrap
+#| msgid "./pre-inst-env guix build gnew --keep-failed\n"
+msgid "./pre-inst-env guix build guix\n"
+msgstr "./pre-inst-env guix build gnew --keep-failed\n"
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1427
+msgid "To guard against accidentally updating the @code{guix} package to a commit that others can't refer to, a check is made that the commit used has already been pushed to the Savannah-hosted Guix git repository."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/contributing.texi:1431
+msgid "This check can be disabled, @emph{at your own peril}, by setting the @code{GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT} environment variable.  When this variable is set, the updated package source is also added to the store.  This is used as part of the release process of Guix."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7
 msgid "@documentencoding UTF-8"
 msgstr "@documentencoding UTF-8"
 
 #. type: title
-#: doc/guix.texi:7 doc/guix.texi:92
+#: guix-git/doc/guix.texi:7 guix-git/doc/guix.texi:118
 #, no-wrap
 msgid "GNU Guix Reference Manual"
-msgstr "GNU Guix参考手册"
+msgstr "GNU Guix 参考手册"
 
 #. type: include
-#: doc/guix.texi:10
+#: guix-git/doc/guix.texi:10
 #, no-wrap
 msgid "version.texi"
 msgstr "version-zh_CN.texi"
 
 #. type: copying
-#: doc/guix.texi:66
-msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 ng0@* Copyright @copyright{} 2016, 2017, 2018, 2019 Jan Nieuwenhuizen@* Copyright @copyright{} 2016 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019 Christopher Baines@* Copyright @copyright{} 2017, 2018 Clément Lassieur@* Copyright @copyright{} 2017, 2018 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017 Christopher Allan Webber@* Copyright @copyright{} 2017, 2018 Marius Bakke@* Copyright @copyright{} 2017 Hartmut Goebel@* Copyright @copyright{} 2017 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018 Gábor Boskovits@* Copyright @copyright{} 2018 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@*"
+#: guix-git/doc/guix.texi:91
+msgid "Copyright @copyright{} 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès@* Copyright @copyright{} 2013, 2014, 2016 Andreas Enge@* Copyright @copyright{} 2013 Nikita Karetnikov@* Copyright @copyright{} 2014, 2015, 2016 Alex Kost@* Copyright @copyright{} 2015, 2016 Mathieu Lirzin@* Copyright @copyright{} 2014 Pierre-Antoine Rault@* Copyright @copyright{} 2015 Taylan Ulrich Bayırlı/Kammer@* Copyright @copyright{} 2015, 2016, 2017, 2019, 2020, 2021 Leo Famulari@* Copyright @copyright{} 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus@* Copyright @copyright{} 2016 Ben Woodcroft@* Copyright @copyright{} 2016, 2017, 2018, 2021 Chris Marusich@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner@* Copyright @copyright{} 2016 John Darrington@* Copyright @copyright{} 2016, 2017 Nikita Gillmann@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Jan Nieuwenhuizen@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020 Julien Lepiller@* Copyright @copyright{} 2016 Alex ter Weele@* Copyright @copyright{} 2016, 2017, 2018, 2019, 2020, 2021 Christopher Baines@* Copyright @copyright{} 2017, 2018, 2019 Clément Lassieur@* Copyright @copyright{} 2017, 2018, 2020, 2021 Mathieu Othacehe@* Copyright @copyright{} 2017 Federico Beffa@* Copyright @copyright{} 2017, 2018 Carlo Zancanaro@* Copyright @copyright{} 2017 Thomas Danckaert@* Copyright @copyright{} 2017 humanitiesNerd@* Copyright @copyright{} 2017, 2021 Christopher Lemmer Webber@* Copyright @copyright{} 2017, 2018, 2019, 2020 Marius Bakke@* Copyright @copyright{} 2017, 2019, 2020 Hartmut Goebel@* Copyright @copyright{} 2017, 2019, 2020, 2021 Maxim Cournoyer@* Copyright @copyright{} 2017, 2018, 2019, 2020, 2021 Tobias Geerinckx-Rice@* Copyright @copyright{} 2017 George Clemmer@* Copyright @copyright{} 2017 Andy Wingo@* Copyright @copyright{} 2017, 2018, 2019, 2020 Arun Isaac@* Copyright @copyright{} 2017 nee@* Copyright @copyright{} 2018 Rutger Helling@* Copyright @copyright{} 2018, 2021 Oleg Pykhalov@* Copyright @copyright{} 2018 Mike Gerwitz@* Copyright @copyright{} 2018 Pierre-Antoine Rouby@* Copyright @copyright{} 2018, 2019 Gábor Boskovits@* Copyright @copyright{} 2018, 2019, 2020 Florian Pelz@* Copyright @copyright{} 2018 Laura Lazzati@* Copyright @copyright{} 2018 Alex Vong@* Copyright @copyright{} 2019 Josh Holland@* Copyright @copyright{} 2019, 2020 Diego Nicola Barbato@* Copyright @copyright{} 2019 Ivan Petkov@* Copyright @copyright{} 2019 Jakob L. Kreuze@* Copyright @copyright{} 2019 Kyle Andrews@* Copyright @copyright{} 2019 Alex Griffin@* Copyright @copyright{} 2019, 2020 Guillaume Le Vaillant@* Copyright @copyright{} 2020 Leo Prikler@* Copyright @copyright{} 2019, 2020 Simon Tournier@* Copyright @copyright{} 2020 Wiktor Żelazny@* Copyright @copyright{} 2020 Damien Cassou@* Copyright @copyright{} 2020 Jakub Kądziołka@* Copyright @copyright{} 2020 Jack Hill@* Copyright @copyright{} 2020 Naga Malleswari@* Copyright @copyright{} 2020 Brice Waegeneire@* Copyright @copyright{} 2020 R Veera Kumar@* Copyright @copyright{} 2020 Pierre Langlois@* Copyright @copyright{} 2020 pinoaffe@* Copyright @copyright{} 2020 André Batista@* Copyright @copyright{} 2020, 2021 Alexandru-Sergiu Marton@* Copyright @copyright{} 2020 raingloom@* Copyright @copyright{} 2020 Daniel Brooks@* Copyright @copyright{} 2020 John Soo@* Copyright @copyright{} 2020 Jonathan Brielmaier@* Copyright @copyright{} 2020 Edgar Vincent@* Copyright @copyright{} 2021 Maxime Devos@*"
 msgstr ""
 
 #. type: copying
-#: doc/guix.texi:73
+#: guix-git/doc/guix.texi:98
 msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license is included in the section entitled ``GNU Free Documentation License''."
-msgstr ""
+msgstr "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  A copy of the license is included in the section entitled ``GNU Free Documentation License''."
 
 #. type: dircategory
-#: doc/guix.texi:75
+#: guix-git/doc/guix.texi:100
 #, no-wrap
 msgid "System administration"
 msgstr "系统管理"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Guix: (guix)"
 msgstr "Guix：（guix）"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Manage installed software and system configuration."
 msgstr "管理安装的软件和系统配置。"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "guix package: (guix)Invoking guix package"
 msgstr "guix package：调用guix package"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Installing, removing, and upgrading packages."
 msgstr "安装、删除和升级软件包。"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "guix gc: (guix)Invoking guix gc"
 msgstr "guix gc：调用guix gc"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Reclaiming unused disk space."
 msgstr "回收不使用的硬盘空间。"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "guix pull: (guix)Invoking guix pull"
 msgstr "guix pull：调用guix pull"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Update the list of available packages."
 msgstr "更新可用的软件包列表。"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "guix system: (guix)Invoking guix system"
 msgstr "guix system：调用guix system"
 
 #. type: menuentry
-#: doc/guix.texi:82
+#: guix-git/doc/guix.texi:108
 msgid "Manage the operating system configuration."
 msgstr "管理操作系统配置。"
 
+#. type: menuentry
+#: guix-git/doc/guix.texi:108
+#, fuzzy
+#| msgid "guix pull: (guix)Invoking guix pull"
+msgid "guix deploy: (guix)Invoking guix deploy"
+msgstr "guix pull：调用guix pull"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:108
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Manage operating system configurations for remote hosts."
+msgstr "管理操作系统配置。"
+
 #. type: dircategory
-#: doc/guix.texi:84
+#: guix-git/doc/guix.texi:110
 #, no-wrap
 msgid "Software development"
 msgstr "软件开发"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "guix environment: (guix)Invoking guix environment"
 msgstr "guix environment：调用guix environment"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "Building development environments with Guix."
 msgstr "用Guix构建开发环境。"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "guix build: (guix)Invoking guix build"
 msgstr "guix build：（guix）调用guix build"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "Building packages."
 msgstr "构建软件包。"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "guix pack: (guix)Invoking guix pack"
 msgstr "guix pack：（guix）调用guix pack"
 
 #. type: menuentry
-#: doc/guix.texi:89
+#: guix-git/doc/guix.texi:115
 msgid "Creating binary bundles."
 msgstr "创建二进制bundle。"
 
 #. type: subtitle
-#: doc/guix.texi:93
+#: guix-git/doc/guix.texi:119
 #, no-wrap
 msgid "Using the GNU Guix Functional Package Manager"
 msgstr "使用GNU Guix函数式包管理器"
 
 #. type: author
-#: doc/guix.texi:94
+#: guix-git/doc/guix.texi:120
 #, no-wrap
 msgid "The GNU Guix Developers"
 msgstr "GNU Guix开发者"
 
 #. type: titlepage
-#: doc/guix.texi:100
+#: guix-git/doc/guix.texi:126
 msgid "Edition @value{EDITION} @* @value{UPDATED} @*"
 msgstr "版本@value{EDITION} @* @value{UPDATED} @*"
 
 #. type: node
-#: doc/guix.texi:107
+#: guix-git/doc/guix.texi:133
 #, no-wrap
 msgid "Top"
 msgstr "Top"
 
 #. type: top
-#: doc/guix.texi:108
+#: guix-git/doc/guix.texi:134
 #, no-wrap
 msgid "GNU Guix"
 msgstr "GNU Guix"
 
 #. type: Plain text
-#: doc/guix.texi:112
+#: guix-git/doc/guix.texi:138
 msgid "This document describes GNU Guix version @value{VERSION}, a functional package management tool written for the GNU system."
 msgstr "这份文档介绍GNU Guix版本@value{VERSION}，一个为GNU系统编写的函数式包管理器。"
 
+#.  You can replace the following paragraph with information on
 #. type: Plain text
-#: doc/guix.texi:123
-msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}).  If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}."
+#: guix-git/doc/guix.texi:150
+#, fuzzy
+#| msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), and Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}).  If you would like to translate it in your native language, consider joining the @uref{https://translationproject.org/domain/guix-manual.html, Translation Project}."
+msgid "This manual is also available in Simplified Chinese (@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}), French (@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}), German (@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}), Spanish (@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}), and Russian (@pxref{Top,,, guix.ru, Руководство GNU Guix}).  If you would like to translate it in your native language, consider joining @uref{https://translate.fedoraproject.org/projects/guix/documentation-manual, Weblate}."
 msgstr "这个用户手册还提供简体中文版（@pxref{Top,,, guix.zh_CN, GNU Guix参考手册}），法语版（@pxref{Top,,, guix.fr, Manuel de référence de GNU Guix}），德语版（@pxref{Top,,, guix.de, Referenzhandbuch zu GNU Guix}），和西班牙语版（@pxref{Top,,, guix.es, Manual de referencia de GNU Guix}）。如果你想把它翻译成你的母语，请考虑加入@uref{https://translationproject.org/domain/guix-manual.html, Translation Project}。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:149 doc/guix.texi:312 doc/guix.texi:313
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:178
+#: guix-git/doc/guix.texi:379 guix-git/doc/guix.texi:380
 #, no-wrap
 msgid "Introduction"
 msgstr "介绍"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "What is Guix about?"
 msgstr "Guix是关于什么的？"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:154 doc/guix.texi:471 doc/guix.texi:472
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:183
+#: guix-git/doc/guix.texi:560 guix-git/doc/guix.texi:561
 #, no-wrap
 msgid "Installation"
 msgstr "安装"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Installing Guix."
 msgstr "安装Guix。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:169 doc/guix.texi:1768 doc/guix.texi:1769
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:199
+#: guix-git/doc/guix.texi:1999 guix-git/doc/guix.texi:2000
 #, no-wrap
 msgid "System Installation"
 msgstr "系统安装"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Installing the whole operating system."
 msgstr "安装整个操作系统。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:186 doc/guix.texi:2479 doc/guix.texi:2480
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:2740
+#: guix-git/doc/guix.texi:2741
+#, no-wrap
+msgid "Getting Started"
+msgstr "入门"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:168
+msgid "Your first steps."
+msgstr ""
+
+#. type: chapter
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:216
+#: guix-git/doc/guix.texi:2948 guix-git/doc/guix.texi:2949
 #, no-wrap
 msgid "Package Management"
 msgstr "软件包管理"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Package installation, upgrade, etc."
-msgstr "软件包安装，升级，等"
+msgstr "软件包安装、升级等。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:208 doc/guix.texi:4331 doc/guix.texi:4332
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:239
+#: guix-git/doc/guix.texi:4998 guix-git/doc/guix.texi:4999
+#, no-wrap
+msgid "Channels"
+msgstr "通道"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:168
+msgid "Customizing the package collection."
+msgstr "定制软件包集合。"
+
+#. type: chapter
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:253
+#: guix-git/doc/guix.texi:5526 guix-git/doc/guix.texi:5527
 #, no-wrap
 msgid "Development"
 msgstr "开发"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Guix-aided software development."
 msgstr "Guix辅助的软件开发。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:213 doc/guix.texi:4955 doc/guix.texi:4956
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:260
+#: guix-git/doc/guix.texi:6352 guix-git/doc/guix.texi:6353
 #, no-wrap
 msgid "Programming Interface"
 msgstr "编程接口"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Using Guix in Scheme."
 msgstr "在Scheme里使用Guix。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:229 doc/guix.texi:7583 doc/guix.texi:7584
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:279
+#: guix-git/doc/guix.texi:10148 guix-git/doc/guix.texi:10149
 #, no-wrap
 msgid "Utilities"
 msgstr "工具"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Package management commands."
 msgstr "软件包管理命令。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:254 doc/guix.texi:10194 doc/guix.texi:10195
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:304
+#: guix-git/doc/guix.texi:13358 guix-git/doc/guix.texi:13359
 #, no-wrap
 msgid "System Configuration"
 msgstr "系统配置"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Configuring the operating system."
 msgstr "配置操作系统。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:25392 doc/guix.texi:25393
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:34389
+#: guix-git/doc/guix.texi:34390
 #, no-wrap
 msgid "Documentation"
 msgstr "文档"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Browsing software user manuals."
 msgstr "浏览软件用户手册。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:25456 doc/guix.texi:25457
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:366
+#: guix-git/doc/guix.texi:34453 guix-git/doc/guix.texi:34454
 #, no-wrap
 msgid "Installing Debugging Files"
 msgstr "安装调试文件"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Feeding the debugger."
 msgstr "为调试工具提供输入。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:25522 doc/guix.texi:25523
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:34594
+#: guix-git/doc/guix.texi:34595
 #, no-wrap
 msgid "Security Updates"
 msgstr "安全更新"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Deploying security fixes quickly."
 msgstr "快速部署安全补丁。"
 
 #. type: chapter
-#: doc/guix.texi:139 doc/guix.texi:25642 doc/guix.texi:25643
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:371
+#: guix-git/doc/guix.texi:34709 guix-git/doc/guix.texi:34710
 #, no-wrap
 msgid "Bootstrapping"
 msgstr "引导"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "GNU/Linux built from scratch."
 msgstr "从头开始构建GNU/Linux。"
 
 #. type: node
-#: doc/guix.texi:139 doc/guix.texi:25826
+#: guix-git/doc/guix.texi:168 guix-git/doc/guix.texi:35001
 #, no-wrap
 msgid "Porting"
 msgstr "移植"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Targeting another platform or kernel."
 msgstr "以别的平台或内核为目标。"
 
 #. type: menuentry
-#: doc/guix.texi:139
+#: guix-git/doc/guix.texi:168
 msgid "Your help needed!"
 msgstr "你需要帮助！"
 
 #. type: chapter
-#: doc/guix.texi:144 doc/guix.texi:25874 doc/guix.texi:25875
+#: guix-git/doc/guix.texi:173 guix-git/doc/guix.texi:35049
+#: guix-git/doc/guix.texi:35050
 #, no-wrap
 msgid "Acknowledgments"
 msgstr "致谢"
 
 #. type: menuentry
-#: doc/guix.texi:144
+#: guix-git/doc/guix.texi:173
 msgid "Thanks!"
 msgstr "感谢！"
 
 #. type: appendix
-#: doc/guix.texi:144 doc/guix.texi:25896 doc/guix.texi:25897
+#: guix-git/doc/guix.texi:173 guix-git/doc/guix.texi:35071
+#: guix-git/doc/guix.texi:35072
 #, no-wrap
 msgid "GNU Free Documentation License"
 msgstr "GNU自由文档许可证"
 
 #. type: menuentry
-#: doc/guix.texi:144
+#: guix-git/doc/guix.texi:173
 msgid "The license of this manual."
 msgstr "这个用户手册的许可证。"
 
 #. type: unnumbered
-#: doc/guix.texi:144 doc/guix.texi:25902 doc/guix.texi:25903
+#: guix-git/doc/guix.texi:173 guix-git/doc/guix.texi:35077
+#: guix-git/doc/guix.texi:35078
 #, no-wrap
 msgid "Concept Index"
 msgstr "概念索引"
 
 #. type: menuentry
-#: doc/guix.texi:144
+#: guix-git/doc/guix.texi:173
 msgid "Concepts."
 msgstr "概念。"
 
 #. type: unnumbered
-#: doc/guix.texi:144 doc/guix.texi:25906 doc/guix.texi:25907
+#: guix-git/doc/guix.texi:173 guix-git/doc/guix.texi:35081
+#: guix-git/doc/guix.texi:35082
 #, no-wrap
 msgid "Programming Index"
 msgstr "编程索引"
 
 #. type: menuentry
-#: doc/guix.texi:144
+#: guix-git/doc/guix.texi:173
 msgid "Data types, functions, and variables."
 msgstr "数据类型、函数和变量。"
 
 #. type: menuentry
-#: doc/guix.texi:147
+#: guix-git/doc/guix.texi:176
 msgid "--- The Detailed Node Listing ---"
 msgstr "－－－详细的章节列表－－－"
 
 #. type: section
-#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:341 doc/guix.texi:342
+#: guix-git/doc/guix.texi:181 guix-git/doc/guix.texi:406
+#: guix-git/doc/guix.texi:408 guix-git/doc/guix.texi:409
 #, no-wrap
 msgid "Managing Software the Guix Way"
 msgstr "以Guix的方式管理软件"
 
 #. type: menuentry
-#: doc/guix.texi:152 doc/guix.texi:339
+#: guix-git/doc/guix.texi:181 guix-git/doc/guix.texi:406
 msgid "What's special."
 msgstr "特殊的地方。"
 
 #. type: section
-#: doc/guix.texi:152 doc/guix.texi:339 doc/guix.texi:396 doc/guix.texi:397
+#: guix-git/doc/guix.texi:181 guix-git/doc/guix.texi:406
+#: guix-git/doc/guix.texi:463 guix-git/doc/guix.texi:464
 #, no-wrap
 msgid "GNU Distribution"
 msgstr "GNU发行版"
 
 #. type: menuentry
-#: doc/guix.texi:152 doc/guix.texi:339
+#: guix-git/doc/guix.texi:181 guix-git/doc/guix.texi:406
 msgid "The packages and tools."
 msgstr "软件包和工具。"
 
 #. type: section
-#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:512 doc/guix.texi:513
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:602 guix-git/doc/guix.texi:603
 #, no-wrap
 msgid "Binary Installation"
 msgstr "二进制文件安装"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Getting Guix running in no time!"
 msgstr "立刻运行Guix！"
 
 #. type: section
-#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:714 doc/guix.texi:715
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:820 guix-git/doc/guix.texi:821
 #, no-wrap
 msgid "Requirements"
 msgstr "需求"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Software needed to build and run Guix."
 msgstr "构建和运行Guix需要的软件。"
 
 #. type: section
-#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:798 doc/guix.texi:799
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:908 guix-git/doc/guix.texi:909
 #, no-wrap
 msgid "Running the Test Suite"
 msgstr "运行测试套件"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Testing Guix."
 msgstr "测试Guix。"
 
 #. type: section
-#: doc/guix.texi:161 doc/guix.texi:163 doc/guix.texi:510 doc/guix.texi:863
-#: doc/guix.texi:864
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:193
+#: guix-git/doc/guix.texi:600 guix-git/doc/guix.texi:1005
+#: guix-git/doc/guix.texi:1006
 #, no-wrap
 msgid "Setting Up the Daemon"
 msgstr "设置后台进程"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Preparing the build daemon's environment."
 msgstr "准备“构建后台进程”的环境。"
 
 #. type: node
-#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1294
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:1475
 #, no-wrap
 msgid "Invoking guix-daemon"
 msgstr "调用guix-daemon"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Running the build daemon."
 msgstr "运行“构建后台进程”"
 
 #. type: section
-#: doc/guix.texi:161 doc/guix.texi:510 doc/guix.texi:1562 doc/guix.texi:1563
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:1777 guix-git/doc/guix.texi:1778
 #, no-wrap
 msgid "Application Setup"
 msgstr "设置应用程序"
 
 #. type: menuentry
-#: doc/guix.texi:161 doc/guix.texi:510
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
 msgid "Application-specific setup."
 msgstr "应用程序相关的设置。"
 
+#. type: section
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+#: guix-git/doc/guix.texi:1962 guix-git/doc/guix.texi:1963
+#, fuzzy, no-wrap
+#| msgid "installing Guix"
+msgid "Upgrading Guix"
+msgstr "安装Guix"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:191 guix-git/doc/guix.texi:600
+msgid "Upgrading Guix and its build daemon."
+msgstr "升级 Guix 及其构建守护进程。"
+
 #. type: subsection
-#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:885 doc/guix.texi:886
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
+#: guix-git/doc/guix.texi:1027 guix-git/doc/guix.texi:1028
 #, no-wrap
 msgid "Build Environment Setup"
 msgstr "设置构建环境"
 
 #. type: menuentry
-#: doc/guix.texi:167 doc/guix.texi:883
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
 msgid "Preparing the isolated build environment."
 msgstr "准备隔离的构建环境。"
 
 #. type: node
-#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1002
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
+#: guix-git/doc/guix.texi:1146
 #, no-wrap
 msgid "Daemon Offload Setup"
 msgstr "下发工作给后台进程的设置"
 
 #. type: menuentry
-#: doc/guix.texi:167 doc/guix.texi:883
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
 msgid "Offloading builds to remote machines."
 msgstr "下发构建工作给远程的机器。"
 
 #. type: subsection
-#: doc/guix.texi:167 doc/guix.texi:883 doc/guix.texi:1208 doc/guix.texi:1209
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
+#: guix-git/doc/guix.texi:1384 guix-git/doc/guix.texi:1385
 #, no-wrap
 msgid "SELinux Support"
 msgstr "SELinux的支持"
 
 #. type: menuentry
-#: doc/guix.texi:167 doc/guix.texi:883
+#: guix-git/doc/guix.texi:197 guix-git/doc/guix.texi:1025
 msgid "Using an SELinux policy for the daemon."
 msgstr "为后台进程使用SELinux规则。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1244 doc/guix.texi:1802 doc/guix.texi:1804
-#: doc/guix.texi:1805
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:1420
+#: guix-git/doc/guix.texi:2033 guix-git/doc/guix.texi:2035
+#: guix-git/doc/guix.texi:2036
 #, no-wrap
 msgid "Limitations"
 msgstr "限制"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "What you can expect."
 msgstr "你可以期待什么。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1833 doc/guix.texi:1834
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2061 guix-git/doc/guix.texi:2062
 #, no-wrap
 msgid "Hardware Considerations"
 msgstr "硬件的考虑"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Supported hardware."
 msgstr "支持的硬件。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1868 doc/guix.texi:1869
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2096 guix-git/doc/guix.texi:2097
 #, no-wrap
 msgid "USB Stick and DVD Installation"
 msgstr "U盘和DVD安装"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Preparing the installation medium."
 msgstr "准备安装介质。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1967 doc/guix.texi:1968
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2201 guix-git/doc/guix.texi:2202
 #, no-wrap
 msgid "Preparing for Installation"
 msgstr "准备安装"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Networking, partitioning, etc."
-msgstr "网络、分区、等"
+msgstr "网络、分区等。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:1990 doc/guix.texi:1991
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2224 guix-git/doc/guix.texi:2225
 #, no-wrap
 msgid "Guided Graphical Installation"
 msgstr "指导的图形安装"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Easy graphical installation."
-msgstr "简单的图形安装"
+msgstr "简单的图形安装。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:181 doc/guix.texi:1802 doc/guix.texi:2021
-#: doc/guix.texi:2022
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:211
+#: guix-git/doc/guix.texi:2033 guix-git/doc/guix.texi:2255
+#: guix-git/doc/guix.texi:2256
 #, no-wrap
 msgid "Manual Installation"
 msgstr "手动安装"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Manual installation for wizards."
 msgstr "适合巫师的手动安装。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2364 doc/guix.texi:2365
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2623 guix-git/doc/guix.texi:2624
 #, no-wrap
 msgid "After System Installation"
 msgstr "系统安装之后"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "When installation succeeded."
 msgstr "当安装成功后。"
 
 #. type: node
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2392
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2657
 #, no-wrap
 msgid "Installing Guix in a VM"
-msgstr "在虚拟机里安装Guix。"
+msgstr "在虚拟机里安装 Guix"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "Guix System playground."
 msgstr "Guix系统游乐场。"
 
 #. type: section
-#: doc/guix.texi:179 doc/guix.texi:1802 doc/guix.texi:2446 doc/guix.texi:2447
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
+#: guix-git/doc/guix.texi:2708 guix-git/doc/guix.texi:2709
 #, no-wrap
 msgid "Building the Installation Image"
 msgstr "构建安装镜像"
 
 #. type: menuentry
-#: doc/guix.texi:179 doc/guix.texi:1802
+#: guix-git/doc/guix.texi:209 guix-git/doc/guix.texi:2033
 msgid "How this comes to be."
 msgstr "这是怎样实现的。"
 
 #. type: node
-#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2041
+#: guix-git/doc/guix.texi:214 guix-git/doc/guix.texi:2273
+#: guix-git/doc/guix.texi:2275
 #, no-wrap
 msgid "Keyboard Layout and Networking and Partitioning"
 msgstr "键盘布局、网络和分区"
 
 #. type: menuentry
-#: doc/guix.texi:184 doc/guix.texi:2039
+#: guix-git/doc/guix.texi:214 guix-git/doc/guix.texi:2273
 msgid "Initial setup."
 msgstr "初始设置。"
 
 #. type: subsection
-#: doc/guix.texi:184 doc/guix.texi:2039 doc/guix.texi:2276 doc/guix.texi:2277
+#: guix-git/doc/guix.texi:214 guix-git/doc/guix.texi:2273
+#: guix-git/doc/guix.texi:2535 guix-git/doc/guix.texi:2536
 #, no-wrap
 msgid "Proceeding with the Installation"
-msgstr "继续安装步骤。"
+msgstr "继续安装步骤"
 
 #. type: menuentry
-#: doc/guix.texi:184 doc/guix.texi:2039
+#: guix-git/doc/guix.texi:214 guix-git/doc/guix.texi:2273
 msgid "Installing."
 msgstr "安装。"
 
 #. type: section
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2513 doc/guix.texi:2514
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:2982 guix-git/doc/guix.texi:2983
 #, no-wrap
 msgid "Features"
 msgstr "功能"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "How Guix will make your life brighter."
 msgstr "Guix怎样让你的生活更美好。"
 
 #. type: node
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:2599
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:3072
 #, no-wrap
 msgid "Invoking guix package"
 msgstr "调用guix package"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Package installation, removal, etc."
-msgstr "软件包安装，删除，等"
+msgstr "软件包安装，移除等。"
 
 #. type: section
-#: doc/guix.texi:197 doc/guix.texi:199 doc/guix.texi:2511 doc/guix.texi:3100
-#: doc/guix.texi:3101
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:229
+#: guix-git/doc/guix.texi:2980 guix-git/doc/guix.texi:3688
+#: guix-git/doc/guix.texi:3689
 #, no-wrap
 msgid "Substitutes"
-msgstr ""
+msgstr "substitutes"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Downloading pre-built binaries."
 msgstr "下载构建好的二进制文件。"
 
 #. type: section
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3328 doc/guix.texi:3329
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4019 guix-git/doc/guix.texi:4020
 #, no-wrap
 msgid "Packages with Multiple Outputs"
 msgstr "有多个输出的软件包"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Single source package, multiple outputs."
 msgstr "单个输入多个输出的软件包。"
 
 #. type: node
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3382
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4073
 #, no-wrap
 msgid "Invoking guix gc"
 msgstr "调用guix gc"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Running the garbage collector."
 msgstr "运行垃圾回收器。"
 
 #. type: node
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3588
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4283
 #, no-wrap
 msgid "Invoking guix pull"
 msgstr "调用guix pull"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Fetching the latest Guix and distribution."
 msgstr "获取最新的Guix和发行版。"
 
-#. type: section
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3743 doc/guix.texi:3744
-#, no-wrap
-msgid "Channels"
-msgstr "通道"
+#. type: node
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4530
+#, fuzzy, no-wrap
+#| msgid "Invoking guix archive"
+msgid "Invoking guix time-machine"
+msgstr "调用guix archive"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
-msgid "Customizing the package collection."
-msgstr "定制软件包集合。"
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#, fuzzy
+#| msgid "Interacting with another revision of Guix."
+msgid "Running an older revision of Guix."
+msgstr "和其它版本的Guix交互。"
 
 #. type: section
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:3956 doc/guix.texi:3957
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4585 guix-git/doc/guix.texi:4586
 #, no-wrap
 msgid "Inferiors"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Interacting with another revision of Guix."
 msgstr "和其它版本的Guix交互。"
 
 #. type: node
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4084
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4713
 #, no-wrap
 msgid "Invoking guix describe"
 msgstr "调用guix describe"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Display information about your Guix revision."
 msgstr "显示你的Guix版本信息。"
 
 #. type: node
-#: doc/guix.texi:197 doc/guix.texi:2511 doc/guix.texi:4165
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
+#: guix-git/doc/guix.texi:4808
 #, no-wrap
 msgid "Invoking guix archive"
 msgstr "调用guix archive"
 
 #. type: menuentry
-#: doc/guix.texi:197 doc/guix.texi:2511
+#: guix-git/doc/guix.texi:227 guix-git/doc/guix.texi:2980
 msgid "Exporting and importing store files."
 msgstr "导出和导入仓库文件。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3125 doc/guix.texi:3126
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3714 guix-git/doc/guix.texi:3715
 #, no-wrap
 msgid "Official Substitute Server"
 msgstr "官方的substitute服务器"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "One particular source of substitutes."
 msgstr "substitute的一个特殊来源。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3155 doc/guix.texi:3156
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3743 guix-git/doc/guix.texi:3744
 #, no-wrap
 msgid "Substitute Server Authorization"
 msgstr "授权substitute服务器。"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "How to enable or disable substitutes."
 msgstr "怎么开启或关闭substitute。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3223 doc/guix.texi:3224
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3812 guix-git/doc/guix.texi:3813
+#, fuzzy, no-wrap
+#| msgid "Challenging substitute servers."
+msgid "Getting Substitutes from Other Servers"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#, fuzzy
+#| msgid "substitutes"
+msgid "Substitute diversity."
+msgstr "substitutes"
+
+#. type: subsection
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3914 guix-git/doc/guix.texi:3915
 #, no-wrap
 msgid "Substitute Authentication"
 msgstr "验证substitute"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "How Guix verifies substitutes."
 msgstr "Guix怎样验证substitute。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3258 doc/guix.texi:3259
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3949 guix-git/doc/guix.texi:3950
 #, no-wrap
 msgid "Proxy Settings"
 msgstr "代理设置"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "How to get substitutes via proxy."
 msgstr "怎样通过代理获取substitute。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3270 doc/guix.texi:3271
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3961 guix-git/doc/guix.texi:3962
 #, no-wrap
 msgid "Substitution Failure"
 msgstr "substitute失败"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "What happens when substitution fails."
 msgstr "当substitute失败时会发生什么。"
 
 #. type: subsection
-#: doc/guix.texi:206 doc/guix.texi:3123 doc/guix.texi:3298 doc/guix.texi:3299
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
+#: guix-git/doc/guix.texi:3989 guix-git/doc/guix.texi:3990
 #, no-wrap
 msgid "On Trusting Binaries"
 msgstr "关于信任二进制文件"
 
 #. type: menuentry
-#: doc/guix.texi:206 doc/guix.texi:3123
+#: guix-git/doc/guix.texi:237 guix-git/doc/guix.texi:3712
 msgid "How can you trust that binary blob?"
-msgstr "你怎么信任二进制块。"
+msgstr "你怎么能信任二进制的 blob 呢？"
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5031 guix-git/doc/guix.texi:5032
+#, no-wrap
+msgid "Specifying Additional Channels"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Extending the package collection."
+msgstr "拓展软件包集合。"
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5081 guix-git/doc/guix.texi:5082
+#, no-wrap
+msgid "Using a Custom Guix Channel"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Using a customized Guix."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5103 guix-git/doc/guix.texi:5104
+#, no-wrap
+msgid "Replicating Guix"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Running the @emph{exact same} Guix."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5144 guix-git/doc/guix.texi:5145
+#, fuzzy, no-wrap
+#| msgid "Substitute Authentication"
+msgid "Channel Authentication"
+msgstr "验证substitute"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#, fuzzy
+#| msgid "How Guix verifies substitutes."
+msgid "How Guix verifies what it fetches."
+msgstr "Guix怎样验证substitute。"
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5184 guix-git/doc/guix.texi:5185
+#, fuzzy, no-wrap
+#| msgid "Sharing substitutes."
+msgid "Channels with Substitutes"
+msgstr "分享substitute。"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Using channels with available substitutes."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5209 guix-git/doc/guix.texi:5210
+#, no-wrap
+msgid "Creating a Channel"
+msgstr "创建一个频道"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "How to write your custom channel."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5276 guix-git/doc/guix.texi:5277
+#, fuzzy, no-wrap
+#| msgid "Package Modules"
+msgid "Package Modules in a Sub-directory"
+msgstr "软件包模块"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#, fuzzy
+#| msgid "Specifying how packages are built."
+msgid "Specifying the channel's package modules location."
+msgstr "指定如何构建软件包。"
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5290 guix-git/doc/guix.texi:5291
+#, no-wrap
+msgid "Declaring Channel Dependencies"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "How to depend on other channels."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5332 guix-git/doc/guix.texi:5333
+#, no-wrap
+msgid "Specifying Channel Authorizations"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Defining channel authors authorizations."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5433 guix-git/doc/guix.texi:5434
+#, no-wrap
+msgid "Primary URL"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Distinguishing mirror to original."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+#: guix-git/doc/guix.texi:5456 guix-git/doc/guix.texi:5457
+#, no-wrap
+msgid "Writing Channel News"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:251 guix-git/doc/guix.texi:5029
+msgid "Communicating information to channel's users."
+msgstr ""
 
 #. type: node
-#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4350
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+#: guix-git/doc/guix.texi:5547
 #, no-wrap
 msgid "Invoking guix environment"
 msgstr "调用guix environment"
 
 #. type: menuentry
-#: doc/guix.texi:211 doc/guix.texi:4348
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
 msgid "Setting up development environments."
 msgstr "设置开发环境。"
 
 #. type: node
-#: doc/guix.texi:211 doc/guix.texi:4348 doc/guix.texi:4689
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+#: guix-git/doc/guix.texi:5907
 #, no-wrap
 msgid "Invoking guix pack"
 msgstr "调用guix pack"
 
 #. type: menuentry
-#: doc/guix.texi:211 doc/guix.texi:4348
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
 msgid "Creating software bundles."
 msgstr "创建软件bundle。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:4994 doc/guix.texi:4995
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+#: guix-git/doc/guix.texi:6264 guix-git/doc/guix.texi:6265
+#, no-wrap
+msgid "The GCC toolchain"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+msgid "Working with languages supported by GCC."
+msgstr ""
+
+#. type: node
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+#: guix-git/doc/guix.texi:6290
+#, fuzzy, no-wrap
+#| msgid "Invoking guix edit"
+msgid "Invoking guix git authenticate"
+msgstr "调用guix edit。"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:258 guix-git/doc/guix.texi:5545
+#, fuzzy
+#| msgid "Authenticating HTTPS servers."
+msgid "Authenticating Git repositories."
+msgstr "认证HTTPS服务器。"
+
+#. type: section
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:6394 guix-git/doc/guix.texi:6395
 #, no-wrap
 msgid "Package Modules"
 msgstr "软件包模块"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Packages from the programmer's viewpoint."
 msgstr "从程序员的角度看软件包。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:224 doc/guix.texi:4992 doc/guix.texi:5056
-#: doc/guix.texi:5057
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:274
+#: guix-git/doc/guix.texi:6392 guix-git/doc/guix.texi:6456
+#: guix-git/doc/guix.texi:6457
 #, no-wrap
 msgid "Defining Packages"
 msgstr "定义软件包"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Defining new packages."
 msgstr "定义新软件包。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:5559 doc/guix.texi:5560
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:7024 guix-git/doc/guix.texi:7025
+#, fuzzy, no-wrap
+#| msgid "Defining Packages"
+msgid "Defining Package Variants"
+msgstr "定义软件包"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#, fuzzy
+#| msgid "Building packages."
+msgid "Customizing packages."
+msgstr "构建软件包。"
+
+#. type: section
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:7256 guix-git/doc/guix.texi:7257
 #, no-wrap
 msgid "Build Systems"
 msgstr "构建系统"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Specifying how packages are built."
 msgstr "指定如何构建软件包。"
 
+#. type: subsection
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:8272 guix-git/doc/guix.texi:8273
+#: guix-git/doc/guix.texi:8676
+#, fuzzy, no-wrap
+#| msgid "Build Systems"
+msgid "Build Phases"
+msgstr "构建系统"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+msgid "Phases of the build process of a package."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:8466 guix-git/doc/guix.texi:8467
+#, fuzzy, no-wrap
+#| msgid "Utilities"
+msgid "Build Utilities"
+msgstr "工具"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#, fuzzy
+#| msgid "Importing package definitions."
+msgid "Helpers for your package definitions and more."
+msgstr "导入软件包定义。"
+
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6297 doc/guix.texi:6298
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:8753 guix-git/doc/guix.texi:8754
 #, no-wrap
 msgid "The Store"
 msgstr "仓库"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Manipulating the package store."
 msgstr "操纵软件包仓库。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6447 doc/guix.texi:6448
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:8906 guix-git/doc/guix.texi:8907
 #, no-wrap
 msgid "Derivations"
 msgstr ""
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Low-level interface to package derivations."
 msgstr "软件包derivation的底层接口。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6641 doc/guix.texi:6642
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:9100 guix-git/doc/guix.texi:9101
 #, no-wrap
 msgid "The Store Monad"
 msgstr "仓库monad"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Purely functional interface to the store."
 msgstr "仓库的纯函数式接口。"
 
 #. type: section
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:6956 doc/guix.texi:6957
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:9419 guix-git/doc/guix.texi:9420
 #, no-wrap
 msgid "G-Expressions"
 msgstr "G-表达式"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
 msgid "Manipulating build expressions."
 msgstr "操纵构建表达式。"
 
 #. type: node
-#: doc/guix.texi:222 doc/guix.texi:4992 doc/guix.texi:7530
+#: guix-git/doc/guix.texi:272 guix-git/doc/guix.texi:6392
+#: guix-git/doc/guix.texi:10048
 #, no-wrap
 msgid "Invoking guix repl"
 msgstr "调用guix repl"
 
 #. type: menuentry
-#: doc/guix.texi:222 doc/guix.texi:4992
-msgid "Fiddling with Guix interactively."
-msgstr "交互式地操作Guix。"
+#: guix-git/doc/guix.texi:272
+#, fuzzy
+#| msgid "Programming Index"
+msgid "Programming Guix in Guile."
+msgstr "编程索引"
 
 #. type: node
-#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5327
+#: guix-git/doc/guix.texi:277 guix-git/doc/guix.texi:6659
+#: guix-git/doc/guix.texi:6662
 #, no-wrap
 msgid "package Reference"
 msgstr "软件包引用"
 
 #. type: menuentry
-#: doc/guix.texi:227 doc/guix.texi:5324
+#: guix-git/doc/guix.texi:277 guix-git/doc/guix.texi:6659
 msgid "The package data type."
 msgstr "软件包数据类型。"
 
 #. type: node
-#: doc/guix.texi:227 doc/guix.texi:5324 doc/guix.texi:5471
+#: guix-git/doc/guix.texi:277 guix-git/doc/guix.texi:6659
+#: guix-git/doc/guix.texi:6833
 #, no-wrap
 msgid "origin Reference"
 msgstr "origin参考手册"
 
 #. type: menuentry
-#: doc/guix.texi:227 doc/guix.texi:5324
+#: guix-git/doc/guix.texi:277 guix-git/doc/guix.texi:6659
 msgid "The origin data type."
 msgstr "origin数据类型。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:7609
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:10174
 #, no-wrap
 msgid "Invoking guix build"
 msgstr "调用guix build"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Building packages from the command line."
 msgstr "用命令行构建软件包。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8260
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11010
 #, no-wrap
 msgid "Invoking guix edit"
 msgstr "调用guix edit。"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Editing package definitions."
 msgstr "编辑软件包定义。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8286
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11040
 #, no-wrap
 msgid "Invoking guix download"
 msgstr "调用guix download"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Downloading a file and printing its hash."
 msgstr "下载一个文件并打印它的hash。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8339
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11098
 #, no-wrap
 msgid "Invoking guix hash"
 msgstr "调用guix hash"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Computing the cryptographic hash of a file."
 msgstr "计算一个文件的密码学hash。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8401
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11170
 #, no-wrap
 msgid "Invoking guix import"
 msgstr "调用guix import"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Importing package definitions."
 msgstr "导入软件包定义。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:8799
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11655
 #, no-wrap
 msgid "Invoking guix refresh"
 msgstr "调用guix refresh"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Updating package definitions."
 msgstr "更新软件包定义。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9110
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:11991
 #, no-wrap
 msgid "Invoking guix lint"
 msgstr "调用guix lint"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Finding errors in package definitions."
 msgstr "从软件包定义里寻找错误。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9226
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:12160
 #, no-wrap
 msgid "Invoking guix size"
 msgstr "调用guix size"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Profiling disk usage."
 msgstr "分析硬盘使用情况。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9350
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:12304
 #, no-wrap
 msgid "Invoking guix graph"
 msgstr "调用guix graph"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Visualizing the graph of packages."
 msgstr "展示软件包的关系图。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9553
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:12571
 #, no-wrap
 msgid "Invoking guix publish"
 msgstr "调用guix publish"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Sharing substitutes."
 msgstr "分享substitute。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9770
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:12830
 #, no-wrap
 msgid "Invoking guix challenge"
 msgstr "调用guix challenge"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Challenging substitute servers."
 msgstr "挑战subtitute服务器。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9909
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:13013
 #, no-wrap
 msgid "Invoking guix copy"
 msgstr "调用guix copy"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Copying to and from a remote store."
 msgstr "复制到远程的仓库，或从远程的仓库复制。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:9972
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:13076
 #, no-wrap
 msgid "Invoking guix container"
 msgstr "调用guix container"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Process isolation."
 msgstr "进程隔离。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10026
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:13130
 #, no-wrap
 msgid "Invoking guix weather"
 msgstr "调用guix weather"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Assessing substitute availability."
 msgstr "评估substitute的可用性。"
 
 #. type: node
-#: doc/guix.texi:245 doc/guix.texi:7607 doc/guix.texi:10137
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
+#: guix-git/doc/guix.texi:13260
 #, no-wrap
 msgid "Invoking guix processes"
 msgstr "调用guix processes"
 
 #. type: menuentry
-#: doc/guix.texi:245 doc/guix.texi:7607
+#: guix-git/doc/guix.texi:295 guix-git/doc/guix.texi:10172
 msgid "Listing client processes."
 msgstr "列出客户端进程。"
 
 #. type: section
-#: doc/guix.texi:247 doc/guix.texi:7610
+#: guix-git/doc/guix.texi:297 guix-git/doc/guix.texi:10175
 #, no-wrap
 msgid "Invoking @command{guix build}"
 msgstr "调用@command{guix build}"
 
 #. type: subsection
-#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7663 doc/guix.texi:7664
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
+#: guix-git/doc/guix.texi:10228 guix-git/doc/guix.texi:10229
 #, no-wrap
 msgid "Common Build Options"
 msgstr "普通的构建选项"
 
 #. type: menuentry
-#: doc/guix.texi:252 doc/guix.texi:7661
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
 msgid "Build options for most commands."
 msgstr "大部分命令的构建选项。"
 
 #. type: subsection
-#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7819 doc/guix.texi:7820
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
+#: guix-git/doc/guix.texi:10383 guix-git/doc/guix.texi:10384
 #, no-wrap
 msgid "Package Transformation Options"
 msgstr "软件包变换选项。"
 
 #. type: menuentry
-#: doc/guix.texi:252 doc/guix.texi:7661
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
 msgid "Creating variants of packages."
 msgstr "创建软件包的变体。"
 
 #. type: subsection
-#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:7968 doc/guix.texi:7969
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
+#: guix-git/doc/guix.texi:10692 guix-git/doc/guix.texi:10693
 #, no-wrap
 msgid "Additional Build Options"
 msgstr "额外的构建选项"
 
 #. type: menuentry
-#: doc/guix.texi:252 doc/guix.texi:7661
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
 msgid "Options specific to 'guix build'."
 msgstr "只属于'guix build'的选项。"
 
 #. type: subsection
-#: doc/guix.texi:252 doc/guix.texi:7661 doc/guix.texi:8180 doc/guix.texi:8181
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
+#: guix-git/doc/guix.texi:10930 guix-git/doc/guix.texi:10931
 #, no-wrap
 msgid "Debugging Build Failures"
 msgstr "调试构建错误"
 
 #. type: menuentry
-#: doc/guix.texi:252 doc/guix.texi:7661
+#: guix-git/doc/guix.texi:302 guix-git/doc/guix.texi:10226
 msgid "Real life packaging experience."
 msgstr "真实的打包经验。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10238
-#: doc/guix.texi:10239
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:13403 guix-git/doc/guix.texi:13404
 #, no-wrap
 msgid "Using the Configuration System"
 msgstr "使用配置系统"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Customizing your GNU system."
 msgstr "定制你的GNU系统。"
 
 #. type: node
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10474
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:13651
 #, no-wrap
 msgid "operating-system Reference"
 msgstr "操作系统参考"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Detail of operating-system declarations."
 msgstr "操作系统声明详情。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10678
-#: doc/guix.texi:10679
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:13903 guix-git/doc/guix.texi:13904
 #, no-wrap
 msgid "File Systems"
 msgstr "文件系统"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Configuring file system mounts."
 msgstr "设置文件系统挂载。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10848
-#: doc/guix.texi:10849
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:14226 guix-git/doc/guix.texi:14227
 #, no-wrap
 msgid "Mapped Devices"
 msgstr "映射的设备"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Block device extra processing."
 msgstr "块设备额外的处理。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:10969
-#: doc/guix.texi:10970
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:14374 guix-git/doc/guix.texi:14375
 #, no-wrap
 msgid "User Accounts"
 msgstr "用户帐号"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Specifying user accounts."
 msgstr "指定用户帐号。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:2048 doc/guix.texi:10236
-#: doc/guix.texi:11122 doc/guix.texi:11123
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:2282
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:14550
+#: guix-git/doc/guix.texi:14551
 #, no-wrap
 msgid "Keyboard Layout"
 msgstr "键盘布局"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "How the system interprets key strokes."
 msgstr "系统怎样理解按键。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:1570 doc/guix.texi:10236
-#: doc/guix.texi:11254 doc/guix.texi:11255
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:1785
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:14696
+#: guix-git/doc/guix.texi:14697
 #, no-wrap
 msgid "Locales"
 msgstr "区域"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Language and cultural convention settings."
 msgstr "语言和文化惯例设置。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:273 doc/guix.texi:10236 doc/guix.texi:11394
-#: doc/guix.texi:11395
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:324
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:14836
+#: guix-git/doc/guix.texi:14837
 #, no-wrap
 msgid "Services"
 msgstr "服务"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Specifying system services."
 msgstr "指定系统服务。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23607
-#: doc/guix.texi:23608
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:32033 guix-git/doc/guix.texi:32034
 #, no-wrap
 msgid "Setuid Programs"
 msgstr "setuid程序"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Programs running with root privileges."
 msgstr "以root权限运行的程序。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:1715 doc/guix.texi:10236
-#: doc/guix.texi:23653 doc/guix.texi:23654
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:1934
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:32079
+#: guix-git/doc/guix.texi:32080
 #, no-wrap
 msgid "X.509 Certificates"
 msgstr "X.509证书"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Authenticating HTTPS servers."
 msgstr "认证HTTPS服务器。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:1613 doc/guix.texi:10236
-#: doc/guix.texi:23716 doc/guix.texi:23717
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:1828
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:32142
+#: guix-git/doc/guix.texi:32143
 #, no-wrap
 msgid "Name Service Switch"
 msgstr "Name Service Switch"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Configuring libc's name service switch."
 msgstr "设置libc的name service switch。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:23854
-#: doc/guix.texi:23855
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:32280 guix-git/doc/guix.texi:32281
 #, no-wrap
 msgid "Initial RAM Disk"
 msgstr "初始的内存虚拟硬盘"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Linux-Libre bootstrapping."
 msgstr "Linux-Libre引导。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24028
-#: doc/guix.texi:24029
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:32456 guix-git/doc/guix.texi:32457
 #, no-wrap
 msgid "Bootloader Configuration"
 msgstr "引导设置"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Configuring the boot loader."
 msgstr "设置引导程序。"
 
 #. type: node
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24225
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:32750
 #, no-wrap
 msgid "Invoking guix system"
 msgstr "调用guix system"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Instantiating a system configuration."
 msgstr "实例化一个系统配置。"
 
 #. type: node
-#: doc/guix.texi:271 doc/guix.texi:10236 doc/guix.texi:24680
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:33335
+#, no-wrap
+msgid "Invoking guix deploy"
+msgstr "调用 guix deploy"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#, fuzzy
+#| msgid "Instantiating a system configuration."
+msgid "Deploying a system configuration to a remote host."
+msgstr "实例化一个系统配置。"
+
+#. type: node
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
+#: guix-git/doc/guix.texi:33541
 #, no-wrap
 msgid "Running Guix in a VM"
 msgstr "在虚拟机里运行Guix"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "How to run Guix System in a virtual machine."
 msgstr "怎样在虚拟机里运行Guix。"
 
 #. type: section
-#: doc/guix.texi:271 doc/guix.texi:302 doc/guix.texi:10236 doc/guix.texi:24810
-#: doc/guix.texi:24811
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:359
+#: guix-git/doc/guix.texi:13401 guix-git/doc/guix.texi:33671
+#: guix-git/doc/guix.texi:33672
 #, no-wrap
 msgid "Defining Services"
 msgstr "定义服务"
 
 #. type: menuentry
-#: doc/guix.texi:271 doc/guix.texi:10236
+#: guix-git/doc/guix.texi:322 guix-git/doc/guix.texi:13401
 msgid "Adding new service definitions."
 msgstr "添加新的服务定义。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:11473
-#: doc/guix.texi:11474
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:14921 guix-git/doc/guix.texi:14922
 #, no-wrap
 msgid "Base Services"
 msgstr "基础服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Essential system services."
 msgstr "必要的系统服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12266
-#: doc/guix.texi:12267
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:15837 guix-git/doc/guix.texi:15838
 #, no-wrap
 msgid "Scheduled Job Execution"
 msgstr "执行计划任务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "The mcron service."
 msgstr "mcron服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12367
-#: doc/guix.texi:12368
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:15978 guix-git/doc/guix.texi:15979
 #, no-wrap
 msgid "Log Rotation"
 msgstr "日志轮替"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "The rottlog service."
 msgstr "rottlog服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:12469
-#: doc/guix.texi:12470
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:16091 guix-git/doc/guix.texi:16092
 #, no-wrap
 msgid "Networking Services"
 msgstr "网络服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Network setup, SSH daemon, etc."
 msgstr "网络设置，SSH后台进程，等"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13415
-#: doc/guix.texi:13416
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:17661 guix-git/doc/guix.texi:17662
+#, no-wrap
+msgid "Unattended Upgrades"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "Automated system upgrades."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:17799 guix-git/doc/guix.texi:17800
 #, no-wrap
 msgid "X Window"
 msgstr "X窗口"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Graphical display."
 msgstr "图形显示器。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:13762
-#: doc/guix.texi:13763
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:18176 guix-git/doc/guix.texi:18177
 #, no-wrap
 msgid "Printing Services"
 msgstr "打印服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Local and remote printer support."
 msgstr "本地和远程打印机的支持。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:14603
-#: doc/guix.texi:14604
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:19029 guix-git/doc/guix.texi:19030
 #, no-wrap
 msgid "Desktop Services"
 msgstr "桌面服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "D-Bus and desktop services."
 msgstr "D-Bus和桌面服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15004
-#: doc/guix.texi:15005
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:19547 guix-git/doc/guix.texi:19548
 #, no-wrap
 msgid "Sound Services"
 msgstr "声音服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "ALSA and Pulseaudio services."
 msgstr "ALSA和Pulseaudio服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15085
-#: doc/guix.texi:15086
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:19687 guix-git/doc/guix.texi:19688
 #, no-wrap
 msgid "Database Services"
 msgstr "数据库服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "SQL databases, key-value stores, etc."
 msgstr "SQL数据库，键值仓库，等"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:15245
-#: doc/guix.texi:15246
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:20019 guix-git/doc/guix.texi:20020
 #, no-wrap
 msgid "Mail Services"
 msgstr "邮件服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "IMAP, POP3, SMTP, and all that."
 msgstr "IMAP，POP3，SMTP，等"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:16746
-#: doc/guix.texi:16747
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:21835 guix-git/doc/guix.texi:21836
 #, no-wrap
 msgid "Messaging Services"
 msgstr "消息服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Messaging services."
 msgstr "消息服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17248
-#: doc/guix.texi:17249
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:22338 guix-git/doc/guix.texi:22339
 #, no-wrap
 msgid "Telephony Services"
 msgstr "电话服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Telephony services."
 msgstr "电话服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17453
-#: doc/guix.texi:17454
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:23341 guix-git/doc/guix.texi:23342
 #, no-wrap
 msgid "Monitoring Services"
 msgstr "监控服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Monitoring services."
 msgstr "监控服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:17958
-#: doc/guix.texi:17959
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:23852 guix-git/doc/guix.texi:23853
 #, no-wrap
 msgid "Kerberos Services"
 msgstr "Kerberos服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Kerberos services."
 msgstr "Kerberos服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:18562
-#: doc/guix.texi:18563
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:23978 guix-git/doc/guix.texi:23979
+#, no-wrap
+msgid "LDAP Services"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "LDAP services."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:24457 guix-git/doc/guix.texi:24458
 #, no-wrap
 msgid "Web Services"
 msgstr "Web服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Web servers."
 msgstr "Web服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19363
-#: doc/guix.texi:19364
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:25658 guix-git/doc/guix.texi:25659
 #, no-wrap
 msgid "Certificate Services"
 msgstr "证书服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "TLS certificates via Let's Encrypt."
 msgstr "Let's Encrypt TLS证书。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:19529
-#: doc/guix.texi:19530
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:25831 guix-git/doc/guix.texi:25832
 #, no-wrap
 msgid "DNS Services"
 msgstr "DNS服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "DNS daemons."
 msgstr "DNS后台进程。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20150
-#: doc/guix.texi:20151
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:26579 guix-git/doc/guix.texi:26580
 #, no-wrap
 msgid "VPN Services"
 msgstr "VPN服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "VPN daemons."
 msgstr "VPN后台进程。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20508
-#: doc/guix.texi:20509
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:27034 guix-git/doc/guix.texi:27035
 #, no-wrap
 msgid "Network File System"
 msgstr "网络文件系统"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "NFS related services."
 msgstr "网络文件系统相关的服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20623
-#: doc/guix.texi:20624
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:27230 guix-git/doc/guix.texi:27231
 #, no-wrap
 msgid "Continuous Integration"
 msgstr "持续集成"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
-msgid "The Cuirass service."
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#, fuzzy
+#| msgid "The Cuirass service."
+msgid "Cuirass and Laminar services."
 msgstr "Cuirass服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:20740
-#: doc/guix.texi:20741
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:27508 guix-git/doc/guix.texi:27509
 #, no-wrap
 msgid "Power Management Services"
 msgstr "电源管理服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Extending battery life."
 msgstr "延长电池寿命。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21274
-#: doc/guix.texi:21275
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:28042 guix-git/doc/guix.texi:28043
 #, no-wrap
 msgid "Audio Services"
 msgstr "音频服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "The MPD."
 msgstr "MPD。"
 
-#. type: node
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:21333
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:28161 guix-git/doc/guix.texi:28162
 #, no-wrap
 msgid "Virtualization Services"
 msgstr "虚拟化服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Virtualization services."
 msgstr "虚拟化服务。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:22126
-#: doc/guix.texi:22127
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:29775 guix-git/doc/guix.texi:29776
 #, no-wrap
 msgid "Version Control Services"
 msgstr "版本控制服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Providing remote access to Git repositories."
 msgstr "远程访问Git仓库。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23314
-#: doc/guix.texi:23315
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:30967 guix-git/doc/guix.texi:30968
 #, no-wrap
 msgid "Game Services"
 msgstr "游戏服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Game servers."
 msgstr "游戏服务器。"
 
 #. type: subsection
-#: doc/guix.texi:300 doc/guix.texi:11471 doc/guix.texi:23345
-#: doc/guix.texi:23346
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:30999 guix-git/doc/guix.texi:31000
+#, fuzzy, no-wrap
+#| msgid "Sound Services"
+msgid "PAM Mount Service"
+msgstr "声音服务"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "Service to mount volumes when logging in."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:31082 guix-git/doc/guix.texi:31083
+#, fuzzy, no-wrap
+#| msgid "Audio Services"
+msgid "Guix Services"
+msgstr "音频服务"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "Services relating specifically to Guix."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:31357 guix-git/doc/guix.texi:31358
+#, fuzzy, no-wrap
+#| msgid "Mail Services"
+msgid "Linux Services"
+msgstr "邮件服务"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "Services tied to the Linux kernel."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:31504 guix-git/doc/guix.texi:31505
+#, fuzzy, no-wrap
+#| msgid "Sound Services"
+msgid "Hurd Services"
+msgstr "声音服务"
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+msgid "Services specific for a Hurd System."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
+#: guix-git/doc/guix.texi:31546 guix-git/doc/guix.texi:31547
 #, no-wrap
 msgid "Miscellaneous Services"
 msgstr "其它各种服务"
 
 #. type: menuentry
-#: doc/guix.texi:300 doc/guix.texi:11471
+#: guix-git/doc/guix.texi:357 guix-git/doc/guix.texi:14919
 msgid "Other services."
 msgstr "其它服务。"
 
 #. type: subsection
-#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24824
-#: doc/guix.texi:24825
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
+#: guix-git/doc/guix.texi:33685 guix-git/doc/guix.texi:33686
 #, no-wrap
 msgid "Service Composition"
 msgstr "合成服务"
 
 #. type: menuentry
-#: doc/guix.texi:307 doc/guix.texi:24822
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
 msgid "The model for composing services."
 msgstr "服务合成的模型。"
 
 #. type: subsection
-#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:24880
-#: doc/guix.texi:24881
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
+#: guix-git/doc/guix.texi:33741 guix-git/doc/guix.texi:33742
 #, no-wrap
 msgid "Service Types and Services"
 msgstr "服务类型和服务"
 
 #. type: menuentry
-#: doc/guix.texi:307 doc/guix.texi:24822
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
 msgid "Types and services."
 msgstr "类型和服务。"
 
 #. type: subsection
-#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25017
-#: doc/guix.texi:25018
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
+#: guix-git/doc/guix.texi:33878 guix-git/doc/guix.texi:33879
 #, no-wrap
 msgid "Service Reference"
 msgstr "服务参考"
 
 #. type: menuentry
-#: doc/guix.texi:307 doc/guix.texi:24822
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
 msgid "API reference."
 msgstr "API参考。"
 
 #. type: subsection
-#: doc/guix.texi:307 doc/guix.texi:24822 doc/guix.texi:25242
-#: doc/guix.texi:25243
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
+#: guix-git/doc/guix.texi:34169 guix-git/doc/guix.texi:34170
 #, no-wrap
 msgid "Shepherd Services"
 msgstr "Shepherd服务"
 
 #. type: menuentry
-#: doc/guix.texi:307 doc/guix.texi:24822
+#: guix-git/doc/guix.texi:364 guix-git/doc/guix.texi:33683
 msgid "A particular type of service."
 msgstr "一种特别的服务。"
 
+#. type: section
+#: guix-git/doc/guix.texi:369 guix-git/doc/guix.texi:34470
+#: guix-git/doc/guix.texi:34472 guix-git/doc/guix.texi:34473
+#, no-wrap
+msgid "Separate Debug Info"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:369 guix-git/doc/guix.texi:34470
+#, fuzzy
+#| msgid "Installing Debugging Files"
+msgid "Installing 'debug' outputs."
+msgstr "安装调试文件"
+
+#. type: section
+#: guix-git/doc/guix.texi:369 guix-git/doc/guix.texi:34470
+#: guix-git/doc/guix.texi:34531 guix-git/doc/guix.texi:34532
+#, no-wrap
+msgid "Rebuilding Debug Info"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:369 guix-git/doc/guix.texi:34470
+msgid "Building missing debug info."
+msgstr ""
+
+#. type: node
+#: guix-git/doc/guix.texi:374 guix-git/doc/guix.texi:34748
+#: guix-git/doc/guix.texi:34750
+#, no-wrap
+msgid "Reduced Binary Seed Bootstrap"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:374 guix-git/doc/guix.texi:34748
+msgid "A Bootstrap worthy of GNU."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:374 guix-git/doc/guix.texi:34748
+#: guix-git/doc/guix.texi:34825 guix-git/doc/guix.texi:34826
+#, no-wrap
+msgid "Preparing to Use the Bootstrap Binaries"
+msgstr ""
+
+#. type: menuentry
+#: guix-git/doc/guix.texi:374 guix-git/doc/guix.texi:34748
+msgid "Building that what matters most."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:315
+#: guix-git/doc/guix.texi:382
 #, no-wrap
 msgid "purpose"
 msgstr "目的"
 
 #. type: Plain text
-#: doc/guix.texi:323
+#: guix-git/doc/guix.texi:390
 msgid "GNU Guix@footnote{``Guix'' is pronounced like ``geeks'', or ``ɡiːks'' using the international phonetic alphabet (IPA).} is a package management tool for and distribution of the GNU system.  Guix makes it easy for unprivileged users to install, upgrade, or remove software packages, to roll back to a previous package set, to build packages from source, and generally assists with the creation and maintenance of software environments."
 msgstr "GNU Guix@footnote{``Guix''读做``geeks''，或``ɡiːks''（国际音标）}是GNU系统的包管理器和发行版。Guix让无特权的用户可以轻松地安装，升级，或删除软件包，回滚到前一个软件包集合，从源代码构建软件包，及辅助软件环境的创建和维护。"
 
 #. type: cindex
-#: doc/guix.texi:324 doc/guix.texi:399
+#: guix-git/doc/guix.texi:391 guix-git/doc/guix.texi:466
 #, no-wrap
 msgid "Guix System"
 msgstr "Guix系统"
 
 #. type: cindex
-#: doc/guix.texi:325
+#: guix-git/doc/guix.texi:392
 #, no-wrap
 msgid "GuixSD, now Guix System"
 msgstr "GuixSD，现在称为Guix系统"
 
 #. type: cindex
-#: doc/guix.texi:326
+#: guix-git/doc/guix.texi:393
 #, no-wrap
 msgid "Guix System Distribution, now Guix System"
 msgstr "Guix系统发行版，现在称为Guix系统"
 
 #. type: Plain text
-#: doc/guix.texi:335
+#: guix-git/doc/guix.texi:402
 msgid "You can install GNU@tie{}Guix on top of an existing GNU/Linux system where it complements the available tools without interference (@pxref{Installation}), or you can use it as a standalone operating system distribution, @dfn{Guix@tie{}System}@footnote{We used to refer to Guix System as ``Guix System Distribution'' or ``GuixSD''.  We now consider it makes more sense to group everything under the ``Guix'' banner since, after all, Guix System is readily available through the @command{guix system} command, even if you're using a different distro underneath!}.  @xref{GNU Distribution}."
 msgstr "你可以在现有的GNU/Linux发行版上安装GNU@tie{}Guix（@pxref{Installation}），Guix可以补充已有的工具，并且不会和它们产生冲突。或者你可以把它当作独立的操作系统发行版（@dfn{Guix@tie{}系统}@footnote{我们以前把Guix系统称为``Guix系统发行版''或``GuixSD''。我们现在觉得把一切都统一在``Guix''的旗帜下更合理，因为，毕竟即使在别的发行版上你也可以随时通过@command{guix system}命令获得Guix系统}）。@xref{GNU Distribution}."
 
 #. type: cindex
-#: doc/guix.texi:344
+#: guix-git/doc/guix.texi:411
 #, no-wrap
 msgid "user interfaces"
 msgstr "用户界面"
 
 #. type: Plain text
-#: doc/guix.texi:350
-msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage, (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})."
+#: guix-git/doc/guix.texi:417
+#, fuzzy
+#| msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage, (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})."
+msgid "Guix provides a command-line package management interface (@pxref{Package Management}), tools to help with software development (@pxref{Development}), command-line utilities for more advanced usage (@pxref{Utilities}), as well as Scheme programming interfaces (@pxref{Programming Interface})."
 msgstr "Guix提供了命令行软件包管理接口（@pxref{Package Management}），辅助软件开发的工具（@pxref{Development}），高级用法的命令行接口（@pxref{Utilities}），以及Scheme编程语言接口（@pxref{Programming Interface}）。"
 
 #. type: cindex
-#: doc/guix.texi:350
+#: guix-git/doc/guix.texi:417
 #, no-wrap
 msgid "build daemon"
 msgstr "构建后台进程"
 
 #. type: Plain text
-#: doc/guix.texi:354
+#: guix-git/doc/guix.texi:421
 msgid "Its @dfn{build daemon} is responsible for building packages on behalf of users (@pxref{Setting Up the Daemon}) and for downloading pre-built binaries from authorized sources (@pxref{Substitutes})."
 msgstr "@dfn{构建后台进程}为用户构建软件包（@pxref{Setting Up the Daemon}），及从授权的源（@pxref{Substitutes}）下载预构建的二进制文件。"
 
 #. type: cindex
-#: doc/guix.texi:355
+#: guix-git/doc/guix.texi:422
 #, no-wrap
 msgid "extensibility of the distribution"
 msgstr "发行版的扩展性"
 
 #. type: cindex
-#: doc/guix.texi:356 doc/guix.texi:5016
+#: guix-git/doc/guix.texi:423 guix-git/doc/guix.texi:6416
 #, no-wrap
 msgid "customization, of packages"
 msgstr "定制软件包"
 
 #. type: Plain text
-#: doc/guix.texi:365
+#: guix-git/doc/guix.texi:432
 msgid "Guix includes package definitions for many GNU and non-GNU packages, all of which @uref{https://www.gnu.org/philosophy/free-sw.html, respect the user's computing freedom}.  It is @emph{extensible}: users can write their own package definitions (@pxref{Defining Packages}) and make them available as independent package modules (@pxref{Package Modules}).  It is also @emph{customizable}: users can @emph{derive} specialized package definitions from existing ones, including from the command line (@pxref{Package Transformation Options})."
 msgstr "Guix包含很多GNU和非GNU的软件包定义，所有的这些软件包都@uref{https://www.gnu.org/philosophy/free-sw.html, 尊重用户的自由}。它是@emph{可扩展的}：用户可以编写自己的软件包定义（@pxref{Defining Packages}），并且把它们作为独立的软件包模块@pxref{Package Modules}。它也是@emph{可定制的}：用户可以从现有的软件包定义衍生出特殊的软件包，包括从命令行（@pxref{Package Transformation Options}）。"
 
 #. type: cindex
-#: doc/guix.texi:366
+#: guix-git/doc/guix.texi:433
 #, no-wrap
 msgid "functional package management"
 msgstr "函数式包管理器"
 
 #. type: cindex
-#: doc/guix.texi:367
+#: guix-git/doc/guix.texi:434
 #, no-wrap
 msgid "isolation"
 msgstr "隔离"
 
 #. type: Plain text
-#: doc/guix.texi:382
+#: guix-git/doc/guix.texi:449
 msgid "Under the hood, Guix implements the @dfn{functional package management} discipline pioneered by Nix (@pxref{Acknowledgments}).  In Guix, the package build and installation process is seen as a @emph{function}, in the mathematical sense.  That function takes inputs, such as build scripts, a compiler, and libraries, and returns an installed package.  As a pure function, its result depends solely on its inputs---for instance, it cannot refer to software or scripts that were not explicitly passed as inputs.  A build function always produces the same result when passed a given set of inputs.  It cannot alter the environment of the running system in any way; for instance, it cannot create, modify, or delete files outside of its build and installation directories.  This is achieved by running build processes in isolated environments (or @dfn{containers}), where only their explicit inputs are visible."
 msgstr "在底层，Guix实现了由Nix（@pxref{Acknowledgments}）开创的@dfn{函数式包管理器}。在Guix里，软件包构建和安装过程被视为数学意义上的@emph{函数}。函数获取输入，如构建脚本、编译器和库，并且返回一个安装好的软件包。作为一个纯函数，它的结果只取决于它的输入－－例如，它不能引用没有作为显式输入传入的软件和脚本。当传入特定的输入时，一个构建函数总是得到相同的结果。它不能以任何方式修改运行系统的环境，例如，它不能创建，修改，或删除构建和安装环境之外的文件夹。这是通过在隔离的环境（@dfn{容器}）里运行构建进程实现的，在这个环境里只能访问到显式的输入。"
 
 #. type: cindex
-#: doc/guix.texi:383 doc/guix.texi:6300
+#: guix-git/doc/guix.texi:450 guix-git/doc/guix.texi:8756
 #, no-wrap
 msgid "store"
 msgstr "仓库"
 
 #. type: Plain text
-#: doc/guix.texi:390
+#: guix-git/doc/guix.texi:457
 msgid "The result of package build functions is @dfn{cached} in the file system, in a special directory called @dfn{the store} (@pxref{The Store}).  Each package is installed in a directory of its own in the store---by default under @file{/gnu/store}.  The directory name contains a hash of all the inputs used to build that package; thus, changing an input yields a different directory name."
 msgstr "软件包构建函数的结果被@dfn{缓存}在文件系统里的一个叫做@dfn{仓库}（@pxref{The Store}）的特殊文件夹内。每个软件包都被安装在仓库（默认在@file{/gnu/store}）里的一个独立的文件夹内。这个文件夹的名字含有用于构建这个软件包的所有输入的hash，所以，修改输入会得到一个不同的文件夹名。"
 
 #. type: Plain text
-#: doc/guix.texi:394
+#: guix-git/doc/guix.texi:461
 msgid "This approach is the foundation for the salient features of Guix: support for transactional package upgrade and rollback, per-user installation, and garbage collection of packages (@pxref{Features})."
 msgstr "这种手段是实现Guix的突出功能的基础：对事务型软件包升级和回滚的支持，每个用户独立的安装，软件包垃圾回收@pxref{Features}。"
 
 #. type: Plain text
-#: doc/guix.texi:409
+#: guix-git/doc/guix.texi:476
 msgid "Guix comes with a distribution of the GNU system consisting entirely of free software@footnote{The term ``free'' here refers to the @url{https://www.gnu.org/philosophy/free-sw.html,freedom provided to users of that software}.}.  The distribution can be installed on its own (@pxref{System Installation}), but it is also possible to install Guix as a package manager on top of an installed GNU/Linux system (@pxref{Installation}).  When we need to distinguish between the two, we refer to the standalone distribution as Guix@tie{}System."
 msgstr "Guix提供了一个GNU系统发行版，这个发新版只包含自由软件@footnote{这里的“自由”指的是@url{https://www.gnu.org/philosophy/free-sw.html,软件提供给用户的自由}。}。这个发行版可以独立安装（@pxref{System Installation}），但是把Guix安装为一个已经安装好的GNU/Linux系统的包管理器也是可行的（@pxref{Installation}）。当我们需要区分这两者时，我们把独立的发行版称为“Guix系统”。"
 
 #. type: Plain text
-#: doc/guix.texi:415
+#: guix-git/doc/guix.texi:482
 msgid "The distribution provides core GNU packages such as GNU libc, GCC, and Binutils, as well as many GNU and non-GNU applications.  The complete list of available packages can be browsed @url{https://www.gnu.org/software/guix/packages,on-line} or by running @command{guix package} (@pxref{Invoking guix package}):"
 msgstr "这个发行版提供了GNU核心软件包，如libc、gcc和Binutils，以及很多GNU和非GNU应用程序。可用的软件包的完整列表可以在@url{https://www.gnu.org/software/guix/packages,on-line}浏览，或者通过运行@command{guix package}（@pxref{Invoking guix package}）获得："
 
 #. type: example
-#: doc/guix.texi:418
+#: guix-git/doc/guix.texi:485
 #, no-wrap
 msgid "guix package --list-available\n"
 msgstr "guix package --list-available\n"
 
 #. type: Plain text
-#: doc/guix.texi:424
+#: guix-git/doc/guix.texi:491
 msgid "Our goal is to provide a practical 100% free software distribution of Linux-based and other variants of GNU, with a focus on the promotion and tight integration of GNU components, and an emphasis on programs and tools that help users exert that freedom."
 msgstr "我们的目标是提供一个基于Linux和其它GNU变体的可用的100%自由的软件发行版，我们的重点是推广和紧密集成GNU组件，以及强调帮助用户行使那些自由的程序和工具。"
 
 #. type: Plain text
-#: doc/guix.texi:426
+#: guix-git/doc/guix.texi:493
 msgid "Packages are currently available on the following platforms:"
 msgstr "目前这些平台提供软件包："
 
 #. type: item
-#: doc/guix.texi:429 doc/guix.texi:1877
+#: guix-git/doc/guix.texi:496 guix-git/doc/guix.texi:2105
 #, no-wrap
 msgid "x86_64-linux"
 msgstr "x86_64-linux"
 
 #. type: table
-#: doc/guix.texi:431
-msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel;"
-msgstr "Intel/AMD @code{x86_64}架构，Linux-Libre内核；"
+#: guix-git/doc/guix.texi:498
+msgid "Intel/AMD @code{x86_64} architecture, Linux-Libre kernel."
+msgstr "Intel/AMD @code{x86_64} 架构，Linux-Libre 内核。"
 
 #. type: item
-#: doc/guix.texi:432 doc/guix.texi:1880
+#: guix-git/doc/guix.texi:499 guix-git/doc/guix.texi:2108
 #, no-wrap
 msgid "i686-linux"
 msgstr "i686-linux"
 
 #. type: table
-#: doc/guix.texi:434
-msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel;"
-msgstr "Intel 32位架构（IA32)，Linux-Libre内核；"
+#: guix-git/doc/guix.texi:501
+msgid "Intel 32-bit architecture (IA32), Linux-Libre kernel."
+msgstr "Intel 32 位架构（IA32)，Linux-Libre 内核。"
 
 #. type: item
-#: doc/guix.texi:435
+#: guix-git/doc/guix.texi:502
 #, no-wrap
 msgid "armhf-linux"
 msgstr "armhf-linux"
 
 #. type: table
-#: doc/guix.texi:439
+#: guix-git/doc/guix.texi:506
 msgid "ARMv7-A architecture with hard float, Thumb-2 and NEON, using the EABI hard-float application binary interface (ABI), and Linux-Libre kernel."
 msgstr "ARMv7-A架构，带硬件浮点数、Thumb-2和NEON扩展，EABI硬件浮点数应用二进制接口（ABI），和Linux-Libre内核。"
 
 #. type: item
-#: doc/guix.texi:440
+#: guix-git/doc/guix.texi:507
 #, no-wrap
 msgid "aarch64-linux"
 msgstr "aarch64-linux"
 
 #. type: table
-#: doc/guix.texi:444
-msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel.  This is currently in an experimental stage, with limited support.  @xref{Contributing}, for how to help!"
-msgstr "小端序64位ARMv8-A处理器，Linux-Libre内核。目前处于实验阶段，支持有限。@xref{Contributing}，提供帮助！"
+#: guix-git/doc/guix.texi:509
+#, fuzzy
+#| msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel."
+msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel."
+msgstr "小端序64位MIPS处理器，龙芯系列，n32 ABI，Linux-Libre内核。"
 
 #. type: item
-#: doc/guix.texi:445
+#: guix-git/doc/guix.texi:510
 #, no-wrap
-msgid "mips64el-linux"
+msgid "i586-gnu"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:513
+msgid "@uref{https://hurd.gnu.org, GNU/Hurd} on the Intel 32-bit architecture (IA32)."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:519
+msgid "This configuration is experimental and under development.  The easiest way for you to give it a try is by setting up an instance of @code{hurd-vm-service-type} on your GNU/Linux machine (@pxref{transparent-emulation-qemu, @code{hurd-vm-service-type}}).  @xref{Contributing}, on how to help!"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:520
+#, fuzzy, no-wrap
+#| msgid "mips64el-linux"
+msgid "mips64el-linux (deprecated)"
 msgstr "mips64el-linux"
 
 #. type: table
-#: doc/guix.texi:448
-msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel."
-msgstr "小端序64位MIPS处理器，龙芯系列，n32 ABI，Linux-Libre内核。"
+#: guix-git/doc/guix.texi:526
+msgid "little-endian 64-bit MIPS processors, specifically the Loongson series, n32 ABI, and Linux-Libre kernel.  This configuration is no longer fully supported; in particular, there is no ongoing work to ensure that this architecture still works.  Should someone decide they wish to revive this architecture then the code is still available."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:527
+#, fuzzy, no-wrap
+#| msgid "aarch64-linux"
+msgid "powerpc64le-linux"
+msgstr "aarch64-linux"
+
+#. type: table
+#: guix-git/doc/guix.texi:537
+msgid "little-endian 64-bit Power ISA processors, Linux-Libre kernel.  This includes POWER9 systems such as the @uref{https://www.fsf.org/news/talos-ii-mainboard-and-talos-ii-lite-mainboard-now-fsf-certified-to-respect-your-freedom, RYF Talos II mainboard}. This platform is available as a \"technology preview\": although it is supported, substitutes are not yet available from the build farm (@pxref{Substitutes}), and some packages may fail to build (@pxref{Tracking Bugs and Patches}).  That said, the Guix community is actively working on improving this support, and now is a great time to try it and get involved!"
+msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:458
+#: guix-git/doc/guix.texi:547
 msgid "With Guix@tie{}System, you @emph{declare} all aspects of the operating system configuration and Guix takes care of instantiating the configuration in a transactional, reproducible, and stateless fashion (@pxref{System Configuration}).  Guix System uses the Linux-libre kernel, the Shepherd initialization system (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual}), the well-known GNU utilities and tool chain, as well as the graphical environment or system services of your choice."
 msgstr "在Guix系统里，你@emph{声明}操作系统所有方面的配置，然后Guix以事务型的，可重复的，和无状态的方式解决实例化配置的问题（@pxref{System Configuration}）。Guix系统使用Linux-Libre内核，Shepherd初始化系统@pxref{Introduction,,, shepherd, GNU Shepherd用户手册}，知名的GNU工具和工具链，以及你可选的图形界面环境和系统服务。"
 
 #. type: Plain text
-#: doc/guix.texi:461
-msgid "Guix System is available on all the above platforms except @code{mips64el-linux}."
+#: guix-git/doc/guix.texi:550
+#, fuzzy
+#| msgid "Guix System is available on all the above platforms except @code{mips64el-linux}."
+msgid "Guix System is available on all the above platforms except @code{mips64el-linux} and @code{powerpc64le-linux}."
 msgstr "Guix系统在上面所有的平台上都可用，除了@code{mips64el-linux}。"
 
 #. type: Plain text
-#: doc/guix.texi:465
+#: guix-git/doc/guix.texi:554
 msgid "For information on porting to other architectures or kernels, @pxref{Porting}."
 msgstr "关于移植到其它架构或内核的信息，@pxref{Porting}。"
 
 #. type: Plain text
-#: doc/guix.texi:468
+#: guix-git/doc/guix.texi:557
 msgid "Building this distribution is a cooperative effort, and you are invited to join! @xref{Contributing}, for information about how you can help."
 msgstr "构建这个发行版需要努力合作，欢迎你加入！关于你可以怎样提供帮助的信息，@xref{Contributing}。"
 
 #. type: cindex
-#: doc/guix.texi:474
+#: guix-git/doc/guix.texi:563
 #, no-wrap
 msgid "installing Guix"
 msgstr "安装Guix"
 
 #. type: quotation
-#: doc/guix.texi:476 doc/guix.texi:524 doc/guix.texi:1548 doc/guix.texi:1779
-#: doc/guix.texi:1984 doc/guix.texi:2186 doc/guix.texi:2381 doc/guix.texi:3180
-#: doc/guix.texi:3960 doc/guix.texi:4176 doc/guix.texi:4465 doc/guix.texi:4697
-#: doc/guix.texi:4844 doc/guix.texi:6319 doc/guix.texi:6387 doc/guix.texi:8073
-#: doc/guix.texi:8085 doc/guix.texi:9976 doc/guix.texi:10513
-#: doc/guix.texi:11062 doc/guix.texi:13544 doc/guix.texi:19352
-#: doc/guix.texi:24107 doc/guix.texi:24302 doc/guix.texi:24421
-#: doc/guix.texi:24536 doc/guix.texi:25545
-#, no-wrap
-msgid "Note"
-msgstr "注"
-
-#. type: quotation
-#: doc/guix.texi:486
+#: guix-git/doc/guix.texi:575
 msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script} to install Guix on top of a running GNU/Linux system, thereafter called a @dfn{foreign distro}.@footnote{This section is concerned with the installation of the package manager, which can be done on top of a running GNU/Linux system.  If, instead, you want to install the complete GNU operating system, @pxref{System Installation}.} The script automates the download, installation, and initial configuration of Guix.  It should be run as the root user."
 msgstr "我们推荐使用@uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell安装脚本}在已有的GNU/Linux系统（即@dfn{foreign distro}）上安装Guix。@footnote{这个小节是关于安装包管理器的，可以在GNU/Linux系统上完成。如果你想安装完整的GNU操作系统，@pxref{System Installation}。}这个脚本自动下载、安装并且初始化Guix，它需要以root用户身份运行。"
 
 #. type: cindex
-#: doc/guix.texi:488 doc/guix.texi:1565
+#: guix-git/doc/guix.texi:577 guix-git/doc/guix.texi:1780
 #, no-wrap
 msgid "foreign distro"
 msgstr "别的发行版"
 
 #. type: cindex
-#: doc/guix.texi:489
+#: guix-git/doc/guix.texi:578
 #, no-wrap
 msgid "directories related to foreign distro"
 msgstr "和foreign distro相关的文件夹"
 
 #. type: Plain text
-#: doc/guix.texi:494
+#: guix-git/doc/guix.texi:583
 msgid "When installed on a foreign distro, GNU@tie{}Guix complements the available tools without interference.  Its data lives exclusively in two directories, usually @file{/gnu/store} and @file{/var/guix}; other files on your system, such as @file{/etc}, are left untouched."
 msgstr "在foreign distro上安装时，GNU@tie{}Guix可以在不引起冲突的前提下补充现有的工具。它的数据只存放在两个文件夹里，通常是@file{/gnu/store}和@file{/var/guix}；系统上的其它文件，如@file{/etc}，不会被修改。"
 
 #. type: Plain text
-#: doc/guix.texi:497
+#: guix-git/doc/guix.texi:586
 msgid "Once installed, Guix can be updated by running @command{guix pull} (@pxref{Invoking guix pull})."
 msgstr "一旦安装好了，可以通过运行@command{guix pull}升级Guix（@pxref{Invoking guix pull}）。"
 
 #. type: Plain text
-#: doc/guix.texi:502
+#: guix-git/doc/guix.texi:591
 msgid "If you prefer to perform the installation steps manually or want to tweak them, you may find the following subsections useful.  They describe the software requirements of Guix, as well as how to install it manually and get ready to use it."
 msgstr "如果你希望手动执行安装步骤，或者想改变安装步骤，接下来这些小节会很有用。它们介绍Guix的软件依赖，以及如何手动安装和使用Guix。"
 
 #. type: cindex
-#: doc/guix.texi:515
+#: guix-git/doc/guix.texi:605
 #, no-wrap
 msgid "installing Guix from binaries"
 msgstr "用二进制文件安装Guix"
 
 #. type: cindex
-#: doc/guix.texi:516
+#: guix-git/doc/guix.texi:606
 #, no-wrap
 msgid "installer script"
 msgstr "安装脚本"
 
 #. type: Plain text
-#: doc/guix.texi:522
+#: guix-git/doc/guix.texi:612
 msgid "This section describes how to install Guix on an arbitrary system from a self-contained tarball providing binaries for Guix and for all its dependencies.  This is often quicker than installing from source, which is described in the next sections.  The only requirement is to have GNU@tie{}tar and Xz."
 msgstr "这个小节介绍如何在任意的系统上用独立的Guix二进制文件包安装Guix和它的依赖。这通常比从源代码安装更快，下一小节会介绍如何从源代码安装。唯一的需求是有GNU@tie{}tar和Xz。"
 
 #. type: quotation
-#: doc/guix.texi:530
-msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}.  The script automates the download, installation, and initial configuration steps described below.  It should be run as the root user."
+#: guix-git/doc/guix.texi:620
+#, fuzzy
+#| msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}.  The script automates the download, installation, and initial configuration steps described below.  It should be run as the root user."
+msgid "We recommend the use of this @uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell installer script}.  The script automates the download, installation, and initial configuration steps described below.  It should be run as the root user.  As root, you can thus run this:"
 msgstr "我们推荐使用这个@uref{https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh, shell安装脚本}。这个脚本自动执行下述的下载、安装并且初始化Guix的过程。它需要以root用户身份运行。"
 
+#. type: example
+#: guix-git/doc/guix.texi:626
+#, no-wrap
+msgid ""
+"cd /tmp\n"
+"wget https://git.savannah.gnu.org/cgit/guix.git/plain/etc/guix-install.sh\n"
+"chmod +x guix-install.sh\n"
+"./guix-install.sh\n"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:630
+msgid "When you're done, @pxref{Application Setup} for extra configuration you might need, and @ref{Getting Started} for your first steps!"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:533
+#: guix-git/doc/guix.texi:633
 msgid "Installing goes along these lines:"
 msgstr "安装步骤如下："
 
 #. type: cindex
-#: doc/guix.texi:536
+#: guix-git/doc/guix.texi:636
 #, no-wrap
 msgid "downloading Guix binary"
 msgstr "下载Guix二进制文件"
 
 #. type: enumerate
-#: doc/guix.texi:541
-msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on."
+#: guix-git/doc/guix.texi:642
+#, fuzzy
+#| msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz}, where @var{system} is @code{x86_64-linux} for an @code{x86_64} machine already running the kernel Linux, and so on."
+msgid "Download the binary tarball from @indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz}, where @code{x86_64-linux} can be replaced with @code{i686-linux} for an @code{i686} (32-bits) machine already running the kernel Linux, and so on (@pxref{GNU Distribution})."
 msgstr "从@indicateurl{@value{BASE-URL}/guix-binary-@value{VERSION}.@var{系统}.tar.xz}下载二进制安装包，对于运行Linux内核的@code{x86_64}机器来说@var{系统}是@code{x86_64-linux}，以此类推。"
 
 #. type: enumerate
-#: doc/guix.texi:545
+#: guix-git/doc/guix.texi:646
 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the tarball against it, along these lines:"
 msgstr "请确保下载相关的@file{.sig}文件，并且用它验证文件包的可靠性，方法如下："
 
 #. type: example
-#: doc/guix.texi:549
-#, no-wrap
+#: guix-git/doc/guix.texi:650
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
+#| "$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
 msgid ""
-"$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
-"$ gpg --verify guix-binary-@value{VERSION}.@var{system}.tar.xz.sig\n"
+"$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig\n"
+"$ gpg --verify guix-binary-@value{VERSION}.x86_64-linux.tar.xz.sig\n"
 msgstr ""
 "$ wget @value{BASE-URL}/guix-binary-@value{VERSION}.@var{系统}.tar.xz.sig\n"
 "$ gpg --verify guix-binary-@value{VERSION}.@var{系统}.tar.xz.sig\n"
 
 #. type: Plain text
-#: doc/guix.texi:553 doc/guix.texi:1895
+#: guix-git/doc/guix.texi:654 guix-git/doc/guix.texi:2123
 msgid "If that command fails because you do not have the required public key, then run this command to import it:"
 msgstr "如果那个命令因为缺少所需的公钥而失败了，那么用这个命令导入它："
 
 #. type: example
-#: doc/guix.texi:557 doc/guix.texi:1899
+#: guix-git/doc/guix.texi:658
 #, no-wrap
 msgid ""
-"$ gpg --keyserver @value{KEY-SERVER} \\\n"
-"      --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n"
+"$ wget '@value{OPENPGP-SIGNING-KEY-URL}' \\\n"
+"      -qO - | gpg --import -\n"
 msgstr ""
-"$ gpg --keyserver @value{KEY-SERVER} \\\n"
-"      --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n"
 
 #. type: Plain text
-#: doc/guix.texi:562 doc/guix.texi:1904
+#: guix-git/doc/guix.texi:662 guix-git/doc/guix.texi:2131
 msgid "and rerun the @code{gpg --verify} command."
 msgstr "再次运行@code{gpg --verify}命令。"
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:665 guix-git/doc/guix.texi:2134
+msgid "Take note that a warning like ``This key is not certified with a trusted signature!'' is normal."
+msgstr ""
+
 #. type: enumerate
-#: doc/guix.texi:566
+#: guix-git/doc/guix.texi:671
 msgid "Now, you need to become the @code{root} user.  Depending on your distribution, you may have to run @code{su -} or @code{sudo -i}.  As @code{root}, run:"
 msgstr "现在你需要成为@code{root}用户。基于你的发行版，你可能需要执行@code{su -}或@code{sudo -i}。以@code{root}用户身份，执行："
 
 #. type: example
-#: doc/guix.texi:572
-#, no-wrap
+#: guix-git/doc/guix.texi:677
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# cd /tmp\n"
+#| "# tar --warning=no-timestamp -xf \\\n"
+#| "     guix-binary-@value{VERSION}.@var{system}.tar.xz\n"
+#| "# mv var/guix /var/ && mv gnu /\n"
 msgid ""
 "# cd /tmp\n"
 "# tar --warning=no-timestamp -xf \\\n"
-"     guix-binary-@value{VERSION}.@var{system}.tar.xz\n"
+"     /path/to/guix-binary-@value{VERSION}.x86_64-linux.tar.xz\n"
 "# mv var/guix /var/ && mv gnu /\n"
 msgstr ""
 "# cd /tmp\n"
@@ -3430,27 +4689,31 @@ msgstr ""
 "# mv var/guix /var/ && mv gnu /\n"
 
 #. type: enumerate
-#: doc/guix.texi:577
-msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  The latter contains a ready-to-use profile for @code{root} (see next step.)"
+#: guix-git/doc/guix.texi:682
+#, fuzzy
+#| msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  The latter contains a ready-to-use profile for @code{root} (see next step.)"
+msgid "This creates @file{/gnu/store} (@pxref{The Store}) and @file{/var/guix}.  The latter contains a ready-to-use profile for @code{root} (see next step)."
 msgstr "这会创建@file{/gnu/store}（@pxref{The Store}）和@file{/var/guix}。后一个文件夹为@code{root}用户提供了一个立即可用的profile（见下一步）。"
 
 #. type: enumerate
-#: doc/guix.texi:580
+#: guix-git/doc/guix.texi:685
 msgid "Do @emph{not} unpack the tarball on a working Guix system since that would overwrite its own essential files."
 msgstr "@emph{不要}在一个正常的Guix系统上解压这个文件包，因为那会把现有的重要的文件覆盖。"
 
 #. type: enumerate
-#: doc/guix.texi:590
-msgid "The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.)  They stem from the fact that all the files in the archive have their modification time set to zero (which means January 1st, 1970.)  This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible."
+#: guix-git/doc/guix.texi:695
+#, fuzzy
+#| msgid "The @code{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine.)  They stem from the fact that all the files in the archive have their modification time set to zero (which means January 1st, 1970.)  This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible."
+msgid "The @option{--warning=no-timestamp} option makes sure GNU@tie{}tar does not emit warnings about ``implausibly old time stamps'' (such warnings were triggered by GNU@tie{}tar 1.26 and older; recent versions are fine).  They stem from the fact that all the files in the archive have their modification time set to 1 (which means January 1st, 1970).  This is done on purpose to make sure the archive content is independent of its creation time, thus making it reproducible."
 msgstr "@code{--warning=no-timestamp}选项使GNU@tie{}tar不输出有关“implausibly old time stamps”的警告（这类警告会被GNU@tie{}tar 1.26或更老的版本触发；新的版本没事）。这类警告是因为文件包里的所有文件的修改时间戳都被设置为0(即1970年1月1日）。这是故意的，为了确保文件包的内容独立于创建的时间，从而使它可再现。"
 
 #. type: enumerate
-#: doc/guix.texi:594
+#: guix-git/doc/guix.texi:699
 msgid "Make the profile available under @file{~root/.config/guix/current}, which is where @command{guix pull} will install updates (@pxref{Invoking guix pull}):"
 msgstr "使profile出现在@file{~root/.config/guix/current}，这是@command{guix pull}安装更新的位置（@pxref{Invoking guix pull}）："
 
 #. type: example
-#: doc/guix.texi:599
+#: guix-git/doc/guix.texi:704
 #, no-wrap
 msgid ""
 "# mkdir -p ~root/.config/guix\n"
@@ -3462,12 +4725,14 @@ msgstr ""
 "         ~root/.config/guix/current\n"
 
 #. type: enumerate
-#: doc/guix.texi:603
-msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:"
+#: guix-git/doc/guix.texi:708
+#, fuzzy
+#| msgid "Source @file{etc/profile} to augment @code{PATH} and other relevant environment variables:"
+msgid "Source @file{etc/profile} to augment @env{PATH} and other relevant environment variables:"
 msgstr "执行@file{etc/profile}以更新@code{PATH}和其它相关的环境变量："
 
 #. type: example
-#: doc/guix.texi:607
+#: guix-git/doc/guix.texi:712
 #, no-wrap
 msgid ""
 "# GUIX_PROFILE=\"`echo ~root`/.config/guix/current\" ; \\\n"
@@ -3477,39 +4742,44 @@ msgstr ""
 "  source $GUIX_PROFILE/etc/profile\n"
 
 #. type: enumerate
-#: doc/guix.texi:612
+#: guix-git/doc/guix.texi:717
 msgid "Create the group and user accounts for build users as explained below (@pxref{Build Environment Setup})."
 msgstr "像下面解释的那样为“构建用户”创建用户组和用户（@pxref{Build Environment Setup}）。"
 
 #. type: enumerate
-#: doc/guix.texi:615
+#: guix-git/doc/guix.texi:720
 msgid "Run the daemon, and set it to automatically start on boot."
 msgstr "运行后台进程，并设置为开机自启动。"
 
 #. type: enumerate
-#: doc/guix.texi:618
+#: guix-git/doc/guix.texi:723
 msgid "If your host distro uses the systemd init system, this can be achieved with these commands:"
 msgstr "如果你的主机的发行版使用systemd init系统，可以用这些命令："
 
 #. type: example
-#: doc/guix.texi:630
-#, no-wrap
+#: guix-git/doc/guix.texi:736
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n"
+#| "     /etc/systemd/system/\n"
+#| "# systemctl start guix-daemon && systemctl enable guix-daemon\n"
 msgid ""
-"# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n"
+"# cp ~root/.config/guix/current/lib/systemd/system/gnu-store.mount \\\n"
+"     ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n"
 "     /etc/systemd/system/\n"
-"# systemctl start guix-daemon && systemctl enable guix-daemon\n"
+"# systemctl enable --now gnu-store.mount guix-daemon\n"
 msgstr ""
 "# cp ~root/.config/guix/current/lib/systemd/system/guix-daemon.service \\\n"
 "     /etc/systemd/system/\n"
 "# systemctl start guix-daemon && systemctl enable guix-daemon\n"
 
 #. type: itemize
-#: doc/guix.texi:633 doc/guix.texi:9760
+#: guix-git/doc/guix.texi:739 guix-git/doc/guix.texi:12820
 msgid "If your host distro uses the Upstart init system:"
 msgstr "如果你的主机的发行版使用Upstart init系统："
 
 #. type: example
-#: doc/guix.texi:639
+#: guix-git/doc/guix.texi:745
 #, no-wrap
 msgid ""
 "# initctl reload-configuration\n"
@@ -3523,12 +4793,12 @@ msgstr ""
 "# start guix-daemon\n"
 
 #. type: enumerate
-#: doc/guix.texi:642
+#: guix-git/doc/guix.texi:748
 msgid "Otherwise, you can still start the daemon manually with:"
 msgstr "此外，你可以手动启动后台进程："
 
 #. type: example
-#: doc/guix.texi:646
+#: guix-git/doc/guix.texi:752
 #, no-wrap
 msgid ""
 "# ~root/.config/guix/current/bin/guix-daemon \\\n"
@@ -3538,12 +4808,12 @@ msgstr ""
 "       --build-users-group=guixbuild\n"
 
 #. type: enumerate
-#: doc/guix.texi:651
+#: guix-git/doc/guix.texi:757
 msgid "Make the @command{guix} command available to other users on the machine, for instance with:"
 msgstr "使机器上的其他用户也可以使用@command{guix}命令："
 
 #. type: example
-#: doc/guix.texi:656
+#: guix-git/doc/guix.texi:762
 #, no-wrap
 msgid ""
 "# mkdir -p /usr/local/bin\n"
@@ -3555,12 +4825,12 @@ msgstr ""
 "# ln -s /var/guix/profiles/per-user/root/current-guix/bin/guix\n"
 
 #. type: enumerate
-#: doc/guix.texi:660
+#: guix-git/doc/guix.texi:766
 msgid "It is also a good idea to make the Info version of this manual available there:"
 msgstr "最好让这个用户手册的Info版也可以被访问："
 
 #. type: example
-#: doc/guix.texi:666
+#: guix-git/doc/guix.texi:772
 #, no-wrap
 msgid ""
 "# mkdir -p /usr/local/share/info\n"
@@ -3574,23 +4844,26 @@ msgstr ""
 "  do ln -s $i ; done\n"
 
 #. type: enumerate
-#: doc/guix.texi:672
-msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)"
+#: guix-git/doc/guix.texi:778
+#, fuzzy
+#| msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path.)"
+msgid "That way, assuming @file{/usr/local/share/info} is in the search path, running @command{info guix} will open this manual (@pxref{Other Info Directories,,, texinfo, GNU Texinfo}, for more details on changing the Info search path)."
 msgstr "那样，假设@file{/usr/local/share/info}在搜索路径里，运行@command{info guix}命令就会打开这个用户手册（@pxref{Other Info Directories,,, texinfo, GNU Texinfo}，更多关于Info搜索路径的信息）。"
 
 #. type: cindex
-#: doc/guix.texi:674 doc/guix.texi:3159 doc/guix.texi:11980
+#: guix-git/doc/guix.texi:780 guix-git/doc/guix.texi:3747
+#: guix-git/doc/guix.texi:15454
 #, no-wrap
 msgid "substitutes, authorization thereof"
 msgstr "substitutes，对其授权"
 
 #. type: enumerate
-#: doc/guix.texi:677
+#: guix-git/doc/guix.texi:783
 msgid "To use substitutes from @code{@value{SUBSTITUTE-SERVER}} or one of its mirrors (@pxref{Substitutes}), authorize them:"
 msgstr "为了使用@code{@value{SUBSTITUTE-SERVER}}或其镜像的substitute（@pxref{Substitutes}），对其授权："
 
 #. type: example
-#: doc/guix.texi:681
+#: guix-git/doc/guix.texi:787
 #, no-wrap
 msgid ""
 "# guix archive --authorize < \\\n"
@@ -3600,44 +4873,44 @@ msgstr ""
 "     ~root/.config/guix/current/share/guix/@value{SUBSTITUTE-SERVER}.pub\n"
 
 #. type: enumerate
-#: doc/guix.texi:686
+#: guix-git/doc/guix.texi:792
 msgid "Each user may need to perform a few additional steps to make their Guix environment ready for use, @pxref{Application Setup}."
 msgstr "每个用户可能需要执行一些额外的步骤以使各自的Guix环境可用，@pxref{Application Setup}。"
 
 #. type: Plain text
-#: doc/guix.texi:689
+#: guix-git/doc/guix.texi:795
 msgid "Voilà, the installation is complete!"
 msgstr "瞧，安装完成了！"
 
 #. type: Plain text
-#: doc/guix.texi:692
+#: guix-git/doc/guix.texi:798
 msgid "You can confirm that Guix is working by installing a sample package into the root profile:"
 msgstr "你可以通过给root profile安装一个软件包来确认Guix可以正常工作。"
 
 #. type: example
-#: doc/guix.texi:695
+#: guix-git/doc/guix.texi:801
 #, no-wrap
 msgid "# guix install hello\n"
 msgstr "# guix install hello\n"
 
 #. type: Plain text
-#: doc/guix.texi:699
+#: guix-git/doc/guix.texi:805
 msgid "The binary installation tarball can be (re)produced and verified simply by running the following command in the Guix source tree:"
 msgstr "二进制安装包可以通过在Guix源代码树里运行下面这些命令来重现和验证："
 
 #. type: example
-#: doc/guix.texi:702
+#: guix-git/doc/guix.texi:808
 #, no-wrap
 msgid "make guix-binary.@var{system}.tar.xz\n"
 msgstr "make guix-binary.@var{系统}.tar.xz\n"
 
 #. type: Plain text
-#: doc/guix.texi:706
+#: guix-git/doc/guix.texi:812
 msgid "...@: which, in turn, runs:"
 msgstr "...@: 这个命令会执行："
 
 #. type: example
-#: doc/guix.texi:710
+#: guix-git/doc/guix.texi:816
 #, no-wrap
 msgid ""
 "guix pack -s @var{system} --localstatedir \\\n"
@@ -3647,284 +4920,377 @@ msgstr ""
 "  --profile-name=current-guix guix\n"
 
 #. type: Plain text
-#: doc/guix.texi:713
+#: guix-git/doc/guix.texi:819
 msgid "@xref{Invoking guix pack}, for more info on this handy tool."
 msgstr "@xref{Invoking guix pack}，了解这个方便的工具。"
 
 #. type: Plain text
-#: doc/guix.texi:721
+#: guix-git/doc/guix.texi:827
 msgid "This section lists requirements when building Guix from source.  The build procedure for Guix is the same as for other GNU software, and is not covered here.  Please see the files @file{README} and @file{INSTALL} in the Guix source tree for additional details."
 msgstr "这个小节列举了从源代码构建Guix的需求。构建Guix的步骤和其它GNU软件相同，这里不介绍。请阅读Guix源代码树里的@file{README}和@file{INSTALL}文件以了解更多的信息。"
 
 #. type: cindex
-#: doc/guix.texi:722
+#: guix-git/doc/guix.texi:828
 #, no-wrap
 msgid "official website"
 msgstr "官方网站"
 
 #. type: Plain text
-#: doc/guix.texi:725
+#: guix-git/doc/guix.texi:831
 msgid "GNU Guix is available for download from its website at @url{https://www.gnu.org/software/guix/}."
 msgstr "GNU Guix可以从它的网站下载@url{https://www.gnu.org/software/guix/}。"
 
 #. type: Plain text
-#: doc/guix.texi:727
+#: guix-git/doc/guix.texi:833
 msgid "GNU Guix depends on the following packages:"
 msgstr "GNU Guix依赖这些软件包："
 
 #. type: item
-#: doc/guix.texi:729
-#, no-wrap
-msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x;"
+#: guix-git/doc/guix.texi:835
+#, fuzzy, no-wrap
+#| msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 2.2.x;"
+msgid "@url{https://gnu.org/software/guile/, GNU Guile}, version 3.0.x or"
 msgstr "@url{https://gnu.org/software/guile/, GNU Guile}，版本2.2.x；"
 
+#. type: itemize
+#: guix-git/doc/guix.texi:837
+msgid "2.2.x;"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:730
+#: guix-git/doc/guix.texi:837
 #, no-wrap
 msgid "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}, version"
 msgstr "@url{https://notabug.org/cwebber/guile-gcrypt, Guile-Gcrypt}，版本"
 
 #. type: itemize
-#: doc/guix.texi:732
+#: guix-git/doc/guix.texi:839
 msgid "0.1.0 or later;"
 msgstr "0.1.0或更新；"
 
 #. type: itemize
-#: doc/guix.texi:736
+#: guix-git/doc/guix.texi:843
 msgid "@uref{https://gnutls.org/, GnuTLS}, specifically its Guile bindings (@pxref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile});"
 msgstr "@uref{https://gnutls.org/, GnuTLS}，特别是它的Guile接口（@pxref{Guile Preparations, 怎样为Guile安装GnuTLS接口,, gnutls-guile, GnuTLS-Guile}）；"
 
 #. type: itemize
-#: doc/guix.texi:739
+#: guix-git/doc/guix.texi:846
 msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;"
 msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}，版本0.1.0或更新；"
 
+#. type: item
+#: guix-git/doc/guix.texi:846
+#, fuzzy, no-wrap
+#| msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;"
+msgid "@uref{https://notabug.org/guile-zlib/guile-zlib, Guile-zlib},"
+msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}，版本0.1.0或更新；"
+
 #. type: itemize
-#: doc/guix.texi:743
-msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;"
-msgstr "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}，2017年8月及之后的版本；"
+#: guix-git/doc/guix.texi:848
+#, fuzzy
+#| msgid "0.1.0 or later;"
+msgid "version 0.1.0 or later;"
+msgstr "0.1.0或更新；"
 
 #. type: item
-#: doc/guix.texi:743
-#, no-wrap
-msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON};"
-msgstr "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}；"
+#: guix-git/doc/guix.texi:848
+#, fuzzy, no-wrap
+#| msgid "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}, version 0.1.0 or later;"
+msgid "@uref{https://notabug.org/guile-lzlib/guile-lzlib, Guile-lzlib};"
+msgstr "@uref{https://notabug.org/guile-sqlite3/guile-sqlite3, Guile-SQLite3}，版本0.1.0或更新；"
 
 #. type: item
-#: doc/guix.texi:744
+#: guix-git/doc/guix.texi:849
 #, no-wrap
-msgid "@url{https://zlib.net, zlib};"
-msgstr "@url{https://zlib.net, zlib}；"
+msgid "@uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};"
+msgstr "@uref{https://www.nongnu.org/guile-avahi/, Guile-Avahi};"
+
+#. type: itemize
+#: guix-git/doc/guix.texi:854
+#, fuzzy
+#| msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August 2017 or later;"
+msgid "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.3.0 or later;"
+msgstr "@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}，2017年8月及之后的版本；"
+
+#. type: item
+#: guix-git/doc/guix.texi:854
+#, fuzzy, no-wrap
+#| msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON};"
+msgid "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}"
+msgstr "@uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON}；"
+
+#. type: itemize
+#: guix-git/doc/guix.texi:856
+#, fuzzy
+#| msgid "0.1.0 or later;"
+msgid "4.3.0 or later;"
+msgstr "0.1.0或更新；"
 
 #. type: item
-#: doc/guix.texi:745
+#: guix-git/doc/guix.texi:856
 #, no-wrap
 msgid "@url{https://www.gnu.org/software/make/, GNU Make}."
 msgstr "@url{https://www.gnu.org/software/make/, GNU Make}。"
 
 #. type: Plain text
-#: doc/guix.texi:749
+#: guix-git/doc/guix.texi:860
 msgid "The following dependencies are optional:"
 msgstr "这些依赖是可选的："
 
 #. type: itemize
-#: doc/guix.texi:757
-msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
+#: guix-git/doc/guix.texi:868
+#, fuzzy
+#| msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.10.2 or later."
+msgid "Support for build offloading (@pxref{Daemon Offload Setup}) and @command{guix copy} (@pxref{Invoking guix copy}) depends on @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}, version 0.13.0 or later."
 msgstr "对下发构建任务（@pxref{Daemon Offload Setup}）和@command{guix copy}（@pxref{Invoking guix copy}）的支持依赖于@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}，版本0.10.2或更新。"
 
 #. type: itemize
-#: doc/guix.texi:761
+#: guix-git/doc/guix.texi:873
+msgid "@uref{https://notabug.org/guile-zstd/guile-zstd, Guile-zstd}, for zstd compression and decompression in @command{guix publish} and for substitutes (@pxref{Invoking guix publish})."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:877
+msgid "@uref{https://ngyro.com/software/guile-semver.html, Guile-Semver} for the @code{crate} importer (@pxref{Invoking guix import})."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:882
+msgid "@uref{https://www.nongnu.org/guile-lib/doc/ref/htmlprag/, Guile-Lib} for the @code{go} importer (@pxref{Invoking guix import}) and for some of the ``updaters'' (@pxref{Invoking guix refresh})."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:886
 msgid "When @url{http://www.bzip.org, libbz2} is available, @command{guix-daemon} can use it to compress build logs."
 msgstr "当@url{http://www.bzip.org, libbz2}存在时，@command{guix-daemon}可以用它压缩构建日志。"
 
 #. type: Plain text
-#: doc/guix.texi:765
-msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:"
+#: guix-git/doc/guix.texi:890
+#, fuzzy
+#| msgid "Unless @code{--disable-daemon} was passed to @command{configure}, the following packages are also needed:"
+msgid "Unless @option{--disable-daemon} was passed to @command{configure}, the following packages are also needed:"
 msgstr "除非@code{--disable-daemon}参数被传给@command{configure}，这些软件包也是需要的依赖："
 
 #. type: item
-#: doc/guix.texi:767
+#: guix-git/doc/guix.texi:892
 #, no-wrap
 msgid "@url{https://gnupg.org/, GNU libgcrypt};"
 msgstr "@url{https://gnupg.org/, GNU libgcrypt}；"
 
 #. type: item
-#: doc/guix.texi:768
+#: guix-git/doc/guix.texi:893
 #, no-wrap
 msgid "@url{https://sqlite.org, SQLite 3};"
 msgstr "@url{https://sqlite.org, SQLite 3}；"
 
 #. type: item
-#: doc/guix.texi:769
+#: guix-git/doc/guix.texi:894
 #, no-wrap
 msgid "@url{https://gcc.gnu.org, GCC's g++}, with support for the"
 msgstr "@url{https://gcc.gnu.org, GCC's g++}，支持"
 
 #. type: itemize
-#: doc/guix.texi:771
+#: guix-git/doc/guix.texi:896
 msgid "C++11 standard."
 msgstr "C++11标准。"
 
 #. type: cindex
-#: doc/guix.texi:773
+#: guix-git/doc/guix.texi:898
 #, no-wrap
 msgid "state directory"
 msgstr "状态文件夹"
 
 #. type: Plain text
-#: doc/guix.texi:781
-msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}).  The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})."
+#: guix-git/doc/guix.texi:907
+#, fuzzy
+#| msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @code{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}).  The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})."
+msgid "When configuring Guix on a system that already has a Guix installation, be sure to specify the same state directory as the existing installation using the @option{--localstatedir} option of the @command{configure} script (@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}).  Usually, this @var{localstatedir} option is set to the value @file{/var}.  The @command{configure} script protects against unintended misconfiguration of @var{localstatedir} so you do not inadvertently corrupt your store (@pxref{The Store})."
 msgstr "当在一个已经安装Guix的系统上配置Guix时，请确保用@command{configure}的@code{--localstatedir}参数指定和现有的安装相同的状态文件夹（@pxref{Directory Variables, @code{localstatedir},, standards, GNU Coding Standards}）。@command{configure}保护你免于误设置@var{localstatedir}，从而不会无意中损坏仓库（@pxref{The Store}）。"
 
 #. type: cindex
-#: doc/guix.texi:782
-#, no-wrap
-msgid "Nix, compatibility"
-msgstr "Nix，兼容性"
-
-#. type: Plain text
-#: doc/guix.texi:787
-msgid "When a working installation of @url{https://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix with @code{--disable-daemon}.  In that case, Nix replaces the three dependencies above."
-msgstr "当一个已经安装的且可用的@url{https://nixos.org/nix/, Nix包管理器}存在时，你可以为Guix配置@code{--disable-daemon}参数。那样Nix可以替换上面的三个依赖。"
-
-#. type: Plain text
-#: doc/guix.texi:797
-msgid "Guix is compatible with Nix, so it is possible to share the same store between both.  To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value.  The latter is essential because it specifies where the database that stores metadata about the store is located, among other things.  The default values for Nix are @code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not required if your goal is to share the store with Nix."
-msgstr "Guix和Nix兼容，所以两者共享相同的仓库是可行的。如果这样做，你必须传给@command{configure}相同的@code{--with-store-dir}，以及相同的@code{--localstatedir}。后者很重要，因为它指定了储存仓库元数据以及其它信息的数据库的位置，。Nix的默认值是@code{--with-store-dir=/nix/store}和@code{--localstatedir=/nix/var}。注意，如果你的目的是和Nix共享仓库，那么@code{--disable-daemon}参数不是必须的。"
-
-#. type: cindex
-#: doc/guix.texi:801
+#: guix-git/doc/guix.texi:911
 #, no-wrap
 msgid "test suite"
 msgstr "测试套件"
 
 #. type: Plain text
-#: doc/guix.texi:807
+#: guix-git/doc/guix.texi:917
 msgid "After a successful @command{configure} and @code{make} run, it is a good idea to run the test suite.  It can help catch issues with the setup or environment, or bugs in Guix itself---and really, reporting test failures is a good way to help improve the software.  To run the test suite, type:"
 msgstr "成功执行@command{configure}和@code{make}之后，最好运行测试套件。它可以帮助查找设置和环境的错误，或者是Guix自身的bug－－并且，报告测试错误是帮助改进软件的好方法。输入下面的命令以执行测试套件。"
 
 #. type: example
-#: doc/guix.texi:810
+#: guix-git/doc/guix.texi:920
 #, no-wrap
 msgid "make check\n"
 msgstr "make check\n"
 
 #. type: Plain text
-#: doc/guix.texi:817
+#: guix-git/doc/guix.texi:927
 msgid "Test cases can run in parallel: you can use the @code{-j} option of GNU@tie{}make to speed things up.  The first run may take a few minutes on a recent machine; subsequent runs will be faster because the store that is created for test purposes will already have various things in cache."
 msgstr "测试用例可以并行运行：你可以用GNU@tie{}make的@code{-j}参数来加速运行。才一台较新的机器上第一次运行可能会花几分钟，后续的运行会更快，因为为测试创建的仓库已经包含了各种缓存。"
 
 #. type: Plain text
-#: doc/guix.texi:820
+#: guix-git/doc/guix.texi:930
 msgid "It is also possible to run a subset of the tests by defining the @code{TESTS} makefile variable as in this example:"
 msgstr "你还可以通过定义makefile的@code{TESTS}变量只运行测试的一个子集："
 
 #. type: example
-#: doc/guix.texi:823
+#: guix-git/doc/guix.texi:933
 #, no-wrap
 msgid "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n"
 msgstr "make check TESTS=\"tests/store.scm tests/cpio.scm\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:828
+#: guix-git/doc/guix.texi:938
 msgid "By default, tests results are displayed at a file level.  In order to see the details of every individual test cases, it is possible to define the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example:"
 msgstr "默认情况下，测试结果只展示到文件层级。为了看每个独立的测试用例的详情，可以像这样定义@code{SCM_LOG_DRIVER_FLAGS} makefile变量："
 
 #. type: example
-#: doc/guix.texi:831
+#: guix-git/doc/guix.texi:941
 #, no-wrap
 msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
 msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:837
+#: guix-git/doc/guix.texi:949
+msgid "The underlying SRFI 64 custom Automake test driver used for the 'check' test suite (located at @file{build-aux/test-driver.scm}) also allows selecting which test cases to run at a finer level, via its @option{--select} and @option{--exclude} options.  Here's an example, to run all the test cases from the @file{tests/packages.scm} test file whose names start with ``transaction-upgrade-entry'':"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:953
+#, no-wrap
+msgid ""
+"export SCM_LOG_DRIVER_FLAGS=\"--select=^transaction-upgrade-entry\"\n"
+"make check TESTS=\"tests/packages.scm\"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:959
+msgid "Those wishing to inspect the results of failed tests directly from the command line can add the @option{--errors-only=yes} option to the @code{SCM_LOG_DRIVER_FLAGS} makefile variable and set the @code{VERBOSE} Automake makefile variable, as in:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:962
+#, fuzzy, no-wrap
+#| msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
+msgid "make check SCM_LOG_DRIVER_FLAGS=\"--brief=no --errors-only=yes\" VERBOSE=1\n"
+msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:967
+msgid "The @option{--show-duration=yes} option can be used to print the duration of the individual test cases, when used in combination with @option{--brief=no}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:970
+#, fuzzy, no-wrap
+#| msgid "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
+msgid "make check SCM_LOG_DRIVER_FLAGS=\"--brief=no --show-duration=yes\"\n"
+msgstr "make check TESTS=\"tests/base64.scm\" SCM_LOG_DRIVER_FLAGS=\"--brief=no\"\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:974
+msgid "@xref{Parallel Test Harness,,,automake,GNU Automake} for more information about the Automake Parallel Test Harness."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:979
 msgid "Upon failure, please email @email{bug-guix@@gnu.org} and attach the @file{test-suite.log} file.  Please specify the Guix version being used as well as version numbers of the dependencies (@pxref{Requirements}) in your message."
 msgstr "遇到错误时，请给@email{bug-guix@@gnu.org}发邮件，并附带@file{test-suite.log}文件。请在消息里说明使用的Guix的版本信息和依赖（@pxref{Requirements}）的版本信息。"
 
 #. type: Plain text
-#: doc/guix.texi:841
+#: guix-git/doc/guix.texi:983
 msgid "Guix also comes with a whole-system test suite that tests complete Guix System instances.  It can only run on systems where Guix is already installed, using:"
 msgstr "Guix还附带了一个可以测试整个Guix系统实例的全系统测试套件。它只能在已经安装Guix的系统上运行："
 
 #. type: example
-#: doc/guix.texi:844
+#: guix-git/doc/guix.texi:986
 #, no-wrap
 msgid "make check-system\n"
 msgstr "make check-system\n"
 
 #. type: Plain text
-#: doc/guix.texi:848
+#: guix-git/doc/guix.texi:990
 msgid "or, again, by defining @code{TESTS} to select a subset of tests to run:"
 msgstr "或者，同样的，通过定义@code{TESTS}只运行测试的一个子集："
 
 #. type: example
-#: doc/guix.texi:851
+#: guix-git/doc/guix.texi:993
 #, no-wrap
 msgid "make check-system TESTS=\"basic mcron\"\n"
 msgstr "make check-system TESTS=\"basic mcron\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:859
+#: guix-git/doc/guix.texi:1001
 msgid "These system tests are defined in the @code{(gnu tests @dots{})} modules.  They work by running the operating systems under test with lightweight instrumentation in a virtual machine (VM).  They can be computationally intensive or rather cheap, depending on whether substitutes are available for their dependencies (@pxref{Substitutes}).  Some of them require a lot of storage space to hold VM images."
 msgstr "这些系统测试是在@code{(gnu tests @dots{})}模块里定义的。它们在虚拟机（VM）里运行轻量的指令。它们的计算量可能很多也可能很少，这取决于它们依赖的substitute（@pxref{Substitutes}）是否已经存在。它们之中有些需要很多存储空间以保存虚拟机硬盘。"
 
 #. type: Plain text
-#: doc/guix.texi:862
+#: guix-git/doc/guix.texi:1004
 msgid "Again in case of test failures, please send @email{bug-guix@@gnu.org} all the details."
 msgstr "再重复一遍，如果遇到测试错误，请给@email{bug-guix@@gnu.org}发邮件，并附带详细的说明。"
 
 #. type: cindex
-#: doc/guix.texi:866
+#: guix-git/doc/guix.texi:1008
 #, no-wrap
 msgid "daemon"
 msgstr "后台进程"
 
 #. type: Plain text
-#: doc/guix.texi:874
+#: guix-git/doc/guix.texi:1016
 msgid "Operations such as building a package or running the garbage collector are all performed by a specialized process, the @dfn{build daemon}, on behalf of clients.  Only the daemon may access the store and its associated database.  Thus, any operation that manipulates the store goes through the daemon.  For instance, command-line tools such as @command{guix package} and @command{guix build} communicate with the daemon (@i{via} remote procedure calls) to instruct it what to do."
 msgstr "构建软件包或运行垃圾回收器之类的操作都是由一个特殊的进程代替客户执行的，即@dfn{构建后台进程}。只有这个进程可以访问仓库和相关的数据库。因此，所有修改仓库的操作都通过这个后台进程执行。例如，@command{guix package}和@command{guix build}之类的命令行工具通过和这个后台进程通信（@i{通过}远程过程调用）来指示它该做什么。"
 
 #. type: Plain text
-#: doc/guix.texi:878
+#: guix-git/doc/guix.texi:1020
 msgid "The following sections explain how to prepare the build daemon's environment.  See also @ref{Substitutes}, for information on how to allow the daemon to download pre-built binaries."
 msgstr "接下来的几个小节介绍如何准备“构建后台进程”的环境。参考@ref{Substitutes}，了解怎样允许这个后台进程下载预构建好的二进制文件。"
 
 #. type: cindex
-#: doc/guix.texi:888 doc/guix.texi:1311
+#: guix-git/doc/guix.texi:1030 guix-git/doc/guix.texi:1492
 #, no-wrap
 msgid "build environment"
 msgstr "构建环境"
 
 #. type: Plain text
-#: doc/guix.texi:896
+#: guix-git/doc/guix.texi:1038
 msgid "In a standard multi-user setup, Guix and its daemon---the @command{guix-daemon} program---are installed by the system administrator; @file{/gnu/store} is owned by @code{root} and @command{guix-daemon} runs as @code{root}.  Unprivileged users may use Guix tools to build packages or otherwise access the store, and the daemon will do it on their behalf, ensuring that the store is kept in a consistent state, and allowing built packages to be shared among users."
 msgstr "在一个标准的多用户设置里，Guix和它的后台进程--@command{guix-daemon}程序--是由@code{root}用户安装的，并且@command{guix-daemon}以@code{root}用户身份运行。无特权的用户可以用Guix的工具构建软件包或访问仓库，这个后台进程会代替用户进行这些操作，以确保仓库保持一致的状态，并且允许构建好的软件包可以在不同用户间共享。"
 
 #. type: cindex
-#: doc/guix.texi:897
+#: guix-git/doc/guix.texi:1039
 #, no-wrap
 msgid "build users"
 msgstr "构建用户"
 
 #. type: Plain text
-#: doc/guix.texi:908
+#: guix-git/doc/guix.texi:1050
 msgid "When @command{guix-daemon} runs as @code{root}, you may not want package build processes themselves to run as @code{root} too, for obvious security reasons.  To avoid that, a special pool of @dfn{build users} should be created for use by build processes started by the daemon.  These build users need not have a shell and a home directory: they will just be used when the daemon drops @code{root} privileges in build processes.  Having several such users allows the daemon to launch distinct build processes under separate UIDs, which guarantees that they do not interfere with each other---an essential feature since builds are regarded as pure functions (@pxref{Introduction})."
 msgstr "当@command{guix-daemon}以@code{root}用户身份运行时，由于安全方面的考虑，你可能不希望软件包构建进程也以@code{root}用户身份运行。为了避免那样，我们需要创建一个@dfn{构建用户}池，以供后台进程启动的构建进程使用。这些构建用户不需要拥有shell和家目录：他们只会在后台进程为构建进程剥夺@code{root}特权时使用。拥有多个这类用户使后台进程可以以不同的UID启动不同的构建进程，这保证它们不会互相干扰--这是一个重要的功能，因为构建被视为纯函数（@pxref{Introduction}）。"
 
 #. type: Plain text
-#: doc/guix.texi:911
+#: guix-git/doc/guix.texi:1053
 msgid "On a GNU/Linux system, a build user pool may be created like this (using Bash syntax and the @code{shadow} commands):"
 msgstr "在一个GNU/Linux系统上，可以这样创建一个构建用户池（用bash语法和@code{shadow}命令）："
 
 #. type: example
-#: doc/guix.texi:923
-#, no-wrap
+#: guix-git/doc/guix.texi:1065
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# groupadd --system guixbuild\n"
+#| "# for i in `seq -w 1 10`;\n"
+#| "  do\n"
+#| "    useradd -g guixbuild -G guixbuild           \\\n"
+#| "            -d /var/empty -s `which nologin`    \\\n"
+#| "            -c \"Guix build user $i\" --system    \\\n"
+#| "            guixbuilder$i;\n"
+#| "  done\n"
 msgid ""
 "# groupadd --system guixbuild\n"
-"# for i in `seq -w 1 10`;\n"
+"# for i in $(seq -w 1 10);\n"
 "  do\n"
 "    useradd -g guixbuild -G guixbuild           \\\n"
-"            -d /var/empty -s `which nologin`    \\\n"
+"            -d /var/empty -s $(which nologin)   \\\n"
 "            -c \"Guix build user $i\" --system    \\\n"
 "            guixbuilder$i;\n"
 "  done\n"
@@ -3939,118 +5305,161 @@ msgstr ""
 "  done\n"
 
 #. type: Plain text
-#: doc/guix.texi:933
+#: guix-git/doc/guix.texi:1075
 msgid "The number of build users determines how many build jobs may run in parallel, as specified by the @option{--max-jobs} option (@pxref{Invoking guix-daemon, @option{--max-jobs}}).  To use @command{guix system vm} and related commands, you may need to add the build users to the @code{kvm} group so they can access @file{/dev/kvm}, using @code{-G guixbuild,kvm} instead of @code{-G guixbuild} (@pxref{Invoking guix system})."
 msgstr "构建用户的数量决定了有多少个构建任务可以并行执行，即@option{--max-jobs}参数(@pxref{Invoking guix-daemon, @option{--max-jobs}})。为了使用@command{guix system vm}和相关的命令，你需要把构建用户添加到@code{kvm}用户组，以使它们访问@file{/dev/kvm}。为此，把@code{-G guixbuild}替换成@code{-G guixbuild,kvm}（@pxref{Invoking guix system}）。"
 
 #. type: Plain text
-#: doc/guix.texi:942
+#: guix-git/doc/guix.texi:1084
 msgid "The @code{guix-daemon} program may then be run as @code{root} with the following command@footnote{If your machine uses the systemd init system, dropping the @file{@var{prefix}/lib/systemd/system/guix-daemon.service} file in @file{/etc/systemd/system} will ensure that @command{guix-daemon} is automatically started.  Similarly, if your machine uses the Upstart init system, drop the @file{@var{prefix}/lib/upstart/system/guix-daemon.conf} file in @file{/etc/init}.}:"
 msgstr "之后以@code{root}身份用下面的命令运行@code{guix-daemon}程序command@footnote{如果你的机器使用systemd init系统，把@file{@var{prefix}/lib/systemd/system/guix-daemon.service}文件复制到@file{/etc/systemd/system}文件夹里可以使@command{guix-daemon}自启动。类似的，如果你的机器使用Upstart init系统，把@file{@var{prefix}/lib/upstart/system/guix-daemon.conf}文件复制到@file{/etc/init}文件夹里}："
 
 #. type: example
-#: doc/guix.texi:945 doc/guix.texi:1304
+#: guix-git/doc/guix.texi:1087 guix-git/doc/guix.texi:1485
 #, no-wrap
 msgid "# guix-daemon --build-users-group=guixbuild\n"
 msgstr "# guix-daemon --build-users-group=guixbuild\n"
 
 #. type: cindex
-#: doc/guix.texi:947 doc/guix.texi:1309
+#: guix-git/doc/guix.texi:1089 guix-git/doc/guix.texi:1490
 #, no-wrap
 msgid "chroot"
 msgstr "chroot"
 
 #. type: Plain text
-#: doc/guix.texi:952
+#: guix-git/doc/guix.texi:1094
 msgid "This way, the daemon starts build processes in a chroot, under one of the @code{guixbuilder} users.  On GNU/Linux, by default, the chroot environment contains nothing but:"
 msgstr "这样，后台进程在一个chroot环境里，以一个@code{guixbuilder}用户组成员的身份启动构建进程。在GNU/Linux上，默认的，这个chroot环境仅包含这些东西："
 
 #. type: itemize
-#: doc/guix.texi:960
+#: guix-git/doc/guix.texi:1102
 msgid "a minimal @code{/dev} directory, created mostly independently from the host @code{/dev}@footnote{``Mostly'', because while the set of files that appear in the chroot's @code{/dev} is fixed, most of these files can only be created if the host has them.};"
 msgstr "一个和主机@code{/dev}独立的@footnote{大致这样，因为虽然chroot环境里的@code{/dev}包含的文件是固定的，大部分这些文件只有在主机有对应的文件时才能创建。}，最小的@code{/dev}文件夹；"
 
 #. type: itemize
-#: doc/guix.texi:964
+#: guix-git/doc/guix.texi:1106
 msgid "the @code{/proc} directory; it only shows the processes of the container since a separate PID name space is used;"
 msgstr "@code{/proc}文件夹；它只含有当前容器的进程，因为用了一个独立的进程PID命名空间；"
 
 #. type: itemize
-#: doc/guix.texi:968
+#: guix-git/doc/guix.texi:1110
 msgid "@file{/etc/passwd} with an entry for the current user and an entry for user @file{nobody};"
 msgstr "@file{/etc/passwd}，仅包含当前用户和@file{nobody}；"
 
 #. type: itemize
-#: doc/guix.texi:971
+#: guix-git/doc/guix.texi:1113
 msgid "@file{/etc/group} with an entry for the user's group;"
 msgstr "@file{/etc/group}，包含用户的组；"
 
 #. type: itemize
-#: doc/guix.texi:975
+#: guix-git/doc/guix.texi:1117
 msgid "@file{/etc/hosts} with an entry that maps @code{localhost} to @code{127.0.0.1};"
 msgstr "@file{/etc/hosts}，包含@code{localhost}映射到@code{127.0.0.1}的条目；"
 
 #. type: itemize
-#: doc/guix.texi:978
+#: guix-git/doc/guix.texi:1120
 msgid "a writable @file{/tmp} directory."
 msgstr "一个可写的@file{/tmp}文件夹。"
 
 #. type: Plain text
-#: doc/guix.texi:987
-msgid "You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable.  However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}.  This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree."
+#: guix-git/doc/guix.texi:1129
+#, fuzzy
+#| msgid "You can influence the directory where the daemon stores build trees @i{via} the @code{TMPDIR} environment variable.  However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}.  This way, the value of @code{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree."
+msgid "You can influence the directory where the daemon stores build trees @i{via} the @env{TMPDIR} environment variable.  However, the build tree within the chroot is always called @file{/tmp/guix-build-@var{name}.drv-0}, where @var{name} is the derivation name---e.g., @code{coreutils-8.24}.  This way, the value of @env{TMPDIR} does not leak inside build environments, which avoids discrepancies in cases where build processes capture the name of their build tree."
 msgstr "你可以@i{通过}@code{TMPDIR}环境变量修改后台进程保存构建树的位置。但是，chroot里的构建树总是在@file{/tmp/guix-build-@var{名字}.drv-0}，@var{名字}是derivation的名字--如@code{coreutils-8.24}。这样，@code{TMPDIR}的值就不会泄漏到构建环境里，这可以避免由构建进程读取构建树名字引起的问题。"
 
 #. type: vindex
-#: doc/guix.texi:988 doc/guix.texi:3261
+#: guix-git/doc/guix.texi:1130 guix-git/doc/guix.texi:3952
 #, no-wrap
 msgid "http_proxy"
 msgstr "http_proxy"
 
+#. type: vindex
+#: guix-git/doc/guix.texi:1131 guix-git/doc/guix.texi:3953
+#, fuzzy, no-wrap
+#| msgid "http_proxy"
+msgid "https_proxy"
+msgstr "http_proxy"
+
 #. type: Plain text
-#: doc/guix.texi:992
-msgid "The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})."
+#: guix-git/doc/guix.texi:1136
+#, fuzzy
+#| msgid "The daemon also honors the @code{http_proxy} environment variable for HTTP downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})."
+msgid "The daemon also honors the @env{http_proxy} and @env{https_proxy} environment variables for HTTP and HTTPS downloads it performs, be it for fixed-output derivations (@pxref{Derivations}) or for substitutes (@pxref{Substitutes})."
 msgstr "后台进程通过HTTP下载时还遵守@code{http_proxy}环境变量，无论是下载derivation（@pxref{Derivations}），还是下载substitute（@pxref{Substitutes}）。"
 
 #. type: Plain text
-#: doc/guix.texi:1000
-msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}.  However, build processes will not be isolated from one another, and not from the rest of the system.  Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions."
+#: guix-git/doc/guix.texi:1144
+#, fuzzy
+#| msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @code{--disable-chroot}.  However, build processes will not be isolated from one another, and not from the rest of the system.  Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions."
+msgid "If you are installing Guix as an unprivileged user, it is still possible to run @command{guix-daemon} provided you pass @option{--disable-chroot}.  However, build processes will not be isolated from one another, and not from the rest of the system.  Thus, build processes may interfere with each other, and may access programs, libraries, and other files available on the system---making it much harder to view them as @emph{pure} functions."
 msgstr "如果你是以无特权的用户的身份安装Guix，你仍可以运行@command{guix-daemon}，只要添加@code{--disable-chroot}参数就行了。但是，构建进程不会互相隔离，也不会和系统的其它部分隔离。因此，构建进程有可能互相干扰，可以访问程序、库和系统上的其它文件--这样就很难把它看作@emph{纯}函数。"
 
 #. type: subsection
-#: doc/guix.texi:1003
+#: guix-git/doc/guix.texi:1147
 #, no-wrap
 msgid "Using the Offload Facility"
 msgstr "使用任务下发设施"
 
 #. type: cindex
-#: doc/guix.texi:1005
+#: guix-git/doc/guix.texi:1149 guix-git/doc/guix.texi:1551
 #, no-wrap
 msgid "offloading"
 msgstr "下发"
 
 #. type: cindex
-#: doc/guix.texi:1006 doc/guix.texi:1367
+#: guix-git/doc/guix.texi:1150
 #, no-wrap
 msgid "build hook"
 msgstr "构建钩子"
 
 #. type: Plain text
-#: doc/guix.texi:1020
-msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine."
+#: guix-git/doc/guix.texi:1169
+#, fuzzy
+#| msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system type---e.g., @file{x86_64-linux}.  Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine."
+msgid "When desired, the build daemon can @dfn{offload} derivation builds to other machines running Guix, using the @code{offload} @dfn{build hook}@footnote{This feature is available only when @uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH} is present.}.  When that feature is enabled, a list of user-specified build machines is read from @file{/etc/guix/machines.scm}; every time a build is requested, for instance via @code{guix build}, the daemon attempts to offload it to one of the machines that satisfy the constraints of the derivation, in particular its system types---e.g., @code{x86_64-linux}.  A single machine can have multiple system types, either because its architecture natively supports it, via emulation (@pxref{transparent-emulation-qemu, Transparent Emulation with QEMU}), or both.  Missing prerequisites for the build are copied over SSH to the target machine, which then proceeds with the build; upon success the output(s) of the build are copied back to the initial machine.  The offload facility comes with a basic scheduler that attempts to select the best machine.  The best machine is chosen among the available machines based on criteria such as:"
 msgstr "当需要时，构建后台进程可以把构建derivation的任务@dfn{下发}给其它运行Guix的机器，这通过@code{下发} @dfn{构建钩子}实现@footnote{这个功能只有当@uref{https://github.com/artyom-poptsov/guile-ssh, Guile-SSH}存在时才可用。}。当那个功能被启用时，会从@file{/etc/guix/machines.scm}读取一列用户指定的机器；每次发送构建请求时，如执行@code{guix build}，后台进程尝试把它下发到某一台满足derivation的约束（特别是系统类型--如@file{x86_64-linux}）的机器上。缺少的必备构建依赖通过SSH复制到目标机器，然后继续构建；成功后，构建输出的结果被复制回初始的机器上。"
 
+#. type: enumerate
+#: guix-git/doc/guix.texi:1175
+msgid "The availability of a build slot.  A build machine can have as many build slots (connections) as the value of the @code{parallel-builds} field of its @code{build-machine} object."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1179
+msgid "Its relative speed, as defined via the @code{speed} field of its @code{build-machine} object."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1184
+msgid "Its load.  The normalized machine load must be lower than a threshold value, configurable via the @code{overload-threshold} field of its @code{build-machine} object."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1187
+msgid "Disk space availability.  More than a 100 MiB must be available."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:1022
+#: guix-git/doc/guix.texi:1190
 msgid "The @file{/etc/guix/machines.scm} file typically looks like this:"
 msgstr "@file{/etc/guix/machines.scm}文件通常是这样的："
 
-#. type: example
-#: doc/guix.texi:1030
-#, no-wrap
+#. type: lisp
+#: guix-git/doc/guix.texi:1198
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(list (build-machine\n"
+#| "        (name \"eightysix.example.org\")\n"
+#| "        (system \"x86_64-linux\")\n"
+#| "        (host-key \"ssh-ed25519 AAAAC3Nza@dots{}\")\n"
+#| "        (user \"bob\")\n"
+#| "        (speed 2.))     ;incredibly fast!\n"
+#| "\n"
 msgid ""
 "(list (build-machine\n"
 "        (name \"eightysix.example.org\")\n"
-"        (system \"x86_64-linux\")\n"
+"        (systems (list \"x86_64-linux\" \"i686-linux\"))\n"
 "        (host-key \"ssh-ed25519 AAAAC3Nza@dots{}\")\n"
 "        (user \"bob\")\n"
 "        (speed 2.))     ;incredibly fast!\n"
@@ -4064,13 +5473,22 @@ msgstr ""
 "        (speed 2.))     ;非常快！\n"
 "\n"
 
-#. type: example
-#: doc/guix.texi:1039
-#, no-wrap
+#. type: lisp
+#: guix-git/doc/guix.texi:1207
+#, fuzzy, no-wrap
+#| msgid ""
+#| "      (build-machine\n"
+#| "        (name \"meeps.example.org\")\n"
+#| "        (system \"mips64el-linux\")\n"
+#| "        (host-key \"ssh-rsa AAAAB3Nza@dots{}\")\n"
+#| "        (user \"alice\")\n"
+#| "        (private-key\n"
+#| "         (string-append (getenv \"HOME\")\n"
+#| "                        \"/.ssh/identity-for-guix\"))))\n"
 msgid ""
 "      (build-machine\n"
-"        (name \"meeps.example.org\")\n"
-"        (system \"mips64el-linux\")\n"
+"        (name \"armeight.example.org\")\n"
+"        (systems (list \"aarch64-linux\"))\n"
 "        (host-key \"ssh-rsa AAAAB3Nza@dots{}\")\n"
 "        (user \"alice\")\n"
 "        (private-key\n"
@@ -4087,936 +5505,1059 @@ msgstr ""
 "                        \"/.ssh/identity-for-guix\"))))\n"
 
 #. type: Plain text
-#: doc/guix.texi:1045
-msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} architecture."
+#: guix-git/doc/guix.texi:1213
+#, fuzzy
+#| msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} architecture and one for the @code{mips64el} architecture."
+msgid "In the example above we specify a list of two build machines, one for the @code{x86_64} and @code{i686} architectures and one for the @code{aarch64} architecture."
 msgstr "在上面的例子里，我们指定了一个包含两个构建机器的列表，一个是@code{x86_64}架构，一个是@code{mips64el}架构。"
 
 #. type: Plain text
-#: doc/guix.texi:1054
+#: guix-git/doc/guix.texi:1222
 msgid "In fact, this file is---not surprisingly!---a Scheme file that is evaluated when the @code{offload} hook is started.  Its return value must be a list of @code{build-machine} objects.  While this example shows a fixed list of build machines, one could imagine, say, using DNS-SD to return a list of potential build machines discovered in the local network (@pxref{Introduction, Guile-Avahi,, guile-avahi, Using Avahi in Guile Scheme Programs}).  The @code{build-machine} data type is detailed below."
 msgstr "事实上，这个文件--并不意外地--是一个Scheme文件，当@code{下发}钩子被启动时执行。它的返回值必须是一个包含@code{build-machine}对象的列表。虽然这个例子展示的是一个固定的列表，你可以想象，使用DNS-SD来返回一个包含从局域网内发现的构建机器的列表，@pxref{Introduction, Guile-Avahi,, guile-avahi, 在Guile Scheme程序里使用Avahi}。@code{build-machine}数据类型的详细信息如下。"
 
 #. type: deftp
-#: doc/guix.texi:1055
+#: guix-git/doc/guix.texi:1223
 #, no-wrap
 msgid "{Data Type} build-machine"
 msgstr "{数据类型} build-machine"
 
 #. type: deftp
-#: doc/guix.texi:1058
+#: guix-git/doc/guix.texi:1226
 msgid "This data type represents build machines to which the daemon may offload builds.  The important fields are:"
 msgstr "这个数据类型表示后台进程可以下发构建任务的构建机器。重要的项有："
 
 #. type: item
-#: doc/guix.texi:1061 doc/guix.texi:5337 doc/guix.texi:11004
-#: doc/guix.texi:11086 doc/guix.texi:11313 doc/guix.texi:12897
-#: doc/guix.texi:17434 doc/guix.texi:18019 doc/guix.texi:18630
-#: doc/guix.texi:18938 doc/guix.texi:18979 doc/guix.texi:23523
-#: doc/guix.texi:23540 doc/guix.texi:23833 doc/guix.texi:25130
-#: doc/guix.texi:25336
+#: guix-git/doc/guix.texi:1229 guix-git/doc/guix.texi:6672
+#: guix-git/doc/guix.texi:14420 guix-git/doc/guix.texi:14514
+#: guix-git/doc/guix.texi:14755 guix-git/doc/guix.texi:16704
+#: guix-git/doc/guix.texi:19888 guix-git/doc/guix.texi:22524
+#: guix-git/doc/guix.texi:23913 guix-git/doc/guix.texi:24525
+#: guix-git/doc/guix.texi:24877 guix-git/doc/guix.texi:24918
+#: guix-git/doc/guix.texi:27017 guix-git/doc/guix.texi:29286
+#: guix-git/doc/guix.texi:29306 guix-git/doc/guix.texi:31753
+#: guix-git/doc/guix.texi:31770 guix-git/doc/guix.texi:32259
+#: guix-git/doc/guix.texi:33991 guix-git/doc/guix.texi:34299
 #, no-wrap
 msgid "name"
 msgstr "名字"
 
 #. type: table
-#: doc/guix.texi:1063
+#: guix-git/doc/guix.texi:1231
 msgid "The host name of the remote machine."
 msgstr "远程机器的主机名。"
 
 #. type: item
-#: doc/guix.texi:1064
-#, no-wrap
-msgid "system"
+#: guix-git/doc/guix.texi:1232
+#, fuzzy, no-wrap
+#| msgid "system"
+msgid "systems"
 msgstr "系统"
 
 #. type: table
-#: doc/guix.texi:1066
-msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
+#: guix-git/doc/guix.texi:1235
+#, fuzzy
+#| msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
+msgid "The system types the remote machine supports---e.g., @code{(list \"x86_64-linux\" \"i686-linux\")}."
 msgstr "远程机器的系统类型--如，@code{\"x86_64-linux\"}。"
 
 #. type: code{#1}
-#: doc/guix.texi:1067 doc/guix.texi:12907
+#: guix-git/doc/guix.texi:1236 guix-git/doc/guix.texi:16714
 #, no-wrap
 msgid "user"
 msgstr "用户"
 
 #. type: table
-#: doc/guix.texi:1071
+#: guix-git/doc/guix.texi:1240
 msgid "The user account to use when connecting to the remote machine over SSH.  Note that the SSH key pair must @emph{not} be passphrase-protected, to allow non-interactive logins."
 msgstr "通过SSH连接远程机器时使用的用户帐号。注意，SSH密钥@emph{不}能被密码保护，以支持无交互的登录。"
 
 #. type: item
-#: doc/guix.texi:1072
+#: guix-git/doc/guix.texi:1241
 #, no-wrap
 msgid "host-key"
 msgstr "主机公钥"
 
 #. type: table
-#: doc/guix.texi:1076
+#: guix-git/doc/guix.texi:1245
 msgid "This must be the machine's SSH @dfn{public host key} in OpenSSH format.  This is used to authenticate the machine when we connect to it.  It is a long string that looks like this:"
 msgstr "这必须是机器的OpenSSH格式的SSH@dfn{公钥}。这是用来在连接机器时认证身份的。它是一个像这样的长字符串："
 
 #. type: example
-#: doc/guix.texi:1079
+#: guix-git/doc/guix.texi:1248
 #, no-wrap
 msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 msgstr "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
 
 #. type: table
-#: doc/guix.texi:1084
+#: guix-git/doc/guix.texi:1253
 msgid "If the machine is running the OpenSSH daemon, @command{sshd}, the host key can be found in a file such as @file{/etc/ssh/ssh_host_ed25519_key.pub}."
 msgstr "如果这个机器正在运行OpenSSH后台进程，@command{sshd}，那么主机公钥可以在@file{/etc/ssh/ssh_host_ed25519_key.pub}找到。"
 
 #. type: table
-#: doc/guix.texi:1089
+#: guix-git/doc/guix.texi:1258
 msgid "If the machine is running the SSH daemon of GNU@tie{}lsh, @command{lshd}, the host key is in @file{/etc/lsh/host-key.pub} or a similar file.  It can be converted to the OpenSSH format using @command{lsh-export-key} (@pxref{Converting keys,,, lsh, LSH Manual}):"
 msgstr "如果这个机器正在运行GNU@tie{}lsh，@command{lshd}，那么主机公钥可以在@file{/etc/lsh/host-key.pub}或类似的位置找到。它可以通过@command{lsh-export-key}命令转换成OpenSSH格式（@pxref{Converting keys,,, lsh, LSH用户手册}）："
 
 #. type: example
-#: doc/guix.texi:1093
-#, no-wrap
+#: guix-git/doc/guix.texi:1262
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n"
+#| "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n"
 msgid ""
-"$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n"
+"$ lsh-export-key --openssh < /etc/lsh/host-key.pub\n"
 "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n"
 msgstr ""
 "$ lsh-export-key --openssh < /etc/lsh/host-key.pub \n"
 "ssh-rsa AAAAB3NzaC1yc2EAAAAEOp8FoQAAAQEAs1eB46LV@dots{}\n"
 
 #. type: deftp
-#: doc/guix.texi:1098
+#: guix-git/doc/guix.texi:1267
 msgid "A number of optional fields may be specified:"
 msgstr "一些可选的项："
 
 #. type: item
-#: doc/guix.texi:1101
+#: guix-git/doc/guix.texi:1270 guix-git/doc/guix.texi:33491
 #, no-wrap
 msgid "@code{port} (default: @code{22})"
 msgstr "@code{port}（默认值：@code{22}）"
 
 #. type: table
-#: doc/guix.texi:1103
+#: guix-git/doc/guix.texi:1272
 msgid "Port number of SSH server on the machine."
 msgstr "机器上的SSH服务器的端口号。"
 
 #. type: item
-#: doc/guix.texi:1104
+#: guix-git/doc/guix.texi:1273
 #, no-wrap
 msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
 msgstr "@code{private-key}（默认值：@file{~root/.ssh/id_rsa}）"
 
 #. type: table
-#: doc/guix.texi:1107
+#: guix-git/doc/guix.texi:1276
 msgid "The SSH private key file to use when connecting to the machine, in OpenSSH format.  This key must not be protected with a passphrase."
 msgstr "连接机器时使用的SSH私钥，OpenSSH格式。这个私钥不能被密码保护。"
 
 #. type: table
-#: doc/guix.texi:1110
+#: guix-git/doc/guix.texi:1279
 msgid "Note that the default value is the private key @emph{of the root account}.  Make sure it exists if you use the default."
 msgstr "注意，默认值是@emph{root帐号}的私钥。使用默认值时请确保它存在。"
 
 #. type: item
-#: doc/guix.texi:1111
+#: guix-git/doc/guix.texi:1280
 #, no-wrap
 msgid "@code{compression} (default: @code{\"zlib@@openssh.com,zlib\"})"
 msgstr "@code{compression}（默认值：@code{\"zlib@@openssh.com,zlib\"}）"
 
-#. type: item
-#: doc/guix.texi:1112 doc/guix.texi:12200
+#. type: itemx
+#: guix-git/doc/guix.texi:1281
 #, no-wrap
 msgid "@code{compression-level} (default: @code{3})"
 msgstr "@code{compression-level}（默认值：@code{3}）"
 
 #. type: table
-#: doc/guix.texi:1114
+#: guix-git/doc/guix.texi:1283
 msgid "The SSH-level compression methods and compression level requested."
 msgstr "SSH压缩算法和压缩级别。"
 
 #. type: table
-#: doc/guix.texi:1117
+#: guix-git/doc/guix.texi:1286
 msgid "Note that offloading relies on SSH compression to reduce bandwidth usage when transferring files to and from build machines."
 msgstr "下发任务依赖SSH压缩来减少传输文件到构建机器时使用的带宽。"
 
 #. type: item
-#: doc/guix.texi:1118
+#: guix-git/doc/guix.texi:1287
 #, no-wrap
 msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
 msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
 
 #. type: table
-#: doc/guix.texi:1121
+#: guix-git/doc/guix.texi:1290
 msgid "File name of the Unix-domain socket @command{guix-daemon} is listening to on that machine."
 msgstr "那台机器上的@command{guix-daemon}监听的Unix套接字文件名。"
 
 #. type: item
-#: doc/guix.texi:1122
+#: guix-git/doc/guix.texi:1291
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{overload-threshold} (default: @code{0.6})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:1297
+msgid "The load threshold above which a potential offload machine is disregarded by the offload scheduler.  The value roughly translates to the total processor usage of the build machine, ranging from 0.0 (0%) to 1.0 (100%).  It can also be disabled by setting @code{overload-threshold} to @code{#f}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:1298
 #, no-wrap
 msgid "@code{parallel-builds} (default: @code{1})"
 msgstr "@code{parallel-builds}（默认值：@code{1}）"
 
 #. type: table
-#: doc/guix.texi:1124
+#: guix-git/doc/guix.texi:1300
 msgid "The number of builds that may run in parallel on the machine."
 msgstr "那台机器上可以并行运行的构建任务数量。"
 
 #. type: item
-#: doc/guix.texi:1125
+#: guix-git/doc/guix.texi:1301
 #, no-wrap
 msgid "@code{speed} (default: @code{1.0})"
 msgstr "@code{speed}（默认值：@code{1.0}）"
 
 #. type: table
-#: doc/guix.texi:1128
+#: guix-git/doc/guix.texi:1304
 msgid "A ``relative speed factor''.  The offload scheduler will tend to prefer machines with a higher speed factor."
 msgstr "一个相对的速度值。下发调度器会偏好速度更快的机器。"
 
 #. type: item
-#: doc/guix.texi:1129
+#: guix-git/doc/guix.texi:1305
 #, no-wrap
 msgid "@code{features} (default: @code{'()})"
 msgstr "@code{features} （@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:1134
+#: guix-git/doc/guix.texi:1310
 msgid "A list of strings denoting specific features supported by the machine.  An example is @code{\"kvm\"} for machines that have the KVM Linux modules and corresponding hardware support.  Derivations can request features by name, and they will be scheduled on matching build machines."
 msgstr "一个表示机器支持的功能的字符串列表。例如，@code{\"kvm\"}表示机器有KVM Linux模块和相关的硬件支持。Derivation可以通过名字请求需要的功能，然后被分发到匹配的机器的任务队列里。"
 
 #. type: Plain text
-#: doc/guix.texi:1140
+#: guix-git/doc/guix.texi:1316
 msgid "The @command{guix} command must be in the search path on the build machines.  You can check whether this is the case by running:"
 msgstr "@command{guix}命令必须在构建机器的搜素路径里。你可以通过这个命令检查："
 
 #. type: example
-#: doc/guix.texi:1143
+#: guix-git/doc/guix.texi:1319
 #, no-wrap
 msgid "ssh build-machine guix repl --version\n"
 msgstr "ssh build-machine guix repl --version\n"
 
 #. type: Plain text
-#: doc/guix.texi:1150
+#: guix-git/doc/guix.texi:1326
 msgid "There is one last thing to do once @file{machines.scm} is in place.  As explained above, when offloading, files are transferred back and forth between the machine stores.  For this to work, you first need to generate a key pair on each machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}):"
 msgstr "@file{machines.scm}到位后，还有一件要做的事。如上所述，下发任务时会在机器的仓库之间传输文件。为此，你需要在每台机器上生成一个密钥对，以使后台进程可以从仓库导出签名后的文件包（@pxref{Invoking guix archive}）："
 
 #. type: example
-#: doc/guix.texi:1153
+#: guix-git/doc/guix.texi:1329 guix-git/doc/guix.texi:33419
 #, no-wrap
 msgid "# guix archive --generate-key\n"
 msgstr "# guix archive --generate-key\n"
 
 #. type: Plain text
-#: doc/guix.texi:1158
+#: guix-git/doc/guix.texi:1334
 msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:"
 msgstr "每台构建机器都必须认证主机器的公钥，从而接收从主机器接收的仓库文件："
 
 #. type: example
-#: doc/guix.texi:1161
+#: guix-git/doc/guix.texi:1337
 #, no-wrap
 msgid "# guix archive --authorize < master-public-key.txt\n"
 msgstr "# guix archive --authorize < master-public-key.txt\n"
 
 #. type: Plain text
-#: doc/guix.texi:1165
+#: guix-git/doc/guix.texi:1341
 msgid "Likewise, the master machine must authorize the key of each build machine."
 msgstr "类似的，主机器必须认证每台构建机器的公钥："
 
 #. type: Plain text
-#: doc/guix.texi:1171
+#: guix-git/doc/guix.texi:1347
 msgid "All the fuss with keys is here to express pairwise mutual trust relations between the master and the build machines.  Concretely, when the master receives files from a build machine (and @i{vice versa}), its build daemon can make sure they are genuine, have not been tampered with, and that they are signed by an authorized key."
 msgstr "所有这些有关公钥的繁琐事宜都是为了表达主服务器和构建服务器之间成对的互相信任关系。具体地，当主机器从构建机器接收文件时（反之亦然），它的构建后台进程可以确保文件是原样的，没有被篡改，并且被认证的公钥签名过。"
 
 #. type: cindex
-#: doc/guix.texi:1172
+#: guix-git/doc/guix.texi:1348
 #, no-wrap
 msgid "offload test"
 msgstr "下发测试"
 
 #. type: Plain text
-#: doc/guix.texi:1175
+#: guix-git/doc/guix.texi:1351
 msgid "To test whether your setup is operational, run this command on the master node:"
 msgstr "为了测试你的设置是否能正常工作，在主节点上运行这个命令："
 
 #. type: example
-#: doc/guix.texi:1178
+#: guix-git/doc/guix.texi:1354
 #, no-wrap
 msgid "# guix offload test\n"
 msgstr "# guix offload test\n"
 
 #. type: Plain text
-#: doc/guix.texi:1184
-msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process."
+#: guix-git/doc/guix.texi:1360
+#, fuzzy
+#| msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guile and the Guix modules are available on each machine, attempt to export to the machine and import from it, and report any error in the process."
+msgid "This will attempt to connect to each of the build machines specified in @file{/etc/guix/machines.scm}, make sure Guix is available on each machine, attempt to export to the machine and import from it, and report any error in the process."
 msgstr "这会尝试连接每台在@file{/etc/guix/machines.scm}里指定的构建机器，确保Guile和Guix模块在每台机器上都可用，尝试导出到这些机器和从这些机器导入，并且报告这个过程中遇到的任何错误。"
 
 #. type: Plain text
-#: doc/guix.texi:1187
+#: guix-git/doc/guix.texi:1363
 msgid "If you want to test a different machine file, just specify it on the command line:"
 msgstr "如果你希望用别的文件测试，只需要在命令行指定它："
 
 #. type: example
-#: doc/guix.texi:1190
+#: guix-git/doc/guix.texi:1366
 #, no-wrap
 msgid "# guix offload test machines-qualif.scm\n"
 msgstr "# guix offload test machines-qualif.scm\n"
 
 #. type: Plain text
-#: doc/guix.texi:1194
+#: guix-git/doc/guix.texi:1370
 msgid "Last, you can test the subset of the machines whose name matches a regular expression like this:"
 msgstr "最后，你可以像这样只测试机器列表里名字匹配某个正则表达式的子集："
 
 #. type: example
-#: doc/guix.texi:1197
+#: guix-git/doc/guix.texi:1373
 #, no-wrap
 msgid "# guix offload test machines.scm '\\.gnu\\.org$'\n"
 msgstr "# guix offload test machines.scm '\\.gnu\\.org$'\n"
 
 #. type: cindex
-#: doc/guix.texi:1199
+#: guix-git/doc/guix.texi:1375
 #, no-wrap
 msgid "offload status"
 msgstr "下发状态"
 
 #. type: Plain text
-#: doc/guix.texi:1202
+#: guix-git/doc/guix.texi:1378
 msgid "To display the current load of all build hosts, run this command on the main node:"
 msgstr "若想展示所有构建主机的当前负载，在主节点上运行这个命令："
 
 #. type: example
-#: doc/guix.texi:1205
+#: guix-git/doc/guix.texi:1381
 #, no-wrap
 msgid "# guix offload status\n"
 msgstr "# guix offload status\n"
 
 #. type: cindex
-#: doc/guix.texi:1211
+#: guix-git/doc/guix.texi:1387
 #, no-wrap
 msgid "SELinux, daemon policy"
 msgstr "SELinux，后台进程策略"
 
 #. type: cindex
-#: doc/guix.texi:1212
+#: guix-git/doc/guix.texi:1388
 #, no-wrap
 msgid "mandatory access control, SELinux"
 msgstr "强制访问控制，SELinux"
 
 #. type: cindex
-#: doc/guix.texi:1213
+#: guix-git/doc/guix.texi:1389
 #, no-wrap
 msgid "security, guix-daemon"
 msgstr "安全，guix-daemon"
 
 #. type: Plain text
-#: doc/guix.texi:1219
+#: guix-git/doc/guix.texi:1395
 msgid "Guix includes an SELinux policy file at @file{etc/guix-daemon.cil} that can be installed on a system where SELinux is enabled, in order to label Guix files and to specify the expected behavior of the daemon.  Since Guix System does not provide an SELinux base policy, the daemon policy cannot be used on Guix System."
 msgstr "Guix附带一个SELinux策略文件，位置在@file{etc/guix-daemon.cil}，它可以在启用SELinux的系统上安装，为Guix的文件添加标签及指定后台进程的期望行为。由于Guix系统不提供SELinux基础策略，这个后台进程策略不能在Guix系统上使用。"
 
 #. type: subsubsection
-#: doc/guix.texi:1220
+#: guix-git/doc/guix.texi:1396
 #, no-wrap
 msgid "Installing the SELinux policy"
 msgstr "安装SELinux策略"
 
 #. type: cindex
-#: doc/guix.texi:1221
+#: guix-git/doc/guix.texi:1397
 #, no-wrap
 msgid "SELinux, policy installation"
 msgstr "SELinux，安装策略"
 
 #. type: Plain text
-#: doc/guix.texi:1223
+#: guix-git/doc/guix.texi:1399
 msgid "To install the policy run this command as root:"
 msgstr "用root用户执行这个命令以安装策略："
 
 #. type: example
-#: doc/guix.texi:1226
+#: guix-git/doc/guix.texi:1402
 #, no-wrap
 msgid "semodule -i etc/guix-daemon.cil\n"
 msgstr "semodule -i etc/guix-daemon.cil\n"
 
 #. type: Plain text
-#: doc/guix.texi:1230
+#: guix-git/doc/guix.texi:1406
 msgid "Then relabel the file system with @code{restorecon} or by a different mechanism provided by your system."
 msgstr "用@code{restorecon}或者你的系统提供的其它机制重新给文件系统打标签。"
 
 #. type: Plain text
-#: doc/guix.texi:1235
+#: guix-git/doc/guix.texi:1411
 msgid "Once the policy is installed, the file system has been relabeled, and the daemon has been restarted, it should be running in the @code{guix_daemon_t} context.  You can confirm this with the following command:"
 msgstr "一旦安装好策略，为文件系统重新打好标签，并且重启了后台进程，它应该在@code{guix_daemon_t}环境里运行。你可以用下面这个命令确认："
 
 #. type: example
-#: doc/guix.texi:1238
+#: guix-git/doc/guix.texi:1414
 #, no-wrap
 msgid "ps -Zax | grep guix-daemon\n"
 msgstr "ps -Zax | grep guix-daemon\n"
 
 #. type: Plain text
-#: doc/guix.texi:1243
+#: guix-git/doc/guix.texi:1419
 msgid "Monitor the SELinux log files as you run a command like @code{guix build hello} to convince yourself that SELinux permits all necessary operations."
 msgstr "运行@code{guix build hello}之类的命令并监控SELinux日志以说服你自己SELinux允许所有的操作。"
 
 #. type: cindex
-#: doc/guix.texi:1245
+#: guix-git/doc/guix.texi:1421
 #, no-wrap
 msgid "SELinux, limitations"
 msgstr "SELinux，限制"
 
 #. type: Plain text
-#: doc/guix.texi:1250
+#: guix-git/doc/guix.texi:1426
 msgid "This policy is not perfect.  Here is a list of limitations or quirks that should be considered when deploying the provided SELinux policy for the Guix daemon."
 msgstr "这个策略不是完美的。这里有一个关于限制和缺陷的列表，当为Guix后台进程部署提供的SELinux策略时该认真考虑。"
 
 #. type: enumerate
-#: doc/guix.texi:1257
-msgid "@code{guix_daemon_socket_t} isn’t actually used.  None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only this label."
+#: guix-git/doc/guix.texi:1433
+#, fuzzy
+#| msgid "@code{guix_daemon_socket_t} isn’t actually used.  None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but it would be preferrable to define socket rules for only this label."
+msgid "@code{guix_daemon_socket_t} isn’t actually used.  None of the socket operations involve contexts that have anything to do with @code{guix_daemon_socket_t}.  It doesn’t hurt to have this unused label, but it would be preferable to define socket rules for only this label."
 msgstr "@code{guix_daemon_socket_t}没有被实际使用。所有的套接字操作都和@code{guix_daemon_socket_t}没有任何关系。存在这个没被使用的标签并不碍事，但是为这个标签定义套接字规则是更好的选择。"
 
 #. type: enumerate
-#: doc/guix.texi:1268
+#: guix-git/doc/guix.texi:1444
 msgid "@code{guix gc} cannot access arbitrary links to profiles.  By design, the file label of the destination of a symlink is independent of the file label of the link itself.  Although all profiles under $localstatedir are labelled, the links to these profiles inherit the label of the directory they are in.  For links in the user’s home directory this will be @code{user_home_t}.  But for links from the root user’s home directory, or @file{/tmp}, or the HTTP server’s working directory, etc, this won’t work.  @code{guix gc} would be prevented from reading and following these links."
 msgstr "@code{guix gc}不可以任意访问指向profile的链接。由于设计的原因，符号链接的目标的文件标签和符号链接本身的文件标签是不同的。尽管$localstatedir里的所有profile都被打上了标签，指向这些profile的符号链接继承它们所在的文件夹的标签。对于普通用户的家目录里的链接，标签是@code{user_home_t}。但是对于root用户的家目录，或@file{/tmp}，或HTTP服务器的工作目录等文件夹里的链接不是这样。@code{guix gc}会被阻止读取和跟随这些链接。"
 
 #. type: enumerate
-#: doc/guix.texi:1273
+#: guix-git/doc/guix.texi:1449
 msgid "The daemon’s feature to listen for TCP connections might no longer work.  This might require extra rules, because SELinux treats network sockets differently from files."
 msgstr "后台进程监听TCP连接的功能不再可用。这可能需要额外的规则，因为SELinux区别对待网络套接字和文件。"
 
 #. type: enumerate
-#: doc/guix.texi:1284
+#: guix-git/doc/guix.texi:1460
 msgid "Currently all files with a name matching the regular expression @code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon} are assigned the label @code{guix_daemon_exec_t}; this means that @emph{any} file with that name in any profile would be permitted to run in the @code{guix_daemon_t} domain.  This is not ideal.  An attacker could build a package that provides this executable and convince a user to install and run it, which lifts it into the @code{guix_daemon_t} domain.  At that point SELinux could not prevent it from accessing files that are allowed for processes in that domain."
 msgstr "目前，所有匹配正则表达式@code{/gnu/store/.+-(guix-.+|profile)/bin/guix-daemon}的文件都被赋予@code{guix_daemon_exec_t}标签；这意味着@emph{任何}profile里的任何有这样名字的的文件都会被允许在@code{guix_daemon_t}域里执行。这不够理想。一个攻击者可以构建提供这个可执行程序的软件包，并说服一个用户安装、运行它，以此进入@code{guix_daemon_t}域。那时，SELinux无法阻止它访问所在域的进程可以访问的文件。"
 
 #. type: enumerate
-#: doc/guix.texi:1292
+#: guix-git/doc/guix.texi:1465
+msgid "You will need to relabel the store directory after all upgrades to @file{guix-daemon}, such as after running @code{guix pull}.  Assuming the store is in @file{/gnu}, you can do this with @code{restorecon -vR /gnu}, or by other means provided by your operating system."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1473
 msgid "We could generate a much more restrictive policy at installation time, so that only the @emph{exact} file name of the currently installed @code{guix-daemon} executable would be labelled with @code{guix_daemon_exec_t}, instead of using a broad regular expression.  The downside is that root would have to install or upgrade the policy at installation time whenever the Guix package that provides the effectively running @code{guix-daemon} executable is upgraded."
 msgstr "我们可以在安装时生成一个更严格的策略，仅当前安装的@code{guix-daemon}的@emph{精确的}的文件名会被打上@code{guix_daemon_exec_t}标签，而不是用一个宽泛的正则表达式。这样的缺点是root必须在每次安装提供@code{guix-daemon}的Guix软件包时安装或升级策略。"
 
 #. type: section
-#: doc/guix.texi:1295
+#: guix-git/doc/guix.texi:1476
 #, no-wrap
 msgid "Invoking @command{guix-daemon}"
 msgstr "调用@command{guix-daemon}"
 
 #. type: Plain text
-#: doc/guix.texi:1301
+#: guix-git/doc/guix.texi:1482
 msgid "The @command{guix-daemon} program implements all the functionality to access the store.  This includes launching build processes, running the garbage collector, querying the availability of a build result, etc.  It is normally run as @code{root} like this:"
 msgstr "@command{guix-daemon}程序实现了所有访问仓库的功能。包括启动构建进程，运行垃圾回收器，查询构建结果，等。它通常以@code{root}身份运行："
 
 #. type: Plain text
-#: doc/guix.texi:1308
+#: guix-git/doc/guix.texi:1489
 msgid "For details on how to set it up, @pxref{Setting Up the Daemon}."
 msgstr "关于如何设置它，@pxref{Setting Up the Daemon}。"
 
 #. type: cindex
-#: doc/guix.texi:1310
+#: guix-git/doc/guix.texi:1491
 #, no-wrap
 msgid "container, build environment"
 msgstr "容器，构建环境"
 
 #. type: cindex
-#: doc/guix.texi:1312 doc/guix.texi:2561 doc/guix.texi:3242 doc/guix.texi:9773
+#: guix-git/doc/guix.texi:1493 guix-git/doc/guix.texi:3034
+#: guix-git/doc/guix.texi:3933 guix-git/doc/guix.texi:12833
 #, no-wrap
 msgid "reproducible builds"
 msgstr "可复现的构建"
 
 #. type: Plain text
-#: doc/guix.texi:1324
-msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--build-users-group}.  In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories.  By default, the latter contains @file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
+#: guix-git/doc/guix.texi:1505
+#, fuzzy
+#| msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @code{--build-users-group}.  In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories.  By default, the latter contains @file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
+msgid "By default, @command{guix-daemon} launches build processes under different UIDs, taken from the build group specified with @option{--build-users-group}.  In addition, each build process is run in a chroot environment that only contains the subset of the store that the build process depends on, as specified by its derivation (@pxref{Programming Interface, derivation}), plus a set of specific system directories.  By default, the latter contains @file{/dev} and @file{/dev/pts}.  Furthermore, on GNU/Linux, the build environment is a @dfn{container}: in addition to having its own file system tree, it has a separate mount name space, its own PID name space, network name space, etc.  This helps achieve reproducible builds (@pxref{Features})."
 msgstr "默认情况下，@command{guix-daemon}用不同的UID启动构建进程，这些用户是从@code{--build-users-group}参数指定的用户组里获取的。并且，每个构建进程都在一个chroot环境里运行，这个环境只包含构建进程依赖的仓库的子集（由derivation（@pxref{Programming Interface, derivation}）的内容决定），以及一些系统文件夹。默认情况下，后者包含@file{/dev}和@file{/dev/pts}。并且，在GNU/Linux上，构建环境是一个@dfn{容器}：它不仅有自己的文件系统树，还有独立的挂载命名空间，独立的PID命名空间，网络命名空间，等。这帮助实现可复现构建的目的（@pxref{Features}）。"
 
 #. type: Plain text
-#: doc/guix.texi:1330
-msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable.  This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}."
+#: guix-git/doc/guix.texi:1511
+#, fuzzy
+#| msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @code{TMPDIR} environment variable.  This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}."
+msgid "When the daemon performs a build on behalf of the user, it creates a build directory under @file{/tmp} or under the directory specified by its @env{TMPDIR} environment variable.  This directory is shared with the container for the duration of the build, though within the container, the build tree is always called @file{/tmp/guix-build-@var{name}.drv-0}."
 msgstr "当后台进程代替用户执行构建时，它在@file{/tmp}或@code{TMPDIR}环境变量指定的文件夹里创建一个文件夹。在构建期间，这个文件夹被共享给容器，然而容器内，这个构建树总是叫做@file{/tmp/guix-build-@var{name}.drv-0}。"
 
 #. type: Plain text
-#: doc/guix.texi:1334
-msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})."
+#: guix-git/doc/guix.texi:1515
+#, fuzzy
+#| msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Invoking guix build, @option{--keep-failed}})."
+msgid "The build directory is automatically deleted upon completion, unless the build failed and the client specified @option{--keep-failed} (@pxref{Common Build Options, @option{--keep-failed}})."
 msgstr "结束时构建文件夹就被自动删除了，除非构建失败并且客户端指定了@option{--keep-failed}参数（@pxref{Invoking guix build, @option{--keep-failed}}）。"
 
 #. type: Plain text
-#: doc/guix.texi:1340
-msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands.)  The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients.  @xref{Invoking guix processes}, for more information."
+#: guix-git/doc/guix.texi:1521
+#, fuzzy
+#| msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands.)  The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients.  @xref{Invoking guix processes}, for more information."
+msgid "The daemon listens for connections and spawns one sub-process for each session started by a client (one of the @command{guix} sub-commands).  The @command{guix processes} command allows you to get an overview of the activity on your system by viewing each of the active sessions and clients.  @xref{Invoking guix processes}, for more information."
 msgstr "后台进程监听连接并且为每个客户端（@command{guix}的子命令）启动的会话生成一个子进程。@command{guix processes}命令允许你获取系统上的活动的概况，浏览每个活动会话和客户端。@xref{Invoking guix processes}，以了解更多信息。"
 
 #. type: Plain text
-#: doc/guix.texi:1342
+#: guix-git/doc/guix.texi:1523
 msgid "The following command-line options are supported:"
 msgstr "下面这些命令行选项受支持："
 
 #. type: item
-#: doc/guix.texi:1344
+#: guix-git/doc/guix.texi:1525
 #, no-wrap
 msgid "--build-users-group=@var{group}"
 msgstr "--build-users-group=@var{用户组}"
 
 #. type: table
-#: doc/guix.texi:1347
+#: guix-git/doc/guix.texi:1528
 msgid "Take users from @var{group} to run build processes (@pxref{Setting Up the Daemon, build users})."
 msgstr "这会从@var{用户组}里选取用户，以运行构建进程（@pxref{Setting Up the Daemon,构建用户}）。"
 
 #. type: item
-#: doc/guix.texi:1348 doc/guix.texi:7723
+#: guix-git/doc/guix.texi:1529 guix-git/doc/guix.texi:10288
 #, no-wrap
 msgid "--no-substitutes"
 msgstr "--no-substitutes"
 
 #. type: cindex
-#: doc/guix.texi:1349 doc/guix.texi:2573 doc/guix.texi:3103
+#: guix-git/doc/guix.texi:1530 guix-git/doc/guix.texi:3046
+#: guix-git/doc/guix.texi:3691
 #, no-wrap
 msgid "substitutes"
 msgstr "substitutes"
 
 #. type: table
-#: doc/guix.texi:1353 doc/guix.texi:7727
+#: guix-git/doc/guix.texi:1534 guix-git/doc/guix.texi:10292
 msgid "Do not use substitutes for build products.  That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})."
 msgstr "不要为构建商品使用substitute。即，总是在本地构建，而不是下载预构建的二进制文件（@pxref{Substitutes}）。"
 
 #. type: table
-#: doc/guix.texi:1357
-msgid "When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})."
+#: guix-git/doc/guix.texi:1538
+#, fuzzy
+#| msgid "When the daemon runs with @code{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})."
+msgid "When the daemon runs with @option{--no-substitutes}, clients can still explicitly enable substitution @i{via} the @code{set-build-options} remote procedure call (@pxref{The Store})."
 msgstr "当后台进程用@code{--no-substitutes}参数启动时，客户端仍然可以显式地@i{通过}@code{set-build-options}远程过程调用来启用substitute（@pxref{The Store}）。"
 
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:1540
+msgid "daemon-substitute-urls"
+msgstr "daemon-substitute-urls"
+
 #. type: item
-#: doc/guix.texi:1358 doc/guix.texi:7710 doc/guix.texi:9317 doc/guix.texi:9898
-#: doc/guix.texi:10088
+#: guix-git/doc/guix.texi:1540 guix-git/doc/guix.texi:10275
+#: guix-git/doc/guix.texi:12264 guix-git/doc/guix.texi:12979
+#: guix-git/doc/guix.texi:13204
 #, no-wrap
 msgid "--substitute-urls=@var{urls}"
 msgstr "--substitute-urls=@var{urls}"
 
-#. type: anchor{#1}
-#: doc/guix.texi:1363
-msgid "daemon-substitute-urls"
-msgstr "daemon-substitute-urls"
-
 #. type: table
-#: doc/guix.texi:1363
+#: guix-git/doc/guix.texi:1544
 msgid "Consider @var{urls} the default whitespace-separated list of substitute source URLs.  When this option is omitted, @indicateurl{https://@value{SUBSTITUTE-SERVER}} is used."
 msgstr "@var{urls}是用空格分隔的substitute源URL列表。当这个选项被省略时，默认使用@indicateurl{https://@value{SUBSTITUTE-SERVER}}。"
 
 #. type: table
-#: doc/guix.texi:1366
+#: guix-git/doc/guix.texi:1547
 msgid "This means that substitutes may be downloaded from @var{urls}, as long as they are signed by a trusted signature (@pxref{Substitutes})."
 msgstr "这意味着可以从@var{urls}下载substitute，只要它们的签名可信（@pxref{Substitutes}）。"
 
-#. type: item
-#: doc/guix.texi:1368 doc/guix.texi:7748
-#, no-wrap
-msgid "--no-build-hook"
-msgstr "--no-build-hook"
-
 #. type: table
-#: doc/guix.texi:1370
-msgid "Do not use the @dfn{build hook}."
-msgstr "不要使用@dfn{构建钩子}。"
+#: guix-git/doc/guix.texi:1550
+msgid "@xref{Getting Substitutes from Other Servers}, for more information on how to configure the daemon to get substitutes from other servers."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:1552 guix-git/doc/guix.texi:10311
+#, fuzzy, no-wrap
+#| msgid "offloading"
+msgid "--no-offload"
+msgstr "下发"
 
 #. type: table
-#: doc/guix.texi:1374
-msgid "The build hook is a helper program that the daemon can start and to which it submits build requests.  This mechanism is used to offload builds to other machines (@pxref{Daemon Offload Setup})."
-msgstr "构建钩子是一个可以被后台进程启动并且提交构建请求的辅助程序。这个机制被用来向其它机器下发构建。（@pxref{Daemon Offload Setup}）。"
+#: guix-git/doc/guix.texi:1556 guix-git/doc/guix.texi:10315
+#, fuzzy
+#| msgid "Do not use substitutes for build products.  That is, always build things locally instead of allowing downloads of pre-built binaries (@pxref{Substitutes})."
+msgid "Do not use offload builds to other machines (@pxref{Daemon Offload Setup}).  That is, always build things locally instead of offloading builds to remote machines."
+msgstr "不要为构建商品使用substitute。即，总是在本地构建，而不是下载预构建的二进制文件（@pxref{Substitutes}）。"
 
 #. type: item
-#: doc/guix.texi:1375
+#: guix-git/doc/guix.texi:1557
 #, no-wrap
 msgid "--cache-failures"
 msgstr "--cache-failures"
 
 #. type: table
-#: doc/guix.texi:1377
+#: guix-git/doc/guix.texi:1559
 msgid "Cache build failures.  By default, only successful builds are cached."
 msgstr "缓存失败的构建。默认地，只缓存成功的构建。"
 
 #. type: table
-#: doc/guix.texi:1382
+#: guix-git/doc/guix.texi:1564
 msgid "When this option is used, @command{guix gc --list-failures} can be used to query the set of store items marked as failed; @command{guix gc --clear-failures} removes store items from the set of cached failures.  @xref{Invoking guix gc}."
 msgstr "当这个选项被使用时，可以用@command{guix gc --list-failures}查询被标记为失败的仓库文件；@command{guix gc --clear-failures}从仓库里删除失败的缓存。@xref{Invoking guix gc}。"
 
 #. type: item
-#: doc/guix.texi:1383 doc/guix.texi:7777
+#: guix-git/doc/guix.texi:1565 guix-git/doc/guix.texi:10341
 #, no-wrap
 msgid "--cores=@var{n}"
 msgstr "--cores=@var{n}"
 
 #. type: itemx
-#: doc/guix.texi:1384 doc/guix.texi:7778
+#: guix-git/doc/guix.texi:1566 guix-git/doc/guix.texi:10342
 #, no-wrap
 msgid "-c @var{n}"
 msgstr "-c @var{n}"
 
 #. type: table
-#: doc/guix.texi:1387
+#: guix-git/doc/guix.texi:1569
 msgid "Use @var{n} CPU cores to build each derivation; @code{0} means as many as available."
 msgstr "用@var{n}个CPU核来构建每个derivation；@code{0}表示有多少就用多少。"
 
 #. type: table
-#: doc/guix.texi:1391
-msgid "The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} (@pxref{Invoking guix build})."
+#: guix-git/doc/guix.texi:1573
+#, fuzzy
+#| msgid "The default value is @code{0}, but it may be overridden by clients, such as the @code{--cores} option of @command{guix build} (@pxref{Invoking guix build})."
+msgid "The default value is @code{0}, but it may be overridden by clients, such as the @option{--cores} option of @command{guix build} (@pxref{Invoking guix build})."
 msgstr "默认值是@code{0}，但是它的值可以被客户端覆盖，例如@command{guix build}的@code{--cores}选项（@pxref{Invoking guix build}）。"
 
 #. type: table
-#: doc/guix.texi:1395
-msgid "The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
+#: guix-git/doc/guix.texi:1577
+#, fuzzy
+#| msgid "The effect is to define the @code{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
+msgid "The effect is to define the @env{NIX_BUILD_CORES} environment variable in the build process, which can then use it to exploit internal parallelism---for instance, by running @code{make -j$NIX_BUILD_CORES}."
 msgstr "他的作用是在构建进程里设置@code{NIX_BUILD_CORES}环境变量，从而用它来利用内部的并行机制--例如，通过运行@code{make -j$NIX_BUILD_CORES}。"
 
 #. type: item
-#: doc/guix.texi:1396 doc/guix.texi:7782
+#: guix-git/doc/guix.texi:1578 guix-git/doc/guix.texi:10346
 #, no-wrap
 msgid "--max-jobs=@var{n}"
 msgstr "--max-jobs=@var{n}"
 
 #. type: itemx
-#: doc/guix.texi:1397 doc/guix.texi:7783
+#: guix-git/doc/guix.texi:1579 guix-git/doc/guix.texi:10347
 #, no-wrap
 msgid "-M @var{n}"
 msgstr "-M @var{n}"
 
 #. type: table
-#: doc/guix.texi:1402
+#: guix-git/doc/guix.texi:1584
 msgid "Allow at most @var{n} build jobs in parallel.  The default value is @code{1}.  Setting it to @code{0} means that no builds will be performed locally; instead, the daemon will offload builds (@pxref{Daemon Offload Setup}), or simply fail."
 msgstr "最多允许@var{n}个并行的构建任务。默认值是@code{1}。设置为@code{0}表示不在本地执行构建；而是下发构建任务（@pxref{Daemon Offload Setup}），或者直接失败。"
 
 #. type: item
-#: doc/guix.texi:1403 doc/guix.texi:7753
+#: guix-git/doc/guix.texi:1585 guix-git/doc/guix.texi:10316
 #, no-wrap
 msgid "--max-silent-time=@var{seconds}"
 msgstr "--max-silent-time=@var{seconds}"
 
 #. type: table
-#: doc/guix.texi:1406 doc/guix.texi:7756
+#: guix-git/doc/guix.texi:1588 guix-git/doc/guix.texi:10319
 msgid "When the build or substitution process remains silent for more than @var{seconds}, terminate it and report a build failure."
 msgstr "当构建或substitution进程超过@var{seconds}秒仍然保持静默，就把它结束掉并报告构建失败。"
 
 #. type: table
-#: doc/guix.texi:1408 doc/guix.texi:1417
+#: guix-git/doc/guix.texi:1590 guix-git/doc/guix.texi:1599
 msgid "The default value is @code{0}, which disables the timeout."
 msgstr "默认值是@code{0}，表示关闭超时。"
 
 #. type: table
-#: doc/guix.texi:1411
-msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})."
+#: guix-git/doc/guix.texi:1593
+#, fuzzy
+#| msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--max-silent-time}})."
+msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @option{--max-silent-time}})."
 msgstr "这里指定的值可以被客户端覆盖（@pxref{Common Build Options, @code{--max-silent-time}}）。"
 
 #. type: item
-#: doc/guix.texi:1412 doc/guix.texi:7760
+#: guix-git/doc/guix.texi:1594 guix-git/doc/guix.texi:10323
 #, no-wrap
 msgid "--timeout=@var{seconds}"
 msgstr "--timeout=@var{seconds}"
 
 #. type: table
-#: doc/guix.texi:1415 doc/guix.texi:7763
+#: guix-git/doc/guix.texi:1597 guix-git/doc/guix.texi:10326
 msgid "Likewise, when the build or substitution process lasts for more than @var{seconds}, terminate it and report a build failure."
 msgstr "类似地，当构建或substitution进程执行超过@var{seconds}秒，就把它结束掉并报告构建失败。"
 
 #. type: table
-#: doc/guix.texi:1420
-msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})."
+#: guix-git/doc/guix.texi:1602
+#, fuzzy
+#| msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @code{--timeout}})."
+msgid "The value specified here can be overridden by clients (@pxref{Common Build Options, @option{--timeout}})."
 msgstr "这里指定的值可以被客户端覆盖（@pxref{Common Build Options, @code{--timeout}}）。"
 
 #. type: item
-#: doc/guix.texi:1421
+#: guix-git/doc/guix.texi:1603
 #, no-wrap
 msgid "--rounds=@var{N}"
 msgstr "--rounds=@var{N}"
 
 #. type: table
-#: doc/guix.texi:1426
+#: guix-git/doc/guix.texi:1608
 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical.  Note that this setting can be overridden by clients such as @command{guix build} (@pxref{Invoking guix build})."
 msgstr "为每个derivation构建@var{n}次，如果连续的构建结果不是每个比特都相同就报告错误。这个设置可以被@command{guix build}之类的客户端覆盖（@pxref{Invoking guix build}）。"
 
 #. type: table
-#: doc/guix.texi:1430 doc/guix.texi:8122
+#: guix-git/doc/guix.texi:1612 guix-git/doc/guix.texi:10310
+#: guix-git/doc/guix.texi:10872
 msgid "When used in conjunction with @option{--keep-failed}, the differing output is kept in the store, under @file{/gnu/store/@dots{}-check}.  This makes it easy to look for differences between the two results."
 msgstr "当和@option{--keep-failed}一起使用时，不同的输出保存在@file{/gnu/store/@dots{}-check}。这让检查两个结果的区别更容易。"
 
 #. type: item
-#: doc/guix.texi:1431
+#: guix-git/doc/guix.texi:1613
 #, no-wrap
 msgid "--debug"
 msgstr "--debug"
 
 #. type: table
-#: doc/guix.texi:1433
+#: guix-git/doc/guix.texi:1615
 msgid "Produce debugging output."
 msgstr "生成调试输出。"
 
 #. type: table
-#: doc/guix.texi:1437
-msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})."
+#: guix-git/doc/guix.texi:1619
+#, fuzzy
+#| msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @code{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})."
+msgid "This is useful to debug daemon start-up issues, but then it may be overridden by clients, for example the @option{--verbosity} option of @command{guix build} (@pxref{Invoking guix build})."
 msgstr "这对调试后台进程的启动问题很有用，但是之后它可能会被客户端覆盖，例如@command{guix build}命令的@code{--verbosity}选项（@pxref{Invoking guix build}）。"
 
 #. type: item
-#: doc/guix.texi:1438
+#: guix-git/doc/guix.texi:1620
 #, no-wrap
 msgid "--chroot-directory=@var{dir}"
 msgstr "--chroot-directory=@var{dir}"
 
 #. type: table
-#: doc/guix.texi:1440
+#: guix-git/doc/guix.texi:1622
 msgid "Add @var{dir} to the build chroot."
 msgstr "把@var{dir}添加到构建的chroot。"
 
 #. type: table
-#: doc/guix.texi:1446
+#: guix-git/doc/guix.texi:1628
 msgid "Doing this may change the result of build processes---for instance if they use optional dependencies found in @var{dir} when it is available, and not otherwise.  For that reason, it is not recommended to do so.  Instead, make sure that each derivation declares all the inputs that it needs."
 msgstr "这么做可能会改变构建进程的结果--例如，如果它们使用了在@var{dir}里发现的可选依赖。因此，建议不要这么做，而是确保每个derivation声明所需的全部输入。"
 
 #. type: item
-#: doc/guix.texi:1447
+#: guix-git/doc/guix.texi:1629
 #, no-wrap
 msgid "--disable-chroot"
 msgstr "--disable-chroot"
 
 #. type: table
-#: doc/guix.texi:1449
+#: guix-git/doc/guix.texi:1631
 msgid "Disable chroot builds."
 msgstr "关闭chroot构建。"
 
 #. type: table
-#: doc/guix.texi:1454
+#: guix-git/doc/guix.texi:1636
 msgid "Using this option is not recommended since, again, it would allow build processes to gain access to undeclared dependencies.  It is necessary, though, when @command{guix-daemon} is running under an unprivileged user account."
 msgstr "不建议使用这个选项，因为它会允许构建进程访问到没被声明的依赖。但是，当@command{guix-daemon}以没有特权的用户身份运行时，这个选项是必须的。"
 
 #. type: item
-#: doc/guix.texi:1455
+#: guix-git/doc/guix.texi:1637
 #, no-wrap
 msgid "--log-compression=@var{type}"
 msgstr "--log-compression=@var{type}"
 
 #. type: table
-#: doc/guix.texi:1458
+#: guix-git/doc/guix.texi:1640
 msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}."
 msgstr "以@var{type}方式压缩构建日志，可选的值：@code{gzip}，@code{bzip2}，@code{none}。"
 
 #. type: table
-#: doc/guix.texi:1462
-msgid "Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}.  To save space, the daemon automatically compresses them with bzip2 by default."
+#: guix-git/doc/guix.texi:1644
+#, fuzzy
+#| msgid "Unless @code{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}.  To save space, the daemon automatically compresses them with bzip2 by default."
+msgid "Unless @option{--lose-logs} is used, all the build logs are kept in the @var{localstatedir}.  To save space, the daemon automatically compresses them with Bzip2 by default."
 msgstr "除非使用了@code{--lose-logs}，所有的构建日志都保存在@var{localstatedir}里。为了节省空间，后台进程默认使用bzip2对它们进行压缩。"
 
 #. type: item
-#: doc/guix.texi:1463
+#: guix-git/doc/guix.texi:1645
+#, no-wrap
+msgid "--discover[=yes|no]"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:1648 guix-git/doc/guix.texi:15520
+msgid "Whether to discover substitute servers on the local network using mDNS and DNS-SD."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:1651
+msgid "This feature is still experimental.  However, here are a few considerations."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1655
+msgid "It might be faster/less expensive than fetching from remote servers;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1658
+msgid "There are no security risks, only genuine substitutes will be used (@pxref{Substitute Authentication});"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1662
+msgid "An attacker advertising @command{guix publish} on your LAN cannot serve you malicious binaries, but they can learn what software you’re installing;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:1665
+msgid "Servers may serve substitute over HTTP, unencrypted, so anyone on the LAN can see what software you’re installing."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:1669
+msgid "It is also possible to enable or disable substitute server discovery at run-time by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:1673
+#, no-wrap
+msgid ""
+"herd discover guix-daemon on\n"
+"herd discover guix-daemon off\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:1675
 #, no-wrap
 msgid "--disable-deduplication"
 msgstr "--disable-deduplication"
 
 #. type: cindex
-#: doc/guix.texi:1464 doc/guix.texi:3576
+#: guix-git/doc/guix.texi:1676 guix-git/doc/guix.texi:4271
 #, no-wrap
 msgid "deduplication"
 msgstr "去重"
 
 #. type: table
-#: doc/guix.texi:1466
+#: guix-git/doc/guix.texi:1678
 msgid "Disable automatic file ``deduplication'' in the store."
 msgstr "关闭自动对仓库文件“去重”。"
 
 #. type: table
-#: doc/guix.texi:1473
+#: guix-git/doc/guix.texi:1685
 msgid "By default, files added to the store are automatically ``deduplicated'': if a newly added file is identical to another one found in the store, the daemon makes the new file a hard link to the other file.  This can noticeably reduce disk usage, at the expense of slightly increased input/output load at the end of a build process.  This option disables this optimization."
 msgstr "默认地，添加到仓库的文件会被自动“去重”：如果新添加的文件和仓库里找到的某个文件完全相同，后台进程把这个新文件变成另一个文件的硬链接。这可以明显地减少硬盘使用，代价是构建结束后轻微地增加输入／输出负载。这个选项关闭这个优化。"
 
 #. type: item
-#: doc/guix.texi:1474
+#: guix-git/doc/guix.texi:1686
 #, no-wrap
 msgid "--gc-keep-outputs[=yes|no]"
 msgstr "--gc-keep-outputs[=yes|no]"
 
 #. type: table
-#: doc/guix.texi:1477
+#: guix-git/doc/guix.texi:1689
 msgid "Tell whether the garbage collector (GC) must keep outputs of live derivations."
 msgstr "垃圾收集器（GC）是否必须保留存活的derivation的输出。"
 
 #. type: cindex
-#: doc/guix.texi:1478 doc/guix.texi:3393
+#: guix-git/doc/guix.texi:1690 guix-git/doc/guix.texi:4084
 #, no-wrap
 msgid "GC roots"
 msgstr "GC根"
 
 #. type: cindex
-#: doc/guix.texi:1479 doc/guix.texi:3394
+#: guix-git/doc/guix.texi:1691 guix-git/doc/guix.texi:4085
 #, no-wrap
 msgid "garbage collector roots"
 msgstr "垃圾收集的根"
 
 #. type: table
-#: doc/guix.texi:1484
-msgid "When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files.  The default is ``no'', meaning that derivation outputs are kept only if they are reachable from a GC root.  @xref{Invoking guix gc}, for more on GC roots."
+#: guix-git/doc/guix.texi:1697
+#, fuzzy
+#| msgid "When set to ``yes'', the GC will keep the outputs of any live derivation available in the store---the @code{.drv} files.  The default is ``no'', meaning that derivation outputs are kept only if they are reachable from a GC root.  @xref{Invoking guix gc}, for more on GC roots."
+msgid "When set to @code{yes}, the GC will keep the outputs of any live derivation available in the store---the @file{.drv} files.  The default is @code{no}, meaning that derivation outputs are kept only if they are reachable from a GC root.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr "当设置为“yes”时，GC会保留仓库里每个存活的derivation（@code{.drv}文件）的输出。默认是“no”，表示只有当从GC根可以访问时才保留derivation的输出。@xref{Invoking guix gc}，了解更多关于GC根的信息。"
 
 #. type: item
-#: doc/guix.texi:1485
+#: guix-git/doc/guix.texi:1698
 #, no-wrap
 msgid "--gc-keep-derivations[=yes|no]"
 msgstr "--gc-keep-derivations[=yes|no]"
 
 #. type: table
-#: doc/guix.texi:1488
+#: guix-git/doc/guix.texi:1701
 msgid "Tell whether the garbage collector (GC) must keep derivations corresponding to live outputs."
 msgstr "垃圾收集器（GC）是否必须保留和存活的输出相关的derivation。"
 
 #. type: table
-#: doc/guix.texi:1493
-msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live.  This allows users to keep track of the origins of items in their store.  Setting it to ``no'' saves a bit of disk space."
+#: guix-git/doc/guix.texi:1707
+#, fuzzy
+#| msgid "When set to ``yes'', as is the case by default, the GC keeps derivations---i.e., @code{.drv} files---as long as at least one of their outputs is live.  This allows users to keep track of the origins of items in their store.  Setting it to ``no'' saves a bit of disk space."
+msgid "When set to @code{yes}, as is the case by default, the GC keeps derivations---i.e., @file{.drv} files---as long as at least one of their outputs is live.  This allows users to keep track of the origins of items in their store.  Setting it to @code{no} saves a bit of disk space."
 msgstr "当设置为“yes”时（默认），只要derivation（即@code{.drv}文件）的输出至少有一个是存活的，GC就将其保留。这让用户可以追踪仓库里物品的源头。设置为“no”可以节省一点硬盘空间。"
 
 #. type: table
-#: doc/guix.texi:1501
-msgid "In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to ``yes'' causes liveness to flow from derivations to outputs.  When both are set to ``yes'', the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root.  This is convenient for developers since it saves rebuilds or downloads."
+#: guix-git/doc/guix.texi:1716
+#, fuzzy
+#| msgid "In this way, setting @code{--gc-keep-derivations} to ``yes'' causes liveness to flow from outputs to derivations, and setting @code{--gc-keep-outputs} to ``yes'' causes liveness to flow from derivations to outputs.  When both are set to ``yes'', the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root.  This is convenient for developers since it saves rebuilds or downloads."
+msgid "In this way, setting @option{--gc-keep-derivations} to @code{yes} causes liveness to flow from outputs to derivations, and setting @option{--gc-keep-outputs} to @code{yes} causes liveness to flow from derivations to outputs.  When both are set to @code{yes}, the effect is to keep all the build prerequisites (the sources, compiler, libraries, and other build-time tools) of live objects in the store, regardless of whether these prerequisites are reachable from a GC root.  This is convenient for developers since it saves rebuilds or downloads."
 msgstr "这样，设置@code{--gc-keep-derivations}为“yes”使存活性从“输出”传递到“derivation”，设置@code{--gc-keep-outputs}为“yes”使存活性从“derivation”传递到“输出”。当两者都设置为“yes”时，效果是保留所有在仓库里的存活对象的构建先决条件（源代码，编译器，库，和其它构建时的工具），不管这些先决条件是否能从某个GC根访问到。这对开发者来说很方便，因为它避免了重复构建和下载。"
 
 #. type: item
-#: doc/guix.texi:1502
+#: guix-git/doc/guix.texi:1717
 #, no-wrap
 msgid "--impersonate-linux-2.6"
 msgstr "--impersonate-linux-2.6"
 
 #. type: table
-#: doc/guix.texi:1505
-msgid "On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's @code{uname} system call will report 2.6 as the release number."
+#: guix-git/doc/guix.texi:1720
+#, fuzzy
+#| msgid "On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's @code{uname} system call will report 2.6 as the release number."
+msgid "On Linux-based systems, impersonate Linux 2.6.  This means that the kernel's @command{uname} system call will report 2.6 as the release number."
 msgstr "在基于Linux的系统上，伪装成Linux 2.6。这意味着内核的@code{uname}系统调用会把版本号报告为2.6。"
 
 #. type: table
-#: doc/guix.texi:1508
+#: guix-git/doc/guix.texi:1723
 msgid "This might be helpful to build programs that (usually wrongfully) depend on the kernel version number."
 msgstr "这可能会有助于构建那些（通常是错误地）依赖内核版本号的程序。"
 
 #. type: item
-#: doc/guix.texi:1509
+#: guix-git/doc/guix.texi:1724
 #, no-wrap
 msgid "--lose-logs"
 msgstr "--lose-logs"
 
 #. type: table
-#: doc/guix.texi:1512
-msgid "Do not keep build logs.  By default they are kept under @code{@var{localstatedir}/guix/log}."
+#: guix-git/doc/guix.texi:1727
+#, fuzzy
+#| msgid "Do not keep build logs.  By default they are kept under @code{@var{localstatedir}/guix/log}."
+msgid "Do not keep build logs.  By default they are kept under @file{@var{localstatedir}/guix/log}."
 msgstr "不保留构建日志。默认保存在@code{@var{localstatedir}/guix/log}。"
 
 #. type: item
-#: doc/guix.texi:1513 doc/guix.texi:3722 doc/guix.texi:4590 doc/guix.texi:4883
-#: doc/guix.texi:8066 doc/guix.texi:9344 doc/guix.texi:9543
-#: doc/guix.texi:10093 doc/guix.texi:23935 doc/guix.texi:24555
+#: guix-git/doc/guix.texi:1728 guix-git/doc/guix.texi:4512
+#: guix-git/doc/guix.texi:5811 guix-git/doc/guix.texi:6182
+#: guix-git/doc/guix.texi:10816 guix-git/doc/guix.texi:12291
+#: guix-git/doc/guix.texi:12542 guix-git/doc/guix.texi:13209
+#: guix-git/doc/guix.texi:32362 guix-git/doc/guix.texi:33161
 #, no-wrap
 msgid "--system=@var{system}"
 msgstr "--system=@var{system}"
 
 #. type: table
-#: doc/guix.texi:1517
+#: guix-git/doc/guix.texi:1732
 msgid "Assume @var{system} as the current system type.  By default it is the architecture/kernel pair found at configure time, such as @code{x86_64-linux}."
 msgstr "假设@var{system}是当前的系统类型。默认值是configure时发现的架构／内核元组，如@code{x86_64-linux}。"
 
 #. type: item
-#: doc/guix.texi:1518 doc/guix.texi:7568
+#: guix-git/doc/guix.texi:1733 guix-git/doc/guix.texi:10121
 #, no-wrap
 msgid "--listen=@var{endpoint}"
 msgstr "--listen=@var{endpoint}"
 
 #. type: table
-#: doc/guix.texi:1523
+#: guix-git/doc/guix.texi:1738
 msgid "Listen for connections on @var{endpoint}.  @var{endpoint} is interpreted as the file name of a Unix-domain socket if it starts with @code{/} (slash sign).  Otherwise, @var{endpoint} is interpreted as a host name or host name and port to listen to.  Here are a few examples:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1525
+#: guix-git/doc/guix.texi:1740
 #, no-wrap
 msgid "--listen=/gnu/var/daemon"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1528
+#: guix-git/doc/guix.texi:1743
 msgid "Listen for connections on the @file{/gnu/var/daemon} Unix-domain socket, creating it if needed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1529
+#: guix-git/doc/guix.texi:1744
 #, no-wrap
 msgid "--listen=localhost"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1530 doc/guix.texi:6349
+#: guix-git/doc/guix.texi:1745 guix-git/doc/guix.texi:8805
 #, no-wrap
 msgid "daemon, remote access"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1531 doc/guix.texi:6350
+#: guix-git/doc/guix.texi:1746 guix-git/doc/guix.texi:8806
 #, no-wrap
 msgid "remote access to the daemon"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1532 doc/guix.texi:6351
+#: guix-git/doc/guix.texi:1747 guix-git/doc/guix.texi:8807
 #, no-wrap
 msgid "daemon, cluster setup"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1533 doc/guix.texi:6352
+#: guix-git/doc/guix.texi:1748 guix-git/doc/guix.texi:8808
 #, no-wrap
 msgid "clusters, daemon setup"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1536
+#: guix-git/doc/guix.texi:1751
 msgid "Listen for TCP connections on the network interface corresponding to @code{localhost}, on port 44146."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:1537
+#: guix-git/doc/guix.texi:1752
 #, no-wrap
 msgid "--listen=128.0.0.42:1234"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1540
+#: guix-git/doc/guix.texi:1755
 msgid "Listen for TCP connections on the network interface corresponding to @code{128.0.0.42}, on port 1234."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1547
-msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints.  Users can tell client commands what endpoint to connect to by setting the @code{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @code{GUIX_DAEMON_SOCKET}})."
+#: guix-git/doc/guix.texi:1762
+msgid "This option can be repeated multiple times, in which case @command{guix-daemon} accepts connections on all the specified endpoints.  Users can tell client commands what endpoint to connect to by setting the @env{GUIX_DAEMON_SOCKET} environment variable (@pxref{The Store, @env{GUIX_DAEMON_SOCKET}})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1554
-msgid "The daemon protocol is @emph{unauthenticated and unencrypted}.  Using @code{--listen=@var{host}} is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon.  In other cases where remote access to the daemon is needed, we recommend using Unix-domain sockets along with SSH."
+#: guix-git/doc/guix.texi:1769
+msgid "The daemon protocol is @emph{unauthenticated and unencrypted}.  Using @option{--listen=@var{host}} is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon.  In other cases where remote access to the daemon is needed, we recommend using Unix-domain sockets along with SSH."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1559
-msgid "When @code{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at @file{@var{localstatedir}/guix/daemon-socket/socket}."
+#: guix-git/doc/guix.texi:1774
+msgid "When @option{--listen} is omitted, @command{guix-daemon} listens for connections on the Unix-domain socket located at @file{@var{localstatedir}/guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1569
+#: guix-git/doc/guix.texi:1784
 msgid "When using Guix on top of GNU/Linux distribution other than Guix System---a so-called @dfn{foreign distro}---a few additional steps are needed to get everything in place.  Here are some of them."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:1573
+#: guix-git/doc/guix.texi:1788
 msgid "locales-and-locpath"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1573
+#: guix-git/doc/guix.texi:1788
 #, no-wrap
 msgid "locales, when not on Guix System"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:1574 doc/guix.texi:11297
+#: guix-git/doc/guix.texi:1789 guix-git/doc/guix.texi:14739
 #, no-wrap
 msgid "LOCPATH"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:1575
+#: guix-git/doc/guix.texi:1790
 #, no-wrap
 msgid "GUIX_LOCPATH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1580
-msgid "Packages installed @i{via} Guix will not use the locale data of the host system.  Instead, you must first install one of the locale packages available with Guix and then define the @code{GUIX_LOCPATH} environment variable:"
+#: guix-git/doc/guix.texi:1795
+msgid "Packages installed @i{via} Guix will not use the locale data of the host system.  Instead, you must first install one of the locale packages available with Guix and then define the @env{GUIX_LOCPATH} environment variable:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1584
+#: guix-git/doc/guix.texi:1799
 #, no-wrap
 msgid ""
 "$ guix install glibc-locales\n"
@@ -5024,643 +6565,699 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1590
-msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 110@tie{}MiB.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
+#: guix-git/doc/guix.texi:1805
+msgid "Note that the @code{glibc-locales} package contains data for all the locales supported by the GNU@tie{}libc and weighs in at around 917@tie{}MiB@.  Alternatively, the @code{glibc-utf8-locales} is smaller but limited to a few UTF-8 locales."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1594
-msgid "The @code{GUIX_LOCPATH} variable plays a role similar to @code{LOCPATH} (@pxref{Locale Names, @code{LOCPATH},, libc, The GNU C Library Reference Manual}).  There are two important differences though:"
+#: guix-git/doc/guix.texi:1809
+msgid "The @env{GUIX_LOCPATH} variable plays a role similar to @env{LOCPATH} (@pxref{Locale Names, @env{LOCPATH},, libc, The GNU C Library Reference Manual}).  There are two important differences though:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1601
-msgid "@code{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros.  Thus, using @code{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data."
+#: guix-git/doc/guix.texi:1816
+msgid "@env{GUIX_LOCPATH} is honored only by the libc in Guix, and not by the libc provided by foreign distros.  Thus, using @env{GUIX_LOCPATH} allows you to make sure the programs of the foreign distro will not end up loading incompatible locale data."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1608
-msgid "libc suffixes each entry of @code{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}.  This means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will only try to load locale data in the right format."
+#: guix-git/doc/guix.texi:1823
+msgid "libc suffixes each entry of @env{GUIX_LOCPATH} with @code{/X.Y}, where @code{X.Y} is the libc version---e.g., @code{2.22}.  This means that, should your Guix profile contain a mixture of programs linked against different libc version, each libc version will only try to load locale data in the right format."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1612
+#: guix-git/doc/guix.texi:1827
 msgid "This is important because the locale data format used by different libc versions may be incompatible."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1615
+#: guix-git/doc/guix.texi:1830
 #, no-wrap
 msgid "name service switch, glibc"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1616
+#: guix-git/doc/guix.texi:1831
 #, no-wrap
 msgid "NSS (name service switch), glibc"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1617
+#: guix-git/doc/guix.texi:1832
 #, no-wrap
 msgid "nscd (name service caching daemon)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1618
+#: guix-git/doc/guix.texi:1833
 #, no-wrap
 msgid "name service caching daemon (nscd)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1625
+#: guix-git/doc/guix.texi:1840
 msgid "When using Guix on a foreign distro, we @emph{strongly recommend} that the system run the GNU C library's @dfn{name service cache daemon}, @command{nscd}, which should be listening on the @file{/var/run/nscd/socket} socket.  Failing to do that, applications installed with Guix may fail to look up host names or user accounts, or may even crash.  The next paragraphs explain why."
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:1626
+#: guix-git/doc/guix.texi:1841
 #, no-wrap
 msgid "nsswitch.conf"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1631
+#: guix-git/doc/guix.texi:1846
 msgid "The GNU C library implements a @dfn{name service switch} (NSS), which is an extensible mechanism for ``name lookups'' in general: host name resolution, user accounts, and more (@pxref{Name Service Switch,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1632
+#: guix-git/doc/guix.texi:1847
 #, no-wrap
 msgid "Network information service (NIS)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1633
+#: guix-git/doc/guix.texi:1848
 #, no-wrap
 msgid "NIS (Network information service)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1642
+#: guix-git/doc/guix.texi:1857
 msgid "Being extensible, the NSS supports @dfn{plugins}, which provide new name lookup implementations: for example, the @code{nss-mdns} plugin allow resolution of @code{.local} host names, the @code{nis} plugin allows user account lookup using the Network information service (NIS), and so on.  These extra ``lookup services'' are configured system-wide in @file{/etc/nsswitch.conf}, and all the programs running on the system honor those settings (@pxref{NSS Configuration File,,, libc, The GNU C Reference Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1652
+#: guix-git/doc/guix.texi:1867
 msgid "When they perform a name lookup---for instance by calling the @code{getaddrinfo} function in C---applications first try to connect to the nscd; on success, nscd performs name lookups on their behalf.  If the nscd is not running, then they perform the name lookup by themselves, by loading the name lookup services into their own address space and running it.  These name lookup services---the @file{libnss_*.so} files---are @code{dlopen}'d, but they may come from the host system's C library, rather than from the C library the application is linked against (the C library coming from Guix)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1657
+#: guix-git/doc/guix.texi:1872
 msgid "And this is where the problem is: if your application is linked against Guix's C library (say, glibc 2.24) and tries to load NSS plugins from another C library (say, @code{libnss_mdns.so} for glibc 2.22), it will likely crash or have its name lookups fail unexpectedly."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1662
+#: guix-git/doc/guix.texi:1877
 msgid "Running @command{nscd} on the system, among other advantages, eliminates this binary incompatibility problem because those @code{libnss_*.so} files are loaded in the @command{nscd} process, not in applications themselves."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:1663
+#: guix-git/doc/guix.texi:1878
 #, no-wrap
 msgid "X11 Fonts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1673
-msgid "The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering.  The @code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default.  Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well.  Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont-ttf}."
+#: guix-git/doc/guix.texi:1888
+msgid "The majority of graphical applications use Fontconfig to locate and load fonts and perform X11-client-side rendering.  The @code{fontconfig} package in Guix looks for fonts in @file{$HOME/.guix-profile} by default.  Thus, to allow graphical applications installed with Guix to display fonts, you have to install fonts with Guix as well.  Essential font packages include @code{gs-fonts}, @code{font-dejavu}, and @code{font-gnu-freefont}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:1889
+#, no-wrap
+msgid "fc-cache"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:1890
+#, no-wrap
+msgid "font cache"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:1894
+msgid "Once you have installed or removed fonts, or when you notice an application that does not find fonts, you may need to install Fontconfig and to force an update of its font cache by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:1898
+#, no-wrap
+msgid ""
+"guix install fontconfig\n"
+"fc-cache -rv\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1680
+#: guix-git/doc/guix.texi:1906
 msgid "To display text written in Chinese languages, Japanese, or Korean in graphical applications, consider installing @code{font-adobe-source-han-sans} or @code{font-wqy-zenhei}.  The former has multiple outputs, one per language family (@pxref{Packages with Multiple Outputs}).  For instance, the following command installs fonts for Chinese languages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1683
+#: guix-git/doc/guix.texi:1909
 #, no-wrap
 msgid "guix install font-adobe-source-han-sans:cn\n"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1685
+#: guix-git/doc/guix.texi:1911
 #, no-wrap
 msgid "xterm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1689
+#: guix-git/doc/guix.texi:1915
 msgid "Older programs such as @command{xterm} do not use Fontconfig and instead rely on server-side font rendering.  Such programs require to specify a full name of a font using XLFD (X Logical Font Description), like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1692
+#: guix-git/doc/guix.texi:1918
 #, no-wrap
 msgid "-*-dejavu sans-medium-r-normal-*-*-100-*-*-*-*-*-1\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1696
+#: guix-git/doc/guix.texi:1922
 msgid "To be able to use such full names for the TrueType fonts installed in your Guix profile, you need to extend the font path of the X server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1701
+#: guix-git/doc/guix.texi:1927
 #, no-wrap
 msgid "xset +fp $(dirname $(readlink -f ~/.guix-profile/share/fonts/truetype/fonts.dir))\n"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1703
+#: guix-git/doc/guix.texi:1929
 #, no-wrap
 msgid "xlsfonts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1706
+#: guix-git/doc/guix.texi:1932
 msgid "After that, you can run @code{xlsfonts} (from @code{xlsfonts} package)  to make sure your TrueType fonts are listed there."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1707
+#: guix-git/doc/guix.texi:1936 guix-git/doc/guix.texi:32100
 #, no-wrap
-msgid "fc-cache"
+msgid "nss-certs"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:1708
-#, no-wrap
-msgid "font cache"
+#. type: Plain text
+#: guix-git/doc/guix.texi:1939
+msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1714
-msgid "After installing fonts you may have to refresh the font cache to use them in applications.  The same applies when applications installed via Guix do not seem to find fonts.  To force rebuilding of the font cache run @code{fc-cache -f}.  The @code{fc-cache} command is provided by the @code{fontconfig} package."
+#: guix-git/doc/guix.texi:1944
+msgid "When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to look for certificates.  @xref{X.509 Certificates}, for detailed information."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:1717 doc/guix.texi:23674
+#: guix-git/doc/guix.texi:1947
 #, no-wrap
-msgid "nss-certs"
+msgid "emacs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1720
-msgid "The @code{nss-certs} package provides X.509 certificates, which allow programs to authenticate Web servers accessed over HTTPS."
+#: guix-git/doc/guix.texi:1953
+msgid "When you install Emacs packages with Guix, the Elisp files are placed under the @file{share/emacs/site-lisp/} directory of the profile in which they are installed.  The Elisp libraries are made available to Emacs through the @env{EMACSLOADPATH} environment variable, which is set when installing Emacs itself."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1725
-msgid "When using Guix on a foreign distro, you can install this package and define the relevant environment variables so that packages know where to look for certificates.  @xref{X.509 Certificates}, for detailed information."
-msgstr ""
-
-#. type: subsection
-#: doc/guix.texi:1726
-#, no-wrap
-msgid "Emacs Packages"
+#: guix-git/doc/guix.texi:1960
+msgid "Additionally, autoload definitions are automatically evaluated at the initialization of Emacs, by the Guix-specific @code{guix-emacs-autoload-packages} procedure.  If, for some reason, you want to avoid auto-loading the Emacs packages installed with Guix, you can do so by running Emacs with the @option{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:1728
+#. type: cindex
+#: guix-git/doc/guix.texi:1965
 #, no-wrap
-msgid "emacs"
+msgid "Upgrading Guix, on a foreign distro"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1739
-msgid "When you install Emacs packages with Guix, the elisp files may be placed either in @file{$HOME/.guix-profile/share/emacs/site-lisp/} or in sub-directories of @file{$HOME/.guix-profile/share/emacs/site-lisp/guix.d/}.  The latter directory exists because potentially there may exist thousands of Emacs packages and storing all their files in a single directory may not be reliable (because of name conflicts).  So we think using a separate directory for each package is a good idea.  It is very similar to how the Emacs package system organizes the file structure (@pxref{Package Files,,, emacs, The GNU Emacs Manual})."
+#: guix-git/doc/guix.texi:1968
+msgid "To upgrade Guix, run:"
 msgstr ""
 
+#. type: example
+#: guix-git/doc/guix.texi:1971 guix-git/doc/guix.texi:2842
+#, no-wrap
+msgid "guix pull\n"
+msgstr "guix pull\n"
+
 #. type: Plain text
-#: doc/guix.texi:1745
-msgid "By default, Emacs (installed with Guix) ``knows'' where these packages are placed, so you do not need to perform any configuration.  If, for some reason, you want to avoid auto-loading Emacs packages installed with Guix, you can do so by running Emacs with @code{--no-site-file} option (@pxref{Init File,,, emacs, The GNU Emacs Manual})."
-msgstr ""
+#: guix-git/doc/guix.texi:1974
+#, fuzzy
+#| msgid "@xref{Invoking guix pack}, for more info on this handy tool."
+msgid "@xref{Invoking guix pull}, for more information."
+msgstr "@xref{Invoking guix pack}，了解这个方便的工具。"
 
-#. type: subsection
-#: doc/guix.texi:1746
+#. type: cindex
+#: guix-git/doc/guix.texi:1975
 #, no-wrap
-msgid "The GCC toolchain"
+msgid "upgrading Guix for the root user, on a foreign distro"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1748
+#: guix-git/doc/guix.texi:1976
 #, no-wrap
-msgid "GCC"
+msgid "upgrading the Guix daemon, on a foreign distro"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1749
+#: guix-git/doc/guix.texi:1977
 #, no-wrap
-msgid "ld-wrapper"
+msgid "@command{guix pull} for the root user, on a foreign distro"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1758
-msgid "Guix offers individual compiler packages such as @code{gcc} but if you are in need of a complete toolchain for compiling and linking source code what you really want is the @code{gcc-toolchain} package.  This package provides a complete GCC toolchain for C/C++ development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), Binutils, and a linker wrapper."
+#: guix-git/doc/guix.texi:1980
+msgid "On a foreign distro, you can upgrade the build daemon by running:"
 msgstr ""
 
+#. type: example
+#: guix-git/doc/guix.texi:1983
+#, no-wrap
+msgid "sudo -i guix pull\n"
+msgstr "sudo -i guix pull\n"
+
 #. type: Plain text
-#: doc/guix.texi:1764
-msgid "The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} arguments, and invoke the actual linker with this new set of arguments.  You can instruct the wrapper to refuse to link against libraries not in the store by setting the @code{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}."
+#: guix-git/doc/guix.texi:1988
+msgid "followed by (assuming your distro uses the systemd service management tool):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:1991
+#, fuzzy, no-wrap
+#| msgid "semodule -i etc/guix-daemon.cil\n"
+msgid "systemctl restart guix-daemon.service\n"
+msgstr "semodule -i etc/guix-daemon.cil\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:1995
+msgid "On Guix System, upgrading the daemon is achieved by reconfiguring the system (@pxref{Invoking guix system, @code{guix system reconfigure}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1771
+#: guix-git/doc/guix.texi:2002
 #, no-wrap
 msgid "installing Guix System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1772
+#: guix-git/doc/guix.texi:2003
 #, no-wrap
 msgid "Guix System, installation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1777
+#: guix-git/doc/guix.texi:2008
 msgid "This section explains how to install Guix System on a machine.  Guix, as a package manager, can also be installed on top of a running GNU/Linux system, @pxref{Installation}."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1786
+#: guix-git/doc/guix.texi:2017
 msgid "You are reading this documentation with an Info reader.  For details on how to use it, hit the @key{RET} key (``return'' or ``enter'') on the link that follows: @pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}.  Hit @kbd{l} afterwards to come back here."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1789
-msgid "Alternately, run @command{info info} in another tty to keep the manual available."
+#: guix-git/doc/guix.texi:2020
+msgid "Alternatively, run @command{info info} in another tty to keep the manual available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1810
+#: guix-git/doc/guix.texi:2041
 msgid "We consider Guix System to be ready for a wide range of ``desktop'' and server use cases.  The reliability guarantees it provides---transactional upgrades and rollbacks, reproducibility---make it a solid foundation."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1813
+#: guix-git/doc/guix.texi:2044
 msgid "Nevertheless, before you proceed with the installation, be aware of the following noteworthy limitations applicable to version @value{VERSION}:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:1817
-msgid "Support for the Logical Volume Manager (LVM) is missing."
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:1821
+#: guix-git/doc/guix.texi:2049
 msgid "More and more system services are provided (@pxref{Services}), but some may be missing."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:1826
+#: guix-git/doc/guix.texi:2054
 msgid "GNOME, Xfce, LXDE, and Enlightenment are available (@pxref{Desktop Services}), as well as a number of X11 window managers.  However, KDE is currently missing."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1831
+#: guix-git/doc/guix.texi:2059
 msgid "More than a disclaimer, this is an invitation to report issues (and success stories!), and to join us in improving it.  @xref{Contributing}, for more info."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1836
+#: guix-git/doc/guix.texi:2064
 #, no-wrap
 msgid "hardware support on Guix System"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1845
+#: guix-git/doc/guix.texi:2073
 msgid "GNU@tie{}Guix focuses on respecting the user's computing freedom.  It builds around the kernel Linux-libre, which means that only hardware for which free software drivers and firmware exist is supported.  Nowadays, a wide range of off-the-shelf hardware is supported on GNU/Linux-libre---from keyboards to graphics cards to scanners and Ethernet controllers.  Unfortunately, there are still areas where hardware vendors deny users control over their own computing, and such hardware is not supported on Guix System."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1846
+#: guix-git/doc/guix.texi:2074
 #, no-wrap
 msgid "WiFi, hardware support"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1855
+#: guix-git/doc/guix.texi:2083
 msgid "One of the main areas where free drivers or firmware are lacking is WiFi devices.  WiFi devices known to work include those using Atheros chips (AR9271 and AR7010), which corresponds to the @code{ath9k} Linux-libre driver, and those using Broadcom/AirForce chips (BCM43xx with Wireless-Core Revision 5), which corresponds to the @code{b43-open} Linux-libre driver.  Free firmware exists for both and is available out-of-the-box on Guix System, as part of @code{%base-firmware} (@pxref{operating-system Reference, @code{firmware}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:1856
+#: guix-git/doc/guix.texi:2084
 #, no-wrap
 msgid "RYF, Respects Your Freedom"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1862
+#: guix-git/doc/guix.texi:2090
 msgid "The @uref{https://www.fsf.org/, Free Software Foundation} runs @uref{https://www.fsf.org/ryf, @dfn{Respects Your Freedom}} (RYF), a certification program for hardware products that respect your freedom and your privacy and ensure that you have control over your device.  We encourage you to check the list of RYF-certified devices."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1866
+#: guix-git/doc/guix.texi:2094
 msgid "Another useful resource is the @uref{https://www.h-node.org/, H-Node} web site.  It contains a catalog of hardware devices with information about their support in GNU/Linux."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1875
-msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz}, where @var{system} is one of:"
+#: guix-git/doc/guix.texi:2103
+msgid "An ISO-9660 installation image that can be written to a USB stick or burnt to a DVD can be downloaded from @indicateurl{@value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz}, where you can replace @code{x86_64-linux} with one of:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1879
+#: guix-git/doc/guix.texi:2107
 msgid "for a GNU/Linux system on Intel/AMD-compatible 64-bit CPUs;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:1882
+#: guix-git/doc/guix.texi:2110
 msgid "for a 32-bit GNU/Linux system on Intel-compatible CPUs."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1887
+#: guix-git/doc/guix.texi:2115
 msgid "Make sure to download the associated @file{.sig} file and to verify the authenticity of the image against it, along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1891
-#, no-wrap
+#: guix-git/doc/guix.texi:2119
+#, fuzzy, no-wrap
+#| msgid ""
+#| "$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
+#| "$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
 msgid ""
-"$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
-"$ gpg --verify guix-system-install-@value{VERSION}.@var{system}.iso.xz.sig\n"
+"$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig\n"
+"$ gpg --verify guix-system-install-@value{VERSION}.x86_64-linux.iso.xz.sig\n"
 msgstr ""
 "$ wget @value{BASE-URL}/guix-system-install-@value{VERSION}.@var{系统}.iso.xz.sig\n"
 "$ gpg --verify guix-system-install-@value{VERSION}.@var{系统}.iso.xz.sig\n"
 
+#. type: example
+#: guix-git/doc/guix.texi:2127
+#, no-wrap
+msgid ""
+"$ wget @value{OPENPGP-SIGNING-KEY-URL} \\\n"
+"      -qO - | gpg --import -\n"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:1907
+#: guix-git/doc/guix.texi:2139
 msgid "This image contains the tools necessary for an installation.  It is meant to be copied @emph{as is} to a large-enough USB stick or DVD."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:1908
+#: guix-git/doc/guix.texi:2140
 #, no-wrap
 msgid "Copying to a USB Stick"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1911
+#: guix-git/doc/guix.texi:2143
 msgid "To copy the image to a USB stick, follow these steps:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1915 doc/guix.texi:1940
+#: guix-git/doc/guix.texi:2147 guix-git/doc/guix.texi:2172
 msgid "Decompress the image using the @command{xz} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1918 doc/guix.texi:1943
+#: guix-git/doc/guix.texi:2150 guix-git/doc/guix.texi:2175
 #, no-wrap
-msgid "xz -d guix-system-install-@value{VERSION}.@var{system}.iso.xz\n"
+msgid "xz -d guix-system-install-@value{VERSION}.x86_64-linux.iso.xz\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1924
+#: guix-git/doc/guix.texi:2156
 msgid "Insert a USB stick of 1@tie{}GiB or more into your machine, and determine its device name.  Assuming that the USB stick is known as @file{/dev/sdX}, copy the image with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1928
+#: guix-git/doc/guix.texi:2160
 #, no-wrap
 msgid ""
-"dd if=guix-system-install-@value{VERSION}.@var{system}.iso of=/dev/sdX\n"
+"dd if=guix-system-install-@value{VERSION}.x86_64-linux.iso of=/dev/sdX status=progress\n"
 "sync\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1931
+#: guix-git/doc/guix.texi:2163
 msgid "Access to @file{/dev/sdX} usually requires root privileges."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:1933
+#: guix-git/doc/guix.texi:2165
 #, no-wrap
 msgid "Burning on a DVD"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1936
+#: guix-git/doc/guix.texi:2168
 msgid "To copy the image to a DVD, follow these steps:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1949
+#: guix-git/doc/guix.texi:2181
 msgid "Insert a blank DVD into your machine, and determine its device name.  Assuming that the DVD drive is known as @file{/dev/srX}, copy the image with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:1952
+#: guix-git/doc/guix.texi:2184
 #, no-wrap
-msgid "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.@var{system}.iso\n"
+msgid "growisofs -dvd-compat -Z /dev/srX=guix-system-install-@value{VERSION}.x86_64-linux.iso\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:1955
+#: guix-git/doc/guix.texi:2187
 msgid "Access to @file{/dev/srX} usually requires root privileges."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:1957
+#: guix-git/doc/guix.texi:2189
 #, no-wrap
 msgid "Booting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1962
-msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD.  The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick."
+#: guix-git/doc/guix.texi:2196
+msgid "Once this is done, you should be able to reboot the system and boot from the USB stick or DVD@.  The latter usually requires you to get in the BIOS or UEFI boot menu, where you can choose to boot from the USB stick.  In order to boot from Libreboot, switch to the command mode by pressing the @kbd{c} key and type @command{search_grub usb}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1965
+#: guix-git/doc/guix.texi:2199
 msgid "@xref{Installing Guix in a VM}, if, instead, you would like to install Guix System in a virtual machine (VM)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1975
-msgid "Once you have booted, you can use the guided graphical installer, which makes it easy to get started (@pxref{Guided Graphical Installation}).  Alternately, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation})."
+#: guix-git/doc/guix.texi:2209
+msgid "Once you have booted, you can use the guided graphical installer, which makes it easy to get started (@pxref{Guided Graphical Installation}).  Alternatively, if you are already familiar with GNU/Linux and if you want more control than what the graphical installer provides, you can choose the ``manual'' installation process (@pxref{Manual Installation})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1983
+#: guix-git/doc/guix.texi:2217
 msgid "The graphical installer is available on TTY1.  You can obtain root shells on TTYs 3 to 6 by hitting @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, etc.  TTY2 shows this documentation and you can reach it with @kbd{ctrl-alt-f2}.  Documentation is browsable using the Info reader commands (@pxref{Top,,, info-stnd, Stand-alone GNU Info}).  The installation system runs the GPM mouse daemon, which allows you to select text with the left mouse button and to paste it with the middle button."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:1988
+#: guix-git/doc/guix.texi:2222
 msgid "Installation requires access to the Internet so that any missing dependencies of your system configuration can be downloaded.  See the ``Networking'' section below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:1995
+#: guix-git/doc/guix.texi:2229
 msgid "The graphical installer is a text-based user interface.  It will guide you, with dialog boxes, through the steps needed to install GNU@tie{}Guix System."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2000
+#: guix-git/doc/guix.texi:2234
 msgid "The first dialog boxes allow you to set up the system as you use it during the installation: you can choose the language, keyboard layout, and set up networking, which will be used during the installation.  The image below shows the networking dialog."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2002
+#: guix-git/doc/guix.texi:2236
 msgid "@image{images/installer-network,5in,, networking setup with the graphical installer}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2007
+#: guix-git/doc/guix.texi:2241
 msgid "Later steps allow you to partition your hard disk, as shown in the image below, to choose whether or not to use encrypted file systems, to enter the host name and root password, and to create an additional account, among other things."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2009
+#: guix-git/doc/guix.texi:2243
 msgid "@image{images/installer-partitions,5in,, partitioning with the graphical installer}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2012
+#: guix-git/doc/guix.texi:2246
 msgid "Note that, at any time, the installer allows you to exit the current installation step and resume at a previous step, as show in the image below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2014
+#: guix-git/doc/guix.texi:2248
 msgid "@image{images/installer-resume,5in,, resuming the installation process}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2019
+#: guix-git/doc/guix.texi:2253
 msgid "Once you're done, the installer produces an operating system configuration and displays it (@pxref{Using the Configuration System}).  At that point you can hit ``OK'' and installation will proceed.  On success, you can reboot into the new system and enjoy.  @xref{After System Installation}, for what's next!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2029
+#: guix-git/doc/guix.texi:2263
 msgid "This section describes how you would ``manually'' install GNU@tie{}Guix System on your machine.  This option requires familiarity with GNU/Linux, with the shell, and with common administration tools.  If you think this is not for you, consider using the guided graphical installer (@pxref{Guided Graphical Installation})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2035
+#: guix-git/doc/guix.texi:2269
 msgid "The installation system provides root shells on TTYs 3 to 6; press @kbd{ctrl-alt-f3}, @kbd{ctrl-alt-f4}, and so on to reach them.  It includes many common tools needed to install the system.  But it is also a full-blown Guix System, which means that you can install additional packages, should you need it, using @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:2042
+#: guix-git/doc/guix.texi:2276
 #, no-wrap
 msgid "Keyboard Layout, Networking, and Partitioning"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2047
+#: guix-git/doc/guix.texi:2281
 msgid "Before you can install the system, you may want to adjust the keyboard layout, set up networking, and partition your target hard disk.  This section will guide you through this."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2050 doc/guix.texi:11125
+#: guix-git/doc/guix.texi:2284 guix-git/doc/guix.texi:14553
 #, no-wrap
 msgid "keyboard layout"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2054
+#: guix-git/doc/guix.texi:2288
 msgid "The installation image uses the US qwerty keyboard layout.  If you want to change it, you can use the @command{loadkeys} command.  For example, the following command selects the Dvorak keyboard layout:"
-msgstr ""
+msgstr "安装镜像使用的是美国的 qwerty 键盘布局，如果想更改，可以使用 @command{loadkeys} 命令。 例如，用以下命令选择 Dvorak 键盘布局："
 
 #. type: example
-#: doc/guix.texi:2057
+#: guix-git/doc/guix.texi:2291
 #, no-wrap
 msgid "loadkeys dvorak\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2062
+#: guix-git/doc/guix.texi:2296
 msgid "See the files under @file{/run/current-system/profile/share/keymaps} for a list of available keyboard layouts.  Run @command{man loadkeys} for more information."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:2063
+#: guix-git/doc/guix.texi:2297
 #, no-wrap
 msgid "Networking"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2066
+#: guix-git/doc/guix.texi:2300
 msgid "Run the following command to see what your network interfaces are called:"
-msgstr ""
+msgstr "运行以下命令查看你的网络接口的名称："
 
 #. type: example
-#: doc/guix.texi:2069
+#: guix-git/doc/guix.texi:2303
 #, no-wrap
 msgid "ifconfig -a\n"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:2073
+#. type: table
+#: guix-git/doc/guix.texi:2307 guix-git/doc/guix.texi:2329
 msgid "@dots{} or, using the GNU/Linux-specific @command{ip} command:"
-msgstr ""
+msgstr "@dots{} 或者，使用 GNU/Linux 特有的 @command{ip} 命令："
 
 #. type: example
-#: doc/guix.texi:2076
+#: guix-git/doc/guix.texi:2310
 #, no-wrap
-msgid "ip a\n"
+msgid "ip address\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2083
+#: guix-git/doc/guix.texi:2317
 msgid "Wired interfaces have a name starting with @samp{e}; for example, the interface corresponding to the first on-board Ethernet controller is called @samp{eno1}.  Wireless interfaces have a name starting with @samp{w}, like @samp{w1p2s0}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2085
+#: guix-git/doc/guix.texi:2319
 #, no-wrap
 msgid "Wired connection"
-msgstr ""
+msgstr "有线连接"
 
 #. type: table
-#: doc/guix.texi:2088
+#: guix-git/doc/guix.texi:2322
 msgid "To configure a wired network run the following command, substituting @var{interface} with the name of the wired interface you want to use."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2091
+#: guix-git/doc/guix.texi:2325
 #, no-wrap
 msgid "ifconfig @var{interface} up\n"
 msgstr ""
 
+#. type: example
+#: guix-git/doc/guix.texi:2332
+#, no-wrap
+msgid "ip link set @var{interface} up\n"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:2093
+#: guix-git/doc/guix.texi:2334
 #, no-wrap
 msgid "Wireless connection"
-msgstr ""
+msgstr "无线连接"
 
 #. type: cindex
-#: doc/guix.texi:2094 doc/guix.texi:12556
+#: guix-git/doc/guix.texi:2335 guix-git/doc/guix.texi:16178
 #, no-wrap
 msgid "wireless"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2095 doc/guix.texi:12557
+#: guix-git/doc/guix.texi:2336 guix-git/doc/guix.texi:16179
 #, no-wrap
 msgid "WiFi"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2100
+#: guix-git/doc/guix.texi:2341
 msgid "To configure wireless networking, you can create a configuration file for the @command{wpa_supplicant} configuration tool (its location is not important) using one of the available text editors such as @command{nano}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2103
+#: guix-git/doc/guix.texi:2344
 #, no-wrap
 msgid "nano wpa_supplicant.conf\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2108
+#: guix-git/doc/guix.texi:2349
 msgid "As an example, the following stanza can go to this file and will work for many wireless networks, provided you give the actual SSID and passphrase for the network you are connecting to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2115
+#: guix-git/doc/guix.texi:2356
 #, no-wrap
 msgid ""
 "network=@{\n"
@@ -5671,184 +7268,212 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2120
+#: guix-git/doc/guix.texi:2361
 msgid "Start the wireless service and run it in the background with the following command (substitute @var{interface} with the name of the network interface you want to use):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2123
+#: guix-git/doc/guix.texi:2364
 #, no-wrap
 msgid "wpa_supplicant -c wpa_supplicant.conf -i @var{interface} -B\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2126
+#: guix-git/doc/guix.texi:2367
 msgid "Run @command{man wpa_supplicant} for more information."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2128
+#: guix-git/doc/guix.texi:2369
 #, no-wrap
 msgid "DHCP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2131
+#: guix-git/doc/guix.texi:2372
 msgid "At this point, you need to acquire an IP address.  On a network where IP addresses are automatically assigned @i{via} DHCP, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2134
+#: guix-git/doc/guix.texi:2375
 #, no-wrap
 msgid "dhclient -v @var{interface}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2137
+#: guix-git/doc/guix.texi:2378
 msgid "Try to ping a server to see if networking is up and running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2140
+#: guix-git/doc/guix.texi:2381
 #, no-wrap
 msgid "ping -c 3 gnu.org\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2144
+#: guix-git/doc/guix.texi:2385
 msgid "Setting up network access is almost always a requirement because the image does not contain all the software and tools that may be needed."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2145
+#: guix-git/doc/guix.texi:2386
+#, fuzzy, no-wrap
+#| msgid "After System Installation"
+msgid "proxy, during system installation"
+msgstr "系统安装之后"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2389
+msgid "If you need HTTP and HTTPS access to go through a proxy, run the following command:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2392
+#, no-wrap
+msgid "herd set-http-proxy guix-daemon @var{URL}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2397
+msgid "where @var{URL} is the proxy URL, for example @code{http://example.org:8118}."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:2398
 #, no-wrap
 msgid "installing over SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2148
+#: guix-git/doc/guix.texi:2401
 msgid "If you want to, you can continue the installation remotely by starting an SSH server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2151
+#: guix-git/doc/guix.texi:2404
 #, no-wrap
 msgid "herd start ssh-daemon\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2155
+#: guix-git/doc/guix.texi:2408
 msgid "Make sure to either set a password with @command{passwd}, or configure OpenSSH public key authentication before logging in."
 msgstr ""
 
 #. type: subsubsection
-#: doc/guix.texi:2156
+#: guix-git/doc/guix.texi:2409
 #, no-wrap
 msgid "Disk Partitioning"
-msgstr ""
+msgstr "磁盘分区"
 
 #. type: Plain text
-#: doc/guix.texi:2160
+#: guix-git/doc/guix.texi:2413
 msgid "Unless this has already been done, the next step is to partition, and then format the target partition(s)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2165
+#: guix-git/doc/guix.texi:2418
 msgid "The installation image includes several partitioning tools, including Parted (@pxref{Overview,,, parted, GNU Parted User Manual}), @command{fdisk}, and @command{cfdisk}.  Run it and set up your disk with the partition layout you want:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2168
+#: guix-git/doc/guix.texi:2421
 #, no-wrap
 msgid "cfdisk\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2174
+#: guix-git/doc/guix.texi:2427
 msgid "If your disk uses the GUID Partition Table (GPT) format and you plan to install BIOS-based GRUB (which is the default), make sure a BIOS Boot Partition is available (@pxref{BIOS installation,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2175
+#: guix-git/doc/guix.texi:2428
 #, no-wrap
 msgid "EFI, installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2176
+#: guix-git/doc/guix.texi:2429
 #, no-wrap
 msgid "UEFI, installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2177
+#: guix-git/doc/guix.texi:2430
 #, no-wrap
 msgid "ESP, EFI system partition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2181
+#: guix-git/doc/guix.texi:2434
 msgid "If you instead wish to use EFI-based GRUB, a FAT32 @dfn{EFI System Partition} (ESP) is required.  This partition can be mounted at @file{/boot/efi} for instance and must have the @code{esp} flag set.  E.g., for @command{parted}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2184
+#: guix-git/doc/guix.texi:2437
 #, no-wrap
 msgid "parted /dev/sda set 1 esp on\n"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:2187 doc/guix.texi:24064
+#: guix-git/doc/guix.texi:2440 guix-git/doc/guix.texi:32500
 #, no-wrap
 msgid "grub-bootloader"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:2188 doc/guix.texi:24058
+#: guix-git/doc/guix.texi:2441 guix-git/doc/guix.texi:32494
 #, no-wrap
 msgid "grub-efi-bootloader"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:2195
+#: guix-git/doc/guix.texi:2448
 msgid "Unsure whether to use EFI- or BIOS-based GRUB? If the directory @file{/sys/firmware/efi} exists in the installation image, then you should probably perform an EFI installation, using @code{grub-efi-bootloader}.  Otherwise you should use the BIOS-based GRUB, known as @code{grub-bootloader}.  @xref{Bootloader Configuration}, for more info on bootloaders."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2203
-msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4 and btrfs file systems.  In particular, code that reads file system UUIDs and labels only works for these file system types.}.  For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:"
+#: guix-git/doc/guix.texi:2456
+msgid "Once you are done partitioning the target hard disk drive, you have to create a file system on the relevant partition(s)@footnote{Currently Guix System only supports ext4, btrfs, JFS, and F2FS file systems.  In particular, code that reads file system UUIDs and labels only works for these file system types.}.  For the ESP, if you have one and assuming it is @file{/dev/sda1}, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2206
+#: guix-git/doc/guix.texi:2459
 #, no-wrap
 msgid "mkfs.fat -F32 /dev/sda1\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2214
+#: guix-git/doc/guix.texi:2466
+msgid "For the root file system, ext4 is the most widely used format.  Other file systems, such as Btrfs, support compression, which is reported to nicely complement file deduplication that the daemon performs independently of the file system (@pxref{Invoking guix-daemon, deduplication})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2473
 msgid "Preferably, assign file systems a label so that you can easily and reliably refer to them in @code{file-system} declarations (@pxref{File Systems}).  This is typically done using the @code{-L} option of @command{mkfs.ext4} and related commands.  So, assuming the target root partition lives at @file{/dev/sda2}, a file system with the label @code{my-root} can be created with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2217
+#: guix-git/doc/guix.texi:2476
 #, no-wrap
 msgid "mkfs.ext4 -L my-root /dev/sda2\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2219 doc/guix.texi:10382
+#: guix-git/doc/guix.texi:2478 guix-git/doc/guix.texi:13551
 #, no-wrap
 msgid "encrypted disk"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2226
-msgid "If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information.)  Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines:"
+#: guix-git/doc/guix.texi:2485
+msgid "If you are instead planning to encrypt the root partition, you can use the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @uref{https://linux.die.net/man/8/cryptsetup, @code{man cryptsetup}}, @code{man cryptsetup}} for more information).  Assuming you want to store the root partition on @file{/dev/sda2}, the command sequence would be along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2231
+#: guix-git/doc/guix.texi:2490
 #, no-wrap
 msgid ""
 "cryptsetup luksFormat /dev/sda2\n"
@@ -5857,28 +7482,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2236
+#: guix-git/doc/guix.texi:2495
 msgid "Once that is done, mount the target file system under @file{/mnt} with a command like (again, assuming @code{my-root} is the label of the root file system):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2239
+#: guix-git/doc/guix.texi:2498
 #, no-wrap
 msgid "mount LABEL=my-root /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2245
+#: guix-git/doc/guix.texi:2504
 msgid "Also mount any other file systems you would like to use on the target system relative to this path.  If you have opted for @file{/boot/efi} as an EFI mount point for example, mount it at @file{/mnt/boot/efi} now so it is found by @code{guix system init} afterwards."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2250
+#: guix-git/doc/guix.texi:2509
 msgid "Finally, if you plan to use one or more swap partitions (@pxref{Memory Concepts, swap space,, libc, The GNU C Library Reference Manual}), make sure to initialize them with @command{mkswap}.  Assuming you have one swap partition on @file{/dev/sda3}, you would run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2254
+#: guix-git/doc/guix.texi:2513
 #, no-wrap
 msgid ""
 "mkswap /dev/sda3\n"
@@ -5886,12 +7511,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2262
+#: guix-git/doc/guix.texi:2521
 msgid "Alternatively, you may use a swap file.  For example, assuming that in the new system you want to use the file @file{/swapfile} as a swap file, you would run@footnote{This example will work for many types of file systems (e.g., ext4).  However, for copy-on-write file systems (e.g., btrfs), the required steps may be different.  For details, see the manual pages for @command{mkswap} and @command{swapon}.}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2270
+#: guix-git/doc/guix.texi:2529
 #, no-wrap
 msgid ""
 "# This is 10 GiB of swap space.  Adjust \"count\" to change the size.\n"
@@ -5903,38 +7528,38 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2275
+#: guix-git/doc/guix.texi:2534
 msgid "Note that if you have encrypted the root partition and created a swap file in its file system as described above, then the encryption also protects the swap file, just like any other file in that file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2281
+#: guix-git/doc/guix.texi:2540
 msgid "With the target partitions ready and the target root mounted on @file{/mnt}, we're ready to go.  First, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2284
+#: guix-git/doc/guix.texi:2543
 #, no-wrap
 msgid "herd start cow-store /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2291
+#: guix-git/doc/guix.texi:2550
 msgid "This makes @file{/gnu/store} copy-on-write, such that packages added to it during the installation phase are written to the target disk on @file{/mnt} rather than kept in memory.  This is necessary because the first phase of the @command{guix system init} command (see below) entails downloads or builds to @file{/gnu/store} which, initially, is an in-memory file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2302
+#: guix-git/doc/guix.texi:2561
 msgid "Next, you have to edit a file and provide the declaration of the operating system to be installed.  To that end, the installation system comes with three text editors.  We recommend GNU nano (@pxref{Top,,, nano, GNU nano Manual}), which supports syntax highlighting and parentheses matching; other editors include GNU Zile (an Emacs clone), and nvi (a clone of the original BSD @command{vi} editor).  We strongly recommend storing that file on the target root file system, say, as @file{/mnt/etc/config.scm}.  Failing to do that, you will have lost your configuration file once you have rebooted into the newly-installed system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2309
+#: guix-git/doc/guix.texi:2568
 msgid "@xref{Using the Configuration System}, for an overview of the configuration file.  The example configurations discussed in that section are available under @file{/etc/configuration} in the installation image.  Thus, to get started with a system configuration providing a graphical display server (a ``desktop'' system), you can run something along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2314
+#: guix-git/doc/guix.texi:2573
 #, no-wrap
 msgid ""
 "# mkdir /mnt/etc\n"
@@ -5943,53 +7568,53 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2318
+#: guix-git/doc/guix.texi:2577
 msgid "You should pay attention to what your configuration file contains, and in particular:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2329
+#: guix-git/doc/guix.texi:2588
 msgid "Make sure the @code{bootloader-configuration} form refers to the target you want to install GRUB on.  It should mention @code{grub-bootloader} if you are installing GRUB in the legacy way, or @code{grub-efi-bootloader} for newer UEFI systems.  For legacy systems, the @code{target} field names a device, like @code{/dev/sda}; for UEFI systems it names a path to a mounted EFI partition, like @code{/boot/efi}; do make sure the path is currently mounted and a @code{file-system} entry is specified in your configuration."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2335
+#: guix-git/doc/guix.texi:2594
 msgid "Be sure that your file system labels match the value of their respective @code{device} fields in your @code{file-system} configuration, assuming your @code{file-system} configuration uses the @code{file-system-label} procedure in its @code{device} field."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2339
+#: guix-git/doc/guix.texi:2598
 msgid "If there are encrypted or RAID partitions, make sure to add a @code{mapped-devices} field to describe them (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2344
+#: guix-git/doc/guix.texi:2603
 msgid "Once you are done preparing the configuration file, the new system must be initialized (remember that the target root file system is mounted under @file{/mnt}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2347
+#: guix-git/doc/guix.texi:2606
 #, no-wrap
 msgid "guix system init /mnt/etc/config.scm /mnt\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2354
+#: guix-git/doc/guix.texi:2613
 msgid "This copies all the necessary files and installs GRUB on @file{/dev/sdX}, unless you pass the @option{--no-bootloader} option.  For more information, @pxref{Invoking guix system}.  This command may trigger downloads or builds of missing packages, which can take some time."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2362
+#: guix-git/doc/guix.texi:2621
 msgid "Once that command has completed---and hopefully succeeded!---you can run @command{reboot} and boot into the new system.  The @code{root} password in the new system is initially empty; other users' passwords need to be initialized by running the @command{passwd} command as @code{root}, unless your configuration specifies otherwise (@pxref{user-account-password, user account passwords}).  @xref{After System Installation}, for what's next!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2369
+#: guix-git/doc/guix.texi:2628
 msgid "Success, you've now booted into Guix System! From then on, you can update the system whenever you want by running, say:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2373
+#: guix-git/doc/guix.texi:2632
 #, no-wrap
 msgid ""
 "guix pull\n"
@@ -5997,648 +7622,964 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2379
+#: guix-git/doc/guix.texi:2638
 msgid "This builds a new system generation with the latest packages and services (@pxref{Invoking guix system}).  We recommend doing that regularly so that your system includes the latest security updates (@pxref{Security Updates})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2382
+#: guix-git/doc/guix.texi:2641
 #, no-wrap
 msgid "sudo vs. @command{guix pull}"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:2386
-msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @code{PATH} unchanged.  To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}."
+#: guix-git/doc/guix.texi:2645
+msgid "Note that @command{sudo guix} runs your user's @command{guix} command and @emph{not} root's, because @command{sudo} leaves @env{PATH} unchanged.  To explicitly run root's @command{guix}, type @command{sudo -i guix @dots{}}."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2650
+msgid "The difference matters here, because @command{guix pull} updates the @command{guix} command and package definitions only for the user it is run as.  This means that if you choose to use @command{guix system reconfigure} in root's login shell, you'll need to @command{guix pull} separately."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2390
-msgid "Join us on @code{#guix} on the Freenode IRC network or on @email{guix-devel@@gnu.org} to share your experience!"
+#: guix-git/doc/guix.texi:2655
+msgid "Now, @pxref{Getting Started}, and join us on @code{#guix} on the Freenode IRC network or on @email{guix-devel@@gnu.org} to share your experience!"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:2393
+#: guix-git/doc/guix.texi:2658
 #, no-wrap
 msgid "Installing Guix in a Virtual Machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2395
+#: guix-git/doc/guix.texi:2660
 #, no-wrap
 msgid "virtual machine, Guix System installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2396
+#: guix-git/doc/guix.texi:2661
 #, no-wrap
 msgid "virtual private server (VPS)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2397
+#: guix-git/doc/guix.texi:2662
 #, no-wrap
 msgid "VPS (virtual private server)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2401
+#: guix-git/doc/guix.texi:2666
 msgid "If you'd like to install Guix System in a virtual machine (VM) or on a virtual private server (VPS) rather than on your beloved machine, this section is for you."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2404
+#: guix-git/doc/guix.texi:2669
 msgid "To boot a @uref{https://qemu.org/,QEMU} VM for installing Guix System in a disk image, follow these steps:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2409
+#: guix-git/doc/guix.texi:2674
 msgid "First, retrieve and decompress the Guix system installation image as described previously (@pxref{USB Stick and DVD Installation})."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2413
+#: guix-git/doc/guix.texi:2678
 msgid "Create a disk image that will hold the installed system.  To make a qcow2-formatted disk image, use the @command{qemu-img} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2416
+#: guix-git/doc/guix.texi:2681
 #, no-wrap
-msgid "qemu-img create -f qcow2 guixsd.img 50G\n"
+msgid "qemu-img create -f qcow2 guix-system.img 50G\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2420
+#: guix-git/doc/guix.texi:2685
 msgid "The resulting file will be much smaller than 50 GB (typically less than 1 MB), but it will grow as the virtualized storage device is filled up."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2423
+#: guix-git/doc/guix.texi:2688
 msgid "Boot the USB installation image in an VM:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2429
+#: guix-git/doc/guix.texi:2694
 #, no-wrap
 msgid ""
-"qemu-system-x86_64 -m 1024 -smp 1 \\\n"
-"  -net user -net nic,model=virtio -boot menu=on \\\n"
-"  -drive file=guix-system-install-@value{VERSION}.@var{system}.iso \\\n"
-"  -drive file=guixsd.img\n"
-msgstr ""
-
-#. type: enumerate
-#: doc/guix.texi:2432
-msgid "The ordering of the drives matters."
+"qemu-system-x86_64 -m 1024 -smp 1 -enable-kvm \\\n"
+"  -nic user,model=virtio-net-pci -boot menu=on,order=d \\\n"
+"  -drive file=guix-system.img \\\n"
+"  -drive media=cdrom,file=guix-system-install-@value{VERSION}.@var{system}.iso\n"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2436
-msgid "In the VM console, quickly press the @kbd{F12} key to enter the boot menu.  Then press the @kbd{2} key and the @kbd{RET} key to validate your selection."
+#: guix-git/doc/guix.texi:2698
+msgid "@code{-enable-kvm} is optional, but significantly improves performance, @pxref{Running Guix in a VM}."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:2440
+#: guix-git/doc/guix.texi:2702
 msgid "You're now root in the VM, proceed with the installation process.  @xref{Preparing for Installation}, and follow the instructions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2445
-msgid "Once installation is complete, you can boot the system that's on your @file{guixsd.img} image.  @xref{Running Guix in a VM}, for how to do that."
+#: guix-git/doc/guix.texi:2707
+msgid "Once installation is complete, you can boot the system that's on your @file{guix-system.img} image.  @xref{Running Guix in a VM}, for how to do that."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2449
+#: guix-git/doc/guix.texi:2711
 #, no-wrap
 msgid "installation image"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2452
+#: guix-git/doc/guix.texi:2714
 msgid "The installation image described above was built using the @command{guix system} command, specifically:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2456
+#: guix-git/doc/guix.texi:2717
 #, no-wrap
-msgid ""
-"guix system disk-image --file-system-type=iso9660 \\\n"
-"  gnu/system/install.scm\n"
+msgid "guix system image -t iso9660 gnu/system/install.scm\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2461
+#: guix-git/doc/guix.texi:2722
 msgid "Have a look at @file{gnu/system/install.scm} in the source tree, and see also @ref{Invoking guix system} for more information about the installation image."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:2462
+#: guix-git/doc/guix.texi:2723
 #, no-wrap
 msgid "Building the Installation Image for ARM Boards"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2466
+#: guix-git/doc/guix.texi:2727
 msgid "Many ARM boards require a specific variant of the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot} bootloader."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2470
+#: guix-git/doc/guix.texi:2731
 msgid "If you build a disk image and the bootloader is not available otherwise (on another boot drive etc), it's advisable to build an image that includes the bootloader, specifically:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2473
+#: guix-git/doc/guix.texi:2734
 #, no-wrap
-msgid "guix system disk-image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n"
+msgid "guix system image --system=armhf-linux -e '((@@ (gnu system install) os-with-u-boot) (@@ (gnu system install) installation-os) \"A20-OLinuXino-Lime2\")'\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2477
+#: guix-git/doc/guix.texi:2738
 msgid "@code{A20-OLinuXino-Lime2} is the name of the board.  If you specify an invalid board, a list of possible boards will be printed."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:2748
+msgid "Presumably, you've reached this section because either you have installed Guix on top of another distribution (@pxref{Installation}), or you've installed the standalone Guix System (@pxref{System Installation}).  It's time for you to get started using Guix and this section aims to help you do that and give you a feel of what it's like."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2752
+msgid "Guix is about installing software, so probably the first thing you'll want to do is to actually look for software.  Let's say you're looking for a text editor, you can run:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2755
+#, no-wrap
+msgid "guix search text editor\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2762
+msgid "This command shows you a number of matching @dfn{packages}, each time showing the package's name, version, a description, and additional info.  Once you've found out the one you want to use, let's say Emacs (ah ha!), you can go ahead and install it (run this command as a regular user, @emph{no need for root privileges}!):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2765
+#, fuzzy, no-wrap
+#| msgid "guix install emacs-guix\n"
+msgid "guix install emacs\n"
+msgstr "guix install emacs-guix\n"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:2767 guix-git/doc/guix.texi:3079
+#: guix-git/doc/guix.texi:3131
+#, no-wrap
+msgid "profile"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2775
+msgid "You've installed your first package, congrats! The package is now visible in your default @dfn{profile}, @file{$HOME/.guix-profile}---a profile is a directory containing installed packages.  In the process, you've probably noticed that Guix downloaded pre-built binaries; or, if you explicitly chose to @emph{not} use pre-built binaries, then probably Guix is still building software (@pxref{Substitutes}, for more info)."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2778
+msgid "Unless you're using Guix System, the @command{guix install} command must have printed this hint:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2781
+#, no-wrap
+msgid ""
+"hint: Consider setting the necessary environment variables by running:\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2784
+#, no-wrap
+msgid ""
+"     GUIX_PROFILE=\"$HOME/.guix-profile\"\n"
+"     . \"$GUIX_PROFILE/etc/profile\"\n"
+"\n"
+msgstr ""
+"     GUIX_PROFILE=\"$HOME/.guix-profile\"\n"
+"     . \"$GUIX_PROFILE/etc/profile\"\n"
+"\n"
+
+#. type: example
+#: guix-git/doc/guix.texi:2786
+#, no-wrap
+msgid "Alternately, see `guix package --search-paths -p \"$HOME/.guix-profile\"'.\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2800
+msgid "Indeed, you must now tell your shell where @command{emacs} and other programs installed with Guix are to be found.  Pasting the two lines above will do just that: it will add @code{$HOME/.guix-profile/bin}---which is where the installed package is---to the @code{PATH} environment variable.  You can paste these two lines in your shell so they take effect right away, but more importantly you should add them to @file{~/.bash_profile} (or equivalent file if you do not use Bash) so that environment variables are set next time you spawn a shell.  You only need to do this once and other search paths environment variables will be taken care of similarly---e.g., if you eventually install @code{python} and Python libraries, @code{PYTHONPATH} will be defined."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2803
+msgid "You can go on installing packages at your will.  To list installed packages, run:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2806
+#, fuzzy, no-wrap
+#| msgid "guix package --list-available\n"
+msgid "guix package --list-installed\n"
+msgstr "guix package --list-available\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2811
+msgid "To remove a package, you would unsurprisingly run @command{guix remove}.  A distinguishing feature is the ability to @dfn{roll back} any operation you made---installation, removal, upgrade---by simply typing:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2814
+#, fuzzy, no-wrap
+#| msgid "guix package --list-available\n"
+msgid "guix package --roll-back\n"
+msgstr "guix package --list-available\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2819
+msgid "This is because each operation is in fact a @dfn{transaction} that creates a new @dfn{generation}.  These generations and the difference between them can be displayed by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2822
+#, fuzzy, no-wrap
+#| msgid "guix package --list-available\n"
+msgid "guix package --list-generations\n"
+msgstr "guix package --list-available\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2825
+msgid "Now you know the basics of package management!"
+msgstr "现在你知道包管理的基本知识了吧！"
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2826 guix-git/doc/guix.texi:2885
+#, no-wrap
+msgid "Going further"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2834
+msgid "@xref{Package Management}, for more about package management.  You may like @dfn{declarative} package management with @command{guix package --manifest}, managing separate @dfn{profiles} with @option{--profile}, deleting old generations, collecting garbage, and other nifty features that will come in handy as you become more familiar with Guix.  If you are a developer, @pxref{Development} for additional tools.  And if you're curious, @pxref{Features}, to peek under the hood."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2839
+msgid "Once you've installed a set of packages, you will want to periodically @emph{upgrade} them to the latest and greatest version.  To do that, you will first pull the latest revision of Guix and its package collection:"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2849
+msgid "The end result is a new @command{guix} command, under @file{~/.config/guix/current/bin}.  Unless you're on Guix System, the first time you run @command{guix pull}, be sure to follow the hint that the command prints and, similar to what we saw above, paste these two lines in your terminal and @file{.bash_profile}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2853
+#, no-wrap
+msgid ""
+"GUIX_PROFILE=\"$HOME/.config/guix/current\"\n"
+". \"$GUIX_PROFILE/etc/profile\"\n"
+msgstr ""
+"GUIX_PROFILE=\"$HOME/.config/guix/current\"\n"
+". \"$GUIX_PROFILE/etc/profile\"\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2857
+msgid "You must also instruct your shell to point to this new @command{guix}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2860
+#, no-wrap
+msgid "hash guix\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2864
+msgid "At this point, you're running a brand new Guix.  You can thus go ahead and actually upgrade all the packages you previously installed:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2867
+#, no-wrap
+msgid "guix upgrade\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2873
+msgid "As you run this command, you will see that binaries are downloaded (or perhaps some packages are built), and eventually you end up with the upgraded packages.  Should one of these upgraded packages not be to your liking, remember you can always roll back!"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2876
+msgid "You can display the exact revision of Guix you're currently using by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2879
+#, no-wrap
+msgid "guix describe\n"
+msgstr "guix describe\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2884
+msgid "The information it displays is @emph{all it takes to reproduce the exact same Guix}, be it at a different point in time or on a different machine."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2890
+msgid "@xref{Invoking guix pull}, for more information.  @xref{Channels}, on how to specify additional @dfn{channels} to pull packages from, how to replicate Guix, and more.  You may also find @command{time-machine} handy (@pxref{Invoking guix time-machine})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2895
+msgid "If you installed Guix System, one of the first things you'll want to do is to upgrade your system.  Once you've run @command{guix pull} to get the latest Guix, you can upgrade the system like this:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2898
+#, no-wrap
+msgid "sudo guix system reconfigure /etc/config.scm\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2907
+msgid "Upon completion, the system runs the latest versions of its software packages.  When you eventually reboot, you'll notice a sub-menu in the bootloader that reads ``Old system generations'': it's what allows you to boot @emph{an older generation of your system}, should the latest generation be ``broken'' or otherwise unsatisfying.  Just like for packages, you can always @emph{roll back} to a previous generation @emph{of the whole system}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:2910
+#, no-wrap
+msgid "sudo guix system roll-back\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2917
+msgid "There are many things you'll probably want to tweak on your system: adding new user accounts, adding new system services, fiddling with the configuration of those services, etc.  The system configuration is @emph{entirely} described in the @file{/etc/config.scm} file.  @xref{Using the Configuration System}, to learn how to change it."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2919
+msgid "Now you know enough to get started!"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2920
+#, no-wrap
+msgid "Resources"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2923
+msgid "The rest of this manual provides a reference for all things Guix.  Here are some additional resources you may find useful:"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:2928
+msgid "@xref{Top,,, guix-cookbook, The GNU Guix Cookbook}, for a list of ``how-to'' style of recipes for a variety of applications."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:2933
+msgid "The @uref{https://guix.gnu.org/guix-refcard.pdf, GNU Guix Reference Card} lists in two pages most of the commands and options you'll ever need."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:2938
+msgid "The web site contains @uref{https://guix.gnu.org/en/videos/, instructional videos} covering topics such as everyday use of Guix, how to get help, and how to become a contributor."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:2942
+msgid "@xref{Documentation}, to learn how to access documentation on your computer."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:2945
+msgid "We hope you will enjoy Guix as much as the community enjoys building it!"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:2482
+#: guix-git/doc/guix.texi:2951
 #, no-wrap
 msgid "packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2487
+#: guix-git/doc/guix.texi:2956
 msgid "The purpose of GNU Guix is to allow users to easily install, upgrade, and remove software packages, without having to know about their build procedures or dependencies.  Guix also goes beyond this obvious set of features."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2495
+#: guix-git/doc/guix.texi:2964
 msgid "This chapter describes the main features of Guix, as well as the package management tools it provides.  Along with the command-line interface described below (@pxref{Invoking guix package, @code{guix package}}), you may also use the Emacs-Guix interface (@pxref{Top,,, emacs-guix, The Emacs-Guix Reference Manual}), after installing @code{emacs-guix} package (run @kbd{M-x guix-help} command to start with it):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2498
+#: guix-git/doc/guix.texi:2967
 #, no-wrap
 msgid "guix install emacs-guix\n"
 msgstr "guix install emacs-guix\n"
 
 #. type: Plain text
-#: doc/guix.texi:2519
+#: guix-git/doc/guix.texi:2988
+msgid "Here we assume you've already made your first steps with Guix (@pxref{Getting Started}) and would like to get an overview about what's going on under the hood."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:2992
 msgid "When using Guix, each package ends up in the @dfn{package store}, in its own directory---something that resembles @file{/gnu/store/xxx-package-1.2}, where @code{xxx} is a base32 string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2524
+#: guix-git/doc/guix.texi:2997
 msgid "Instead of referring to these directories, users have their own @dfn{profile}, which points to the packages that they actually want to use.  These profiles are stored within each user's home directory, at @code{$HOME/.guix-profile}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2532
+#: guix-git/doc/guix.texi:3005
 msgid "For example, @code{alice} installs GCC 4.7.2.  As a result, @file{/home/alice/.guix-profile/bin/gcc} points to @file{/gnu/store/@dots{}-gcc-4.7.2/bin/gcc}.  Now, on the same machine, @code{bob} had already installed GCC 4.8.0.  The profile of @code{bob} simply continues to point to @file{/gnu/store/@dots{}-gcc-4.8.0/bin/gcc}---i.e., both versions of GCC coexist on the same system without any interference."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2536
+#: guix-git/doc/guix.texi:3009
 msgid "The @command{guix package} command is the central tool to manage packages (@pxref{Invoking guix package}).  It operates on the per-user profiles, and can be used @emph{with normal user privileges}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2537 doc/guix.texi:2616
+#: guix-git/doc/guix.texi:3010 guix-git/doc/guix.texi:3093
 #, no-wrap
 msgid "transactions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2544
+#: guix-git/doc/guix.texi:3017
 msgid "The command provides the obvious install, remove, and upgrade operations.  Each invocation is actually a @emph{transaction}: either the specified operation succeeds, or nothing happens.  Thus, if the @command{guix package} process is terminated during the transaction, or if a power outage occurs during the transaction, then the user's profile remains in its previous state, and remains usable."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2552
+#: guix-git/doc/guix.texi:3025
 msgid "In addition, any package transaction may be @emph{rolled back}.  So, if, for example, an upgrade installs a new version of a package that turns out to have a serious bug, users may roll back to the previous instance of their profile, which was known to work well.  Similarly, the global system configuration on Guix is subject to transactional upgrades and roll-back (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2559
+#: guix-git/doc/guix.texi:3032
 msgid "All packages in the package store may be @emph{garbage-collected}.  Guix can determine which packages are still referenced by user profiles, and remove those that are provably no longer referenced (@pxref{Invoking guix gc}).  Users may also explicitly remove old generations of their profile so that the packages they refer to can be collected."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2560 doc/guix.texi:4087
+#: guix-git/doc/guix.texi:3033 guix-git/doc/guix.texi:4716
 #, no-wrap
 msgid "reproducibility"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2572
+#: guix-git/doc/guix.texi:3045
 msgid "Guix takes a @dfn{purely functional} approach to package management, as described in the introduction (@pxref{Introduction}).  Each @file{/gnu/store} package directory name contains a hash of all the inputs that were used to build that package---compiler, libraries, build scripts, etc.  This direct correspondence allows users to make sure a given package installation matches the current state of their distribution.  It also helps maximize @dfn{build reproducibility}: thanks to the isolated build environments that are used, a given build is likely to yield bit-identical files when performed on different machines (@pxref{Invoking guix-daemon, container})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2583
+#: guix-git/doc/guix.texi:3056
 msgid "This foundation allows Guix to support @dfn{transparent binary/source deployment}.  When a pre-built binary for a @file{/gnu/store} item is available from an external source---a @dfn{substitute}, Guix just downloads it and unpacks it; otherwise, it builds the package from source, locally (@pxref{Substitutes}).  Because build results are usually bit-for-bit reproducible, users do not have to trust servers that provide substitutes: they can force a local build and @emph{challenge} providers (@pxref{Invoking guix challenge})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2589
+#: guix-git/doc/guix.texi:3062
 msgid "Control over the build environment is a feature that is also useful for developers.  The @command{guix environment} command allows developers of a package to quickly set up the right development environment for their package, without having to manually install the dependencies of the package into their profile (@pxref{Invoking guix environment})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2590
+#: guix-git/doc/guix.texi:3063
 #, no-wrap
 msgid "replication, of software environments"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2591
+#: guix-git/doc/guix.texi:3064
 #, no-wrap
 msgid "provenance tracking, of software artifacts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2598
+#: guix-git/doc/guix.texi:3071
 msgid "All of Guix and its package definitions is version-controlled, and @command{guix pull} allows you to ``travel in time'' on the history of Guix itself (@pxref{Invoking guix pull}).  This makes it possible to replicate a Guix instance on a different machine or at a later point in time, which in turn allows you to @emph{replicate complete software environments}, while retaining precise @dfn{provenance tracking} of the software."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:2600
+#: guix-git/doc/guix.texi:3073
 #, no-wrap
 msgid "Invoking @command{guix package}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2602
+#: guix-git/doc/guix.texi:3075
 #, no-wrap
 msgid "installing packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2603
+#: guix-git/doc/guix.texi:3076
 #, no-wrap
 msgid "removing packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2604
+#: guix-git/doc/guix.texi:3077
 #, no-wrap
 msgid "package installation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2605
+#: guix-git/doc/guix.texi:3078
 #, no-wrap
 msgid "package removal"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2611
-msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations.  It operates only on the user's own profile, and works with normal user privileges (@pxref{Features}).  Its syntax is:"
+#: guix-git/doc/guix.texi:3088
+msgid "The @command{guix package} command is the tool that allows users to install, upgrade, and remove packages, as well as rolling back to previous configurations.  These operations work on a user @dfn{profile}---a directory of installed packages.  Each user has a default profile in @file{$HOME/.guix-profile}.  The command operates only on the user's own profile, and works with normal user privileges (@pxref{Features}).  Its syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2614
+#: guix-git/doc/guix.texi:3091
 #, no-wrap
 msgid "guix package @var{options}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2621
+#: guix-git/doc/guix.texi:3098
 msgid "Primarily, @var{options} specifies the operations to be performed during the transaction.  Upon completion, a new profile is created, but previous @dfn{generations} of the profile remain available, should the user want to roll back."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2624
+#: guix-git/doc/guix.texi:3101
 msgid "For example, to remove @code{lua} and install @code{guile} and @code{guile-cairo} in a single transaction:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2627
+#: guix-git/doc/guix.texi:3104
 #, no-wrap
 msgid "guix package -r lua -i guile guile-cairo\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2629
+#: guix-git/doc/guix.texi:3106
 #, no-wrap
 msgid "aliases, for @command{guix package}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2631
+#: guix-git/doc/guix.texi:3108
 msgid "For your convenience, we also provide the following aliases:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2635
+#: guix-git/doc/guix.texi:3112
 msgid "@command{guix search} is an alias for @command{guix package -s},"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2637
+#: guix-git/doc/guix.texi:3114
 msgid "@command{guix install} is an alias for @command{guix package -i},"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2639
+#: guix-git/doc/guix.texi:3116
 msgid "@command{guix remove} is an alias for @command{guix package -r},"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:2641
-msgid "and @command{guix upgrade} is an alias for @command{guix package -u}."
+#: guix-git/doc/guix.texi:3118
+msgid "@command{guix upgrade} is an alias for @command{guix package -u},"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:3120
+msgid "and @command{guix show} is an alias for @command{guix package --show=}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2646
+#: guix-git/doc/guix.texi:3125
 msgid "These aliases are less expressive than @command{guix package} and provide fewer options, so in some cases you'll probably want to use @command{guix package} directly."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2651
+#: guix-git/doc/guix.texi:3130
 msgid "@command{guix package} also supports a @dfn{declarative approach} whereby the user specifies the exact set of packages to be available and passes it @i{via} the @option{--manifest} option (@pxref{profile-manifest, @option{--manifest}})."
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:2652
-#, no-wrap
-msgid "profile"
-msgstr ""
-
 #. type: Plain text
-#: doc/guix.texi:2658
-msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}.  This symlink always points to the current generation of the user's default profile.  Thus, users can add @file{$HOME/.guix-profile/bin} to their @code{PATH} environment variable, and so on."
+#: guix-git/doc/guix.texi:3137
+msgid "For each user, a symlink to the user's default profile is automatically created in @file{$HOME/.guix-profile}.  This symlink always points to the current generation of the user's default profile.  Thus, users can add @file{$HOME/.guix-profile/bin} to their @env{PATH} environment variable, and so on."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2658 doc/guix.texi:2855
+#: guix-git/doc/guix.texi:3137 guix-git/doc/guix.texi:3370
 #, no-wrap
 msgid "search paths"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2663
+#: guix-git/doc/guix.texi:3142
 msgid "If you are not using Guix System, consider adding the following lines to your @file{~/.bash_profile} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}) so that newly-spawned shells get all the right environment variable definitions:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2667
+#: guix-git/doc/guix.texi:3146
 #, no-wrap
 msgid ""
 "GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n"
-"source \"$HOME/.guix-profile/etc/profile\"\n"
+"source \"$GUIX_PROFILE/etc/profile\"\n"
 msgstr ""
+"GUIX_PROFILE=\"$HOME/.guix-profile\" ; \\\n"
+"source \"$GUIX_PROFILE/etc/profile\"\n"
 
 #. type: Plain text
-#: doc/guix.texi:2678
-msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}).  That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @code{--localstatedir}, and @var{user} is the user name.  The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}."
+#: guix-git/doc/guix.texi:3157
+msgid "In a multi-user setup, user profiles are stored in a place registered as a @dfn{garbage-collector root}, which @file{$HOME/.guix-profile} points to (@pxref{Invoking guix gc}).  That directory is normally @code{@var{localstatedir}/guix/profiles/per-user/@var{user}}, where @var{localstatedir} is the value passed to @code{configure} as @option{--localstatedir}, and @var{user} is the user name.  The @file{per-user} directory is created when @command{guix-daemon} is started, and the @var{user} sub-directory is created by @command{guix package}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2680
+#: guix-git/doc/guix.texi:3159
 msgid "The @var{options} can be among the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2683
+#: guix-git/doc/guix.texi:3162
 #, no-wrap
 msgid "--install=@var{package} @dots{}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2684
+#: guix-git/doc/guix.texi:3163
 #, no-wrap
 msgid "-i @var{package} @dots{}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2686
+#: guix-git/doc/guix.texi:3165
 msgid "Install the specified @var{package}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2691
-msgid "Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by @code{1.8} is selected.)"
+#: guix-git/doc/guix.texi:3170
+msgid "Each @var{package} may specify either a simple package name, such as @code{guile}, or a package name followed by an at-sign and version number, such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter case, the newest version prefixed by @code{1.8} is selected)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2699
+#: guix-git/doc/guix.texi:3178
 msgid "If no version number is specified, the newest available version will be selected.  In addition, @var{package} may contain a colon, followed by the name of one of the outputs of the package, as in @code{gcc:doc} or @code{binutils@@2.22:lib} (@pxref{Packages with Multiple Outputs}).  Packages with a corresponding name (and optionally version) are searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2700
+#: guix-git/doc/guix.texi:3179
 #, no-wrap
 msgid "propagated inputs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2706
+#: guix-git/doc/guix.texi:3185
 msgid "Sometimes packages have @dfn{propagated inputs}: these are dependencies that automatically get installed along with the required package (@pxref{package-propagated-inputs, @code{propagated-inputs} in @code{package} objects}, for information about propagated inputs in package definitions)."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:2713
+#: guix-git/doc/guix.texi:3192
 msgid "package-cmd-propagated-inputs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2713
+#: guix-git/doc/guix.texi:3192
 msgid "An example is the GNU MPC library: its C header files refer to those of the GNU MPFR library, which in turn refer to those of the GMP library.  Thus, when installing MPC, the MPFR and GMP libraries also get installed in the profile; removing MPC also removes MPFR and GMP---unless they had also been explicitly installed by the user."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2718
-msgid "Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @code{--search-paths} below).  Any missing or possibly incorrect environment variable definitions are reported here."
+#: guix-git/doc/guix.texi:3197
+msgid "Besides, packages sometimes rely on the definition of environment variables for their search paths (see explanation of @option{--search-paths} below).  Any missing or possibly incorrect environment variable definitions are reported here."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2719
+#: guix-git/doc/guix.texi:3198
 #, no-wrap
 msgid "--install-from-expression=@var{exp}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2720
+#: guix-git/doc/guix.texi:3199
 #, no-wrap
 msgid "-e @var{exp}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2722
+#: guix-git/doc/guix.texi:3201
 msgid "Install the package @var{exp} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2727
+#: guix-git/doc/guix.texi:3206
 msgid "@var{exp} must be a Scheme expression that evaluates to a @code{<package>} object.  This option is notably useful to disambiguate between same-named variants of a package, with expressions such as @code{(@@ (gnu packages base) guile-final)}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2731
+#: guix-git/doc/guix.texi:3210
 msgid "Note that this option installs the first output of the specified package, which may be insufficient when needing a specific output of a multiple-output package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2732
+#: guix-git/doc/guix.texi:3211
 #, no-wrap
 msgid "--install-from-file=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2733 doc/guix.texi:7983
+#: guix-git/doc/guix.texi:3212 guix-git/doc/guix.texi:10707
 #, no-wrap
 msgid "-f @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2735
+#: guix-git/doc/guix.texi:3214
 msgid "Install the package that the code within @var{file} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2738 doc/guix.texi:4524
+#: guix-git/doc/guix.texi:3217 guix-git/doc/guix.texi:5744
 msgid "As an example, @var{file} might contain a definition like this (@pxref{Defining Packages}):"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:2741 doc/guix.texi:7992
+#. type: include
+#: guix-git/doc/guix.texi:3219 guix-git/doc/guix.texi:10715
 #, no-wrap
-msgid "@verbatiminclude package-hello.scm\n"
+msgid "package-hello.scm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2747
+#: guix-git/doc/guix.texi:3226
 msgid "Developers may find it useful to include such a @file{guix.scm} file in the root of their project source tree that can be used to test development snapshots and create reproducible development environments (@pxref{Invoking guix environment})."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:3231
+msgid "The @var{file} may also contain a JSON representation of one or more package definitions.  Running @code{guix package -f} on @file{hello.json} with the following contents would result in installing the package @code{greeter} after building @code{myhello}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3234 guix-git/doc/guix.texi:10725
+#, no-wrap
+msgid "@verbatiminclude package-hello.json\n"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:2748
+#: guix-git/doc/guix.texi:3236
 #, no-wrap
 msgid "--remove=@var{package} @dots{}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2749
+#: guix-git/doc/guix.texi:3237
 #, no-wrap
 msgid "-r @var{package} @dots{}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2751
+#: guix-git/doc/guix.texi:3239
 msgid "Remove the specified @var{package}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2756
-msgid "As for @code{--install}, each @var{package} may specify a version number and/or output name in addition to the package name.  For instance, @code{-r glibc:debug} would remove the @code{debug} output of @code{glibc}."
+#: guix-git/doc/guix.texi:3244
+msgid "As for @option{--install}, each @var{package} may specify a version number and/or output name in addition to the package name.  For instance, @samp{-r glibc:debug} would remove the @code{debug} output of @code{glibc}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2757
+#: guix-git/doc/guix.texi:3245
 #, no-wrap
 msgid "--upgrade[=@var{regexp} @dots{}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2758
+#: guix-git/doc/guix.texi:3246
 #, no-wrap
 msgid "-u [@var{regexp} @dots{}]"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2759
+#: guix-git/doc/guix.texi:3247
 #, no-wrap
 msgid "upgrading packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2763
-msgid "Upgrade all the installed packages.  If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches a @var{regexp}.  Also see the @code{--do-not-upgrade} option below."
+#: guix-git/doc/guix.texi:3251
+msgid "Upgrade all the installed packages.  If one or more @var{regexp}s are specified, upgrade only installed packages whose name matches a @var{regexp}.  Also see the @option{--do-not-upgrade} option below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2768
+#: guix-git/doc/guix.texi:3256
 msgid "Note that this upgrades package to the latest version of packages found in the distribution currently installed.  To update your distribution, you should regularly run @command{guix pull} (@pxref{Invoking guix pull})."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:3257
+#, fuzzy, no-wrap
+#| msgid "Package Transformation Options"
+msgid "package transformations, upgrades"
+msgstr "软件包变换选项。"
+
+#. type: table
+#: guix-git/doc/guix.texi:3262
+msgid "When upgrading, package transformations that were originally applied when creating the profile are automatically re-applied (@pxref{Package Transformation Options}).  For example, assume you first installed Emacs from the tip of its development branch with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3265
+#, no-wrap
+msgid "guix install emacs-next --with-branch=emacs-next=master\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3270
+msgid "Next time you run @command{guix upgrade}, Guix will again pull the tip of the Emacs development branch and build @code{emacs-next} from that checkout."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3275
+msgid "Note that transformation options such as @option{--with-branch} and @option{--with-source} depend on external state; it is up to you to ensure that they work as expected.  You can also discard a transformations that apply to a package by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3278
+#, fuzzy, no-wrap
+#| msgid "guix install emacs-guix\n"
+msgid "guix install @var{package}\n"
+msgstr "guix install emacs-guix\n"
+
 #. type: item
-#: doc/guix.texi:2769
+#: guix-git/doc/guix.texi:3280
 #, no-wrap
 msgid "--do-not-upgrade[=@var{regexp} @dots{}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2774
-msgid "When used together with the @code{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}.  For example, to upgrade all packages in the current profile except those containing the substring ``emacs'':"
+#: guix-git/doc/guix.texi:3285
+msgid "When used together with the @option{--upgrade} option, do @emph{not} upgrade any packages whose name matches a @var{regexp}.  For example, to upgrade all packages in the current profile except those containing the substring ``emacs'':"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2777
+#: guix-git/doc/guix.texi:3288
 #, no-wrap
 msgid "$ guix package --upgrade . --do-not-upgrade emacs\n"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:2779
+#: guix-git/doc/guix.texi:3290
 #, no-wrap
 msgid "profile-manifest"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2779 doc/guix.texi:4529 doc/guix.texi:4870 doc/guix.texi:8916
-#: doc/guix.texi:10099
+#: guix-git/doc/guix.texi:3290 guix-git/doc/guix.texi:5749
+#: guix-git/doc/guix.texi:6168 guix-git/doc/guix.texi:11778
+#: guix-git/doc/guix.texi:13215
 #, no-wrap
 msgid "--manifest=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2780 doc/guix.texi:4530 doc/guix.texi:4871 doc/guix.texi:8917
+#: guix-git/doc/guix.texi:3291 guix-git/doc/guix.texi:5750
+#: guix-git/doc/guix.texi:6169 guix-git/doc/guix.texi:11779
 #, no-wrap
 msgid "-m @var{file}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2781
+#: guix-git/doc/guix.texi:3292
 #, no-wrap
 msgid "profile declaration"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2782
+#: guix-git/doc/guix.texi:3293
 #, no-wrap
 msgid "profile manifest"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2785
-msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}."
+#: guix-git/doc/guix.texi:3297
+msgid "Create a new generation of the profile from the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2791
-msgid "This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @code{--install} and similar commands.  The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the same profile, and so on."
+#: guix-git/doc/guix.texi:3303
+msgid "This allows you to @emph{declare} the profile's contents rather than constructing it through a sequence of @option{--install} and similar commands.  The advantage is that @var{file} can be put under version control, copied to different machines to reproduce the same profile, and so on."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2795
+#: guix-git/doc/guix.texi:3307
 msgid "@var{file} must return a @dfn{manifest} object, which is roughly a list of packages:"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:2796
+#: guix-git/doc/guix.texi:3308
 #, no-wrap
 msgid "packages->manifest"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:2799
+#. type: lisp
+#: guix-git/doc/guix.texi:3311
 #, no-wrap
 msgid ""
 "(use-package-modules guile emacs)\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:2805
+#. type: lisp
+#: guix-git/doc/guix.texi:3317
 #, no-wrap
 msgid ""
 "(packages->manifest\n"
@@ -6649,140 +8590,147 @@ msgid ""
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:2807
+#: guix-git/doc/guix.texi:3319
 #, no-wrap
 msgid "specifications->manifest"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2814
+#: guix-git/doc/guix.texi:3326
 msgid "In this example we have to know which modules define the @code{emacs} and @code{guile-2.0} variables to provide the right @code{use-package-modules} line, which can be cumbersome.  We can instead provide regular package specifications and let @code{specifications->manifest} look up the corresponding package objects, like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:2818
+#. type: lisp
+#: guix-git/doc/guix.texi:3330
 #, no-wrap
 msgid ""
 "(specifications->manifest\n"
 " '(\"emacs\" \"guile@@2.2\" \"guile@@2.2:debug\"))\n"
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:3334
+msgid "@xref{export-manifest, @option{--export-manifest}}, to learn how to obtain a manifest file from an existing profile."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:2820
+#: guix-git/doc/guix.texi:3335 guix-git/doc/guix.texi:4437
 #, no-wrap
 msgid "--roll-back"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2821 doc/guix.texi:24354
+#: guix-git/doc/guix.texi:3336 guix-git/doc/guix.texi:4438
+#: guix-git/doc/guix.texi:32922
 #, no-wrap
 msgid "rolling back"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2822
+#: guix-git/doc/guix.texi:3337 guix-git/doc/guix.texi:4439
 #, no-wrap
 msgid "undoing transactions"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2823
+#: guix-git/doc/guix.texi:3338 guix-git/doc/guix.texi:4440
 #, no-wrap
 msgid "transactions, undoing"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2826
+#: guix-git/doc/guix.texi:3341
 msgid "Roll back to the previous @dfn{generation} of the profile---i.e., undo the last transaction."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2829
-msgid "When combined with options such as @code{--install}, roll back occurs before any other actions."
+#: guix-git/doc/guix.texi:3344
+msgid "When combined with options such as @option{--install}, roll back occurs before any other actions."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2833
+#: guix-git/doc/guix.texi:3348
 msgid "When rolling back from the first generation that actually contains installed packages, the profile is made to point to the @dfn{zeroth generation}, which contains no files apart from its own metadata."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2837
+#: guix-git/doc/guix.texi:3352
 msgid "After having rolled back, installing, removing, or upgrading packages overwrites previous future generations.  Thus, the history of the generations in a profile is always linear."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2838
+#: guix-git/doc/guix.texi:3353 guix-git/doc/guix.texi:4444
 #, no-wrap
 msgid "--switch-generation=@var{pattern}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2839
+#: guix-git/doc/guix.texi:3354 guix-git/doc/guix.texi:4445
 #, no-wrap
 msgid "-S @var{pattern}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2840 doc/guix.texi:3036 doc/guix.texi:24312
+#: guix-git/doc/guix.texi:3355 guix-git/doc/guix.texi:3585
+#: guix-git/doc/guix.texi:4446 guix-git/doc/guix.texi:32880
 #, no-wrap
 msgid "generations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2842
+#: guix-git/doc/guix.texi:3357 guix-git/doc/guix.texi:4448
 msgid "Switch to a particular generation defined by @var{pattern}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2848
-msgid "@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''.  The latter means: move forward/backward by a specified number of generations.  For example, if you want to return to the latest generation after @code{--roll-back}, use @code{--switch-generation=+1}."
+#: guix-git/doc/guix.texi:3363 guix-git/doc/guix.texi:4454
+msgid "@var{pattern} may be either a generation number or a number prefixed with ``+'' or ``-''.  The latter means: move forward/backward by a specified number of generations.  For example, if you want to return to the latest generation after @option{--roll-back}, use @option{--switch-generation=+1}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2853
-msgid "The difference between @code{--roll-back} and @code{--switch-generation=-1} is that @code{--switch-generation} will not make a zeroth generation, so if a specified generation does not exist, the current generation will not be changed."
+#: guix-git/doc/guix.texi:3368
+msgid "The difference between @option{--roll-back} and @option{--switch-generation=-1} is that @option{--switch-generation} will not make a zeroth generation, so if a specified generation does not exist, the current generation will not be changed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2854
+#: guix-git/doc/guix.texi:3369
 #, no-wrap
 msgid "--search-paths[=@var{kind}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2860
+#: guix-git/doc/guix.texi:3375
 msgid "Report environment variable definitions, in Bash syntax, that may be needed in order to use the set of installed packages.  These environment variables are used to specify @dfn{search paths} for files used by some of the installed packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2868
-msgid "For example, GCC needs the @code{CPATH} and @code{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}).  If GCC and, say, the C library are installed in the profile, then @code{--search-paths} will suggest setting these variables to @code{@var{profile}/include} and @code{@var{profile}/lib}, respectively."
+#: guix-git/doc/guix.texi:3383
+msgid "For example, GCC needs the @env{CPATH} and @env{LIBRARY_PATH} environment variables to be defined so it can look for headers and libraries in the user's profile (@pxref{Environment Variables,,, gcc, Using the GNU Compiler Collection (GCC)}).  If GCC and, say, the C library are installed in the profile, then @option{--search-paths} will suggest setting these variables to @file{@var{profile}/include} and @file{@var{profile}/lib}, respectively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2871
+#: guix-git/doc/guix.texi:3386
 msgid "The typical use case is to define these environment variables in the shell:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2874
+#: guix-git/doc/guix.texi:3389
 #, no-wrap
 msgid "$ eval `guix package --search-paths`\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2880
+#: guix-git/doc/guix.texi:3395
 msgid "@var{kind} may be one of @code{exact}, @code{prefix}, or @code{suffix}, meaning that the returned environment variable definitions will either be exact settings, or prefixes or suffixes of the current value of these variables.  When omitted, @var{kind} defaults to @code{exact}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2883
+#: guix-git/doc/guix.texi:3398
 msgid "This option can also be used to compute the @emph{combined} search paths of several profiles.  Consider this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2888
+#: guix-git/doc/guix.texi:3403
 #, no-wrap
 msgid ""
 "$ guix package -p foo -i guile\n"
@@ -6791,107 +8739,174 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2893
-msgid "The last command above reports about the @code{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor @file{bar} would lead to that recommendation."
+#: guix-git/doc/guix.texi:3408
+msgid "The last command above reports about the @env{GUILE_LOAD_PATH} variable, even though, taken individually, neither @file{foo} nor @file{bar} would lead to that recommendation."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:3410
+#, no-wrap
+msgid "profile, choosing"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2895 doc/guix.texi:3713 doc/guix.texi:4160
+#: guix-git/doc/guix.texi:3411 guix-git/doc/guix.texi:4474
+#: guix-git/doc/guix.texi:4803
 #, no-wrap
 msgid "--profile=@var{profile}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2896 doc/guix.texi:3714 doc/guix.texi:4161
+#: guix-git/doc/guix.texi:3412 guix-git/doc/guix.texi:4475
+#: guix-git/doc/guix.texi:4804
 #, no-wrap
 msgid "-p @var{profile}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2898
+#: guix-git/doc/guix.texi:3414
 msgid "Use @var{profile} instead of the user's default profile."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:3419
+msgid "@var{profile} must be the name of a file that will be created upon completion.  Concretely, @var{profile} will be a mere symbolic link (``symlink'') pointing to the actual profile where packages are installed:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3425
+#, no-wrap
+msgid ""
+"$ guix install hello -p ~/code/my-profile\n"
+"@dots{}\n"
+"$ ~/code/my-profile/bin/hello\n"
+"Hello, world!\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3429
+msgid "All it takes to get rid of the profile is to remove this symlink and its siblings that point to specific generations:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3432
+#, no-wrap
+msgid "$ rm ~/code/my-profile ~/code/my-profile-*-link\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:3434
+#, no-wrap
+msgid "--list-profiles"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3436
+msgid "List all the user's profiles:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3443
+#, no-wrap
+msgid ""
+"$ guix package --list-profiles\n"
+"/home/charlie/.guix-profile\n"
+"/home/charlie/code/my-profile\n"
+"/home/charlie/code/devel-profile\n"
+"/home/charlie/tmp/test\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3446
+msgid "When running as root, list all the profiles of all the users."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:2899
+#: guix-git/doc/guix.texi:3447
 #, no-wrap
 msgid "collisions, in a profile"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2900
+#: guix-git/doc/guix.texi:3448
 #, no-wrap
 msgid "colliding packages in profiles"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:2901
+#: guix-git/doc/guix.texi:3449
 #, no-wrap
 msgid "profile collisions"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2902
+#: guix-git/doc/guix.texi:3450
 #, no-wrap
 msgid "--allow-collisions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2904
+#: guix-git/doc/guix.texi:3452
 msgid "Allow colliding packages in the new profile.  Use at your own risk!"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2908
+#: guix-git/doc/guix.texi:3456
 msgid "By default, @command{guix package} reports as an error @dfn{collisions} in the profile.  Collisions happen when two or more different versions or variants of a given package end up in the profile."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2909 doc/guix.texi:3730 doc/guix.texi:4944
+#: guix-git/doc/guix.texi:3457 guix-git/doc/guix.texi:4517
+#: guix-git/doc/guix.texi:6254
 #, no-wrap
 msgid "--bootstrap"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2912
+#: guix-git/doc/guix.texi:3460
 msgid "Use the bootstrap Guile to build the profile.  This option is only useful to distribution developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:2918
+#: guix-git/doc/guix.texi:3466
 msgid "In addition to these actions, @command{guix package} supports the following options to query the current state of a profile, or the availability of packages:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2921
+#: guix-git/doc/guix.texi:3469
 #, no-wrap
 msgid "--search=@var{regexp}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:2922
+#: guix-git/doc/guix.texi:3470
 #, no-wrap
 msgid "-s @var{regexp}"
 msgstr ""
 
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:3472
+msgid "guix-search"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:2923
+#: guix-git/doc/guix.texi:3472
 #, no-wrap
 msgid "searching for packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2929
+#: guix-git/doc/guix.texi:3478
 msgid "List the available packages whose name, synopsis, or description matches @var{regexp} (in a case-insensitive fashion), sorted by relevance.  Print all the metadata of matching packages in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2932
+#: guix-git/doc/guix.texi:3481
 msgid "This allows specific fields to be extracted using the @command{recsel} command, for instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2938
+#: guix-git/doc/guix.texi:3487
 #, no-wrap
 msgid ""
 "$ guix package -s malloc | recsel -p name,version,relevance\n"
@@ -6902,7 +8917,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2942
+#: guix-git/doc/guix.texi:3491
 #, no-wrap
 msgid ""
 "name: glibc\n"
@@ -6912,7 +8927,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2946
+#: guix-git/doc/guix.texi:3495
 #, no-wrap
 msgid ""
 "name: libgc\n"
@@ -6921,12 +8936,12 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2950
+#: guix-git/doc/guix.texi:3499
 msgid "Similarly, to show the name of all the packages available under the terms of the GNU@tie{}LGPL version 3:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2954
+#: guix-git/doc/guix.texi:3503
 #, no-wrap
 msgid ""
 "$ guix package -s \"\" | recsel -p name -e 'license ~ \"LGPL 3\"'\n"
@@ -6935,7 +8950,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2957
+#: guix-git/doc/guix.texi:3506
 #, no-wrap
 msgid ""
 "name: gmp\n"
@@ -6943,12 +8958,12 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2963
+#: guix-git/doc/guix.texi:3512
 msgid "It is also possible to refine search results using several @code{-s} flags to @command{guix package}, or several arguments to @command{guix search}.  For example, the following command returns a list of board games (this time using the @command{guix search} alias):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2968
+#: guix-git/doc/guix.texi:3517
 #, no-wrap
 msgid ""
 "$ guix search '\\<board\\>' game | recsel -p name\n"
@@ -6957,17 +8972,17 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2974
+#: guix-git/doc/guix.texi:3523
 msgid "If we were to omit @code{-s game}, we would also get software packages that deal with printed circuit boards; removing the angle brackets around @code{board} would further add packages that have to do with keyboards."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2978
+#: guix-git/doc/guix.texi:3527
 msgid "And now for a more elaborate example.  The following command searches for cryptographic libraries, filters out Haskell, Perl, Python, and Ruby libraries, and prints the name and synopsis of the matching packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2982
+#: guix-git/doc/guix.texi:3531
 #, no-wrap
 msgid ""
 "$ guix search crypto library | \\\n"
@@ -6975,23 +8990,23 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2987
+#: guix-git/doc/guix.texi:3536
 msgid "@xref{Selection Expressions,,, recutils, GNU recutils manual}, for more information on @dfn{selection expressions} for @code{recsel -e}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:2988
+#: guix-git/doc/guix.texi:3537
 #, no-wrap
 msgid "--show=@var{package}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:2992
+#: guix-git/doc/guix.texi:3541
 msgid "Show details about @var{package}, taken from the list of available packages, in @code{recutils} format (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:2997
+#: guix-git/doc/guix.texi:3546
 #, no-wrap
 msgid ""
 "$ guix package --show=python | recsel -p name,version\n"
@@ -7001,7 +9016,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3000
+#: guix-git/doc/guix.texi:3549
 #, no-wrap
 msgid ""
 "name: python\n"
@@ -7009,259 +9024,323 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3004
-msgid "You may also specify the full name of a package to only get details about a specific version of it:"
+#: guix-git/doc/guix.texi:3553
+msgid "You may also specify the full name of a package to only get details about a specific version of it (this time using the @command{guix show} alias):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3008
+#: guix-git/doc/guix.texi:3557
 #, no-wrap
 msgid ""
-"$ guix package --show=python@@3.4 | recsel -p name,version\n"
+"$ guix show python@@3.4 | recsel -p name,version\n"
 "name: python\n"
 "version: 3.4.3\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3012
+#: guix-git/doc/guix.texi:3561
 #, no-wrap
 msgid "--list-installed[=@var{regexp}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3013
+#: guix-git/doc/guix.texi:3562
 #, no-wrap
 msgid "-I [@var{regexp}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3017
+#: guix-git/doc/guix.texi:3566
 msgid "List the currently installed packages in the specified profile, with the most recently installed packages shown last.  When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3023
+#: guix-git/doc/guix.texi:3572
 msgid "For each installed package, print the following items, separated by tabs: the package name, its version string, the part of the package that is installed (for instance, @code{out} for the default output, @code{include} for its headers, etc.), and the path of this package in the store."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3024
+#: guix-git/doc/guix.texi:3573
 #, no-wrap
 msgid "--list-available[=@var{regexp}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3025
+#: guix-git/doc/guix.texi:3574
 #, no-wrap
 msgid "-A [@var{regexp}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3029
-msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, list only installed packages whose name matches @var{regexp}."
+#: guix-git/doc/guix.texi:3578
+msgid "List packages currently available in the distribution for this system (@pxref{GNU Distribution}).  When @var{regexp} is specified, list only available packages whose name matches @var{regexp}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3033
+#: guix-git/doc/guix.texi:3582
 msgid "For each package, print the following items separated by tabs: its name, its version string, the parts of the package (@pxref{Packages with Multiple Outputs}), and the source location of its definition."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3034 doc/guix.texi:3703
+#: guix-git/doc/guix.texi:3583 guix-git/doc/guix.texi:4430
 #, no-wrap
 msgid "--list-generations[=@var{pattern}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3035 doc/guix.texi:3704
+#: guix-git/doc/guix.texi:3584 guix-git/doc/guix.texi:4431
 #, no-wrap
 msgid "-l [@var{pattern}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3041
+#: guix-git/doc/guix.texi:3590
 msgid "Return a list of generations along with their creation dates; for each generation, show the installed packages, with the most recently installed packages shown last.  Note that the zeroth generation is never shown."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3046
+#: guix-git/doc/guix.texi:3595
 msgid "For each installed package, print the following items, separated by tabs: the name of a package, its version string, the part of the package that is installed (@pxref{Packages with Multiple Outputs}), and the location of this package in the store."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3049
+#: guix-git/doc/guix.texi:3598
 msgid "When @var{pattern} is used, the command returns only matching generations.  Valid patterns include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3051
+#: guix-git/doc/guix.texi:3600
 #, no-wrap
 msgid "@emph{Integers and comma-separated integers}.  Both patterns denote"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:3054
-msgid "generation numbers.  For instance, @code{--list-generations=1} returns the first one."
+#: guix-git/doc/guix.texi:3603
+msgid "generation numbers.  For instance, @option{--list-generations=1} returns the first one."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:3057
-msgid "And @code{--list-generations=1,8,2} outputs three generations in the specified order.  Neither spaces nor trailing commas are allowed."
+#: guix-git/doc/guix.texi:3606
+msgid "And @option{--list-generations=1,8,2} outputs three generations in the specified order.  Neither spaces nor trailing commas are allowed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3058
+#: guix-git/doc/guix.texi:3607
 #, no-wrap
-msgid "@emph{Ranges}.  @code{--list-generations=2..9} prints the"
+msgid "@emph{Ranges}.  @option{--list-generations=2..9} prints the"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:3061
+#: guix-git/doc/guix.texi:3610
 msgid "specified generations and everything in between.  Note that the start of a range must be smaller than its end."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:3065
-msgid "It is also possible to omit the endpoint.  For example, @code{--list-generations=2..}, returns all generations starting from the second one."
+#: guix-git/doc/guix.texi:3614
+msgid "It is also possible to omit the endpoint.  For example, @option{--list-generations=2..}, returns all generations starting from the second one."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3066
+#: guix-git/doc/guix.texi:3615
 #, no-wrap
 msgid "@emph{Durations}.  You can also get the last @emph{N}@tie{}days, weeks,"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:3070
-msgid "or months by passing an integer along with the first letter of the duration.  For example, @code{--list-generations=20d} lists generations that are up to 20 days old."
+#: guix-git/doc/guix.texi:3619
+msgid "or months by passing an integer along with the first letter of the duration.  For example, @option{--list-generations=20d} lists generations that are up to 20 days old."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3072
+#: guix-git/doc/guix.texi:3621 guix-git/doc/guix.texi:4455
 #, no-wrap
 msgid "--delete-generations[=@var{pattern}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3073
+#: guix-git/doc/guix.texi:3622 guix-git/doc/guix.texi:4456
 #, no-wrap
 msgid "-d [@var{pattern}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3076
+#: guix-git/doc/guix.texi:3625 guix-git/doc/guix.texi:4459
 msgid "When @var{pattern} is omitted, delete all generations except the current one."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3082
-msgid "This command accepts the same patterns as @option{--list-generations}.  When @var{pattern} is specified, delete the matching generations.  When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match.  For instance, @code{--delete-generations=1m} deletes generations that are more than one month old."
+#: guix-git/doc/guix.texi:3631 guix-git/doc/guix.texi:4465
+msgid "This command accepts the same patterns as @option{--list-generations}.  When @var{pattern} is specified, delete the matching generations.  When @var{pattern} specifies a duration, generations @emph{older} than the specified duration match.  For instance, @option{--delete-generations=1m} deletes generations that are more than one month old."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3085
+#: guix-git/doc/guix.texi:3634
 msgid "If the current generation matches, it is @emph{not} deleted.  Also, the zeroth generation is never deleted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3088
+#: guix-git/doc/guix.texi:3637 guix-git/doc/guix.texi:4470
 msgid "Note that deleting generations prevents rolling back to them.  Consequently, this command must be used with care."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:3638
+#, no-wrap
+msgid "manifest, exporting"
+msgstr ""
+
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:3640
+msgid "export-manifest"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:3640
+#, no-wrap
+msgid "--export-manifest"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3643
+msgid "Write to standard output a manifest suitable for @option{--manifest} corresponding to the chosen profile(s)."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3647
+msgid "This option is meant to help you migrate from the ``imperative'' operating mode---running @command{guix install}, @command{guix upgrade}, etc.---to the declarative mode that @option{--manifest} offers."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3652
+msgid "Be aware that the resulting manifest @emph{approximates} what your profile actually contains; for instance, depending on how your profile was created, it can refer to packages or package versions that are not exactly what you specified."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3657
+msgid "Keep in mind that a manifest is purely symbolic: it only contains package names and possibly versions, and their meaning varies over time.  If you wish to ``pin'' channels to the revisions that were used to build the profile(s), see @option{--export-channels} below."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:3658
+#, fuzzy, no-wrap
+#| msgid "Interacting with another revision of Guix."
+msgid "pinning, channel revisions of a profile"
+msgstr "和其它版本的Guix交互。"
+
+#. type: item
+#: guix-git/doc/guix.texi:3659
+#, no-wrap
+msgid "--export-channels"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3663
+msgid "Write to standard output the list of channels used by the chosen profile(s), in a format suitable for @command{guix pull --channels} or @command{guix time-machine --channels} (@pxref{Channels})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3667
+msgid "Together with @option{--export-manifest}, this option provides information allowing you to replicate the current profile (@pxref{Replicating Guix})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3675
+msgid "However, note that the output of this command @emph{approximates} what was actually used to build this profile.  In particular, a single profile might have been built from several different revisions of the same channel.  In that case, @option{--export-manifest} chooses the last one and writes the list of other revisions in a comment.  If you really need to pick packages from different channel revisions, you can use inferiors in your manifest to do so (@pxref{Inferiors})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:3680
+msgid "Together with @option{--export-manifest}, this is a good starting point if you are willing to migrate from the ``imperative'' model to the fully declarative model consisting of a manifest file along with a channels file pinning the exact channel revision(s) you want."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:3099
-msgid "Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common Build Options}).  It also supports package transformation options, such as @option{--with-source} (@pxref{Package Transformation Options}).  However, note that package transformations are lost when upgrading; to preserve transformations across upgrades, you should define your own package variant in a Guile module and add it to @code{GUIX_PACKAGE_PATH} (@pxref{Defining Packages})."
+#: guix-git/doc/guix.texi:3687
+msgid "Finally, since @command{guix package} may actually start build processes, it supports all the common build options (@pxref{Common Build Options}).  It also supports package transformation options, such as @option{--with-source}, and preserves them across upgrades (@pxref{Package Transformation Options})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3104
+#: guix-git/doc/guix.texi:3692
 #, no-wrap
 msgid "pre-built binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3110
+#: guix-git/doc/guix.texi:3698
 msgid "Guix supports transparent source/binary deployment, which means that it can either build things locally, or download pre-built items from a server, or both.  We call these pre-built items @dfn{substitutes}---they are substitutes for local build results.  In many cases, downloading a substitute is much faster than building things locally."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3115
+#: guix-git/doc/guix.texi:3703
 msgid "Substitutes can be anything resulting from a derivation build (@pxref{Derivations}).  Of course, in the common case, they are pre-built package binaries, but source tarballs, for instance, which also result from derivation builds, can be available as substitutes."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3128
-#, no-wrap
-msgid "hydra"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:3129
+#: guix-git/doc/guix.texi:3717
 #, no-wrap
 msgid "build farm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3139
+#: guix-git/doc/guix.texi:3727
 msgid "The @code{@value{SUBSTITUTE-SERVER}} server is a front-end to an official build farm that builds packages from Guix continuously for some architectures, and makes them available as substitutes.  This is the default source of substitutes; it can be overridden by passing the @option{--substitute-urls} option either to @command{guix-daemon} (@pxref{daemon-substitute-urls,, @code{guix-daemon --substitute-urls}})  or to client tools such as @command{guix package} (@pxref{client-substitute-urls,, client @option{--substitute-urls} option})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3145
+#: guix-git/doc/guix.texi:3733
 msgid "Substitute URLs can be either HTTP or HTTPS.  HTTPS is recommended because communications are encrypted; conversely, using HTTP makes all communications visible to an eavesdropper, who could use the information gathered to determine, for instance, whether your system has unpatched security vulnerabilities."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3154
+#: guix-git/doc/guix.texi:3742
 msgid "Substitutes from the official build farm are enabled by default when using Guix System (@pxref{GNU Distribution}).  However, they are disabled by default when using Guix on a foreign distribution, unless you have explicitly enabled them via one of the recommended installation steps (@pxref{Installation}).  The following paragraphs describe how to enable or disable substitutes for the official build farm; the same procedure can also be used to enable substitutes for any other substitute server."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3158
+#: guix-git/doc/guix.texi:3746
 #, no-wrap
 msgid "security"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3160
+#: guix-git/doc/guix.texi:3748
 #, no-wrap
 msgid "access control list (ACL), for substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3161
+#: guix-git/doc/guix.texi:3749
 #, no-wrap
 msgid "ACL (access control list), for substitutes"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3168
+#: guix-git/doc/guix.texi:3756
 msgid "To allow Guix to download substitutes from @code{@value{SUBSTITUTE-SERVER}} or a mirror thereof, you must add its public key to the access control list (ACL) of archive imports, using the @command{guix archive} command (@pxref{Invoking guix archive}).  Doing so implies that you trust @code{@value{SUBSTITUTE-SERVER}} to not be compromised and to serve genuine substitutes."
 msgstr ""
 
+#. type: quotation
+#: guix-git/doc/guix.texi:3760
+msgid "If you are using Guix System, you can skip this section: Guix System authorizes substitutes from @code{@value{SUBSTITUTE-SERVER}} by default."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:3175
+#: guix-git/doc/guix.texi:3768
 msgid "The public key for @code{@value{SUBSTITUTE-SERVER}} is installed along with Guix, in @code{@var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub}, where @var{prefix} is the installation prefix of Guix.  If you installed Guix from source, make sure you checked the GPG signature of @file{guix-@value{VERSION}.tar.gz}, which contains this public key file.  Then, you can run something like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3178
+#: guix-git/doc/guix.texi:3771
 #, no-wrap
 msgid "# guix archive --authorize < @var{prefix}/share/guix/@value{SUBSTITUTE-SERVER}.pub\n"
 msgstr ""
 
-#. type: quotation
-#: doc/guix.texi:3184
-msgid "Similarly, the @file{hydra.gnu.org.pub} file contains the public key of an independent build farm also run by the project, reachable at @indicateurl{https://mirror.hydra.gnu.org}."
-msgstr ""
-
 #. type: Plain text
-#: doc/guix.texi:3188
+#: guix-git/doc/guix.texi:3775
 msgid "Once this is in place, the output of a command like @code{guix build} should change from something like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3197
+#: guix-git/doc/guix.texi:3784
 #, no-wrap
 msgid ""
 "$ guix build emacs --dry-run\n"
@@ -7274,12 +9353,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3201
+#: guix-git/doc/guix.texi:3788
 msgid "to something like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3210
+#: guix-git/doc/guix.texi:3797
 #, no-wrap
 msgid ""
 "$ guix build emacs --dry-run\n"
@@ -7292,590 +9371,759 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3215
-msgid "This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds."
+#: guix-git/doc/guix.texi:3804
+msgid "The text changed from ``The following derivations would be built'' to ``112.3 MB would be downloaded''.  This indicates that substitutes from @code{@value{SUBSTITUTE-SERVER}} are usable and will be downloaded, when possible, for future builds."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3216
+#: guix-git/doc/guix.texi:3805
 #, no-wrap
 msgid "substitutes, how to disable"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3222
-msgid "The substitute mechanism can be disabled globally by running @code{guix-daemon} with @code{--no-substitutes} (@pxref{Invoking guix-daemon}).  It can also be disabled temporarily by passing the @code{--no-substitutes} option to @command{guix package}, @command{guix build}, and other command-line tools."
+#: guix-git/doc/guix.texi:3811
+msgid "The substitute mechanism can be disabled globally by running @code{guix-daemon} with @option{--no-substitutes} (@pxref{Invoking guix-daemon}).  It can also be disabled temporarily by passing the @option{--no-substitutes} option to @command{guix package}, @command{guix build}, and other command-line tools."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3226
+#: guix-git/doc/guix.texi:3815
+#, fuzzy, no-wrap
+#| msgid "Substitute Server Authorization"
+msgid "substitute servers, adding more"
+msgstr "授权substitute服务器。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3822
+msgid "Guix can look up and fetch substitutes from several servers.  This is useful when you are using packages from additional channels for which the official server does not have substitutes but another server provides them.  Another situation where this is useful is when you would prefer to download from your organization's substitute server, resorting to the official server only as a fallback or dismissing it altogether."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3827
+msgid "You can give Guix a list of substitute server URLs and it will check them in the specified order.  You also need to explicitly authorize the public keys of substitute servers to instruct Guix to accept the substitutes they sign."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3834
+msgid "On Guix System, this is achieved by modifying the configuration of the @code{guix} service.  Since the @code{guix} service is part of the default lists of services, @code{%base-services} and @code{%desktop-services}, you can use @code{modify-services} to change its configuration and add the URLs and substitute keys that you want (@pxref{Service Reference, @code{modify-services}})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3839
+msgid "As an example, suppose you want to fetch substitutes from @code{guix.example.org} and to authorize the signing key of that server, in addition to the default @code{@value{SUBSTITUTE-SERVER}}.  The resulting operating system configuration will look something like:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:3856
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ;; @dots{}\n"
+"  (services\n"
+"    ;; Assume we're starting from '%desktop-services'.  Replace it\n"
+"    ;; with the list of services you're actually using.\n"
+"    (modify-services %desktop-services\n"
+"      (guix-service-type config =>\n"
+"                        (guix-configuration\n"
+"                          (inherit config)\n"
+"                          (substitute-urls\n"
+"                            (append (list \"https://guix.example.org\")\n"
+"                                    %default-substitute-urls))\n"
+"                          (authorized-keys\n"
+"                            (append (list (local-file \"./key.pub\"))\n"
+"                                    %default-authorized-guix-keys)))))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3863
+msgid "This assumes that the file @file{key.pub} contains the signing key of @code{guix.example.org}.  With this change in place in your operating system configuration file (say @file{/etc/config.scm}), you can reconfigure and restart the @code{guix-daemon} service or reboot so the changes take effect:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3867
+#, no-wrap
+msgid ""
+"$ sudo guix system reconfigure /etc/config.scm\n"
+"$ sudo herd restart guix-daemon\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3871
+msgid "If you're running Guix on a ``foreign distro'', you would instead take the following steps to get substitutes from additional servers:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:3880
+msgid "Edit the service configuration file for @code{guix-daemon}; when using systemd, this is normally @file{/etc/systemd/system/guix-daemon.service}.  Add the @option{--substitute-urls} option on the @command{guix-daemon} command line and list the URLs of interest (@pxref{daemon-substitute-urls, @code{guix-daemon --substitute-urls}}):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3883
+#, no-wrap
+msgid "@dots{} --substitute-urls='https://guix.example.org https://@value{SUBSTITUTE-SERVER}'\n"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:3887
+msgid "Restart the daemon.  For systemd, it goes like this:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3891
+#, no-wrap
+msgid ""
+"systemctl daemon-reload\n"
+"systemctl restart guix-daemon.service\n"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:3895
+msgid "Authorize the key of the new server (@pxref{Invoking guix archive}):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:3898
+#, fuzzy, no-wrap
+#| msgid "# guix archive --authorize < master-public-key.txt\n"
+msgid "guix archive --authorize < key.pub\n"
+msgstr "# guix archive --authorize < master-public-key.txt\n"
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:3902
+msgid "Again this assumes @file{key.pub} contains the public key that @code{guix.example.org} uses to sign substitutes."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3909
+msgid "Now you're all set! Substitutes will be preferably taken from @code{https://guix.example.org}, using @code{@value{SUBSTITUTE-SERVER}} as a fallback.  Of course you can list as many substitute servers as you like, with the caveat that substitute lookup can be slowed down if too many servers need to be contacted."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:3913
+msgid "Note that there are also situations where one may want to add the URL of a substitute server @emph{without} authorizing its key.  @xref{Substitute Authentication}, to understand this fine point."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:3917
 #, no-wrap
 msgid "digital signatures"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3230
+#: guix-git/doc/guix.texi:3921
 msgid "Guix detects and raises an error when attempting to use a substitute that has been tampered with.  Likewise, it ignores substitutes that are not signed, or that are not signed by one of the keys listed in the ACL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3236
+#: guix-git/doc/guix.texi:3927
 msgid "There is one exception though: if an unauthorized server provides substitutes that are @emph{bit-for-bit identical} to those provided by an authorized server, then the unauthorized server becomes eligible for downloads.  For example, assume we have chosen two substitute servers with this option:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3239
+#: guix-git/doc/guix.texi:3930
 #, no-wrap
 msgid "--substitute-urls=\"https://a.example.org https://b.example.org\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3250
-msgid "If the ACL contains only the key for @code{b.example.org}, and if @code{a.example.org} happens to serve the @emph{exact same} substitutes, then Guix will download substitutes from @code{a.example.org} because it comes first in the list and can be considered a mirror of @code{b.example.org}.  In practice, independent build machines usually produce the same binaries, thanks to bit-reproducible builds (see below)."
+#: guix-git/doc/guix.texi:3941
+msgid "If the ACL contains only the key for @samp{b.example.org}, and if @samp{a.example.org} happens to serve the @emph{exact same} substitutes, then Guix will download substitutes from @samp{a.example.org} because it comes first in the list and can be considered a mirror of @samp{b.example.org}.  In practice, independent build machines usually produce the same binaries, thanks to bit-reproducible builds (see below)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3257
-msgid "When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary to what HTTPS clients such as Web browsers usually do.  This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and public keys.)"
+#: guix-git/doc/guix.texi:3948
+msgid "When using HTTPS, the server's X.509 certificate is @emph{not} validated (in other words, the server is not authenticated), contrary to what HTTPS clients such as Web browsers usually do.  This is because Guix authenticates substitute information itself, as explained above, which is what we care about (whereas X.509 certificates are about authenticating bindings between domain names and public keys)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3269
-msgid "Substitutes are downloaded over HTTP or HTTPS.  The @code{http_proxy} environment variable can be set in the environment of @command{guix-daemon} and is honored for downloads of substitutes.  Note that the value of @code{http_proxy} in the environment where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}."
+#: guix-git/doc/guix.texi:3960
+msgid "Substitutes are downloaded over HTTP or HTTPS@.  The @env{http_proxy} and @env{https_proxy} environment variables can be set in the environment of @command{guix-daemon} and are honored for downloads of substitutes.  Note that the value of those environment variables in the environment where @command{guix build}, @command{guix package}, and other client commands are run has @emph{absolutely no effect}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3278
+#: guix-git/doc/guix.texi:3969
 msgid "Even when a substitute for a derivation is available, sometimes the substitution attempt will fail.  This can happen for a variety of reasons: the substitute server might be offline, the substitute may recently have been deleted, the connection might have been interrupted, etc."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3292
-msgid "When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt to build the derivation locally depending on whether or not @code{--fallback} was given (@pxref{fallback-option,, common build option @code{--fallback}}).  Specifically, if @code{--fallback} was omitted, then no local build will be performed, and the derivation is considered to have failed.  However, if @code{--fallback} was given, then Guix will attempt to build the derivation locally, and the success or failure of the derivation depends on the success or failure of the local build.  Note that when substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be performed, regardless of whether or not @code{--fallback} was given."
+#: guix-git/doc/guix.texi:3983
+msgid "When substitutes are enabled and a substitute for a derivation is available, but the substitution attempt fails, Guix will attempt to build the derivation locally depending on whether or not @option{--fallback} was given (@pxref{fallback-option,, common build option @option{--fallback}}).  Specifically, if @option{--fallback} was omitted, then no local build will be performed, and the derivation is considered to have failed.  However, if @option{--fallback} was given, then Guix will attempt to build the derivation locally, and the success or failure of the derivation depends on the success or failure of the local build.  Note that when substitutes are disabled or no substitute is available for the derivation in question, a local build will @emph{always} be performed, regardless of whether or not @option{--fallback} was given."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3297
+#: guix-git/doc/guix.texi:3988
 msgid "To get an idea of how many substitutes are available right now, you can try running the @command{guix weather} command (@pxref{Invoking guix weather}).  This command provides statistics on the substitutes provided by a server."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3301
+#: guix-git/doc/guix.texi:3992
 #, no-wrap
 msgid "trust, of pre-built binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3311
+#: guix-git/doc/guix.texi:4002
 msgid "Today, each individual's control over their own computing is at the mercy of institutions, corporations, and groups with enough power and determination to subvert the computing infrastructure and exploit its weaknesses.  While using @code{@value{SUBSTITUTE-SERVER}} substitutes can be convenient, we encourage users to also build on their own, or even run their own build farm, such that @code{@value{SUBSTITUTE-SERVER}} is less of an interesting target.  One way to help is by publishing the software you build using @command{guix publish} so that others have one more choice of server to download substitutes from (@pxref{Invoking guix publish})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3323
+#: guix-git/doc/guix.texi:4014
 msgid "Guix has the foundations to maximize build reproducibility (@pxref{Features}).  In most cases, independent builds of a given package or derivation should yield bit-identical results.  Thus, through a diverse set of independent package builds, we can strengthen the integrity of our systems.  The @command{guix challenge} command aims to help users assess substitute servers, and to assist developers in finding out about non-deterministic package builds (@pxref{Invoking guix challenge}).  Similarly, the @option{--check} option of @command{guix build} allows users to check whether previously-installed substitutes are genuine by rebuilding them locally (@pxref{build-check, @command{guix build --check}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3327
+#: guix-git/doc/guix.texi:4018
 msgid "In the future, we want Guix to have support to publish and retrieve binaries to/from other users, in a peer-to-peer fashion.  If you would like to discuss this project, join us on @email{guix-devel@@gnu.org}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3331
+#: guix-git/doc/guix.texi:4022
 #, no-wrap
 msgid "multiple-output packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3332
+#: guix-git/doc/guix.texi:4023
 #, no-wrap
 msgid "package outputs"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3333
+#: guix-git/doc/guix.texi:4024
 #, no-wrap
 msgid "outputs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3343
+#: guix-git/doc/guix.texi:4034
 msgid "Often, packages defined in Guix have a single @dfn{output}---i.e., the source package leads to exactly one directory in the store.  When running @command{guix install glibc}, one installs the default output of the GNU libc package; the default output is called @code{out}, but its name can be omitted as shown in this command.  In this particular case, the default output of @code{glibc} contains all the C header files, shared libraries, static libraries, Info documentation, and other supporting files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3351
+#: guix-git/doc/guix.texi:4042
 msgid "Sometimes it is more appropriate to separate the various types of files produced from a single source package into separate outputs.  For instance, the GLib C library (used by GTK+ and related packages)  installs more than 20 MiB of reference documentation as HTML pages.  To save space for users who do not need it, the documentation goes to a separate output, called @code{doc}.  To install the main GLib output, which contains everything but the documentation, one would run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3354
+#: guix-git/doc/guix.texi:4045
 #, no-wrap
 msgid "guix install glib\n"
 msgstr "guix install glib\n"
 
 #. type: item
-#: doc/guix.texi:3356 doc/guix.texi:25314 doc/guix.texi:25339
+#: guix-git/doc/guix.texi:4047 guix-git/doc/guix.texi:34245
+#: guix-git/doc/guix.texi:34302
 #, no-wrap
 msgid "documentation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3358
+#: guix-git/doc/guix.texi:4049
 msgid "The command to install its documentation is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3361
+#: guix-git/doc/guix.texi:4052
 #, no-wrap
 msgid "guix install glib:doc\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3372
+#: guix-git/doc/guix.texi:4063
 msgid "Some packages install programs with different ``dependency footprints''.  For instance, the WordNet package installs both command-line tools and graphical user interfaces (GUIs).  The former depend solely on the C library, whereas the latter depend on Tcl/Tk and the underlying X libraries.  In this case, we leave the command-line tools in the default output, whereas the GUIs are in a separate output.  This allows users who do not need the GUIs to save space.  The @command{guix size} command can help find out about such situations (@pxref{Invoking guix size}).  @command{guix graph} can also be helpful (@pxref{Invoking guix graph})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3380
+#: guix-git/doc/guix.texi:4071
 msgid "There are several such multiple-output packages in the GNU distribution.  Other conventional output names include @code{lib} for libraries and possibly header files, @code{bin} for stand-alone programs, and @code{debug} for debugging information (@pxref{Installing Debugging Files}).  The outputs of a packages are listed in the third column of the output of @command{guix package --list-available} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:3383
+#: guix-git/doc/guix.texi:4074
 #, no-wrap
 msgid "Invoking @command{guix gc}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3385
+#: guix-git/doc/guix.texi:4076
 #, no-wrap
 msgid "garbage collector"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3386
+#: guix-git/doc/guix.texi:4077
 #, no-wrap
 msgid "disk space"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3392
+#: guix-git/doc/guix.texi:4083
 msgid "Packages that are installed, but not used, may be @dfn{garbage-collected}.  The @command{guix gc} command allows users to explicitly run the garbage collector to reclaim space from the @file{/gnu/store} directory.  It is the @emph{only} way to remove files from @file{/gnu/store}---removing files or directories manually may break it beyond repair!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3403
+#: guix-git/doc/guix.texi:4094
 msgid "The garbage collector has a set of known @dfn{roots}: any file under @file{/gnu/store} reachable from a root is considered @dfn{live} and cannot be deleted; any other file is considered @dfn{dead} and may be deleted.  The set of garbage collector roots (``GC roots'' for short)  includes default user profiles; by default, the symlinks under @file{/var/guix/gcroots} represent these GC roots.  New GC roots can be added with @command{guix build --root}, for example (@pxref{Invoking guix build}).  The @command{guix gc --list-roots} command lists them."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3409
+#: guix-git/doc/guix.texi:4100
 msgid "Prior to running @code{guix gc --collect-garbage} to make space, it is often useful to remove old generations from user profiles; that way, old package builds referenced by those generations can be reclaimed.  This is achieved by running @code{guix package --delete-generations} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3413
+#: guix-git/doc/guix.texi:4104
 msgid "Our recommendation is to run a garbage collection periodically, or when you are short on disk space.  For instance, to guarantee that at least 5@tie{}GB are available on your disk, simply run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3416
+#: guix-git/doc/guix.texi:4107
 #, no-wrap
 msgid "guix gc -F 5G\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3425
+#: guix-git/doc/guix.texi:4116
 msgid "It is perfectly safe to run as a non-interactive periodic job (@pxref{Scheduled Job Execution}, for how to set up such a job).  Running @command{guix gc} with no arguments will collect as much garbage as it can, but that is often inconvenient: you may find yourself having to rebuild or re-download software that is ``dead'' from the GC viewpoint but that is necessary to build other pieces of software---e.g., the compiler tool chain."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3431
-msgid "The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to delete specific files (the @code{--delete} option), to print garbage-collector information, or for more advanced queries.  The garbage collection options are as follows:"
+#: guix-git/doc/guix.texi:4122
+msgid "The @command{guix gc} command has three modes of operation: it can be used to garbage-collect any dead files (the default), to delete specific files (the @option{--delete} option), to print garbage-collector information, or for more advanced queries.  The garbage collection options are as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3433
+#: guix-git/doc/guix.texi:4124
 #, no-wrap
 msgid "--collect-garbage[=@var{min}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3434
+#: guix-git/doc/guix.texi:4125
 #, no-wrap
 msgid "-C [@var{min}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3438
+#: guix-git/doc/guix.texi:4129
 msgid "Collect garbage---i.e., unreachable @file{/gnu/store} files and sub-directories.  This is the default operation when no option is specified."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3443
+#: guix-git/doc/guix.texi:4134
 msgid "When @var{min} is given, stop once @var{min} bytes have been collected.  @var{min} may be a number of bytes, or it may include a unit as a suffix, such as @code{MiB} for mebibytes and @code{GB} for gigabytes (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3445
+#: guix-git/doc/guix.texi:4136
 msgid "When @var{min} is omitted, collect all the garbage."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3446
+#: guix-git/doc/guix.texi:4137
 #, no-wrap
 msgid "--free-space=@var{free}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3447
+#: guix-git/doc/guix.texi:4138
 #, no-wrap
 msgid "-F @var{free}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3451
+#: guix-git/doc/guix.texi:4142
 msgid "Collect garbage until @var{free} space is available under @file{/gnu/store}, if possible; @var{free} denotes storage space, such as @code{500MiB}, as described above."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3454
+#: guix-git/doc/guix.texi:4145
 msgid "When @var{free} or more is already available in @file{/gnu/store}, do nothing and exit immediately."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3455
+#: guix-git/doc/guix.texi:4146
 #, no-wrap
 msgid "--delete-generations[=@var{duration}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3456
+#: guix-git/doc/guix.texi:4147
 #, no-wrap
 msgid "-d [@var{duration}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3460
+#: guix-git/doc/guix.texi:4151
 msgid "Before starting the garbage collection process, delete all the generations older than @var{duration}, for all the user profiles; when run as root, this applies to all the profiles @emph{of all the users}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3464
+#: guix-git/doc/guix.texi:4155
 msgid "For example, this command deletes all the generations of all your profiles that are older than 2 months (except generations that are current), and then proceeds to free space until at least 10 GiB are available:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3467
+#: guix-git/doc/guix.texi:4158
 #, no-wrap
 msgid "guix gc -d 2m -F 10G\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3469
+#: guix-git/doc/guix.texi:4160
 #, no-wrap
 msgid "--delete"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3470
+#: guix-git/doc/guix.texi:4161
 #, no-wrap
 msgid "-D"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3474
+#: guix-git/doc/guix.texi:4165
 msgid "Attempt to delete all the store files and directories specified as arguments.  This fails if some of the files are not in the store, or if they are still live."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3475
+#: guix-git/doc/guix.texi:4166
 #, no-wrap
 msgid "--list-failures"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3477
+#: guix-git/doc/guix.texi:4168
 msgid "List store items corresponding to cached build failures."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3481
+#: guix-git/doc/guix.texi:4172
 msgid "This prints nothing unless the daemon was started with @option{--cache-failures} (@pxref{Invoking guix-daemon, @option{--cache-failures}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3482
+#: guix-git/doc/guix.texi:4173
 #, no-wrap
 msgid "--list-roots"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3485
+#: guix-git/doc/guix.texi:4176
 msgid "List the GC roots owned by the user; when run as root, list @emph{all} the GC roots."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3486
+#: guix-git/doc/guix.texi:4177
+#, no-wrap
+msgid "--list-busy"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4180
+msgid "List store items in use by currently running processes.  These store items are effectively considered GC roots: they cannot be deleted."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:4181
 #, no-wrap
 msgid "--clear-failures"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3488
+#: guix-git/doc/guix.texi:4183
 msgid "Remove the specified store items from the failed-build cache."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3491
+#: guix-git/doc/guix.texi:4186
 msgid "Again, this option only makes sense when the daemon is started with @option{--cache-failures}.  Otherwise, it does nothing."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3492
+#: guix-git/doc/guix.texi:4187
 #, no-wrap
 msgid "--list-dead"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3495
+#: guix-git/doc/guix.texi:4190
 msgid "Show the list of dead files and directories still present in the store---i.e., files and directories no longer reachable from any root."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3496
+#: guix-git/doc/guix.texi:4191
 #, no-wrap
 msgid "--list-live"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3498
+#: guix-git/doc/guix.texi:4193
 msgid "Show the list of live store files and directories."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3502
+#: guix-git/doc/guix.texi:4197
 msgid "In addition, the references among existing store files can be queried:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3505
+#: guix-git/doc/guix.texi:4200
 #, no-wrap
 msgid "--references"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3506
+#: guix-git/doc/guix.texi:4201
 #, no-wrap
 msgid "--referrers"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3507 doc/guix.texi:9355
+#: guix-git/doc/guix.texi:4202 guix-git/doc/guix.texi:12309
 #, no-wrap
 msgid "package dependencies"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3510
+#: guix-git/doc/guix.texi:4205
 msgid "List the references (respectively, the referrers) of store files given as arguments."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3511
+#: guix-git/doc/guix.texi:4206
 #, no-wrap
 msgid "--requisites"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3512 doc/guix.texi:4810
+#: guix-git/doc/guix.texi:4207 guix-git/doc/guix.texi:6054
 #, no-wrap
 msgid "-R"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3513 doc/guix.texi:9231 doc/guix.texi:9259 doc/guix.texi:9327
+#: guix-git/doc/guix.texi:4208 guix-git/doc/guix.texi:12165
+#: guix-git/doc/guix.texi:12193 guix-git/doc/guix.texi:12274
 #, no-wrap
 msgid "closure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3518
+#: guix-git/doc/guix.texi:4213
 msgid "List the requisites of the store files passed as arguments.  Requisites include the store files themselves, their references, and the references of these, recursively.  In other words, the returned list is the @dfn{transitive closure} of the store files."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3522
+#: guix-git/doc/guix.texi:4217
 msgid "@xref{Invoking guix size}, for a tool to profile the size of the closure of an element.  @xref{Invoking guix graph}, for a tool to visualize the graph of references."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3523
+#: guix-git/doc/guix.texi:4218
 #, no-wrap
 msgid "--derivers"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3524 doc/guix.texi:4971 doc/guix.texi:9456
+#: guix-git/doc/guix.texi:4219 guix-git/doc/guix.texi:6368
+#: guix-git/doc/guix.texi:12028 guix-git/doc/guix.texi:12418
 #, no-wrap
 msgid "derivation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3527
+#: guix-git/doc/guix.texi:4222
 msgid "Return the derivation(s) leading to the given store items (@pxref{Derivations})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3529
+#: guix-git/doc/guix.texi:4224
 msgid "For example, this command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3532
+#: guix-git/doc/guix.texi:4227
 #, no-wrap
-msgid "guix gc --derivers `guix package -I ^emacs$ | cut -f4`\n"
+msgid "guix gc --derivers $(guix package -I ^emacs$ | cut -f4)\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3537
+#: guix-git/doc/guix.texi:4232
 msgid "returns the @file{.drv} file(s) leading to the @code{emacs} package installed in your profile."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3541
+#: guix-git/doc/guix.texi:4236
 msgid "Note that there may be zero matching @file{.drv} files, for instance because these files have been garbage-collected.  There can also be more than one matching @file{.drv} due to fixed-output derivations."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3545
+#: guix-git/doc/guix.texi:4240
 msgid "Lastly, the following options allow you to check the integrity of the store and to control disk usage."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3548
+#: guix-git/doc/guix.texi:4243
 #, no-wrap
 msgid "--verify[=@var{options}]"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3549
+#: guix-git/doc/guix.texi:4244
 #, no-wrap
 msgid "integrity, of the store"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3550
+#: guix-git/doc/guix.texi:4245
 #, no-wrap
 msgid "integrity checking"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3552
+#: guix-git/doc/guix.texi:4247
 msgid "Verify the integrity of the store."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3555
+#: guix-git/doc/guix.texi:4250
 msgid "By default, make sure that all the store items marked as valid in the database of the daemon actually exist in @file{/gnu/store}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3558
+#: guix-git/doc/guix.texi:4253
 msgid "When provided, @var{options} must be a comma-separated list containing one or more of @code{contents} and @code{repair}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3564
+#: guix-git/doc/guix.texi:4259
 msgid "When passing @option{--verify=contents}, the daemon computes the content hash of each store item and compares it against its hash in the database.  Hash mismatches are reported as data corruptions.  Because it traverses @emph{all the files in the store}, this command can take a long time, especially on systems with a slow disk drive."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3565
+#: guix-git/doc/guix.texi:4260
 #, no-wrap
 msgid "repairing the store"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3566 doc/guix.texi:8125
+#: guix-git/doc/guix.texi:4261 guix-git/doc/guix.texi:10875
 #, no-wrap
 msgid "corruption, recovering from"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3574
+#: guix-git/doc/guix.texi:4269
 msgid "Using @option{--verify=repair} or @option{--verify=contents,repair} causes the daemon to try to repair corrupt store items by fetching substitutes for them (@pxref{Substitutes}).  Because repairing is not atomic, and thus potentially dangerous, it is available only to the system administrator.  A lightweight alternative, when you know exactly which items in the store are corrupt, is @command{guix build --repair} (@pxref{Invoking guix build})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3575
+#: guix-git/doc/guix.texi:4270
 #, no-wrap
 msgid "--optimize"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3579
+#: guix-git/doc/guix.texi:4274
 msgid "Optimize the store by hard-linking identical files---this is @dfn{deduplication}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3585
-msgid "The daemon performs deduplication after each successful build or archive import, unless it was started with @code{--disable-deduplication} (@pxref{Invoking guix-daemon, @code{--disable-deduplication}}).  Thus, this option is primarily useful when the daemon was running with @code{--disable-deduplication}."
+#: guix-git/doc/guix.texi:4280
+msgid "The daemon performs deduplication after each successful build or archive import, unless it was started with @option{--disable-deduplication} (@pxref{Invoking guix-daemon, @option{--disable-deduplication}}).  Thus, this option is primarily useful when the daemon was running with @option{--disable-deduplication}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:3589
+#: guix-git/doc/guix.texi:4284
 #, no-wrap
 msgid "Invoking @command{guix pull}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3591
+#: guix-git/doc/guix.texi:4286
 #, no-wrap
 msgid "upgrading Guix"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3592
+#: guix-git/doc/guix.texi:4287
 #, no-wrap
 msgid "updating Guix"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:3593
+#: guix-git/doc/guix.texi:4288
 #, no-wrap
 msgid "guix pull"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3594
+#: guix-git/doc/guix.texi:4289
 #, no-wrap
 msgid "pull"
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:4290
+#, fuzzy, no-wrap
+#| msgid "Invoking @command{guix build}"
+msgid "security, @command{guix pull}"
+msgstr "调用@command{guix build}"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:4291
+#, no-wrap
+msgid "authenticity, of code obtained with @command{guix pull}"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:3602
-msgid "Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine.  To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it.  Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized."
+#: guix-git/doc/guix.texi:4301
+msgid "Packages are installed or upgraded to the latest version available in the distribution currently available on your local machine.  To update that distribution, along with the Guix tools, you must run @command{guix pull}: the command downloads the latest Guix source code and package descriptions, and deploys it.  Source code is downloaded from a @uref{https://git-scm.com, Git} repository, by default the official GNU@tie{}Guix repository, though this can be customized.  @command{guix pull} ensures that the code it downloads is @emph{authentic} by verifying that commits are signed by Guix developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3608
+#: guix-git/doc/guix.texi:4304
+msgid "Specifically, @command{guix pull} downloads code from the @dfn{channels} (@pxref{Channels}) specified by one of the followings, in this order:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:4308
+msgid "the @option{--channels} option;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:4310
+msgid "the user's @file{~/.config/guix/channels.scm} file;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:4312
+msgid "the system-wide @file{/etc/guix/channels.scm} file;"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:4315
+msgid "the built-in default channels specified in the @code{%default-channels} variable."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:4322
 msgid "On completion, @command{guix package} will use packages and package versions from this just-retrieved copy of Guix.  Not only that, but all the Guix commands and Scheme modules will also be taken from that latest version.  New @command{guix} sub-commands added by the update also become available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3614
-msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who run @command{guix pull}.  For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa."
+#: guix-git/doc/guix.texi:4328
+msgid "Any user can update their Guix copy using @command{guix pull}, and the effect is limited to the user who ran @command{guix pull}.  For instance, when user @code{root} runs @command{guix pull}, this has no effect on the version of Guix that user @code{alice} sees, and vice versa."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3620
+#: guix-git/doc/guix.texi:4334
 msgid "The result of running @command{guix pull} is a @dfn{profile} available under @file{~/.config/guix/current} containing the latest Guix.  Thus, make sure to add it to the beginning of your search path so that you use the latest version, and similarly for the Info manual (@pxref{Documentation}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3624
+#: guix-git/doc/guix.texi:4338
 #, no-wrap
 msgid ""
 "export PATH=\"$HOME/.config/guix/current/bin:$PATH\"\n"
@@ -7883,12 +10131,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3628
-msgid "The @code{--list-generations} or @code{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:"
+#: guix-git/doc/guix.texi:4342
+msgid "The @option{--list-generations} or @option{-l} option lists past generations produced by @command{guix pull}, along with details about their provenance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3636
+#: guix-git/doc/guix.texi:4350
 #, no-wrap
 msgid ""
 "$ guix pull -l\n"
@@ -7901,7 +10149,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3646
+#: guix-git/doc/guix.texi:4360
 #, no-wrap
 msgid ""
 "Generation 2\tJun 11 2018 11:02:49\n"
@@ -7917,7 +10165,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3654
+#: guix-git/doc/guix.texi:4368
 #, no-wrap
 msgid ""
 "Generation 3\tJun 13 2018 23:31:07\t(current)\n"
@@ -7930,17 +10178,32 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3658
+#: guix-git/doc/guix.texi:4372
 msgid "@xref{Invoking guix describe, @command{guix describe}}, for other ways to describe the current status of Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3663
-msgid "This @code{~/.config/guix/current} profile works like any other profile created by @command{guix package} (@pxref{Invoking guix package}).  That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:"
+#: guix-git/doc/guix.texi:4377
+msgid "This @code{~/.config/guix/current} profile works exactly like the profiles created by @command{guix package} (@pxref{Invoking guix package}).  That is, you can list generations, roll back to the previous generation---i.e., the previous Guix---and so on:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:3669
+#: guix-git/doc/guix.texi:4383
+#, no-wrap
+msgid ""
+"$ guix pull --roll-back\n"
+"switched from generation 3 to 2\n"
+"$ guix pull --delete-generations=1\n"
+"deleting /var/guix/profiles/per-user/charlie/current-guix-1-link\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:4387
+msgid "You can also use @command{guix package} (@pxref{Invoking guix package})  to manage the profile by naming it explicitly:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:4392
 #, no-wrap
 msgid ""
 "$ guix package -p ~/.config/guix/current --roll-back\n"
@@ -7950,479 +10213,355 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3673
+#: guix-git/doc/guix.texi:4396
 msgid "The @command{guix pull} command is usually invoked with no arguments, but it supports the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3675
+#: guix-git/doc/guix.texi:4398 guix-git/doc/guix.texi:4556
 #, no-wrap
 msgid "--url=@var{url}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3676
+#: guix-git/doc/guix.texi:4399 guix-git/doc/guix.texi:4557
 #, no-wrap
 msgid "--commit=@var{commit}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3677
+#: guix-git/doc/guix.texi:4400 guix-git/doc/guix.texi:4558
 #, no-wrap
 msgid "--branch=@var{branch}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3681
+#: guix-git/doc/guix.texi:4404
 msgid "Download code for the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3682 doc/guix.texi:3747
+#: guix-git/doc/guix.texi:4405 guix-git/doc/guix.texi:5002
 #, no-wrap
 msgid "@file{channels.scm}, configuration file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3683 doc/guix.texi:3748
+#: guix-git/doc/guix.texi:4406 guix-git/doc/guix.texi:5003
 #, no-wrap
 msgid "configuration file for channels"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3687
+#: guix-git/doc/guix.texi:4410
 msgid "These options are provided for convenience, but you can also specify your configuration in the @file{~/.config/guix/channels.scm} file or using the @option{--channels} option (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3688
+#: guix-git/doc/guix.texi:4411 guix-git/doc/guix.texi:4563
 #, no-wrap
 msgid "--channels=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3689
+#: guix-git/doc/guix.texi:4412 guix-git/doc/guix.texi:4564
 #, no-wrap
 msgid "-C @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3694
-msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels}, for more information."
+#: guix-git/doc/guix.texi:4418
+msgid "Read the list of channels from @var{file} instead of @file{~/.config/guix/channels.scm} or @file{/etc/guix/channels.scm}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels}, for more information."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:4419
+#, fuzzy, no-wrap
+#| msgid "Channels"
+msgid "channel news"
+msgstr "通道"
+
 #. type: item
-#: doc/guix.texi:3695
+#: guix-git/doc/guix.texi:4420
 #, no-wrap
 msgid "--news"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3696 doc/guix.texi:4608
+#: guix-git/doc/guix.texi:4421 guix-git/doc/guix.texi:5829
+#: guix-git/doc/guix.texi:33214
 #, no-wrap
 msgid "-N"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3698
-msgid "Display the list of packages added or upgraded since the previous generation."
+#: guix-git/doc/guix.texi:4425
+msgid "Display the list of packages added or upgraded since the previous generation, as well as, occasionally, news written by channel authors for their users (@pxref{Channels, Writing Channel News})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3702
-msgid "This is the same information as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)."
+#: guix-git/doc/guix.texi:4429
+msgid "The package information is the same as displayed upon @command{guix pull} completion, but without ellipses; it is also similar to the output of @command{guix pull -l} for the last generation (see below)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3709
+#: guix-git/doc/guix.texi:4436
 msgid "List all the generations of @file{~/.config/guix/current} or, if @var{pattern} is provided, the subset of generations that match @var{pattern}.  The syntax of @var{pattern} is the same as with @code{guix package --list-generations} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3712
+#: guix-git/doc/guix.texi:4443
+msgid "Roll back to the previous @dfn{generation} of @file{~/.config/guix/current}---i.e., undo the last transaction."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4467
+msgid "If the current generation matches, it is @emph{not} deleted."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4473
 msgid "@xref{Invoking guix describe}, for a way to display information about the current generation only."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3716
+#: guix-git/doc/guix.texi:4477
 msgid "Use @var{profile} instead of @file{~/.config/guix/current}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3717 doc/guix.texi:7701
+#: guix-git/doc/guix.texi:4478 guix-git/doc/guix.texi:10266
 #, no-wrap
 msgid "--dry-run"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:3718 doc/guix.texi:7702
+#: guix-git/doc/guix.texi:4479 guix-git/doc/guix.texi:10267
+#: guix-git/doc/guix.texi:12147
 #, no-wrap
 msgid "-n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3721
+#: guix-git/doc/guix.texi:4482
 msgid "Show which channel commit(s) would be used and what would be built or substituted but do not actually do it."
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:3723 doc/guix.texi:4591 doc/guix.texi:4884 doc/guix.texi:8067
-#: doc/guix.texi:9345 doc/guix.texi:9544 doc/guix.texi:10094
-#: doc/guix.texi:24556
+#. type: item
+#: guix-git/doc/guix.texi:4483 guix-git/doc/guix.texi:33233
 #, no-wrap
-msgid "-s @var{system}"
+msgid "--allow-downgrades"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3726 doc/guix.texi:4887
-msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host."
+#: guix-git/doc/guix.texi:4486
+msgid "Allow pulling older or unrelated revisions of channels than those currently in use."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:3727 doc/guix.texi:9902
+#. type: cindex
+#: guix-git/doc/guix.texi:4487
 #, no-wrap
-msgid "--verbose"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:3729
-msgid "Produce verbose output, writing build logs to the standard error output."
+msgid "downgrade attacks, protection against"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:3733
-msgid "Use the bootstrap Guile to build the latest Guix.  This option is only useful to Guix developers."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3739
-msgid "The @dfn{channel} mechanism allows you to instruct @command{guix pull} which repository and branch to pull from, as well as @emph{additional} repositories containing package modules that should be deployed.  @xref{Channels}, for more information."
+#: guix-git/doc/guix.texi:4492
+msgid "By default, @command{guix pull} protects against so-called ``downgrade attacks'' whereby the Git repository of a channel would be reset to an earlier or unrelated revision of itself, potentially leading you to install older, known-vulnerable versions of software packages."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:3742
-msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})."
+#. type: quotation
+#: guix-git/doc/guix.texi:4496 guix-git/doc/guix.texi:33247
+msgid "Make sure you understand its security implications before using @option{--allow-downgrades}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:3746 doc/guix.texi:4149
-#, no-wrap
-msgid "channels"
-msgstr ""
+#: guix-git/doc/guix.texi:4498
+#, fuzzy, no-wrap
+#| msgid "--disable-deduplication"
+msgid "--disable-authentication"
+msgstr "--disable-deduplication"
 
-#. type: cindex
-#: doc/guix.texi:3749
-#, no-wrap
-msgid "@command{guix pull}, configuration file"
+#. type: table
+#: guix-git/doc/guix.texi:4500
+msgid "Allow pulling channel code without authenticating it."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3750
-#, no-wrap
-msgid "configuration of @command{guix pull}"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3759
-msgid "Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}).  By default @command{guix pull} downloads and deploys Guix itself from the official GNU@tie{}Guix repository.  This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file.  A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed to pull from one or more channels.  In other words, channels can be used to @emph{customize} and to @emph{extend} Guix, as we will see below."
-msgstr ""
-
-#. type: subsection
-#: doc/guix.texi:3760
-#, no-wrap
-msgid "Using a Custom Guix Channel"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3767
-msgid "The channel called @code{guix} specifies where Guix itself---its command-line tools as well as its package collection---should be downloaded.  For instance, suppose you want to update from your own copy of the Guix repository at @code{example.org}, and specifically the @code{super-hacks} branch, you can write in @code{~/.config/guix/channels.scm} this specification:"
-msgstr ""
-
-#. type: lisp
-#: doc/guix.texi:3774
-#, no-wrap
-msgid ""
-";; Tell 'guix pull' to use my own repo.\n"
-"(list (channel\n"
-"        (name 'guix)\n"
-"        (url \"https://example.org/my-guix.git\")\n"
-"        (branch \"super-hacks\")))\n"
-msgstr ""
+#: guix-git/doc/guix.texi:4501 guix-git/doc/guix.texi:5148
+#, fuzzy, no-wrap
+#| msgid "indentation, of code"
+msgid "authentication, of channel code"
+msgstr "代码缩进"
 
-#. type: Plain text
-#: doc/guix.texi:3779
-msgid "From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}."
+#. type: table
+#: guix-git/doc/guix.texi:4506
+msgid "By default, @command{guix pull} authenticates code downloaded from channels by verifying that its commits are signed by authorized developers, and raises an error if this is not the case.  This option instructs it to not perform any such verification."
 msgstr ""
 
-#. type: subsection
-#: doc/guix.texi:3780
-#, no-wrap
-msgid "Specifying Additional Channels"
+#. type: quotation
+#: guix-git/doc/guix.texi:4510
+msgid "Make sure you understand its security implications before using @option{--disable-authentication}."
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:3782
+#. type: itemx
+#: guix-git/doc/guix.texi:4513 guix-git/doc/guix.texi:5812
+#: guix-git/doc/guix.texi:6183 guix-git/doc/guix.texi:10817
+#: guix-git/doc/guix.texi:12292 guix-git/doc/guix.texi:12543
+#: guix-git/doc/guix.texi:13210 guix-git/doc/guix.texi:33162
 #, no-wrap
-msgid "extending the package collection (channels)"
+msgid "-s @var{system}"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:3783
-#, no-wrap
-msgid "personal packages (channels)"
+#. type: table
+#: guix-git/doc/guix.texi:4516 guix-git/doc/guix.texi:6186
+msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host."
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:3784
-#, no-wrap
-msgid "channels, for personal packages"
+#. type: table
+#: guix-git/doc/guix.texi:4520
+msgid "Use the bootstrap Guile to build the latest Guix.  This option is only useful to Guix developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3792
-msgid "You can also specify @emph{additional channels} to pull from.  Let's say you have a bunch of custom package variants or personal packages that you think would make little sense to contribute to the Guix project, but would like to have these packages transparently available to you at the command line.  You would first write modules containing those package definitions (@pxref{Package Modules}), maintain them in a Git repository, and then you and anyone else can use it as an additional channel to get packages from.  Neat, no?"
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:3796
-#, no-wrap
-msgid "Warning"
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:3800
-msgid "Before you, dear user, shout---``woow this is @emph{soooo coool}!''---and publish your personal channel to the world, we would like to share a few words of caution:"
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:3808
-msgid "Before publishing a channel, please consider contributing your package definitions to Guix proper (@pxref{Contributing}).  Guix as a project is open to free software of all sorts, and packages in Guix proper are readily available to all Guix users and benefit from the project's quality assurance process."
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:3817
-msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}.  Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs).  We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel.  We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either."
-msgstr ""
-
-#. type: itemize
-#: doc/guix.texi:3821
-msgid "Corollary: if you're using an external channel and that channel breaks, please @emph{report the issue to the channel authors}, not to the Guix project."
-msgstr ""
-
-#. type: quotation
-#: doc/guix.texi:3828
-msgid "You've been warned! Having said this, we believe external channels are a practical way to exert your freedom to augment Guix' package collection and to share your improvements, which are basic tenets of @uref{https://www.gnu.org/philosophy/free-sw.html, free software}.  Please email us at @email{guix-devel@@gnu.org} if you'd like to discuss this."
+#: guix-git/doc/guix.texi:4526
+msgid "The @dfn{channel} mechanism allows you to instruct @command{guix pull} which repository and branch to pull from, as well as @emph{additional} repositories containing package modules that should be deployed.  @xref{Channels}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3833
-msgid "To use a channel, write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to pull from it @emph{in addition} to the default Guix channel(s):"
-msgstr ""
-
-#. type: vindex
-#: doc/guix.texi:3834
-#, no-wrap
-msgid "%default-channels"
-msgstr ""
-
-#. type: lisp
-#: doc/guix.texi:3841
-#, no-wrap
-msgid ""
-";; Add my personal packages to those Guix provides.\n"
-"(cons (channel\n"
-"        (name 'my-personal-packages)\n"
-"        (url \"https://example.org/personal-packages.git\"))\n"
-"      %default-channels)\n"
+#: guix-git/doc/guix.texi:4529
+msgid "In addition, @command{guix pull} supports all the common build options (@pxref{Common Build Options})."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:3851
-msgid "Note that the snippet above is (as always!)@: Scheme code; we use @code{cons} to add a channel the list of channels that the variable @code{%default-channels} is bound to (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}).  With this file in place, @command{guix pull} builds not only Guix but also the package modules from your own repository.  The result in @file{~/.config/guix/current} is the union of Guix with your own package modules:"
-msgstr ""
+#. type: section
+#: guix-git/doc/guix.texi:4531
+#, fuzzy, no-wrap
+#| msgid "Invoking @command{guix-daemon}"
+msgid "Invoking @command{guix time-machine}"
+msgstr "调用@command{guix-daemon}"
 
-#. type: example
-#: doc/guix.texi:3866
+#. type: command{#1}
+#: guix-git/doc/guix.texi:4533
 #, no-wrap
-msgid ""
-"$ guix pull --list-generations\n"
-"@dots{}\n"
-"Generation 19\tAug 27 2018 16:20:48\n"
-"  guix d894ab8\n"
-"    repository URL: https://git.savannah.gnu.org/git/guix.git\n"
-"    branch: master\n"
-"    commit: d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300\n"
-"  my-personal-packages dd3df5e\n"
-"    repository URL: https://example.org/personal-packages.git\n"
-"    branch: master\n"
-"    commit: dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\n"
-"  11 new packages: my-gimp, my-emacs-with-cool-features, @dots{}\n"
-"  4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, @dots{}\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3874
-msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{my-personal-packages} channel.  Among the new and upgraded packages that are listed, some like @code{my-gimp} and @code{my-emacs-with-cool-features} might come from @code{my-personal-packages}, while others come from the Guix default channel."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3885
-msgid "To create a channel, create a Git repository containing your own package modules and make it available.  The repository can contain anything, but a useful channel will contain Guile modules that export packages.  Once you start using a channel, Guix will behave as if the root directory of that channel's Git repository has been added to the Guile load path (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}).  For example, if your channel contains a file at @file{my-packages/my-tools.scm} that defines a Guile module, then the module will be available under the name @code{(my-packages my-tools)}, and you will be able to use it like any other module (@pxref{Modules,,, guile, GNU Guile Reference Manual})."
+msgid "guix time-machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3886
+#: guix-git/doc/guix.texi:4534 guix-git/doc/guix.texi:5106
 #, no-wrap
-msgid "dependencies, channels"
+msgid "pinning, channels"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3887
+#: guix-git/doc/guix.texi:4535 guix-git/doc/guix.texi:4717
+#: guix-git/doc/guix.texi:5107
 #, no-wrap
-msgid "meta-data, channels"
+msgid "replicating Guix"
 msgstr ""
 
-#. type: subsection
-#: doc/guix.texi:3888
+#. type: cindex
+#: guix-git/doc/guix.texi:4536 guix-git/doc/guix.texi:5108
 #, no-wrap
-msgid "Declaring Channel Dependencies"
+msgid "reproducibility, of Guix"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3894
-msgid "Channel authors may decide to augment a package collection provided by other channels.  They can declare their channel to be dependent on other channels in a meta-data file @file{.guix-channel}, which is to be placed in the root of the channel repository."
+#: guix-git/doc/guix.texi:4544
+msgid "The @command{guix time-machine} command provides access to other revisions of Guix, for example to install older versions of packages, or to reproduce a computation in an identical environment.  The revision of Guix to be used is defined by a commit or by a channel description file created by @command{guix describe} (@pxref{Invoking guix describe})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3896
-msgid "The meta-data file should contain a simple S-expression like this:"
+#: guix-git/doc/guix.texi:4546 guix-git/doc/guix.texi:5561
+#: guix-git/doc/guix.texi:6306 guix-git/doc/guix.texi:10063
+#: guix-git/doc/guix.texi:10186 guix-git/doc/guix.texi:11108
+#: guix-git/doc/guix.texi:11185 guix-git/doc/guix.texi:12122
+#: guix-git/doc/guix.texi:12601 guix-git/doc/guix.texi:12964
+#: guix-git/doc/guix.texi:13053 guix-git/doc/guix.texi:13092
+#: guix-git/doc/guix.texi:13189
+msgid "The general syntax is:"
 msgstr ""
 
-#. type: lisp
-#: doc/guix.texi:3908
+#. type: example
+#: guix-git/doc/guix.texi:4549
 #, no-wrap
-msgid ""
-"(channel\n"
-" (version 0)\n"
-" (dependencies\n"
-"  (channel\n"
-"   (name some-collection)\n"
-"   (url \"https://example.org/first-collection.git\"))\n"
-"  (channel\n"
-"   (name some-other-collection)\n"
-"   (url \"https://example.org/second-collection.git\")\n"
-"   (branch \"testing\"))))\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3914
-msgid "In the above example this channel is declared to depend on two other channels, which will both be fetched automatically.  The modules provided by the channel will be compiled in an environment where the modules of all these declared channels are available."
+msgid "guix time-machine @var{options}@dots{} -- @var{command} @var {arg}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3918
-msgid "For the sake of reliability and maintainability, you should avoid dependencies on channels that you don't control, and you should aim to keep the number of dependencies to a minimum."
-msgstr ""
-
-#. type: subsection
-#: doc/guix.texi:3919
-#, no-wrap
-msgid "Replicating Guix"
+#: guix-git/doc/guix.texi:4554
+msgid "where @var{command} and @var{arg}@dots{} are passed unmodified to the @command{guix} command of the specified revision.  The @var{options} that define this revision are the same as for @command{guix pull} (@pxref{Invoking guix pull}):"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:3921
-#, no-wrap
-msgid "pinning, channels"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:3922 doc/guix.texi:4088
-#, no-wrap
-msgid "replicating Guix"
+#. type: table
+#: guix-git/doc/guix.texi:4562
+msgid "Use the @code{guix} channel from the specified @var{url}, at the given @var{commit} (a valid Git commit ID represented as a hexadecimal string), or @var{branch}."
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:3923
-#, no-wrap
-msgid "reproducibility, of Guix"
+#. type: table
+#: guix-git/doc/guix.texi:4568
+msgid "Read the list of channels from @var{file}.  @var{file} must contain Scheme code that evaluates to a list of channel objects.  @xref{Channels} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3928
-msgid "The @command{guix pull --list-generations} output above shows precisely which commits were used to build this instance of Guix.  We can thus replicate it, say, on another machine, by providing a channel specification in @file{~/.config/guix/channels.scm} that is ``pinned'' to these commits:"
+#: guix-git/doc/guix.texi:4572
+msgid "As for @command{guix pull}, the absence of any options means that the latest commit on the master branch will be used.  The command"
 msgstr ""
 
-#. type: lisp
-#: doc/guix.texi:3939
+#. type: example
+#: guix-git/doc/guix.texi:4575
 #, no-wrap
-msgid ""
-";; Deploy specific commits of my channels of interest.\n"
-"(list (channel\n"
-"       (name 'guix)\n"
-"       (url \"https://git.savannah.gnu.org/git/guix.git\")\n"
-"       (commit \"d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300\"))\n"
-"      (channel\n"
-"       (name 'my-personal-packages)\n"
-"       (url \"https://example.org/personal-packages.git\")\n"
-"       (branch \"dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\")))\n"
+msgid "guix time-machine -- build hello\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3943
-msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe})."
+#: guix-git/doc/guix.texi:4580
+msgid "will thus build the package @code{hello} as defined in the master branch, which is in general a newer revision of Guix than you have installed.  Time travel works in both directions!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3950
-msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}.  The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine.  It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:3955
-msgid "This gives you super powers, allowing you to track the provenance of binary artifacts with very fine grain, and to reproduce software environments at will---some sort of ``meta reproducibility'' capabilities, if you will.  @xref{Inferiors}, for another way to take advantage of these super powers."
+#: guix-git/doc/guix.texi:4584
+msgid "Note that @command{guix time-machine} can trigger builds of channels and their dependencies, and these are controlled by the standard build options (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:3963
+#: guix-git/doc/guix.texi:4592
 msgid "The functionality described here is a ``technology preview'' as of version @value{VERSION}.  As such, the interface is subject to change."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3965 doc/guix.texi:7547
+#: guix-git/doc/guix.texi:4594 guix-git/doc/guix.texi:10100
 #, no-wrap
 msgid "inferiors"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3966
+#: guix-git/doc/guix.texi:4595
 #, no-wrap
 msgid "composition of Guix revisions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3971
+#: guix-git/doc/guix.texi:4600
 msgid "Sometimes you might need to mix packages from the revision of Guix you're currently running with packages available in a different revision of Guix.  Guix @dfn{inferiors} allow you to achieve that by composing different Guix revisions in arbitrary ways."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:3972 doc/guix.texi:4037
+#: guix-git/doc/guix.texi:4601 guix-git/doc/guix.texi:4666
 #, no-wrap
 msgid "inferior packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3978
+#: guix-git/doc/guix.texi:4607
 msgid "Technically, an ``inferior'' is essentially a separate Guix process connected to your main Guix process through a REPL (@pxref{Invoking guix repl}).  The @code{(guix inferior)} module allows you to create inferiors and to communicate with them.  It also provides a high-level interface to browse and manipulate the packages that an inferior provides---@dfn{inferior packages}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:3988
+#: guix-git/doc/guix.texi:4617
 msgid "When combined with channels (@pxref{Channels}), inferiors provide a simple way to interact with a separate revision of Guix.  For example, let's assume you want to install in your profile the current @code{guile} package, along with the @code{guile-json} as it existed in an older revision of Guix---perhaps because the newer @code{guile-json} has an incompatible API and you want to run your code against the old API@.  To do that, you could write a manifest for use by @code{guix package --manifest} (@pxref{Invoking guix package}); in that manifest, you would create an inferior for that old Guix revision you care about, and you would look up the @code{guile-json} package in the inferior:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:3992
+#: guix-git/doc/guix.texi:4621
 #, no-wrap
 msgid ""
 "(use-modules (guix inferior) (guix channels)\n"
@@ -8431,7 +10570,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4001
+#: guix-git/doc/guix.texi:4630
 #, no-wrap
 msgid ""
 "(define channels\n"
@@ -8446,7 +10585,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4005
+#: guix-git/doc/guix.texi:4634
 #, no-wrap
 msgid ""
 "(define inferior\n"
@@ -8456,7 +10595,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:4011
+#: guix-git/doc/guix.texi:4640
 #, no-wrap
 msgid ""
 ";; Now create a manifest with the current \"guile\" package\n"
@@ -8467,186 +10606,186 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4016
+#: guix-git/doc/guix.texi:4645
 msgid "On its first run, @command{guix package --manifest} might have to build the channel you specified before it can create the inferior; subsequent runs will be much faster because the Guix revision will be cached."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4019
+#: guix-git/doc/guix.texi:4648
 msgid "The @code{(guix inferior)} module provides the following procedures to open an inferior:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4020
+#: guix-git/doc/guix.texi:4649
 #, no-wrap
 msgid "{Scheme Procedure} inferior-for-channels @var{channels} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4025
+#: guix-git/doc/guix.texi:4654
 msgid "[#:cache-directory] [#:ttl] Return an inferior for @var{channels}, a list of channels.  Use the cache at @var{cache-directory}, where entries can be reclaimed after @var{ttl} seconds.  This procedure opens a new connection to the build daemon."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4028
+#: guix-git/doc/guix.texi:4657
 msgid "As a side effect, this procedure may build or substitute binaries for @var{channels}, which can take time."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4030
+#: guix-git/doc/guix.texi:4659
 #, no-wrap
 msgid "{Scheme Procedure} open-inferior @var{directory} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4035
+#: guix-git/doc/guix.texi:4664
 msgid "[#:command \"bin/guix\"] Open the inferior Guix in @var{directory}, running @code{@var{directory}/@var{command} repl} or equivalent.  Return @code{#f} if the inferior could not be launched."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4040
+#: guix-git/doc/guix.texi:4669
 msgid "The procedures listed below allow you to obtain and manipulate inferior packages."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4041
+#: guix-git/doc/guix.texi:4670
 #, no-wrap
 msgid "{Scheme Procedure} inferior-packages @var{inferior}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4043
+#: guix-git/doc/guix.texi:4672
 msgid "Return the list of packages known to @var{inferior}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4045
+#: guix-git/doc/guix.texi:4674
 #, no-wrap
 msgid "{Scheme Procedure} lookup-inferior-packages @var{inferior} @var{name} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4050
+#: guix-git/doc/guix.texi:4679
 msgid "[@var{version}] Return the sorted list of inferior packages matching @var{name} in @var{inferior}, with highest version numbers first.  If @var{version} is true, return only packages with a version number prefixed by @var{version}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4052
+#: guix-git/doc/guix.texi:4681
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4054
+#: guix-git/doc/guix.texi:4683
 msgid "Return true if @var{obj} is an inferior package."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4056
+#: guix-git/doc/guix.texi:4685
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-name @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4057
+#: guix-git/doc/guix.texi:4686
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-version @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4058
+#: guix-git/doc/guix.texi:4687
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-synopsis @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4059
+#: guix-git/doc/guix.texi:4688
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-description @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4060
+#: guix-git/doc/guix.texi:4689
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-home-page @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4061
+#: guix-git/doc/guix.texi:4690
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-location @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4062
+#: guix-git/doc/guix.texi:4691
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-inputs @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4063
+#: guix-git/doc/guix.texi:4692
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-native-inputs @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4064
+#: guix-git/doc/guix.texi:4693
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-propagated-inputs @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4065
+#: guix-git/doc/guix.texi:4694
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-transitive-propagated-inputs @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4066
+#: guix-git/doc/guix.texi:4695
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-native-search-paths @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4067
+#: guix-git/doc/guix.texi:4696
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-transitive-native-search-paths @var{package}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:4068
+#: guix-git/doc/guix.texi:4697
 #, no-wrap
 msgid "{Scheme Procedure} inferior-package-search-paths @var{package}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:4073
+#: guix-git/doc/guix.texi:4702
 msgid "These procedures are the counterpart of package record accessors (@pxref{package Reference}).  Most of them work by querying the inferior @var{package} comes from, so the inferior must still be live when you call these procedures."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4083
-msgid "Inferior packages can be used transparently like any other package or file-like object in G-expressions (@pxref{G-Expressions}).  They are also transparently handled by the @code{packages->manifest} procedure, which is commonly use in manifests (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}).  Thus you can insert an inferior package pretty much anywhere you would insert a regular package: in manifests, in the @code{packages} field of your @code{operating-system} declaration, and so on."
+#: guix-git/doc/guix.texi:4712
+msgid "Inferior packages can be used transparently like any other package or file-like object in G-expressions (@pxref{G-Expressions}).  They are also transparently handled by the @code{packages->manifest} procedure, which is commonly used in manifests (@pxref{Invoking guix package, the @option{--manifest} option of @command{guix package}}).  Thus you can insert an inferior package pretty much anywhere you would insert a regular package: in manifests, in the @code{packages} field of your @code{operating-system} declaration, and so on."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:4085
+#: guix-git/doc/guix.texi:4714
 #, no-wrap
 msgid "Invoking @command{guix describe}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4096
+#: guix-git/doc/guix.texi:4725
 msgid "Often you may want to answer questions like: ``Which revision of Guix am I using?'' or ``Which channels am I using?'' This is useful information in many situations: if you want to @emph{replicate} an environment on a different machine or user account, if you want to report a bug or to determine what change in the channels you are using caused it, or if you want to record your system state for reproducibility purposes.  The @command{guix describe} command answers these questions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4100
+#: guix-git/doc/guix.texi:4729
 msgid "When run from a @command{guix pull}ed @command{guix}, @command{guix describe} displays the channel(s) that it was built from, including their repository URL and commit IDs (@pxref{Channels}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4108
+#: guix-git/doc/guix.texi:4737
 #, no-wrap
 msgid ""
 "$ guix describe\n"
@@ -8658,17 +10797,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4117
+#: guix-git/doc/guix.texi:4746
 msgid "If you're familiar with the Git version control system, this is similar in spirit to @command{git describe}; the output is also similar to that of @command{guix pull --list-generations}, but limited to the current generation (@pxref{Invoking guix pull, the @option{--list-generations} option}).  Because the Git commit ID shown above unambiguously refers to a snapshot of Guix, this information is all it takes to describe the revision of Guix you're using, and also to replicate it."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4120
+#: guix-git/doc/guix.texi:4749
 msgid "To make it easier to replicate Guix, @command{guix describe} can also be asked to return a list of channels instead of the human-readable description above:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4128
+#: guix-git/doc/guix.texi:4762
 #, no-wrap
 msgid ""
 "$ guix describe -f channels\n"
@@ -8676,437 +10815,1103 @@ msgid ""
 "        (name 'guix)\n"
 "        (url \"https://git.savannah.gnu.org/git/guix.git\")\n"
 "        (commit\n"
-"          \"e0fa68c7718fffd33d81af415279d6ddb518f727\")))\n"
+"          \"e0fa68c7718fffd33d81af415279d6ddb518f727\")\n"
+"        (introduction\n"
+"          (make-channel-introduction\n"
+"            \"9edb3f66fd807b096b48283debdcddccfea34bad\"\n"
+"            (openpgp-fingerprint\n"
+"              \"BBB0 2DDF 2CEA F6A8 0D1D  E643 A2A0 6DF2 A33A 54FA\")))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4137
+#: guix-git/doc/guix.texi:4771
 msgid "You can save this to a file and feed it to @command{guix pull -C} on some other machine or at a later point in time, which will instantiate @emph{this exact Guix revision} (@pxref{Invoking guix pull, the @option{-C} option}).  From there on, since you're able to deploy the same revision of Guix, you can just as well @emph{replicate a complete software environment}.  We humbly think that this is @emph{awesome}, and we hope you'll like it too!"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4140
+#: guix-git/doc/guix.texi:4774
 msgid "The details of the options supported by @command{guix describe} are as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4142 doc/guix.texi:4786
+#: guix-git/doc/guix.texi:4776 guix-git/doc/guix.texi:6013
+#: guix-git/doc/guix.texi:13322
 #, no-wrap
 msgid "--format=@var{format}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4143 doc/guix.texi:4787
+#: guix-git/doc/guix.texi:4777 guix-git/doc/guix.texi:6014
+#: guix-git/doc/guix.texi:13323
 #, no-wrap
 msgid "-f @var{format}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4145
+#: guix-git/doc/guix.texi:4779 guix-git/doc/guix.texi:13325
 msgid "Produce output in the specified @var{format}, one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4147
+#: guix-git/doc/guix.texi:4781
 #, no-wrap
 msgid "human"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4149
+#: guix-git/doc/guix.texi:4783
 msgid "produce human-readable output;"
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:4783 guix-git/doc/guix.texi:5001
+#, no-wrap
+msgid "channels"
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:4153
+#: guix-git/doc/guix.texi:4787
 msgid "produce a list of channel specifications that can be passed to @command{guix pull -C} or installed as @file{~/.config/guix/channels.scm} (@pxref{Invoking guix pull});"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4153 doc/guix.texi:8584
+#: guix-git/doc/guix.texi:4787
+#, no-wrap
+msgid "channels-sans-intro"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4793
+msgid "like @code{channels}, but omit the @code{introduction} field; use it to produce a channel specification suitable for Guix version 1.1.0 or earlier---the @code{introduction} field has to do with channel authentication (@pxref{Channels, Channel Authentication}) and is not supported by these older versions;"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:4793 guix-git/doc/guix.texi:11371
 #, no-wrap
 msgid "json"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4154
+#: guix-git/doc/guix.texi:4794
 #, no-wrap
 msgid "JSON"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4156
+#: guix-git/doc/guix.texi:4796
 msgid "produce a list of channel specifications in JSON format;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4156
+#: guix-git/doc/guix.texi:4796 guix-git/doc/guix.texi:13327
 #, no-wrap
 msgid "recutils"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4158
+#: guix-git/doc/guix.texi:4798
 msgid "produce a list of channel specifications in Recutils format."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:4800
+#, no-wrap
+msgid "--list-formats"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4802
+msgid "Display available formats for @option{--format} option."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:4163
+#: guix-git/doc/guix.texi:4806
 msgid "Display information about @var{profile}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:4166
+#: guix-git/doc/guix.texi:4809
 #, no-wrap
 msgid "Invoking @command{guix archive}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:4168
+#: guix-git/doc/guix.texi:4811
 #, no-wrap
 msgid "guix archive"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4169
+#: guix-git/doc/guix.texi:4812
 #, no-wrap
 msgid "archive"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4175
+#: guix-git/doc/guix.texi:4818
 msgid "The @command{guix archive} command allows users to @dfn{export} files from the store into a single archive, and to later @dfn{import} them on a machine that runs Guix.  In particular, it allows store files to be transferred from one machine to the store on another machine."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4179
+#: guix-git/doc/guix.texi:4822
 msgid "If you're looking for a way to produce archives in a format suitable for tools other than Guix, @pxref{Invoking guix pack}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4181
+#: guix-git/doc/guix.texi:4824
 #, no-wrap
 msgid "exporting store items"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4183
+#: guix-git/doc/guix.texi:4826
 msgid "To export store files as an archive to standard output, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4186
+#: guix-git/doc/guix.texi:4829
 #, no-wrap
 msgid "guix archive --export @var{options} @var{specifications}...\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4193
+#: guix-git/doc/guix.texi:4836
 msgid "@var{specifications} may be either store file names or package specifications, as for @command{guix package} (@pxref{Invoking guix package}).  For instance, the following command creates an archive containing the @code{gui} output of the @code{git} package and the main output of @code{emacs}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4196
+#: guix-git/doc/guix.texi:4839
 #, no-wrap
 msgid "guix archive --export git:gui /gnu/store/...-emacs-24.3 > great.nar\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4201
+#: guix-git/doc/guix.texi:4844
 msgid "If the specified packages are not built yet, @command{guix archive} automatically builds them.  The build process may be controlled with the common build options (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4204
+#: guix-git/doc/guix.texi:4847
 msgid "To transfer the @code{emacs} package to a machine connected over SSH, one would run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4207
+#: guix-git/doc/guix.texi:4850
 #, no-wrap
 msgid "guix archive --export -r emacs | ssh the-machine guix archive --import\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4212
+#: guix-git/doc/guix.texi:4855
 msgid "Similarly, a complete user profile may be transferred from one machine to another like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4216
+#: guix-git/doc/guix.texi:4859
 #, no-wrap
 msgid ""
 "guix archive --export -r $(readlink -f ~/.guix-profile) | \\\n"
-"  ssh the-machine guix-archive --import\n"
+"  ssh the-machine guix archive --import\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4226
-msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @code{-r}), regardless of what is already available in the store on the target machine.  The @code{--missing} option can help figure out which items are missing from the target store.  The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})."
+#: guix-git/doc/guix.texi:4869
+msgid "However, note that, in both examples, all of @code{emacs} and the profile as well as all of their dependencies are transferred (due to @option{-r}), regardless of what is already available in the store on the target machine.  The @option{--missing} option can help figure out which items are missing from the target store.  The @command{guix copy} command simplifies and optimizes this whole process, so this is probably what you should use in this case (@pxref{Invoking guix copy})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4227
+#: guix-git/doc/guix.texi:4870
 #, no-wrap
 msgid "nar, archive format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4228
+#: guix-git/doc/guix.texi:4871
 #, no-wrap
 msgid "normalized archive (nar)"
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:4872
+#, no-wrap
+msgid "nar bundle, archive format"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:4877
+msgid "Each store item is written in the @dfn{normalized archive} or @dfn{nar} format (described below), and the output of @command{guix archive --export} (and input of @command{guix archive --import}) is a @dfn{nar bundle}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:4887
+msgid "The nar format is comparable in spirit to `tar', but with differences that make it more appropriate for our purposes.  First, rather than recording all Unix metadata for each file, the nar format only mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed.  Second, the order in which directory entries are stored always follows the order of file names according to the C locale collation order.  This makes archive production fully deterministic."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:4238
-msgid "Archives are stored in the ``normalized archive'' or ``nar'' format, which is comparable in spirit to `tar', but with differences that make it more appropriate for our purposes.  First, rather than recording all Unix metadata for each file, the nar format only mentions the file type (regular, directory, or symbolic link); Unix permissions and owner/group are dismissed.  Second, the order in which directory entries are stored always follows the order of file names according to the C locale collation order.  This makes archive production fully deterministic."
+#: guix-git/doc/guix.texi:4891
+msgid "That nar bundle format is essentially the concatenation of zero or more nars along with metadata for each store item it contains: its file name, references, corresponding derivation, and a digital signature."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4244
+#: guix-git/doc/guix.texi:4897
 msgid "When exporting, the daemon digitally signs the contents of the archive, and that digital signature is appended.  When importing, the daemon verifies the signature and rejects the import in case of an invalid signature or if the signing key is not authorized."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4246
+#: guix-git/doc/guix.texi:4899
 msgid "The main options are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4248
+#: guix-git/doc/guix.texi:4901
 #, no-wrap
 msgid "--export"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4251
-msgid "Export the specified store files or packages (see below.)  Write the resulting archive to the standard output."
+#: guix-git/doc/guix.texi:4904
+msgid "Export the specified store files or packages (see below).  Write the resulting archive to the standard output."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4254
-msgid "Dependencies are @emph{not} included in the output, unless @code{--recursive} is passed."
+#: guix-git/doc/guix.texi:4907
+msgid "Dependencies are @emph{not} included in the output, unless @option{--recursive} is passed."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4255 doc/guix.texi:8372 doc/guix.texi:8469 doc/guix.texi:8494
-#: doc/guix.texi:8689 doc/guix.texi:8730 doc/guix.texi:8777
+#: guix-git/doc/guix.texi:4908 guix-git/doc/guix.texi:11141
+#: guix-git/doc/guix.texi:11243 guix-git/doc/guix.texi:11268
+#: guix-git/doc/guix.texi:11476 guix-git/doc/guix.texi:11517
+#: guix-git/doc/guix.texi:11564 guix-git/doc/guix.texi:11589
+#: guix-git/doc/guix.texi:11605 guix-git/doc/guix.texi:11636
 #, no-wrap
 msgid "-r"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4256 doc/guix.texi:8371 doc/guix.texi:8468 doc/guix.texi:8493
-#: doc/guix.texi:8688 doc/guix.texi:8729 doc/guix.texi:8776 doc/guix.texi:8833
+#: guix-git/doc/guix.texi:4909 guix-git/doc/guix.texi:11140
+#: guix-git/doc/guix.texi:11242 guix-git/doc/guix.texi:11267
+#: guix-git/doc/guix.texi:11475 guix-git/doc/guix.texi:11516
+#: guix-git/doc/guix.texi:11563 guix-git/doc/guix.texi:11588
+#: guix-git/doc/guix.texi:11604 guix-git/doc/guix.texi:11635
+#: guix-git/doc/guix.texi:11692
 #, no-wrap
 msgid "--recursive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4261
-msgid "When combined with @code{--export}, this instructs @command{guix archive} to include dependencies of the given items in the archive.  Thus, the resulting archive is self-contained: it contains the closure of the exported store items."
+#: guix-git/doc/guix.texi:4914
+msgid "When combined with @option{--export}, this instructs @command{guix archive} to include dependencies of the given items in the archive.  Thus, the resulting archive is self-contained: it contains the closure of the exported store items."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4262
+#: guix-git/doc/guix.texi:4915
 #, no-wrap
 msgid "--import"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4267
-msgid "Read an archive from the standard input, and import the files listed therein into the store.  Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized keys (see @code{--authorize} below.)"
+#: guix-git/doc/guix.texi:4920
+msgid "Read an archive from the standard input, and import the files listed therein into the store.  Abort if the archive has an invalid digital signature, or if it is signed by a public key not among the authorized keys (see @option{--authorize} below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4268
+#: guix-git/doc/guix.texi:4921
 #, no-wrap
 msgid "--missing"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4272
+#: guix-git/doc/guix.texi:4925
 msgid "Read a list of store file names from the standard input, one per line, and write on the standard output the subset of these files missing from the store."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4273
+#: guix-git/doc/guix.texi:4926
 #, no-wrap
 msgid "--generate-key[=@var{parameters}]"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4274
+#: guix-git/doc/guix.texi:4927
 #, no-wrap
 msgid "signing, archives"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4279
-msgid "Generate a new key pair for the daemon.  This is a prerequisite before archives can be exported with @code{--export}.  Note that this operation usually takes time, because it needs to gather enough entropy to generate the key pair."
+#: guix-git/doc/guix.texi:4934
+msgid "Generate a new key pair for the daemon.  This is a prerequisite before archives can be exported with @option{--export}.  This operation is usually instantaneous but it can take time if the system's entropy pool needs to be refilled.  On Guix System, @code{guix-service-type} takes care of generating this key pair the first boot."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4289
-msgid "The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, which must be kept secret.)  When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key.  Alternatively, @var{parameters} can specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})."
+#: guix-git/doc/guix.texi:4944
+msgid "The generated key pair is typically stored under @file{/etc/guix}, in @file{signing-key.pub} (public key) and @file{signing-key.sec} (private key, which must be kept secret).  When @var{parameters} is omitted, an ECDSA key using the Ed25519 curve is generated, or, for Libgcrypt versions before 1.6.0, it is a 4096-bit RSA key.  Alternatively, @var{parameters} can specify @code{genkey} parameters suitable for Libgcrypt (@pxref{General public-key related Functions, @code{gcry_pk_genkey},, gcrypt, The Libgcrypt Reference Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4290
+#: guix-git/doc/guix.texi:4945
 #, no-wrap
 msgid "--authorize"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4291
+#: guix-git/doc/guix.texi:4946
 #, no-wrap
 msgid "authorizing, archives"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4295
+#: guix-git/doc/guix.texi:4950
 msgid "Authorize imports signed by the public key passed on standard input.  The public key must be in ``s-expression advanced format''---i.e., the same format as the @file{signing-key.pub} file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4302
+#: guix-git/doc/guix.texi:4957
 msgid "The list of authorized keys is kept in the human-editable file @file{/etc/guix/acl}.  The file contains @url{https://people.csail.mit.edu/rivest/Sexp.txt, ``advanced-format s-expressions''} and is structured as an access-control list in the @url{https://theworld.com/~cme/spki.txt, Simple Public-Key Infrastructure (SPKI)}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4303
+#: guix-git/doc/guix.texi:4958
 #, no-wrap
 msgid "--extract=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4304
+#: guix-git/doc/guix.texi:4959
 #, no-wrap
 msgid "-x @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4308
+#: guix-git/doc/guix.texi:4963
 msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and extract it to @var{directory}.  This is a low-level operation needed in only very narrow use cases; see below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4311
+#: guix-git/doc/guix.texi:4966
 msgid "For example, the following command extracts the substitute for Emacs served by @code{@value{SUBSTITUTE-SERVER}} to @file{/tmp/emacs}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4316
+#: guix-git/doc/guix.texi:4971
 #, no-wrap
 msgid ""
 "$ wget -O - \\\n"
-"  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-emacs-24.5 \\\n"
-"  | bunzip2 | guix archive -x /tmp/emacs\n"
+"  https://@value{SUBSTITUTE-SERVER}/nar/gzip/@dots{}-emacs-24.5 \\\n"
+"  | gunzip | guix archive -x /tmp/emacs\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4323
+#: guix-git/doc/guix.texi:4978
 msgid "Single-item archives are different from multiple-item archives produced by @command{guix archive --export}; they contain a single store item, and they do @emph{not} embed a signature.  Thus this operation does @emph{no} signature verification and its output should be considered unsafe."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4326
-msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers."
+#: guix-git/doc/guix.texi:4982
+msgid "The primary purpose of this operation is to facilitate inspection of archive contents coming from possibly untrusted substitute servers (@pxref{Invoking guix challenge})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:4983
+#, no-wrap
+msgid "--list"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:4984 guix-git/doc/guix.texi:11463
+#: guix-git/doc/guix.texi:11510
+#, no-wrap
+msgid "-t"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:4988
+msgid "Read a single-item archive as served by substitute servers (@pxref{Substitutes}) and print the list of files it contains, as in this example:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:4993
+#, no-wrap
+msgid ""
+"$ wget -O - \\\n"
+"  https://@value{SUBSTITUTE-SERVER}/nar/lzip/@dots{}-emacs-26.3 \\\n"
+"  | lzip -d | guix archive -t\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5004
+#, no-wrap
+msgid "@command{guix pull}, configuration file"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5005
+#, no-wrap
+msgid "configuration of @command{guix pull}"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5016
+msgid "Guix and its package collection are updated by running @command{guix pull} (@pxref{Invoking guix pull}).  By default @command{guix pull} downloads and deploys Guix itself from the official GNU@tie{}Guix repository.  This can be customized by defining @dfn{channels} in the @file{~/.config/guix/channels.scm} file.  A channel specifies a URL and branch of a Git repository to be deployed, and @command{guix pull} can be instructed to pull from one or more channels.  In other words, channels can be used to @emph{customize} and to @emph{extend} Guix, as we will see below.  Guix is able to take into account security concerns and deal with authenticated updates."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4334
+#: guix-git/doc/guix.texi:5034
+#, no-wrap
+msgid "extending the package collection (channels)"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5035
+#, no-wrap
+msgid "variant packages (channels)"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5039
+msgid "You can specify @emph{additional channels} to pull from.  To use a channel, write @code{~/.config/guix/channels.scm} to instruct @command{guix pull} to pull from it @emph{in addition} to the default Guix channel(s):"
+msgstr ""
+
+#. type: vindex
+#: guix-git/doc/guix.texi:5040
+#, no-wrap
+msgid "%default-channels"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5047
+#, no-wrap
+msgid ""
+";; Add variant packages to those Guix provides.\n"
+"(cons (channel\n"
+"        (name 'variant-packages)\n"
+"        (url \"https://example.org/variant-packages.git\"))\n"
+"      %default-channels)\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5057
+msgid "Note that the snippet above is (as always!)@: Scheme code; we use @code{cons} to add a channel the list of channels that the variable @code{%default-channels} is bound to (@pxref{Pairs, @code{cons} and lists,, guile, GNU Guile Reference Manual}).  With this file in place, @command{guix pull} builds not only Guix but also the package modules from your own repository.  The result in @file{~/.config/guix/current} is the union of Guix with your own package modules:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:5072
+#, no-wrap
+msgid ""
+"$ guix pull --list-generations\n"
+"@dots{}\n"
+"Generation 19\tAug 27 2018 16:20:48\n"
+"  guix d894ab8\n"
+"    repository URL: https://git.savannah.gnu.org/git/guix.git\n"
+"    branch: master\n"
+"    commit: d894ab8e9bfabcefa6c49d9ba2e834dd5a73a300\n"
+"  variant-packages dd3df5e\n"
+"    repository URL: https://example.org/variant-packages.git\n"
+"    branch: master\n"
+"    commit: dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\n"
+"  11 new packages: variant-gimp, variant-emacs-with-cool-features, @dots{}\n"
+"  4 packages upgraded: emacs-racket-mode@@0.0.2-2.1b78827, @dots{}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5080
+msgid "The output of @command{guix pull} above shows that Generation@tie{}19 includes both Guix and packages from the @code{variant-personal-packages} channel.  Among the new and upgraded packages that are listed, some like @code{variant-gimp} and @code{variant-emacs-with-cool-features} might come from @code{variant-packages}, while others come from the Guix default channel."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5089
+msgid "The channel called @code{guix} specifies where Guix itself---its command-line tools as well as its package collection---should be downloaded.  For instance, suppose you want to update from another copy of the Guix repository at @code{example.org}, and specifically the @code{super-hacks} branch, you can write in @code{~/.config/guix/channels.scm} this specification:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5096
+#, no-wrap
+msgid ""
+";; Tell 'guix pull' to use another repo.\n"
+"(list (channel\n"
+"        (name 'guix)\n"
+"        (url \"https://example.org/another-guix.git\")\n"
+"        (branch \"super-hacks\")))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5102
+msgid "From there on, @command{guix pull} will fetch code from the @code{super-hacks} branch of the repository at @code{example.org}.  The authentication concern is addressed below ((@pxref{Channel Authentication})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5113
+msgid "The @command{guix pull --list-generations} output above shows precisely which commits were used to build this instance of Guix.  We can thus replicate it, say, on another machine, by providing a channel specification in @file{~/.config/guix/channels.scm} that is ``pinned'' to these commits:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5124
+#, no-wrap
+msgid ""
+";; Deploy specific commits of my channels of interest.\n"
+"(list (channel\n"
+"       (name 'guix)\n"
+"       (url \"https://git.savannah.gnu.org/git/guix.git\")\n"
+"       (commit \"6298c3ffd9654d3231a6f25390b056483e8f407c\"))\n"
+"      (channel\n"
+"       (name 'variant-packages)\n"
+"       (url \"https://example.org/variant-packages.git\")\n"
+"       (commit \"dd3df5e2c8818760a8fc0bd699e55d3b69fef2bb\")))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5131
+msgid "The @command{guix describe --format=channels} command can even generate this list of channels directly (@pxref{Invoking guix describe}).  The resulting file can be used with the -C options of @command{guix pull} (@pxref{Invoking guix pull}) or @command{guix time-machine} (@pxref{Invoking guix time-machine})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5138
+msgid "At this point the two machines run the @emph{exact same Guix}, with access to the @emph{exact same packages}.  The output of @command{guix build gimp} on one machine will be exactly the same, bit for bit, as the output of the same command on the other machine.  It also means both machines have access to all the source code of Guix and, transitively, to all the source code of every package it defines."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5143
+msgid "This gives you super powers, allowing you to track the provenance of binary artifacts with very fine grain, and to reproduce software environments at will---some sort of ``meta reproducibility'' capabilities, if you will.  @xref{Inferiors}, for another way to take advantage of these super powers."
+msgstr ""
+
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:5148
+msgid "channel-authentication"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5154
+msgid "The @command{guix pull} and @command{guix time-machine} commands @dfn{authenticate} the code retrieved from channels: they make sure each commit that is fetched is signed by an authorized developer.  The goal is to protect from unauthorized modifications to the channel that would lead users to run malicious code."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5159
+msgid "As a user, you must provide a @dfn{channel introduction} in your channels file so that Guix knows how to authenticate its first commit.  A channel specification, including its introduction, looks something along these lines:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5169
+#, no-wrap
+msgid ""
+"(channel\n"
+"  (name 'some-channel)\n"
+"  (url \"https://example.org/some-channel.git\")\n"
+"  (introduction\n"
+"   (make-channel-introduction\n"
+"    \"6f0d8cc0d88abb59c324b2990bfee2876016bb86\"\n"
+"    (openpgp-fingerprint\n"
+"     \"CABB A931 C0FF EEC6 900D  0CFB 090B 1199 3D9A EBB5\"))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5175
+msgid "The specification above shows the name and URL of the channel.  The call to @code{make-channel-introduction} above specifies that authentication of this channel starts at commit @code{6f0d8cc@dots{}}, which is signed by the OpenPGP key with fingerprint @code{CABB A931@dots{}}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5181
+msgid "For the main channel, called @code{guix}, you automatically get that information from your Guix installation.  For other channels, include the channel introduction provided by the channel authors in your @file{channels.scm} file.  Make sure you retrieve the channel introduction from a trusted source since that is the root of your trust."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5183
+msgid "If you're curious about the authentication mechanics, read on!"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5194
+msgid "When running @command{guix pull}, Guix will first compile the definitions of every available package.  This is an expensive operation for which substitutes (@pxref{Substitutes}) may be available.  The following snippet in @file{channels.scm} will ensure that @command{guix pull} uses the latest commit with available substitutes for the package definitions: this is done by querying the continuous integration server at @url{https://ci.guix.gnu.org}."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5197
+#, no-wrap
+msgid ""
+"(use-modules (guix ci))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5201
+#, no-wrap
+msgid ""
+"(list (channel-with-substitutes-available\n"
+"       %default-guix-channel\n"
+"       \"https://ci.guix.gnu.org\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5208
+msgid "Note that this does not mean that all the packages that you will install after running @command{guix pull} will have available substitutes.  It only ensures that @command{guix pull} will not try to compile package definitions.  This is particularly useful when using machines with limited resources."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5212
+#, no-wrap
+msgid "personal packages (channels)"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5213
+#, no-wrap
+msgid "channels, for personal packages"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5221
+msgid "Let's say you have a bunch of custom package variants or personal packages that you think would make little sense to contribute to the Guix project, but would like to have these packages transparently available to you at the command line.  You would first write modules containing those package definitions (@pxref{Package Modules}), maintain them in a Git repository, and then you and anyone else can use it as an additional channel to get packages from.  Neat, no?"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:5225 guix-git/doc/guix.texi:13677
+#: guix-git/doc/guix.texi:19632 guix-git/doc/guix.texi:19639
+#, no-wrap
+msgid "Warning"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:5229
+msgid "Before you, dear user, shout---``woow this is @emph{soooo coool}!''---and publish your personal channel to the world, we would like to share a few words of caution:"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:5237
+msgid "Before publishing a channel, please consider contributing your package definitions to Guix proper (@pxref{Contributing}).  Guix as a project is open to free software of all sorts, and packages in Guix proper are readily available to all Guix users and benefit from the project's quality assurance process."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:5246
+msgid "When you maintain package definitions outside Guix, we, Guix developers, consider that @emph{the compatibility burden is on you}.  Remember that package modules and package definitions are just Scheme code that uses various programming interfaces (APIs).  We want to remain free to change these APIs to keep improving Guix, possibly in ways that break your channel.  We never change APIs gratuitously, but we will @emph{not} commit to freezing APIs either."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:5250
+msgid "Corollary: if you're using an external channel and that channel breaks, please @emph{report the issue to the channel authors}, not to the Guix project."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:5257
+msgid "You've been warned! Having said this, we believe external channels are a practical way to exert your freedom to augment Guix' package collection and to share your improvements, which are basic tenets of @uref{https://www.gnu.org/philosophy/free-sw.html, free software}.  Please email us at @email{guix-devel@@gnu.org} if you'd like to discuss this."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5269
+msgid "To create a channel, create a Git repository containing your own package modules and make it available.  The repository can contain anything, but a useful channel will contain Guile modules that export packages.  Once you start using a channel, Guix will behave as if the root directory of that channel's Git repository has been added to the Guile load path (@pxref{Load Paths,,, guile, GNU Guile Reference Manual}).  For example, if your channel contains a file at @file{my-packages/my-tools.scm} that defines a Guile module, then the module will be available under the name @code{(my-packages my-tools)}, and you will be able to use it like any other module (@pxref{Modules,,, guile, GNU Guile Reference Manual})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5274
+msgid "As a channel author, consider bundling authentication material with your channel so that users can authenticate it.  @xref{Channel Authentication}, and @ref{Specifying Channel Authorizations}, for info on how to do it."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5279
+#, no-wrap
+msgid "subdirectory, channels"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5283
+msgid "As a channel author, you may want to keep your channel modules in a sub-directory.  If your modules are in the sub-directory @file{guix}, you must add a meta-data file @file{.guix-channel} that contains:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5288
+#, no-wrap
+msgid ""
+"(channel\n"
+"  (version 0)\n"
+"  (directory \"guix\"))\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5293
+#, no-wrap
+msgid "dependencies, channels"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5294
+#, no-wrap
+msgid "meta-data, channels"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5299
+msgid "Channel authors may decide to augment a package collection provided by other channels.  They can declare their channel to be dependent on other channels in a meta-data file @file{.guix-channel}, which is to be placed in the root of the channel repository."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5301
+msgid "The meta-data file should contain a simple S-expression like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5309
+#, no-wrap
+msgid ""
+"(channel\n"
+" (version 0)\n"
+" (dependencies\n"
+"  (channel\n"
+"   (name some-collection)\n"
+"   (url \"https://example.org/first-collection.git\")\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5321
+#, no-wrap
+msgid ""
+"   ;; The 'introduction' bit below is optional: you would\n"
+"   ;; provide it for dependencies that can be authenticated.\n"
+"   (introduction\n"
+"    (channel-introduction\n"
+"      (version 0)\n"
+"      (commit \"a8883b58dc82e167c96506cf05095f37c2c2c6cd\")\n"
+"      (signer \"CABB A931 C0FF EEC6 900D  0CFB 090B 1199 3D9A EBB5\"))))\n"
+"  (channel\n"
+"   (name some-other-collection)\n"
+"   (url \"https://example.org/second-collection.git\")\n"
+"   (branch \"testing\"))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5327
+msgid "In the above example this channel is declared to depend on two other channels, which will both be fetched automatically.  The modules provided by the channel will be compiled in an environment where the modules of all these declared channels are available."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5331
+msgid "For the sake of reliability and maintainability, you should avoid dependencies on channels that you don't control, and you should aim to keep the number of dependencies to a minimum."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5335
+#, no-wrap
+msgid "channel authorizations"
+msgstr ""
+
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:5349
+msgid "channel-authorizations"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5349
+msgid "As we saw above, Guix ensures the source code it pulls from channels comes from authorized developers.  As a channel author, you need to specify the list of authorized developers in the @file{.guix-authorizations} file in the channel's Git repository.  The authentication rule is simple: each commit must be signed by a key listed in the @file{.guix-authorizations} file of its parent commit(s)@footnote{Git commits form a @dfn{directed acyclic graph} (DAG).  Each commit can have zero or more parents; ``regular'' commits have one parent and merge commits have two parent commits.  Read @uref{https://eagain.net/articles/git-for-computer-scientists/, @i{Git for Computer Scientists}} for a great overview.} The @file{.guix-authorizations} file looks like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5352
+#, no-wrap
+msgid ""
+";; Example '.guix-authorizations' file.\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5355
+#, no-wrap
+msgid ""
+"(authorizations\n"
+" (version 0)               ;current file format version\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5362
+#, no-wrap
+msgid ""
+" ((\"AD17 A21E F8AE D8F1 CC02  DBD9 F8AE D8F1 765C 61E3\"\n"
+"   (name \"alice\"))\n"
+"  (\"2A39 3FFF 68F4 EF7A 3D29  12AF 68F4 EF7A 22FB B2D5\"\n"
+"   (name \"bob\"))\n"
+"  (\"CABB A931 C0FF EEC6 900D  0CFB 090B 1199 3D9A EBB5\"\n"
+"   (name \"charlie\"))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5366
+msgid "Each fingerprint is followed by optional key/value pairs, as in the example above.  Currently these key/value pairs are ignored."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5371
+msgid "This authentication rule creates a chicken-and-egg issue: how do we authenticate the first commit? Related to that: how do we deal with channels whose repository history contains unsigned commits and lack @file{.guix-authorizations}? And how do we fork existing channels?"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5372
+#, fuzzy, no-wrap
+#| msgid "Introduction"
+msgid "channel introduction"
+msgstr "介绍"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5379
+msgid "Channel introductions answer these questions by describing the first commit of a channel that should be authenticated.  The first time a channel is fetched with @command{guix pull} or @command{guix time-machine}, the command looks up the introductory commit and verifies that it is signed by the specified OpenPGP key.  From then on, it authenticates commits according to the rule above."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5386
+msgid "Additionally, your channel must provide all the OpenPGP keys that were ever mentioned in @file{.guix-authorizations}, stored as @file{.key} files, which can be either binary or ``ASCII-armored''.  By default, those @file{.key} files are searched for in the branch named @code{keyring} but you can specify a different branch name in @code{.guix-channel} like so:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5391
+#, no-wrap
+msgid ""
+"(channel\n"
+"  (version 0)\n"
+"  (keyring-reference \"my-keyring-branch\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5395
+msgid "To summarize, as the author of a channel, there are three things you have to do to allow users to authenticate your code:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:5401
+msgid "Export the OpenPGP keys of past and present committers with @command{gpg --export} and store them in @file{.key} files, by default in a branch named @code{keyring} (we recommend making it an @dfn{orphan branch})."
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:5406
+msgid "Introduce an initial @file{.guix-authorizations} in the channel's repository.  Do that in a signed commit (@pxref{Commit Access}, for information on how to sign Git commits.)"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:5412
+msgid "Advertise the channel introduction, for instance on your channel's web page.  The channel introduction, as we saw above, is the commit/key pair---i.e., the commit that introduced @file{.guix-authorizations}, and the fingerprint of the OpenPGP used to sign it."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5417
+msgid "Before pushing to your public Git repository, you can run @command{guix git-authenticate} to verify that you did sign all the commits you are about to push with an authorized key:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:5420
+#, no-wrap
+msgid "guix git authenticate @var{commit} @var{signer}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5425
+msgid "where @var{commit} and @var{signer} are your channel introduction.  @xref{Invoking guix git authenticate}, for details."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5432
+msgid "Publishing a signed channel requires discipline: any mistake, such as an unsigned commit or a commit signed by an unauthorized key, will prevent users from pulling from your channel---well, that's the whole point of authentication! Pay attention to merges in particular: merge commits are considered authentic if and only if they are signed by a key present in the @file{.guix-authorizations} file of @emph{both} branches."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5436
+#, no-wrap
+msgid "primary URL, channels"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5439
+msgid "Channel authors can indicate the primary URL of their channel's Git repository in the @file{.guix-channel} file, like so:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5444
+#, no-wrap
+msgid ""
+"(channel\n"
+"  (version 0)\n"
+"  (url \"https://example.org/guix.git\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5451
+msgid "This allows @command{guix pull} to determine whether it is pulling code from a mirror of the channel; when that is the case, it warns the user that the mirror might be stale and displays the primary URL@.  That way, users cannot be tricked into fetching code from a stale mirror that does not receive security updates."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5455
+msgid "This feature only makes sense for authenticated repositories, such as the official @code{guix} channel, for which @command{guix pull} ensures the code it fetches is authentic."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5459
+#, no-wrap
+msgid "news, for channels"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5463
+msgid "Channel authors may occasionally want to communicate to their users information about important changes in the channel.  You'd send them all an email, but that's not convenient."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5468
+msgid "Instead, channels can provide a @dfn{news file}; when the channel users run @command{guix pull}, that news file is automatically read and @command{guix pull --news} can display the announcements that correspond to the new commits that have been pulled, if any."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5471
+msgid "To do that, channel authors must first declare the name of the news file in their @file{.guix-channel} file:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5476
+#, no-wrap
+msgid ""
+"(channel\n"
+"  (version 0)\n"
+"  (news-file \"etc/news.txt\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5480
+msgid "The news file itself, @file{etc/news.txt} in this example, must look something like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:5493
+#, no-wrap
+msgid ""
+"(channel-news\n"
+"  (version 0)\n"
+"  (entry (tag \"the-bug-fix\")\n"
+"         (title (en \"Fixed terrible bug\")\n"
+"                (fr \"Oh la la\"))\n"
+"         (body (en \"@@emph@{Good news@}!  It's fixed!\")\n"
+"               (eo \"Certe ĝi pli bone funkcias nun!\")))\n"
+"  (entry (commit \"bdcabe815cd28144a2d2b4bc3c5057b051fa9906\")\n"
+"         (title (en \"Added a great package\")\n"
+"                (ca \"Què vol dir guix?\"))\n"
+"         (body (en \"Don't miss the @@code@{hello@} package!\"))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5500
+msgid "While the news file is using the Scheme syntax, avoid naming it with a @file{.scm} extension or else it will get picked up when building the channel and yield an error since it is not a valid module.  Alternatively, you can move the channel module to a subdirectory and store the news file in another directory."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5505
+msgid "The file consists of a list of @dfn{news entries}.  Each entry is associated with a commit or tag: it describes changes made in this commit, possibly in preceding commits as well.  Users see entries only the first time they obtain the commit the entry refers to."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5511
+msgid "The @code{title} field should be a one-line summary while @code{body} can be arbitrarily long, and both can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  Both the title and body are a list of language tag/message tuples, which allows @command{guix pull} to display news in the language that corresponds to the user's locale."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5517
+msgid "If you want to translate news using a gettext-based workflow, you can extract translatable strings with @command{xgettext} (@pxref{xgettext Invocation,,, gettext, GNU Gettext Utilities}).  For example, assuming you write news entries in English first, the command below creates a PO file containing the strings to translate:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:5520
+#, no-wrap
+msgid "xgettext -o news.po -l scheme -ken etc/news.txt\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5524
+msgid "To sum up, yes, you could use your channel as a blog.  But beware, this is @emph{not quite} what your users might expect."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:5529
 #, no-wrap
 msgid "software development"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4338
+#: guix-git/doc/guix.texi:5533
 msgid "If you are a software developer, Guix provides tools that you should find helpful---independently of the language you're developing in.  This is what this chapter is about."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4344
+#: guix-git/doc/guix.texi:5539
 msgid "The @command{guix environment} command provides a convenient way to set up @dfn{development environments} containing all the dependencies and tools necessary to work on the software package of your choice.  The @command{guix pack} command allows you to create @dfn{application bundles} that can be easily distributed to users who do not run Guix."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:4351
+#: guix-git/doc/guix.texi:5548
 #, no-wrap
 msgid "Invoking @command{guix environment}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4353
+#: guix-git/doc/guix.texi:5550
 #, no-wrap
 msgid "reproducible build environments"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4354
+#: guix-git/doc/guix.texi:5551
 #, no-wrap
 msgid "development environments"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:4355
+#: guix-git/doc/guix.texi:5552
 #, no-wrap
 msgid "guix environment"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4356
+#: guix-git/doc/guix.texi:5553
 #, no-wrap
 msgid "environment, package build environment"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4362
+#: guix-git/doc/guix.texi:5559
 msgid "The purpose of @command{guix environment} is to assist hackers in creating reproducible development environments without polluting their package profile.  The @command{guix environment} tool takes one or more packages, builds all of their inputs, and creates a shell environment to use them."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:4364 doc/guix.texi:7621 doc/guix.texi:8349 doc/guix.texi:8416
-#: doc/guix.texi:9205 doc/guix.texi:9578 doc/guix.texi:9883 doc/guix.texi:9949
-#: doc/guix.texi:9988
-msgid "The general syntax is:"
-msgstr ""
-
 #. type: example
-#: doc/guix.texi:4367
+#: guix-git/doc/guix.texi:5564
 #, no-wrap
 msgid "guix environment @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4371
+#: guix-git/doc/guix.texi:5568
 msgid "The following example spawns a new shell set up for the development of GNU@tie{}Guile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4374
+#: guix-git/doc/guix.texi:5571
 #, no-wrap
 msgid "guix environment guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4391
-msgid "If the needed dependencies are not built yet, @command{guix environment} automatically builds them.  The environment of the new shell is an augmented version of the environment that @command{guix environment} was run in.  It contains the necessary search paths for building the given package added to the existing environment variables.  To create a ``pure'' environment, in which the original environment variables have been unset, use the @code{--pure} option@footnote{Users sometimes wrongfully augment environment variables such as @code{PATH} in their @file{~/.bashrc} file.  As a consequence, when @code{guix environment} launches it, Bash may read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables.  It is an error to define such environment variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}."
+#: guix-git/doc/guix.texi:5588
+msgid "If the needed dependencies are not built yet, @command{guix environment} automatically builds them.  The environment of the new shell is an augmented version of the environment that @command{guix environment} was run in.  It contains the necessary search paths for building the given package added to the existing environment variables.  To create a ``pure'' environment, in which the original environment variables have been unset, use the @option{--pure} option@footnote{Users sometimes wrongfully augment environment variables such as @env{PATH} in their @file{~/.bashrc} file.  As a consequence, when @command{guix environment} launches it, Bash may read @file{~/.bashrc}, thereby introducing ``impurities'' in these environment variables.  It is an error to define such environment variables in @file{.bashrc}; instead, they should be defined in @file{.bash_profile}, which is sourced only by log-in shells.  @xref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}, for details on Bash start-up files.}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5594
+msgid "Exiting from a Guix environment is the same as exiting from the shell, and will place the user back in the old environment before @command{guix environment} was invoked.  The next garbage collection (@pxref{Invoking guix gc}) will clean up packages that were installed from within the environment and are no longer used outside of it."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:4392
+#: guix-git/doc/guix.texi:5595
 #, no-wrap
 msgid "GUIX_ENVIRONMENT"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4398
-msgid "@command{guix environment} defines the @code{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the profile of this environment.  This allows users to, say, define a specific prompt for development environments in their @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):"
+#: guix-git/doc/guix.texi:5601
+msgid "@command{guix environment} defines the @env{GUIX_ENVIRONMENT} variable in the shell it spawns; its value is the file name of the profile of this environment.  This allows users to, say, define a specific prompt for development environments in their @file{.bashrc} (@pxref{Bash Startup Files,,, bash, The GNU Bash Reference Manual}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4404
+#: guix-git/doc/guix.texi:5607
 #, no-wrap
 msgid ""
 "if [ -n \"$GUIX_ENVIRONMENT\" ]\n"
@@ -9116,282 +11921,317 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4408
+#: guix-git/doc/guix.texi:5611
 msgid "...@: or to browse the profile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4411
+#: guix-git/doc/guix.texi:5614
 #, no-wrap
 msgid "$ ls \"$GUIX_ENVIRONMENT/bin\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4417
+#: guix-git/doc/guix.texi:5620
 msgid "Additionally, more than one package may be specified, in which case the union of the inputs for the given packages are used.  For example, the command below spawns a shell where all of the dependencies of both Guile and Emacs are available:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4420
+#: guix-git/doc/guix.texi:5623
 #, no-wrap
 msgid "guix environment guile emacs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4425
+#: guix-git/doc/guix.texi:5628
 msgid "Sometimes an interactive shell session is not desired.  An arbitrary command may be invoked by placing the @code{--} token to separate the command from the rest of the arguments:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4428
+#: guix-git/doc/guix.texi:5631
 #, no-wrap
 msgid "guix environment guile -- make -j4\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4434
+#: guix-git/doc/guix.texi:5637
 msgid "In other situations, it is more convenient to specify the list of packages needed in the environment.  For example, the following command runs @command{python} from an environment containing Python@tie{}2.7 and NumPy:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4437
+#: guix-git/doc/guix.texi:5640
 #, no-wrap
 msgid "guix environment --ad-hoc python2-numpy python-2.7 -- python\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4448
-msgid "Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime dependencies, but are useful when developing nonetheless.  Because of this, the @code{--ad-hoc} flag is positional.  Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment.  Packages appearing after are interpreted as packages that will be added to the environment directly.  For example, the following command creates a Guix development environment that additionally includes Git and strace:"
+#: guix-git/doc/guix.texi:5651
+msgid "Furthermore, one might want the dependencies of a package and also some additional packages that are not build-time or runtime dependencies, but are useful when developing nonetheless.  Because of this, the @option{--ad-hoc} flag is positional.  Packages appearing before @option{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment.  Packages appearing after are interpreted as packages that will be added to the environment directly.  For example, the following command creates a Guix development environment that additionally includes Git and strace:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4451
+#: guix-git/doc/guix.texi:5654
+#, fuzzy, no-wrap
+#| msgid "guix environment guix --ad-hoc help2man git strace\n"
+msgid "guix environment --pure guix --ad-hoc git strace\n"
+msgstr "guix environment guix --ad-hoc help2man git strace\n"
+
+#. type: item
+#: guix-git/doc/guix.texi:5656 guix-git/doc/guix.texi:5817
+#: guix-git/doc/guix.texi:13078 guix-git/doc/guix.texi:33121
 #, no-wrap
-msgid "guix environment guix --ad-hoc git strace\n"
+msgid "container"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4460
+#: guix-git/doc/guix.texi:5664
 msgid "Sometimes it is desirable to isolate the environment as much as possible, for maximal purity and reproducibility.  In particular, when using Guix on a host distro that is not Guix System, it is desirable to prevent access to @file{/usr/bin} and other system-wide resources from the development environment.  For example, the following command spawns a Guile REPL in a ``container'' where only the store and the current working directory are mounted:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4463
+#: guix-git/doc/guix.texi:5667
 #, no-wrap
 msgid "guix environment --ad-hoc --container guile -- guile\n"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4467
-msgid "The @code{--container} option requires Linux-libre 3.19 or newer."
+#: guix-git/doc/guix.texi:5671
+msgid "The @option{--container} option requires Linux-libre 3.19 or newer."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:5673
+#, fuzzy, no-wrap
+#| msgid "X.509 Certificates"
+msgid "certificates"
+msgstr "X.509证书"
+
 #. type: Plain text
-#: doc/guix.texi:4470
+#: guix-git/doc/guix.texi:5680
+msgid "Another typical use case for containers is to run security-sensitive applications such as a web browser.  To run Eolie, we must expose and share some files and directories; we include @code{nss-certs} and expose @file{/etc/ssl/certs/} for HTTPS authentication; finally we preserve the @env{DISPLAY} environment variable since containerized graphical applications won't display without it."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:5687
+#, no-wrap
+msgid ""
+"guix environment --preserve='^DISPLAY$' --container --network \\\n"
+"  --expose=/etc/machine-id \\\n"
+"  --expose=/etc/ssl/certs/ \\\n"
+"  --share=$HOME/.local/share/eolie/=$HOME/.local/share/eolie/ \\\n"
+"  --ad-hoc eolie nss-certs dbus --  eolie\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5690
 msgid "The available options are summarized below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4472 doc/guix.texi:8136 doc/guix.texi:24588
+#: guix-git/doc/guix.texi:5692 guix-git/doc/guix.texi:6228
+#: guix-git/doc/guix.texi:10886 guix-git/doc/guix.texi:33218
 #, no-wrap
 msgid "--root=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4473 doc/guix.texi:8137 doc/guix.texi:24589
+#: guix-git/doc/guix.texi:5693 guix-git/doc/guix.texi:6229
+#: guix-git/doc/guix.texi:10887 guix-git/doc/guix.texi:33219
 #, no-wrap
 msgid "-r @var{file}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4474
+#: guix-git/doc/guix.texi:5694
 #, no-wrap
 msgid "persistent environment"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4475
+#: guix-git/doc/guix.texi:5695
 #, no-wrap
 msgid "garbage collector root, for environments"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4478
+#: guix-git/doc/guix.texi:5698
 msgid "Make @var{file} a symlink to the profile for this environment, and register it as a garbage collector root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4481
+#: guix-git/doc/guix.texi:5701
 msgid "This is useful if you want to protect your environment from garbage collection, to make it ``persistent''."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4487
+#: guix-git/doc/guix.texi:5707
 msgid "When this option is omitted, the environment is protected from garbage collection only for the duration of the @command{guix environment} session.  This means that next time you recreate the same environment, you could have to rebuild or re-download packages.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4488 doc/guix.texi:4862 doc/guix.texi:7994 doc/guix.texi:8875
-#: doc/guix.texi:9533 doc/guix.texi:24547
+#: guix-git/doc/guix.texi:5708 guix-git/doc/guix.texi:6160
+#: guix-git/doc/guix.texi:10732 guix-git/doc/guix.texi:11737
+#: guix-git/doc/guix.texi:12532 guix-git/doc/guix.texi:33153
 #, no-wrap
 msgid "--expression=@var{expr}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4489 doc/guix.texi:4863 doc/guix.texi:7995 doc/guix.texi:8876
-#: doc/guix.texi:9534 doc/guix.texi:24548
+#: guix-git/doc/guix.texi:5709 guix-git/doc/guix.texi:6161
+#: guix-git/doc/guix.texi:10733 guix-git/doc/guix.texi:11738
+#: guix-git/doc/guix.texi:12533 guix-git/doc/guix.texi:33154
 #, no-wrap
 msgid "-e @var{expr}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4492
+#: guix-git/doc/guix.texi:5712
 msgid "Create an environment for the package or list of packages that @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4494
+#: guix-git/doc/guix.texi:5714
 msgid "For example, running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4497
+#: guix-git/doc/guix.texi:5717
 #, no-wrap
 msgid "guix environment -e '(@@ (gnu packages maths) petsc-openmpi)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4501
+#: guix-git/doc/guix.texi:5721
 msgid "starts a shell with the environment for this specific variant of the PETSc package."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4503
+#: guix-git/doc/guix.texi:5723
 msgid "Running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4506
+#: guix-git/doc/guix.texi:5726
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(@@ (gnu) %base-packages)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4509
+#: guix-git/doc/guix.texi:5729
 msgid "starts a shell with all the base system packages available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4512
+#: guix-git/doc/guix.texi:5732
 msgid "The above commands only use the default output of the given packages.  To select other outputs, two element tuples can be specified:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4515
+#: guix-git/doc/guix.texi:5735
 #, no-wrap
 msgid "guix environment --ad-hoc -e '(list (@@ (gnu packages bash) bash) \"include\")'\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4517
+#: guix-git/doc/guix.texi:5737
 #, no-wrap
 msgid "--load=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4518
+#: guix-git/doc/guix.texi:5738
 #, no-wrap
 msgid "-l @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4521
+#: guix-git/doc/guix.texi:5741
 msgid "Create an environment for the package or list of packages that the code within @var{file} evaluates to."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:4527
+#. type: lisp
+#: guix-git/doc/guix.texi:5747
 #, no-wrap
 msgid "@verbatiminclude environment-gdb.scm\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4533
-msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}."
+#: guix-git/doc/guix.texi:5754
+msgid "Create an environment for the packages contained in the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4537
+#: guix-git/doc/guix.texi:5758
 msgid "This is similar to the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4538
+#: guix-git/doc/guix.texi:5759
 #, no-wrap
 msgid "--ad-hoc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4543
+#: guix-git/doc/guix.texi:5764
 msgid "Include all specified packages in the resulting environment, as if an @i{ad hoc} package were defined with them as inputs.  This option is useful for quickly creating an environment without having to write a package expression to contain the desired inputs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4545
+#: guix-git/doc/guix.texi:5766
 msgid "For instance, the command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4548
+#: guix-git/doc/guix.texi:5769
 #, no-wrap
 msgid "guix environment --ad-hoc guile guile-sdl -- guile\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4552
+#: guix-git/doc/guix.texi:5773
 msgid "runs @command{guile} in an environment where Guile and Guile-SDL are available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4557
+#: guix-git/doc/guix.texi:5778
 msgid "Note that this example implicitly asks for the default output of @code{guile} and @code{guile-sdl}, but it is possible to ask for a specific output---e.g., @code{glib:bin} asks for the @code{bin} output of @code{glib} (@pxref{Packages with Multiple Outputs})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4563
-msgid "This option may be composed with the default behavior of @command{guix environment}.  Packages appearing before @code{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment, the default behavior.  Packages appearing after are interpreted as packages that will be added to the environment directly."
+#: guix-git/doc/guix.texi:5784
+msgid "This option may be composed with the default behavior of @command{guix environment}.  Packages appearing before @option{--ad-hoc} are interpreted as packages whose dependencies will be added to the environment, the default behavior.  Packages appearing after are interpreted as packages that will be added to the environment directly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4564
+#: guix-git/doc/guix.texi:5785
 #, no-wrap
 msgid "--pure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4568
-msgid "Unset existing environment variables when building the new environment, except those specified with @option{--preserve} (see below.)  This has the effect of creating an environment in which search paths only contain package inputs."
+#: guix-git/doc/guix.texi:5789
+msgid "Unset existing environment variables when building the new environment, except those specified with @option{--preserve} (see below).  This has the effect of creating an environment in which search paths only contain package inputs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4569
+#: guix-git/doc/guix.texi:5790
 #, no-wrap
 msgid "--preserve=@var{regexp}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4570
+#: guix-git/doc/guix.texi:5791
 #, no-wrap
 msgid "-E @var{regexp}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4575
+#: guix-git/doc/guix.texi:5796
 msgid "When used alongside @option{--pure}, preserve the environment variables matching @var{regexp}---in other words, put them on a ``white list'' of environment variables that must be preserved.  This option can be repeated several times."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4579
+#: guix-git/doc/guix.texi:5800
 #, no-wrap
 msgid ""
 "guix environment --pure --preserve=^SLURM --ad-hoc openmpi @dots{} \\\n"
@@ -9399,111 +12239,105 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4585
-msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @code{PATH}, environment variables whose name starts with @code{SLURM}, as well as the usual ``precious'' variables (@code{HOME}, @code{USER}, etc.)"
+#: guix-git/doc/guix.texi:5806
+msgid "This example runs @command{mpirun} in a context where the only environment variables defined are @env{PATH}, environment variables whose name starts with @samp{SLURM}, as well as the usual ``precious'' variables (@env{HOME}, @env{USER}, etc.)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4586
+#: guix-git/doc/guix.texi:5807
 #, no-wrap
 msgid "--search-paths"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4589
+#: guix-git/doc/guix.texi:5810
 msgid "Display the environment variable definitions that make up the environment."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4593
+#: guix-git/doc/guix.texi:5814
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4594
+#: guix-git/doc/guix.texi:5815
 #, no-wrap
 msgid "--container"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4595
+#: guix-git/doc/guix.texi:5816
 #, no-wrap
 msgid "-C"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:4596 doc/guix.texi:9974 doc/guix.texi:24515
-#, no-wrap
-msgid "container"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:4602
-msgid "Run @var{command} within an isolated container.  The current working directory outside the container is mapped inside the container.  Additionally, unless overridden with @code{--user}, a dummy home directory is created that matches the current user's home directory, and @file{/etc/passwd} is configured accordingly."
+#: guix-git/doc/guix.texi:5823
+msgid "Run @var{command} within an isolated container.  The current working directory outside the container is mapped inside the container.  Additionally, unless overridden with @option{--user}, a dummy home directory is created that matches the current user's home directory, and @file{/etc/passwd} is configured accordingly."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4606
-msgid "The spawned process runs as the current user outside the container.  Inside the container, it has the same UID and GID as the current user, unless @option{--user} is passed (see below.)"
+#: guix-git/doc/guix.texi:5827
+msgid "The spawned process runs as the current user outside the container.  Inside the container, it has the same UID and GID as the current user, unless @option{--user} is passed (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4607
+#: guix-git/doc/guix.texi:5828 guix-git/doc/guix.texi:33213
 #, no-wrap
 msgid "--network"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4612
+#: guix-git/doc/guix.texi:5833
 msgid "For containers, share the network namespace with the host system.  Containers created without this flag only have access to the loopback device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4613
+#: guix-git/doc/guix.texi:5834
 #, no-wrap
 msgid "--link-profile"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4614
+#: guix-git/doc/guix.texi:5835
 #, no-wrap
 msgid "-P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4621
-msgid "For containers, link the environment profile to @file{~/.guix-profile} within the container.  This is equivalent to running the command @command{ln -s $GUIX_ENVIRONMENT ~/.guix-profile} within the container.  Linking will fail and abort the environment if the directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory."
+#: guix-git/doc/guix.texi:5843
+msgid "For containers, link the environment profile to @file{~/.guix-profile} within the container and set @code{GUIX_ENVIRONMENT} to that.  This is equivalent to making @file{~/.guix-profile} a symlink to the actual profile within the container.  Linking will fail and abort the environment if the directory already exists, which will certainly be the case if @command{guix environment} was invoked in the user's home directory."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4628
-msgid "Certain packages are configured to look in @code{~/.guix-profile} for configuration files and data;@footnote{For example, the @code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @code{--link-profile} allows these programs to behave as expected within the environment."
+#: guix-git/doc/guix.texi:5849
+msgid "Certain packages are configured to look in @file{~/.guix-profile} for configuration files and data;@footnote{For example, the @code{fontconfig} package inspects @file{~/.guix-profile/share/fonts} for additional fonts.} @option{--link-profile} allows these programs to behave as expected within the environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4629 doc/guix.texi:9646
+#: guix-git/doc/guix.texi:5850 guix-git/doc/guix.texi:12665
 #, no-wrap
 msgid "--user=@var{user}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4630 doc/guix.texi:9647
+#: guix-git/doc/guix.texi:5851 guix-git/doc/guix.texi:12666
 #, no-wrap
 msgid "-u @var{user}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4637
+#: guix-git/doc/guix.texi:5858
 msgid "For containers, use the username @var{user} in place of the current user.  The generated @file{/etc/passwd} entry within the container will contain the name @var{user}, the home directory will be @file{/home/@var{user}}, and no user GECOS data will be copied.  Furthermore, the UID and GID inside the container are 1000.  @var{user} need not exist on the system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4642
-msgid "Additionally, any shared or exposed path (see @code{--share} and @code{--expose} respectively) whose target is within the current user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working directory."
+#: guix-git/doc/guix.texi:5863
+msgid "Additionally, any shared or exposed path (see @option{--share} and @option{--expose} respectively) whose target is within the current user's home directory will be remapped relative to @file{/home/USER}; this includes the automatic mapping of the current working directory."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4649
+#: guix-git/doc/guix.texi:5870
 #, no-wrap
 msgid ""
 "# will expose paths as /home/foo/wd, /home/foo/test, and /home/foo/target\n"
@@ -9514,111 +12348,106 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4654
+#: guix-git/doc/guix.texi:5875
 msgid "While this will limit the leaking of user identity through home paths and each of the user fields, this is only one useful component of a broader privacy/anonymity solution---not one in and of itself."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4655
+#: guix-git/doc/guix.texi:5876
 #, no-wrap
-msgid "--expose=@var{source}[=@var{target}]"
+msgid "--no-cwd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4660
-msgid "For containers, expose the file system @var{source} from the host system as the read-only file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+#: guix-git/doc/guix.texi:5883
+msgid "For containers, the default behavior is to share the current working directory with the isolated container and immediately change to that directory within the container.  If this is undesirable, @option{--no-cwd} will cause the current working directory to @emph{not} be automatically shared and will change to the user's home directory within the container instead.  See also @option{--user}."
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:4664
-msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/exchange} directory:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:4667
+#. type: item
+#: guix-git/doc/guix.texi:5884
 #, no-wrap
-msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
+msgid "--expose=@var{source}[=@var{target}]"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:4669
+#. type: itemx
+#: guix-git/doc/guix.texi:5885
 #, no-wrap
 msgid "--share=@var{source}[=@var{target}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4674
-msgid "For containers, share the file system @var{source} from the host system as the writable file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
+#: guix-git/doc/guix.texi:5891
+msgid "For containers, @option{--expose} (resp. @option{--share}) exposes the file system @var{source} from the host system as the read-only (resp. writable) file system @var{target} within the container.  If @var{target} is not specified, @var{source} is used as the target mount point in the container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4678
-msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible for both reading and writing via the @file{/exchange} directory:"
+#: guix-git/doc/guix.texi:5895
+msgid "The example below spawns a Guile REPL in a container in which the user's home directory is accessible read-only via the @file{/exchange} directory:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4681
+#: guix-git/doc/guix.texi:5898
 #, no-wrap
-msgid "guix environment --container --share=$HOME=/exchange --ad-hoc guile -- guile\n"
+msgid "guix environment --container --expose=$HOME=/exchange --ad-hoc guile -- guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4688
+#: guix-git/doc/guix.texi:5906
 msgid "@command{guix environment} also supports all of the common build options that @command{guix build} supports (@pxref{Common Build Options}) as well as package transformation options (@pxref{Package Transformation Options})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:4690
+#: guix-git/doc/guix.texi:5908
 #, no-wrap
 msgid "Invoking @command{guix pack}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4696
+#: guix-git/doc/guix.texi:5914
 msgid "Occasionally you want to pass software to people who are not (yet!)  lucky enough to be using Guix.  You'd tell them to run @command{guix package -i @var{something}}, but that's not possible in this case.  This is where @command{guix pack} comes in."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4701
+#: guix-git/doc/guix.texi:5919
 msgid "If you are looking for ways to exchange binaries among machines that already run Guix, @pxref{Invoking guix copy}, @ref{Invoking guix publish}, and @ref{Invoking guix archive}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4703
+#: guix-git/doc/guix.texi:5921
 #, no-wrap
 msgid "pack"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4704
+#: guix-git/doc/guix.texi:5922
 #, no-wrap
 msgid "bundle"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4705
+#: guix-git/doc/guix.texi:5923
 #, no-wrap
 msgid "application bundle"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4706
+#: guix-git/doc/guix.texi:5924
 #, no-wrap
 msgid "software bundle"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4715
+#: guix-git/doc/guix.texi:5933
 msgid "The @command{guix pack} command creates a shrink-wrapped @dfn{pack} or @dfn{software bundle}: it creates a tarball or some other archive containing the binaries of the software you're interested in, and all its dependencies.  The resulting archive can be used on any machine that does not have Guix, and people can run the exact same binaries as those you have with Guix.  The pack itself is created in a bit-reproducible fashion, so anyone can verify that it really contains the build results that you pretend to be shipping."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4718
+#: guix-git/doc/guix.texi:5936
 msgid "For example, to create a bundle containing Guile, Emacs, Geiser, and all their dependencies, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4723
+#: guix-git/doc/guix.texi:5941
 #, no-wrap
 msgid ""
 "$ guix pack guile emacs geiser\n"
@@ -9627,175 +12456,205 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4731
+#: guix-git/doc/guix.texi:5949
 msgid "The result here is a tarball containing a @file{/gnu/store} directory with all the relevant packages.  The resulting tarball contains a @dfn{profile} with the three packages of interest; the profile is the same as would be created by @command{guix package -i}.  It is this mechanism that is used to create Guix's own standalone binary tarball (@pxref{Binary Installation})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4736
+#: guix-git/doc/guix.texi:5954
 msgid "Users of this pack would have to run @file{/gnu/store/@dots{}-profile/bin/guile} to run Guile, which you may find inconvenient.  To work around it, you can create, say, a @file{/opt/gnu/bin} symlink to the profile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4739
+#: guix-git/doc/guix.texi:5957
 #, no-wrap
 msgid "guix pack -S /opt/gnu/bin=bin guile emacs geiser\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4743
+#: guix-git/doc/guix.texi:5961
 msgid "That way, users can happily type @file{/opt/gnu/bin/guile} and enjoy."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4744
+#: guix-git/doc/guix.texi:5962
 #, no-wrap
 msgid "relocatable binaries, with @command{guix pack}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4752
-msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @code{--relocatable} option (see below).  This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}."
+#: guix-git/doc/guix.texi:5970
+msgid "What if the recipient of your pack does not have root privileges on their machine, and thus cannot unpack it in the root file system? In that case, you will want to use the @option{--relocatable} option (see below).  This option produces @dfn{relocatable binaries}, meaning they they can be placed anywhere in the file system hierarchy: in the example above, users can unpack your tarball in their home directory and directly run @file{./opt/gnu/bin/guile}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4753
+#: guix-git/doc/guix.texi:5971
 #, no-wrap
 msgid "Docker, build an image with guix pack"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4756
+#: guix-git/doc/guix.texi:5974
 msgid "Alternatively, you can produce a pack in the Docker image format using the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4759
+#: guix-git/doc/guix.texi:5977
 #, no-wrap
-msgid "guix pack -f docker guile emacs geiser\n"
+msgid "guix pack -f docker -S /bin=bin guile guile-readline\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4766
-msgid "The result is a tarball that can be passed to the @command{docker load} command.  See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information."
+#: guix-git/doc/guix.texi:5982
+msgid "The result is a tarball that can be passed to the @command{docker load} command, followed by @code{docker run}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:5986
+#, no-wrap
+msgid ""
+"docker load < @var{file}\n"
+"docker run -ti guile-guile-readline /bin/guile\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:5993
+msgid "where @var{file} is the image returned by @var{guix pack}, and @code{guile-guile-readline} is its ``image tag''.  See the @uref{https://docs.docker.com/engine/reference/commandline/load/, Docker documentation} for more information."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4767
+#: guix-git/doc/guix.texi:5994
 #, no-wrap
 msgid "Singularity, build an image with guix pack"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4768
+#: guix-git/doc/guix.texi:5995
 #, no-wrap
 msgid "SquashFS, build an image with guix pack"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4771
+#: guix-git/doc/guix.texi:5998
 msgid "Yet another option is to produce a SquashFS image with the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4774
-#, no-wrap
-msgid "guix pack -f squashfs guile emacs geiser\n"
-msgstr ""
+#: guix-git/doc/guix.texi:6001
+#, fuzzy, no-wrap
+#| msgid "guix package -i emacs guile emacs-geiser\n"
+msgid "guix pack -f squashfs bash guile emacs geiser\n"
+msgstr "guix package -i emacs guile emacs-geiser\n"
 
 #. type: Plain text
-#: doc/guix.texi:4782
-msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{https://singularity.lbl.gov, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}."
+#: guix-git/doc/guix.texi:6009
+msgid "The result is a SquashFS file system image that can either be mounted or directly be used as a file system container image with the @uref{https://www.sylabs.io/docs/, Singularity container execution environment}, using commands like @command{singularity shell} or @command{singularity exec}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4784
+#: guix-git/doc/guix.texi:6011
 msgid "Several command-line options allow you to customize your pack:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4789
+#: guix-git/doc/guix.texi:6016
 msgid "Produce a pack in the given @var{format}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4791
+#: guix-git/doc/guix.texi:6018
 msgid "The available formats are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4793
+#: guix-git/doc/guix.texi:6020
 #, no-wrap
 msgid "tarball"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4796
+#: guix-git/doc/guix.texi:6023
 msgid "This is the default format.  It produces a tarball containing all the specified binaries and symlinks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4797
+#: guix-git/doc/guix.texi:6024
 #, no-wrap
 msgid "docker"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4801
-msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}."
+#: guix-git/doc/guix.texi:6030
+msgid "This produces a tarball that follows the @uref{https://github.com/docker/docker/blob/master/image/spec/v1.2.md, Docker Image Specification}.  The ``repository name'' as it appears in the output of the @command{docker images} command is computed from package names passed on the command line or in the manifest file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4802
+#: guix-git/doc/guix.texi:6031
 #, no-wrap
 msgid "squashfs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4806
+#: guix-git/doc/guix.texi:6035
 msgid "This produces a SquashFS image containing all the specified binaries and symlinks, as well as empty mount points for virtual file systems like procfs."
 msgstr ""
 
+#. type: quotation
+#: guix-git/doc/guix.texi:6041
+msgid "Singularity @emph{requires} you to provide @file{/bin/sh} in the image.  For that reason, @command{guix pack -f squashfs} always implies @code{-S /bin=bin}.  Thus, your @command{guix pack} invocation must always start with something like:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:6044
+#, no-wrap
+msgid "guix pack -f squashfs bash @dots{}\n"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:6049
+msgid "If you forget the @code{bash} (or similar) package, @command{singularity run} and @command{singularity exec} will fail with an unhelpful ``no such file or directory'' message."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:4808
+#: guix-git/doc/guix.texi:6052
 #, no-wrap
 msgid "relocatable binaries"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4809
+#: guix-git/doc/guix.texi:6053
 #, no-wrap
 msgid "--relocatable"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4813
+#: guix-git/doc/guix.texi:6057
 msgid "Produce @dfn{relocatable binaries}---i.e., binaries that can be placed anywhere in the file system hierarchy and run from there."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4821
-msgid "When this option is passed once, the resulting binaries require support for @dfn{user namespaces} in the kernel Linux; when passed @emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds PRoot support, can be thought of as the abbreviation of ``Really Relocatable''.  Neat, isn't it?}, relocatable binaries fall to back to PRoot if user namespaces are unavailable, and essentially work anywhere---see below for the implications."
+#: guix-git/doc/guix.texi:6065
+msgid "When this option is passed once, the resulting binaries require support for @dfn{user namespaces} in the kernel Linux; when passed @emph{twice}@footnote{Here's a trick to memorize it: @code{-RR}, which adds PRoot support, can be thought of as the abbreviation of ``Really Relocatable''.  Neat, isn't it?}, relocatable binaries fall to back to other techniques if user namespaces are unavailable, and essentially work anywhere---see below for the implications."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4823
+#: guix-git/doc/guix.texi:6067
 msgid "For example, if you create a pack containing Bash with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4826
+#: guix-git/doc/guix.texi:6070
 #, no-wrap
 msgid "guix pack -RR -S /mybin=bin bash\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4831
+#: guix-git/doc/guix.texi:6075
 msgid "...@: you can copy that pack to a machine that lacks Guix, and from your home directory as a normal user, run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:4835
+#: guix-git/doc/guix.texi:6079
 #, no-wrap
 msgid ""
 "tar xf pack.tar.gz\n"
@@ -9803,243 +12662,536 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4843
+#: guix-git/doc/guix.texi:6087
 msgid "In that shell, if you type @code{ls /gnu/store}, you'll notice that @file{/gnu/store} shows up and contains all the dependencies of @code{bash}, even though the machine actually lacks @file{/gnu/store} altogether! That is probably the simplest way to deploy Guix-built software on a non-Guix machine."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4849
+#: guix-git/doc/guix.texi:6093
 msgid "By default, relocatable binaries rely on the @dfn{user namespace} feature of the kernel Linux, which allows unprivileged users to mount or change root.  Old versions of Linux did not support it, and some GNU/Linux distributions turn it off."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4854
-msgid "To produce relocatable binaries that work even in the absence of user namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}.  In that case, binaries will try user namespace support and fall back to PRoot if user namespaces are not supported."
+#: guix-git/doc/guix.texi:6099
+msgid "To produce relocatable binaries that work even in the absence of user namespaces, pass @option{--relocatable} or @option{-R} @emph{twice}.  In that case, binaries will try user namespace support and fall back to another @dfn{execution engine} if user namespaces are not supported.  The following execution engines are supported:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6101 guix-git/doc/guix.texi:16276
+#, no-wrap
+msgid "default"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6104
+msgid "Try user namespaces and fall back to PRoot if user namespaces are not supported (see below)."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6105
+#, fuzzy, no-wrap
+#| msgid "formatting code"
+msgid "performance"
+msgstr "格式化代码"
+
+#. type: table
+#: guix-git/doc/guix.texi:6108
+msgid "Try user namespaces and fall back to Fakechroot if user namespaces are not supported (see below)."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6109
+#, fuzzy, no-wrap
+#| msgid "user"
+msgid "userns"
+msgstr "用户"
+
+#. type: table
+#: guix-git/doc/guix.texi:6112
+msgid "Run the program through user namespaces and abort if they are not supported."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6113
+#, fuzzy, no-wrap
+#| msgid "chroot"
+msgid "proot"
+msgstr "chroot"
+
+#. type: table
+#: guix-git/doc/guix.texi:6120
+msgid "Run through PRoot.  The @uref{https://proot-me.github.io/, PRoot} program provides the necessary support for file system virtualization.  It achieves that by using the @code{ptrace} system call on the running program.  This approach has the advantage to work without requiring special kernel support, but it incurs run-time overhead every time a system call is made."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6121
+#, fuzzy, no-wrap
+#| msgid "chroot"
+msgid "fakechroot"
+msgstr "chroot"
+
+#. type: table
+#: guix-git/doc/guix.texi:6129
+msgid "Run through Fakechroot.  @uref{https://github.com/dex4er/fakechroot/, Fakechroot} virtualizes file system accesses by intercepting calls to C library functions such as @code{open}, @code{stat}, @code{exec}, and so on.  Unlike PRoot, it incurs very little overhead.  However, it does not always work: for example, some file system accesses made from within the C library are not intercepted, and file system accesses made @i{via} direct syscalls are not intercepted either, leading to erratic behavior."
+msgstr ""
+
+#. type: vindex
+#: guix-git/doc/guix.texi:6131
+#, no-wrap
+msgid "GUIX_EXECUTION_ENGINE"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:4860
-msgid "The @uref{https://proot-me.github.io/, PRoot} program provides the necessary support for file system virtualization.  It achieves that by using the @code{ptrace} system call on the running program.  This approach has the advantage to work without requiring special kernel support, but it incurs run-time overhead every time a system call is made."
+#: guix-git/doc/guix.texi:6135
+msgid "When running a wrapped program, you can explicitly request one of the execution engines listed above by setting the @env{GUIX_EXECUTION_ENGINE} environment variable accordingly."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6137
+#, no-wrap
+msgid "entry point, for Docker images"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6138
+#, fuzzy, no-wrap
+#| msgid "--timeout=@var{seconds}"
+msgid "--entry-point=@var{command}"
+msgstr "--timeout=@var{seconds}"
+
+#. type: table
+#: guix-git/doc/guix.texi:6143
+msgid "Use @var{command} as the @dfn{entry point} of the resulting pack, if the pack format supports it---currently @code{docker} and @code{squashfs} (Singularity)  support it.  @var{command} must be relative to the profile contained in the pack."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4865 doc/guix.texi:8878 doc/guix.texi:9536
+#: guix-git/doc/guix.texi:6147
+msgid "The entry point specifies the command that tools like @code{docker run} or @code{singularity run} automatically start by default.  For example, you can do:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:6150
+#, no-wrap
+msgid "guix pack -f docker --entry-point=bin/guile guile\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6154
+msgid "The resulting pack can easily be loaded and @code{docker run} with no extra arguments will spawn @code{bin/guile}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:6158
+#, no-wrap
+msgid ""
+"docker load -i pack.tar.gz\n"
+"docker run @var{image-id}\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6163 guix-git/doc/guix.texi:11740
+#: guix-git/doc/guix.texi:12535
 msgid "Consider the package @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4869
-msgid "This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @code{--expression} in @command{guix build}})."
+#: guix-git/doc/guix.texi:6167
+msgid "This has the same purpose as the same-named option in @command{guix build} (@pxref{Additional Build Options, @option{--expression} in @command{guix build}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4874
-msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}."
+#: guix-git/doc/guix.texi:6173
+msgid "Use the packages contained in the manifest object returned by the Scheme code in @var{file}.  This option can be repeated several times, in which case the manifests are concatenated."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4882
+#: guix-git/doc/guix.texi:6181
 msgid "This has a similar purpose as the same-named option in @command{guix package} (@pxref{profile-manifest, @option{--manifest}}) and uses the same manifest files.  It allows you to define a collection of packages once and use it both for creating profiles and for creating archives for use on machines that do not have Guix installed.  Note that you can specify @emph{either} a manifest file @emph{or} a list of packages, but not both."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4888 doc/guix.texi:8100
+#: guix-git/doc/guix.texi:6187 guix-git/doc/guix.texi:10850
 #, no-wrap
 msgid "--target=@var{triplet}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:4889 doc/guix.texi:5235 doc/guix.texi:8101
+#: guix-git/doc/guix.texi:6188 guix-git/doc/guix.texi:6639
+#: guix-git/doc/guix.texi:10851
 #, no-wrap
 msgid "cross-compilation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4893
-msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})."
+#: guix-git/doc/guix.texi:6192
+msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"aarch64-linux-gnu\"} (@pxref{Specifying target triplets, GNU configuration triplets,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4894
+#: guix-git/doc/guix.texi:6193
 #, no-wrap
 msgid "--compression=@var{tool}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4895
+#: guix-git/doc/guix.texi:6194
 #, no-wrap
 msgid "-C @var{tool}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4898
-msgid "Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression."
-msgstr ""
+#: guix-git/doc/guix.texi:6198
+#, fuzzy
+#| msgid "Compress build logs according to @var{type}, one of @code{gzip}, @code{bzip2}, or @code{none}."
+msgid "Compress the resulting tarball using @var{tool}---one of @code{gzip}, @code{zstd}, @code{bzip2}, @code{xz}, @code{lzip}, or @code{none} for no compression."
+msgstr "以@var{type}方式压缩构建日志，可选的值：@code{gzip}，@code{bzip2}，@code{none}。"
 
 #. type: item
-#: doc/guix.texi:4899
+#: guix-git/doc/guix.texi:6199
 #, no-wrap
 msgid "--symlink=@var{spec}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4900
+#: guix-git/doc/guix.texi:6200
 #, no-wrap
 msgid "-S @var{spec}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4903
+#: guix-git/doc/guix.texi:6203
 msgid "Add the symlinks specified by @var{spec} to the pack.  This option can appear several times."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4907
+#: guix-git/doc/guix.texi:6207
 msgid "@var{spec} has the form @code{@var{source}=@var{target}}, where @var{source} is the symlink that will be created and @var{target} is the symlink target."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4910
+#: guix-git/doc/guix.texi:6210
 msgid "For instance, @code{-S /opt/gnu/bin=bin} creates a @file{/opt/gnu/bin} symlink pointing to the @file{bin} sub-directory of the profile."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:4911
+#: guix-git/doc/guix.texi:6211 guix-git/doc/guix.texi:33172
 #, no-wrap
 msgid "--save-provenance"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4915
+#: guix-git/doc/guix.texi:6215
 msgid "Save provenance information for the packages passed on the command line.  Provenance information includes the URL and commit of the channels in use (@pxref{Channels})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4921
+#: guix-git/doc/guix.texi:6221
 msgid "Provenance information is saved in the @file{/gnu/store/@dots{}-profile/manifest} file in the pack, along with the usual package metadata---the name and version of each package, their propagated inputs, and so on.  It is useful information to the recipient of the pack, who then knows how the pack was (supposedly) obtained."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4927
+#: guix-git/doc/guix.texi:6227
 msgid "This option is not enabled by default because, like timestamps, provenance information contributes nothing to the build process.  In other words, there is an infinity of channel URLs and commit IDs that can lead to the same pack.  Recording such ``silent'' metadata in the output thus potentially breaks the source-to-binary bitwise reproducibility property."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:6230
+#, fuzzy, no-wrap
+#| msgid "garbage collector roots"
+msgid "garbage collector root, for packs"
+msgstr "垃圾收集的根"
+
+#. type: table
+#: guix-git/doc/guix.texi:6233
+msgid "Make @var{file} a symlink to the resulting pack, and register it as a garbage collector root."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:4928
+#: guix-git/doc/guix.texi:6234
 #, no-wrap
 msgid "--localstatedir"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:4929
+#: guix-git/doc/guix.texi:6235
 #, no-wrap
 msgid "--profile-name=@var{name}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4934
+#: guix-git/doc/guix.texi:6240
 msgid "Include the ``local state directory'', @file{/var/guix}, in the resulting pack, and notably the @file{/var/guix/profiles/per-user/root/@var{name}} profile---by default @var{name} is @code{guix-profile}, which corresponds to @file{~root/.guix-profile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4940
+#: guix-git/doc/guix.texi:6246
 msgid "@file{/var/guix} contains the store database (@pxref{The Store}) as well as garbage-collector roots (@pxref{Invoking guix gc}).  Providing it in the pack means that the store is ``complete'' and manageable by Guix; not providing it pack means that the store is ``dead'': items cannot be added to it or removed from it after extraction of the pack."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:4943
+#: guix-git/doc/guix.texi:6249
 msgid "One use case for this is the Guix self-contained binary tarball (@pxref{Binary Installation})."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:6250 guix-git/doc/guix.texi:33166
+#, no-wrap
+msgid "--derivation"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:6251 guix-git/doc/guix.texi:10882
+#: guix-git/doc/guix.texi:33167
+#, no-wrap
+msgid "-d"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6253
+msgid "Print the name of the derivation that builds the pack."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:4947
+#: guix-git/doc/guix.texi:6257
 msgid "Use the bootstrap binaries to build the pack.  This option is only useful to Guix developers."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4952
+#: guix-git/doc/guix.texi:6262
 msgid "In addition, @command{guix pack} supports all the common build options (@pxref{Common Build Options}) and all the package transformation options (@pxref{Package Transformation Options})."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:6267
+#, no-wrap
+msgid "GCC"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6268
+#, no-wrap
+msgid "ld-wrapper"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6269
+#, no-wrap
+msgid "linker wrapper"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6270
+#, fuzzy, no-wrap
+#| msgid "Software development"
+msgid "toolchain, for C development"
+msgstr "软件开发"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6271
+#, no-wrap
+msgid "toolchain, for Fortran development"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6278
+msgid "If you need a complete toolchain for compiling and linking C or C++ source code, use the @code{gcc-toolchain} package.  This package provides a complete GCC toolchain for C/C++ development, including GCC itself, the GNU C Library (headers and binaries, plus debugging symbols in the @code{debug} output), Binutils, and a linker wrapper."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:4964
+#: guix-git/doc/guix.texi:6284
+msgid "The wrapper's purpose is to inspect the @code{-L} and @code{-l} switches passed to the linker, add corresponding @code{-rpath} arguments, and invoke the actual linker with this new set of arguments.  You can instruct the wrapper to refuse to link against libraries not in the store by setting the @env{GUIX_LD_WRAPPER_ALLOW_IMPURITIES} environment variable to @code{no}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6288
+msgid "The package @code{gfortran-toolchain} provides a complete GCC toolchain for Fortran development.  For other languages, please use @samp{guix search gcc toolchain} (@pxref{guix-search,, Invoking guix package})."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:6291
+#, fuzzy, no-wrap
+#| msgid "Invoking @command{guix build}"
+msgid "Invoking @command{guix git authenticate}"
+msgstr "调用@command{guix build}"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6299
+msgid "The @command{guix git authenticate} command authenticates a Git checkout following the same rule as for channels (@pxref{channel-authentication, channel authentication}).  That is, starting from a given commit, it ensures that all subsequent commits are signed by an OpenPGP key whose fingerprint appears in the @file{.guix-authorizations} file of its parent commit(s)."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6304
+msgid "You will find this command useful if you maintain a channel.  But in fact, this authentication mechanism is useful in a broader context, so you might want to use it for Git repositories that have nothing to do with Guix."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:6309
+#, no-wrap
+msgid "guix git authenticate @var{commit} @var{signer} [@var{options}@dots{}]\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6318
+msgid "By default, this command authenticates the Git checkout in the current directory; it outputs nothing and exits with exit code zero on success and non-zero on failure.  @var{commit} above denotes the first commit where authentication takes place, and @var{signer} is the OpenPGP fingerprint of public key used to sign @var{commit}.  Together, they form a ``channel introduction'' (@pxref{channel-authentication, channel introduction}).  The options below allow you to fine-tune the process."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6320
+#, fuzzy, no-wrap
+#| msgid "--chroot-directory=@var{dir}"
+msgid "--repository=@var{directory}"
+msgstr "--chroot-directory=@var{dir}"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:6321
+#, fuzzy, no-wrap
+#| msgid "state directory"
+msgid "-r @var{directory}"
+msgstr "状态文件夹"
+
+#. type: table
+#: guix-git/doc/guix.texi:6324
+msgid "Open the Git repository in @var{directory} instead of the current directory."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6325
+#, no-wrap
+msgid "--keyring=@var{reference}"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:6326
+#, fuzzy, no-wrap
+#| msgid "-c @var{n}"
+msgid "-k @var{reference}"
+msgstr "-c @var{n}"
+
+#. type: table
+#: guix-git/doc/guix.texi:6332
+msgid "Load OpenPGP keyring from @var{reference}, the reference of a branch such as @code{origin/keyring} or @code{my-keyring}.  The branch must contain OpenPGP public keys in @file{.key} files, either in binary form or ``ASCII-armored''.  By default the keyring is loaded from the branch named @code{keyring}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6333
+#, no-wrap
+msgid "--stats"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6335
+msgid "Display commit signing statistics upon completion."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6336
+#, fuzzy, no-wrap
+#| msgid "--cores=@var{n}"
+msgid "--cache-key=@var{key}"
+msgstr "--cores=@var{n}"
+
+#. type: table
+#: guix-git/doc/guix.texi:6340
+msgid "Previously-authenticated commits are cached in a file under @file{~/.cache/guix/authentication}.  This option forces the cache to be stored in file @var{key} in that directory."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6341
+#, no-wrap
+msgid "--historical-authorizations=@var{file}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6348
+msgid "By default, any commit whose parent commit(s) lack the @file{.guix-authorizations} file is considered inauthentic.  In contrast, this option considers the authorizations in @var{file} for any commit that lacks @file{.guix-authorizations}.  The format of @var{file} is the same as that of @file{.guix-authorizations} (@pxref{channel-authorizations, @file{.guix-authorizations} format})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6361
 msgid "GNU Guix provides several Scheme programming interfaces (APIs) to define, build, and query packages.  The first interface allows users to write high-level package definitions.  These definitions refer to familiar packaging concepts, such as the name and version of a package, its build system, and its dependencies.  These definitions can then be turned into concrete build actions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4970
-msgid "Build actions are performed by the Guix daemon, on behalf of users.  In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not.  The recommended setup also has the daemon perform builds in chroots, under a specific build users, to minimize interference with the rest of the system."
+#: guix-git/doc/guix.texi:6367
+msgid "Build actions are performed by the Guix daemon, on behalf of users.  In a standard setup, the daemon has write access to the store---the @file{/gnu/store} directory---whereas users do not.  The recommended setup also has the daemon perform builds in chroots, under specific build users, to minimize interference with the rest of the system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4979
+#: guix-git/doc/guix.texi:6376
 msgid "Lower-level APIs are available to interact with the daemon and the store.  To instruct the daemon to perform a build action, users actually provide it with a @dfn{derivation}.  A derivation is a low-level representation of the build actions to be taken, and the environment in which they should occur---derivations are to package definitions what assembly is to C programs.  The term ``derivation'' comes from the fact that build results @emph{derive} from them."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:4982
+#: guix-git/doc/guix.texi:6379
 msgid "This chapter describes all these APIs in turn, starting from high-level package definitions."
 msgstr ""
 
+#. type: menuentry
+#: guix-git/doc/guix.texi:6392
+#, fuzzy
+#| msgid "Programming Index"
+msgid "Programming Guix in Guile"
+msgstr "编程索引"
+
 #. type: Plain text
-#: doc/guix.texi:5008
+#: guix-git/doc/guix.texi:6408
 msgid "From a programming viewpoint, the package definitions of the GNU distribution are provided by Guile modules in the @code{(gnu packages @dots{})} name space@footnote{Note that packages under the @code{(gnu packages @dots{})} module name space are not necessarily ``GNU packages''.  This module naming scheme follows the usual Guile module naming convention: @code{gnu} means that these modules are distributed as part of the GNU system, and @code{packages} identifies modules that define packages.} (@pxref{Modules, Guile modules,, guile, GNU Guile Reference Manual}).  For instance, the @code{(gnu packages emacs)} module exports a variable named @code{emacs}, which is bound to a @code{<package>} object (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5015
+#: guix-git/doc/guix.texi:6415
 msgid "The @code{(gnu packages @dots{})} module name space is automatically scanned for packages by the command-line tools.  For instance, when running @code{guix install emacs}, all the @code{(gnu packages @dots{})} modules are scanned until one that exports a package object whose name is @code{emacs} is found.  This package search facility is implemented in the @code{(gnu packages)} module."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5017
+#: guix-git/doc/guix.texi:6417
 #, no-wrap
 msgid "package module search path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5026
-msgid "Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file name and module name must match.  For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs.scm} file relative to the load path specified with @option{--load-path} or @code{GUIX_PACKAGE_PATH}.  @xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for details.}.  There are two ways to make these package definitions visible to the user interfaces:"
+#: guix-git/doc/guix.texi:6426
+msgid "Users can store package definitions in modules with different names---e.g., @code{(my-packages emacs)}@footnote{Note that the file name and module name must match.  For instance, the @code{(my-packages emacs)} module must be stored in a @file{my-packages/emacs.scm} file relative to the load path specified with @option{--load-path} or @env{GUIX_PACKAGE_PATH}.  @xref{Modules and the File System,,, guile, GNU Guile Reference Manual}, for details.}.  There are two ways to make these package definitions visible to the user interfaces:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:5033
-msgid "By adding the directory containing your package modules to the search path with the @code{-L} flag of @command{guix package} and other commands (@pxref{Common Build Options}), or by setting the @code{GUIX_PACKAGE_PATH} environment variable described below."
+#: guix-git/doc/guix.texi:6433
+msgid "By adding the directory containing your package modules to the search path with the @code{-L} flag of @command{guix package} and other commands (@pxref{Common Build Options}), or by setting the @env{GUIX_PACKAGE_PATH} environment variable described below."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:5039
+#: guix-git/doc/guix.texi:6439
 msgid "By defining a @dfn{channel} and configuring @command{guix pull} so that it pulls from it.  A channel is essentially a Git repository containing package modules.  @xref{Channels}, for more information on how to define and use channels."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5042
-msgid "@code{GUIX_PACKAGE_PATH} works similarly to other search path variables:"
+#: guix-git/doc/guix.texi:6442
+msgid "@env{GUIX_PACKAGE_PATH} works similarly to other search path variables:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5043
+#: guix-git/doc/guix.texi:6443
 #, no-wrap
 msgid "{Environment Variable} GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5047
+#: guix-git/doc/guix.texi:6447
 msgid "This is a colon-separated list of directories to search for additional package modules.  Directories listed in this variable take precedence over the own modules of the distribution."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5055
+#: guix-git/doc/guix.texi:6455
 msgid "The distribution is fully @dfn{bootstrapped} and @dfn{self-contained}: each package is built based solely on other packages in the distribution.  The root of this dependency graph is a small set of @dfn{bootstrap binaries}, provided by the @code{(gnu packages bootstrap)} module.  For more information on bootstrapping, @pxref{Bootstrapping}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5063
+#: guix-git/doc/guix.texi:6463
 msgid "The high-level interface to package definitions is implemented in the @code{(guix packages)} and @code{(guix build-system)} modules.  As an example, the package definition, or @dfn{recipe}, for the GNU Hello package looks like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5071
+#. type: lisp
+#: guix-git/doc/guix.texi:6471
 #, no-wrap
 msgid ""
 "(define-module (gnu packages hello)\n"
@@ -10051,8 +13203,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5090
+#. type: lisp
+#: guix-git/doc/guix.texi:6490
 #, no-wrap
 msgid ""
 "(define-public hello\n"
@@ -10076,453 +13228,344 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5100
+#: guix-git/doc/guix.texi:6500
 msgid "Without being a Scheme expert, the reader may have guessed the meaning of the various fields here.  This expression binds the variable @code{hello} to a @code{<package>} object, which is essentially a record (@pxref{SRFI-9, Scheme records,, guile, GNU Guile Reference Manual}).  This package object can be inspected using procedures found in the @code{(guix packages)} module; for instance, @code{(package-name hello)} returns---surprise!---@code{\"hello\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5104
+#: guix-git/doc/guix.texi:6504
 msgid "With luck, you may be able to import part or all of the definition of the package you are interested in from another repository, using the @code{guix import} command (@pxref{Invoking guix import})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5110
-msgid "In the example above, @var{hello} is defined in a module of its own, @code{(gnu packages hello)}.  Technically, this is not strictly necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically known to the command-line tools (@pxref{Package Modules})."
+#: guix-git/doc/guix.texi:6510
+msgid "In the example above, @code{hello} is defined in a module of its own, @code{(gnu packages hello)}.  Technically, this is not strictly necessary, but it is convenient to do so: all the packages defined in modules under @code{(gnu packages @dots{})} are automatically known to the command-line tools (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5112
+#: guix-git/doc/guix.texi:6512
 msgid "There are a few points worth noting in the above package definition:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5119
+#: guix-git/doc/guix.texi:6519
 msgid "The @code{source} field of the package is an @code{<origin>} object (@pxref{origin Reference}, for the complete reference).  Here, the @code{url-fetch} method from @code{(guix download)} is used, meaning that the source is a file to be downloaded over FTP or HTTP."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5122
+#: guix-git/doc/guix.texi:6522
 msgid "The @code{mirror://gnu} prefix instructs @code{url-fetch} to use one of the GNU mirrors defined in @code{(guix download)}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5129
+#: guix-git/doc/guix.texi:6529
 msgid "The @code{sha256} field specifies the expected SHA256 hash of the file being downloaded.  It is mandatory, and allows Guix to check the integrity of the file.  The @code{(base32 @dots{})} form introduces the base32 representation of the hash.  You can obtain this information with @code{guix download} (@pxref{Invoking guix download}) and @code{guix hash} (@pxref{Invoking guix hash})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5130
+#: guix-git/doc/guix.texi:6530
 #, no-wrap
 msgid "patches"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5134
+#: guix-git/doc/guix.texi:6534
 msgid "When needed, the @code{origin} form can also have a @code{patches} field listing patches to be applied, and a @code{snippet} field giving a Scheme expression to modify the source code."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5136
+#: guix-git/doc/guix.texi:6536
 #, no-wrap
 msgid "GNU Build System"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5142
-msgid "The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}).  Here, @var{gnu-build-system} represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence."
+#: guix-git/doc/guix.texi:6542
+msgid "The @code{build-system} field specifies the procedure to build the package (@pxref{Build Systems}).  Here, @code{gnu-build-system} represents the familiar GNU Build System, where packages may be configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5148
-msgid "The @code{arguments} field specifies options for the build system (@pxref{Build Systems}).  Here it is interpreted by @var{gnu-build-system} as a request run @file{configure} with the @code{--enable-silent-rules} flag."
+#: guix-git/doc/guix.texi:6546
+msgid "When you start packaging non-trivial software, you may need tools to manipulate those build phases, manipulate files, and so on.  @xref{Build Utilities}, for more on this."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:6552
+msgid "The @code{arguments} field specifies options for the build system (@pxref{Build Systems}).  Here it is interpreted by @code{gnu-build-system} as a request run @file{configure} with the @option{--enable-silent-rules} flag."
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5149 doc/guix.texi:5152
+#: guix-git/doc/guix.texi:6553 guix-git/doc/guix.texi:6556
 #, no-wrap
 msgid "quote"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5150
+#: guix-git/doc/guix.texi:6554
 #, no-wrap
 msgid "quoting"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5151
+#: guix-git/doc/guix.texi:6555
 #, no-wrap
 msgid "'"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5160
+#: guix-git/doc/guix.texi:6564
 msgid "What about these quote (@code{'}) characters? They are Scheme syntax to introduce a literal list; @code{'} is synonymous with @code{quote}.  @xref{Expression Syntax, quoting,, guile, GNU Guile Reference Manual}, for details.  Here the value of the @code{arguments} field is a list of arguments passed to the build system down the road, as with @code{apply} (@pxref{Fly Evaluation, @code{apply},, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5166
+#: guix-git/doc/guix.texi:6570
 msgid "The hash-colon (@code{#:}) sequence defines a Scheme @dfn{keyword} (@pxref{Keywords,,, guile, GNU Guile Reference Manual}), and @code{#:configure-flags} is a keyword used to pass a keyword argument to the build system (@pxref{Coding With Keywords,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5172
-msgid "The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package.  Here, we define an input called @code{\"gawk\"} whose value is that of the @var{gawk} variable; @var{gawk} is itself bound to a @code{<package>} object."
+#: guix-git/doc/guix.texi:6576
+msgid "The @code{inputs} field specifies inputs to the build process---i.e., build-time or run-time dependencies of the package.  Here, we define an input called @code{\"gawk\"} whose value is that of the @code{gawk} variable; @code{gawk} is itself bound to a @code{<package>} object."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5173
+#: guix-git/doc/guix.texi:6577
 #, no-wrap
 msgid "backquote (quasiquote)"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5174
+#: guix-git/doc/guix.texi:6578
 #, no-wrap
 msgid "`"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5175
+#: guix-git/doc/guix.texi:6579
 #, no-wrap
 msgid "quasiquote"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5176
+#: guix-git/doc/guix.texi:6580
 #, no-wrap
 msgid "comma (unquote)"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5177
+#: guix-git/doc/guix.texi:6581
 #, no-wrap
 msgid ","
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5178
+#: guix-git/doc/guix.texi:6582
 #, no-wrap
 msgid "unquote"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5179
+#: guix-git/doc/guix.texi:6583
 #, no-wrap
 msgid ",@@"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:5180
+#: guix-git/doc/guix.texi:6584
 #, no-wrap
 msgid "unquote-splicing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5186
+#: guix-git/doc/guix.texi:6590
 msgid "Again, @code{`} (a backquote, synonymous with @code{quasiquote}) allows us to introduce a literal list in the @code{inputs} field, while @code{,} (a comma, synonymous with @code{unquote}) allows us to insert a value in that list (@pxref{Expression Syntax, unquote,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5190
-msgid "Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here.  Instead, @var{gnu-build-system} takes care of ensuring that they are present (@pxref{Build Systems})."
+#: guix-git/doc/guix.texi:6594
+msgid "Note that GCC, Coreutils, Bash, and other essential tools do not need to be specified as inputs here.  Instead, @code{gnu-build-system} takes care of ensuring that they are present (@pxref{Build Systems})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:5194
+#: guix-git/doc/guix.texi:6598
 msgid "However, any other dependencies need to be specified in the @code{inputs} field.  Any dependency not specified here will simply be unavailable to the build process, possibly leading to a build failure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5197
+#: guix-git/doc/guix.texi:6601
 msgid "@xref{package Reference}, for a full description of possible fields."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5208
+#: guix-git/doc/guix.texi:6612
 msgid "Once a package definition is in place, the package may actually be built using the @code{guix build} command-line tool (@pxref{Invoking guix build}), troubleshooting any build failures you encounter (@pxref{Debugging Build Failures}).  You can easily jump back to the package definition using the @command{guix edit} command (@pxref{Invoking guix edit}).  @xref{Packaging Guidelines}, for more information on how to test package definitions, and @ref{Invoking guix lint}, for information on how to check a definition for style conformance."
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:5208
+#: guix-git/doc/guix.texi:6612
 #, no-wrap
 msgid "GUIX_PACKAGE_PATH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5212
+#: guix-git/doc/guix.texi:6616
 msgid "Lastly, @pxref{Channels}, for information on how to extend the distribution by adding your own package definitions in a ``channel''."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5216
+#: guix-git/doc/guix.texi:6620
 msgid "Finally, updating the package definition to a new upstream version can be partly automated by the @command{guix refresh} command (@pxref{Invoking guix refresh})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5222
-msgid "Behind the scenes, a derivation corresponding to the @code{<package>} object is first computed by the @code{package-derivation} procedure.  That derivation is stored in a @code{.drv} file under @file{/gnu/store}.  The build actions it prescribes may then be realized by using the @code{build-derivations} procedure (@pxref{The Store})."
+#: guix-git/doc/guix.texi:6626
+msgid "Behind the scenes, a derivation corresponding to the @code{<package>} object is first computed by the @code{package-derivation} procedure.  That derivation is stored in a @file{.drv} file under @file{/gnu/store}.  The build actions it prescribes may then be realized by using the @code{build-derivations} procedure (@pxref{The Store})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5223
+#: guix-git/doc/guix.texi:6627
 #, no-wrap
 msgid "{Scheme Procedure} package-derivation @var{store} @var{package} [@var{system}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5226
+#: guix-git/doc/guix.texi:6630
 msgid "Return the @code{<derivation>} object of @var{package} for @var{system} (@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5232
+#: guix-git/doc/guix.texi:6636
 msgid "@var{package} must be a valid @code{<package>} object, and @var{system} must be a string denoting the target system type---e.g., @code{\"x86_64-linux\"} for an x86_64 Linux-based GNU system.  @var{store} must be a connection to the daemon, which operates on the store (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5238
+#: guix-git/doc/guix.texi:6642
 msgid "Similarly, it is possible to compute a derivation that cross-builds a package for some other system:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5239
+#: guix-git/doc/guix.texi:6643
 #, no-wrap
 msgid "{Scheme Procedure} package-cross-derivation @var{store} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5243
+#: guix-git/doc/guix.texi:6647
 msgid "@var{package} @var{target} [@var{system}] Return the @code{<derivation>} object of @var{package} cross-built from @var{system} to @var{target}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5247
-msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf})."
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:5249
-#, no-wrap
-msgid "package transformations"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:5250
-#, no-wrap
-msgid "input rewriting"
-msgstr ""
-
-#. type: cindex
-#: doc/guix.texi:5251
-#, no-wrap
-msgid "dependency tree rewriting"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5255
-msgid "Packages can be manipulated in arbitrary ways.  An example of a useful transformation is @dfn{input rewriting}, whereby the dependency tree of a package is rewritten by replacing specific inputs by others:"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5256
-#, no-wrap
-msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5263
-msgid "[@var{rewrite-name}] Return a procedure that, when passed a package, replaces its direct and indirect dependencies (but not its implicit inputs) according to @var{replacements}.  @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5266
-msgid "Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5270
-msgid "Consider this example:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:5276
-#, no-wrap
-msgid ""
-"(define libressl-instead-of-openssl\n"
-"  ;; This is a procedure to replace OPENSSL by LIBRESSL,\n"
-"  ;; recursively.\n"
-"  (package-input-rewriting `((,openssl . ,libressl))))\n"
-"\n"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:5279
-#, no-wrap
-msgid ""
-"(define git-with-libressl\n"
-"  (libressl-instead-of-openssl git))\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5287
-msgid "Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}.  Then we use it to define a @dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}.  This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5290
-msgid "The following variant of @code{package-input-rewriting} can match packages to be replaced by name rather than by identity."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5291
-#, no-wrap
-msgid "{Scheme Procedure} package-input-rewriting/spec @var{replacements}"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5297
-msgid "Return a procedure that, given a package, applies the given @var{replacements} to all the package graph (excluding implicit inputs).  @var{replacements} is a list of spec/procedures pair; each spec is a package specification such as @code{\"gcc\"} or @code{\"guile@@2\"}, and each procedure takes a matching package and returns a replacement for that package."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5300
-msgid "The example above could be rewritten this way:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:5305
-#, no-wrap
-msgid ""
-"(define libressl-instead-of-openssl\n"
-"  ;; Replace all the packages called \"openssl\" with LibreSSL.\n"
-"  (package-input-rewriting/spec `((\"openssl\" . ,(const libressl)))))\n"
+#: guix-git/doc/guix.texi:6651
+msgid "@var{target} must be a valid GNU triplet denoting the target hardware and operating system, such as @code{\"aarch64-linux-gnu\"} (@pxref{Specifying Target Triplets,,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5310
-msgid "The key difference here is that, this time, packages are matched by spec and not by identity.  In other words, any package in the graph that is called @code{openssl} will be replaced."
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:5314
-msgid "A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph."
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5315
-#, no-wrap
-msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}]"
-msgstr ""
-
-#. type: deffn
-#: doc/guix.texi:5319
-msgid "Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package.  The procedure stops recursion when @var{cut?} returns true for a given package."
+#: guix-git/doc/guix.texi:6655
+msgid "Once you have package definitions, you can easily define @emph{variants} of those packages.  @xref{Defining Package Variants}, for more on that."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:5328
+#: guix-git/doc/guix.texi:6663
 #, no-wrap
 msgid "@code{package} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5332
+#: guix-git/doc/guix.texi:6667
 msgid "This section summarizes all the options available in @code{package} declarations (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5333
+#: guix-git/doc/guix.texi:6668
 #, no-wrap
 msgid "{Data Type} package"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5335
+#: guix-git/doc/guix.texi:6670
 msgid "This is the data type representing a package recipe."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5339
+#: guix-git/doc/guix.texi:6674
 msgid "The name of the package, as a string."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5340
+#: guix-git/doc/guix.texi:6675
 #, no-wrap
 msgid "version"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5342
+#: guix-git/doc/guix.texi:6677
 msgid "The version of the package, as a string."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5343 doc/guix.texi:9130 doc/guix.texi:10879
-#: doc/guix.texi:11317
+#: guix-git/doc/guix.texi:6678 guix-git/doc/guix.texi:12011
+#: guix-git/doc/guix.texi:14256 guix-git/doc/guix.texi:14759
 #, no-wrap
 msgid "source"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5350
+#: guix-git/doc/guix.texi:6685
 msgid "An object telling how the source code for the package should be acquired.  Most of the time, this is an @code{origin} object, which denotes a file fetched from the Internet (@pxref{origin Reference}).  It can also be any other ``file-like'' object such as a @code{local-file}, which denotes a file from the local file system (@pxref{G-Expressions, @code{local-file}})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5351
+#: guix-git/doc/guix.texi:6686
 #, no-wrap
 msgid "build-system"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5354
+#: guix-git/doc/guix.texi:6689
 msgid "The build system that should be used to build the package (@pxref{Build Systems})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5355 doc/guix.texi:12915
+#: guix-git/doc/guix.texi:6690 guix-git/doc/guix.texi:16722
 #, no-wrap
 msgid "@code{arguments} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5358
+#: guix-git/doc/guix.texi:6693
 msgid "The arguments that should be passed to the build system.  This is a list, typically containing sequential keyword-value pairs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5359
+#: guix-git/doc/guix.texi:6694
 #, no-wrap
 msgid "@code{inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5360
+#: guix-git/doc/guix.texi:6695
 #, no-wrap
 msgid "@code{native-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5361
+#: guix-git/doc/guix.texi:6696
 #, no-wrap
 msgid "@code{propagated-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5362
+#: guix-git/doc/guix.texi:6697
 #, no-wrap
 msgid "inputs, of packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5370
+#: guix-git/doc/guix.texi:6705
 msgid "These fields list dependencies of the package.  Each one is a list of tuples, where each tuple has a label for the input (a string) as its first element, a package, origin, or derivation as its second element, and optionally the name of the output thereof that should be used, which defaults to @code{\"out\"} (@pxref{Packages with Multiple Outputs}, for more on package outputs).  For example, the list below specifies three inputs:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5375
+#. type: lisp
+#: guix-git/doc/guix.texi:6710
 #, no-wrap
 msgid ""
 "`((\"libffi\" ,libffi)\n"
@@ -10531,181 +13574,172 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5377
+#: guix-git/doc/guix.texi:6712
 #, no-wrap
 msgid "cross compilation, package dependencies"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5383
+#: guix-git/doc/guix.texi:6718
 msgid "The distinction between @code{native-inputs} and @code{inputs} is necessary when considering cross-compilation.  When cross-compiling, dependencies listed in @code{inputs} are built for the @emph{target} architecture; conversely, dependencies listed in @code{native-inputs} are built for the architecture of the @emph{build} machine."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5388
+#: guix-git/doc/guix.texi:6723
 msgid "@code{native-inputs} is typically used to list tools needed at build time, but not at run time, such as Autoconf, Automake, pkg-config, Gettext, or Bison.  @command{guix lint} can report likely mistakes in this area (@pxref{Invoking guix lint})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:5395
+#: guix-git/doc/guix.texi:6731
 msgid "package-propagated-inputs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5395
-msgid "Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with propagated inputs.)"
+#: guix-git/doc/guix.texi:6731
+msgid "Lastly, @code{propagated-inputs} is similar to @code{inputs}, but the specified packages will be automatically installed to profiles (@pxref{Features, the role of profiles in Guix}) alongside the package they belong to (@pxref{package-cmd-propagated-inputs, @command{guix package}}, for information on how @command{guix package} deals with propagated inputs)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5399
-msgid "For example this is necessary when a C/C++ library needs headers of another library to compile, or when a pkg-config file refers to another one @i{via} its @code{Requires} field."
+#: guix-git/doc/guix.texi:6735
+msgid "For example this is necessary when packaging a C/C++ library that needs headers of another library to compile, or when a pkg-config file refers to another one @i{via} its @code{Requires} field."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5406
-msgid "Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more.  To ensure that libraries written in those languages can find library code they depend on at run time, run-time dependencies must be listed in @code{propagated-inputs} rather than @code{inputs}."
+#: guix-git/doc/guix.texi:6742
+msgid "Another example where @code{propagated-inputs} is useful is for languages that lack a facility to record the run-time search path akin to the @code{RUNPATH} of ELF files; this includes Guile, Python, Perl, and more.  When packaging libraries written in those languages, ensure they can find library code they depend on at run time by listing run-time dependencies in @code{propagated-inputs} rather than @code{inputs}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5407
+#: guix-git/doc/guix.texi:6743
 #, no-wrap
 msgid "@code{outputs} (default: @code{'(\"out\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5410
+#: guix-git/doc/guix.texi:6746
 msgid "The list of output names of the package.  @xref{Packages with Multiple Outputs}, for typical uses of additional outputs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5411
+#: guix-git/doc/guix.texi:6747
 #, no-wrap
 msgid "@code{native-search-paths} (default: @code{'()})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5412
+#: guix-git/doc/guix.texi:6748
 #, no-wrap
 msgid "@code{search-paths} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5415
+#: guix-git/doc/guix.texi:6751
 msgid "A list of @code{search-path-specification} objects describing search-path environment variables honored by the package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5416
+#: guix-git/doc/guix.texi:6752
 #, no-wrap
 msgid "@code{replacement} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5420
+#: guix-git/doc/guix.texi:6756
 msgid "This must be either @code{#f} or a package object that will be used as a @dfn{replacement} for this package.  @xref{Security Updates, grafts}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5421 doc/guix.texi:9122
+#: guix-git/doc/guix.texi:6757 guix-git/doc/guix.texi:12003
 #, no-wrap
 msgid "synopsis"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5423
+#: guix-git/doc/guix.texi:6759
 msgid "A one-line description of the package."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:5424 doc/guix.texi:9123 doc/guix.texi:25003
+#. type: code{#1}
+#: guix-git/doc/guix.texi:6760 guix-git/doc/guix.texi:12004
+#: guix-git/doc/guix.texi:33864 guix-git/doc/guix.texi:34015
 #, no-wrap
 msgid "description"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5426
+#: guix-git/doc/guix.texi:6762
 msgid "A more elaborate description of the package."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5427
+#: guix-git/doc/guix.texi:6763
 #, no-wrap
 msgid "license"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5428
+#: guix-git/doc/guix.texi:6764
 #, no-wrap
 msgid "license, of packages"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5431
+#: guix-git/doc/guix.texi:6767
 msgid "The license of the package; a value from @code{(guix licenses)}, or a list of such values."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:5432 doc/guix.texi:9131
+#: guix-git/doc/guix.texi:6768 guix-git/doc/guix.texi:12012
 #, no-wrap
 msgid "home-page"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5434
+#: guix-git/doc/guix.texi:6770
 msgid "The URL to the home-page of the package, as a string."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5435
-#, no-wrap
-msgid "@code{supported-systems} (default: @var{%supported-systems})"
-msgstr ""
+#: guix-git/doc/guix.texi:6771
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{supported-systems} (default: @code{%supported-systems})"
+msgstr "@code{port}（默认值：@code{22}）"
 
 #. type: table
-#: doc/guix.texi:5438
+#: guix-git/doc/guix.texi:6774
 msgid "The list of systems supported by the package, as strings of the form @code{architecture-kernel}, for example @code{\"x86_64-linux\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5439
-#, no-wrap
-msgid "@code{maintainers} (default: @code{'()})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:5441
-msgid "The list of maintainers of the package, as @code{maintainer} objects."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:5442
+#: guix-git/doc/guix.texi:6775
 #, no-wrap
 msgid "@code{location} (default: source location of the @code{package} form)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5446
+#: guix-git/doc/guix.texi:6779
 msgid "The source location of the package.  It is useful to override this when inheriting from another package, in which case this field is not automatically corrected."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5449
+#: guix-git/doc/guix.texi:6782
 #, no-wrap
 msgid "{Scheme Syntax} this-package"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5452
+#: guix-git/doc/guix.texi:6785
 msgid "When used in the @emph{lexical scope} of a package field definition, this identifier resolves to the package being defined."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5455
+#: guix-git/doc/guix.texi:6788
 msgid "The example below shows how to add a package as a native input of itself when cross-compiling:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5460
+#. type: lisp
+#: guix-git/doc/guix.texi:6793
 #, no-wrap
 msgid ""
 "(package\n"
@@ -10714,8 +13748,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5466
+#. type: lisp
+#: guix-git/doc/guix.texi:6799
 #, no-wrap
 msgid ""
 "  ;; When cross-compiled, Guile, for example, depends on\n"
@@ -10726,1506 +13760,3223 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:5469
+#: guix-git/doc/guix.texi:6802
 msgid "It is an error to refer to @code{this-package} outside a package definition."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:6808
+msgid "Because packages are regular Scheme objects that capture a complete dependency graph and associated build procedures, it is often useful to write procedures that take a package and return a modified version thereof according to some parameters.  Below are a few examples."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:6809
+#, no-wrap
+msgid "tool chain, choosing a package's tool chain"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6810
+#, no-wrap
+msgid "{Scheme Procedure} package-with-c-toolchain @var{package} @var{toolchain}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6815
+msgid "Return a variant of @var{package} that uses @var{toolchain} instead of the default GNU C/C++ toolchain.  @var{toolchain} must be a list of inputs (label/package tuples) providing equivalent functionality, such as the @code{gcc-toolchain} package."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6819
+msgid "The example below returns a variant of the @code{hello} package built with GCC@tie{}10.x and the rest of the GNU tool chain (Binutils and the GNU C Library) instead of the default tool chain:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:6823
+#, no-wrap
+msgid ""
+"(let ((toolchain (specification->package \"gcc-toolchain@@10\")))\n"
+"  (package-with-c-toolchain hello `((\"toolchain\" ,toolchain))))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6831
+msgid "The build tool chain is part of the @dfn{implicit inputs} of packages---it's usually not listed as part of the various ``inputs'' fields and is instead pulled in by the build system.  Consequently, this procedure works by changing the build system of @var{package} so that it pulls in @var{toolchain} instead of the defaults.  @ref{Build Systems}, for more on build systems."
+msgstr ""
+
 #. type: subsection
-#: doc/guix.texi:5472
+#: guix-git/doc/guix.texi:6834
 #, no-wrap
 msgid "@code{origin} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5476
-msgid "This section summarizes all the options available in @code{origin} declarations (@pxref{Defining Packages})."
+#: guix-git/doc/guix.texi:6842
+msgid "This section documents @dfn{origins}.  An @code{origin} declaration specifies data that must be ``produced''---downloaded, usually---and whose content hash is known in advance.  Origins are primarily used to represent the source code of packages (@pxref{Defining Packages}).  For that reason, the @code{origin} form allows you to declare patches to apply to the original source code as well as code snippets to modify it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5477
+#: guix-git/doc/guix.texi:6843
 #, no-wrap
 msgid "{Data Type} origin"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:5479
+#: guix-git/doc/guix.texi:6845
 msgid "This is the data type representing a source code origin."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5481 doc/guix.texi:18957
+#: guix-git/doc/guix.texi:6847 guix-git/doc/guix.texi:24896
 #, no-wrap
 msgid "uri"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5486
+#: guix-git/doc/guix.texi:6852
 msgid "An object containing the URI of the source.  The object type depends on the @code{method} (see below).  For example, when using the @var{url-fetch} method of @code{(guix download)}, the valid @code{uri} values are: a URL represented as a string, or a list thereof."
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:5487
+#. type: cindex
+#: guix-git/doc/guix.texi:6853
 #, no-wrap
-msgid "method"
+msgid "fixed-output derivations, for download"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:5489
-msgid "A procedure that handles the URI."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:5491
-msgid "Examples include:"
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:5493
+#. type: code{#1}
+#: guix-git/doc/guix.texi:6854
 #, no-wrap
-msgid "@var{url-fetch} from @code{(guix download)}"
+msgid "method"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5496
-msgid "download a file from the HTTP, HTTPS, or FTP URL specified in the @code{uri} field;"
+#: guix-git/doc/guix.texi:6861
+msgid "A monadic procedure that handles the given URI@.  The procedure must accept at least three arguments: the value of the @code{uri} field and the hash algorithm and hash value specified by the @code{hash} field.  It must return a store item or a derivation in the store monad (@pxref{The Store Monad}); most methods return a fixed-output derivation (@pxref{Derivations})."
 msgstr ""
 
-#. type: vindex
-#: doc/guix.texi:5497 doc/guix.texi:8389
-#, no-wrap
-msgid "git-fetch"
+#. type: table
+#: guix-git/doc/guix.texi:6865
+msgid "Commonly used methods include @code{url-fetch}, which fetches data from a URL, and @code{git-fetch}, which fetches data from a Git repository (see below)."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:5498
+#. type: code{#1}
+#: guix-git/doc/guix.texi:6866
 #, no-wrap
-msgid "@var{git-fetch} from @code{(guix git-download)}"
+msgid "sha256"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5502
-msgid "clone the Git version control repository, and check out the revision specified in the @code{uri} field as a @code{git-reference} object; a @code{git-reference} looks like this:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:5507
-#, no-wrap
-msgid ""
-"(git-reference\n"
-"  (url \"git://git.debian.org/git/pkg-shadow/shadow\")\n"
-"  (commit \"v4.1.5.1\"))\n"
+#: guix-git/doc/guix.texi:6870
+msgid "A bytevector containing the SHA-256 hash of the source.  This is equivalent to providing a @code{content-hash} SHA256 object in the @code{hash} field described below."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:5510
+#: guix-git/doc/guix.texi:6871
 #, no-wrap
-msgid "sha256"
+msgid "hash"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5514
-msgid "A bytevector containing the SHA-256 hash of the source.  Typically the @code{base32} form is used here to generate the bytevector from a base-32 string."
+#: guix-git/doc/guix.texi:6874
+msgid "The @code{content-hash} object of the source---see below for how to use @code{content-hash}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5518
+#: guix-git/doc/guix.texi:6878
 msgid "You can obtain this information using @code{guix download} (@pxref{Invoking guix download}) or @code{guix hash} (@pxref{Invoking guix hash})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5519
+#: guix-git/doc/guix.texi:6879
 #, no-wrap
 msgid "@code{file-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5525
+#: guix-git/doc/guix.texi:6885
 msgid "The file name under which the source code should be saved.  When this is @code{#f}, a sensible default value will be used in most cases.  In case the source is fetched from a URL, the file name from the URL will be used.  For version control checkouts, it is recommended to provide the file name explicitly because the default is not very descriptive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5526
+#: guix-git/doc/guix.texi:6886
 #, no-wrap
 msgid "@code{patches} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5529
+#: guix-git/doc/guix.texi:6889
 msgid "A list of file names, origins, or file-like objects (@pxref{G-Expressions, file-like objects}) pointing to patches to be applied to the source."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5533
+#: guix-git/doc/guix.texi:6893
 msgid "This list of patches must be unconditional.  In particular, it cannot depend on the value of @code{%current-system} or @code{%current-target-system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5534
+#: guix-git/doc/guix.texi:6894
 #, no-wrap
 msgid "@code{snippet} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5538
+#: guix-git/doc/guix.texi:6898
 msgid "A G-expression (@pxref{G-Expressions}) or S-expression that will be run in the source directory.  This is a convenient way to modify the source, sometimes more convenient than a patch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5539
+#: guix-git/doc/guix.texi:6899
 #, no-wrap
 msgid "@code{patch-flags} (default: @code{'(\"-p1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5542
+#: guix-git/doc/guix.texi:6902
 msgid "A list of command-line flags that should be passed to the @code{patch} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5543
+#: guix-git/doc/guix.texi:6903
 #, no-wrap
 msgid "@code{patch-inputs} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5547
+#: guix-git/doc/guix.texi:6907
 msgid "Input packages or derivations to the patching process.  When this is @code{#f}, the usual set of inputs necessary for patching are provided, such as GNU@tie{}Patch."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5548
+#: guix-git/doc/guix.texi:6908 guix-git/doc/guix.texi:24769
 #, no-wrap
 msgid "@code{modules} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5551
+#: guix-git/doc/guix.texi:6911
 msgid "A list of Guile modules that should be loaded during the patching process and while running the code in the @code{snippet} field."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5552
+#: guix-git/doc/guix.texi:6912
 #, no-wrap
 msgid "@code{patch-guile} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5555
+#: guix-git/doc/guix.texi:6915
 msgid "The Guile package that should be used in the patching process.  When this is @code{#f}, a sensible default is used."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:6918
+#, no-wrap
+msgid "{Data Type} content-hash @var{value} [@var{algorithm}]"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6922
+msgid "Construct a content hash object for the given @var{algorithm}, and with @var{value} as its hash value.  When @var{algorithm} is omitted, assume it is @code{sha256}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6925
+msgid "@var{value} can be a literal string, in which case it is base32-decoded, or it can be a bytevector."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6927
+#, fuzzy
+#| msgid "The following dependencies are optional:"
+msgid "The following forms are all equivalent:"
+msgstr "这些依赖是可选的："
+
+#. type: lisp
+#: guix-git/doc/guix.texi:6936
+#, no-wrap
+msgid ""
+"(content-hash \"05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj\")\n"
+"(content-hash \"05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj\"\n"
+"              sha256)\n"
+"(content-hash (base32\n"
+"               \"05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj\"))\n"
+"(content-hash (base64 \"kkb+RPaP7uyMZmu4eXPVkM4BN8yhRd8BTHLslb6f/Rc=\")\n"
+"              sha256)\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6941
+msgid "Technically, @code{content-hash} is currently implemented as a macro.  It performs sanity checks at macro-expansion time, when possible, such as ensuring that @var{value} has the right size for @var{algorithm}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6947
+msgid "As we have seen above, how exactly the data an origin refers to is retrieved is determined by its @code{method} field.  The @code{(guix download)} module provides the most common method, @code{url-fetch}, described below."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6948
+#, no-wrap
+msgid "{Scheme Procedure} url-fetch @var{url} @var{hash-algo} @var{hash} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6956
+msgid "[name] [#:executable? #f] Return a fixed-output derivation that fetches data from @var{url} (a string, or a list of strings denoting alternate URLs), which is expected to have hash @var{hash} of type @var{hash-algo} (a symbol).  By default, the file name is the base name of URL; optionally, @var{name} can specify a different file name.  When @var{executable?} is true, make the downloaded file executable."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6959
+msgid "When one of the URL starts with @code{mirror://}, then its host part is interpreted as the name of a mirror scheme, taken from @file{%mirror-file}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6962
+msgid "Alternatively, when URL starts with @code{file://}, return the corresponding file name in the store."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:6968
+msgid "Likewise, the @code{(guix git-download)} module defines the @code{git-fetch} origin method, which fetches data from a Git version control repository, and the @code{git-reference} data type to describe the repository and revision to fetch."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6969
+#, no-wrap
+msgid "{Scheme Procedure} git-fetch @var{ref} @var{hash-algo} @var{hash}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:6974
+msgid "Return a fixed-output derivation that fetches @var{ref}, a @code{<git-reference>} object.  The output is expected to have recursive hash @var{hash} of type @var{hash-algo} (a symbol).  Use @var{name} as the file name, or a generic name if @code{#f}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6976
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} git-reference"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6979
+msgid "This data type represents a Git reference for @code{git-fetch} to retrieve."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:6981 guix-git/doc/guix.texi:22531
+#, no-wrap
+msgid "url"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6983
+msgid "The URL of the Git repository to clone."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:6984
+#, no-wrap
+msgid "commit"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:6988
+msgid "This string denotes either the commit to fetch (a hexadecimal string, either the full SHA1 commit or a ``short'' commit string; the latter is not recommended) or the tag to fetch."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:6989
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{recursive?} (default: @code{#f})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:6991
+msgid "This Boolean indicates whether to recursively fetch Git sub-modules."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:6995
+msgid "The example below denotes the @code{v2.10} tag of the GNU@tie{}Hello repository:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7000
+#, fuzzy, no-wrap
+#| msgid "git clone https://git.savannah.gnu.org/git/guix.git\n"
+msgid ""
+"(git-reference\n"
+"  (url \"https://git.savannah.gnu.org/git/hello.git\")\n"
+"  (commit \"v2.10\"))\n"
+msgstr "git clone https://git.savannah.gnu.org/git/guix.git\n"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:7004
+msgid "This is equivalent to the reference below, which explicitly names the commit:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7009
+#, no-wrap
+msgid ""
+"(git-reference\n"
+"  (url \"https://git.savannah.gnu.org/git/hello.git\")\n"
+"  (commit \"dc7dc56a00e48fe6f231a58f6537139fe2908fb9\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7015
+msgid "For Mercurial repositories, the module @code{(guix hg-download)} defines the @code{hg-fetch} origin method and @code{hg-reference} data type for support of the Mercurial version control system."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7016
+#, no-wrap
+msgid "{Scheme Procedure} hg-fetch @var{ref} @var{hash-algo} @var{hash} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7022
+msgid "[name] Return a fixed-output derivation that fetches @var{ref}, a @code{<hg-reference>} object.  The output is expected to have recursive hash @var{hash} of type @var{hash-algo} (a symbol).  Use @var{name} as the file name, or a generic name if @code{#false}."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7027
+#, fuzzy, no-wrap
+#| msgid "customization, of packages"
+msgid "customizing packages"
+msgstr "定制软件包"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7028
+#, fuzzy, no-wrap
+#| msgid "Creating variants of packages."
+msgid "variants, of packages"
+msgstr "创建软件包的变体。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7038
+msgid "One of the nice things with Guix is that, given a package definition, you can easily @emph{derive} variants of that package---for a different upstream version, with different dependencies, different compilation options, and so on.  Some of these custom packages can be defined straight from the command line (@pxref{Package Transformation Options}).  This section describes how to define package variants in code.  This can be useful in ``manifests'' (@pxref{profile-manifest, @option{--manifest}}) and in your own package collection (@pxref{Creating a Channel}), among others!"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7039
+#, fuzzy, no-wrap
+#| msgid "Finding errors in package definitions."
+msgid "inherit, for package definitions"
+msgstr "从软件包定义里寻找错误。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7046
+msgid "As discussed earlier, packages are first-class objects in the Scheme language.  The @code{(guix packages)} module provides the @code{package} construct to define new package objects (@pxref{package Reference}).  The easiest way to define a package variant is using the @code{inherit} keyword together with @code{package}.  This allows you to inherit from a package definition while overriding the fields you want."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7051
+msgid "For example, given the @code{hello} variable, which contains a definition for the current version of GNU@tie{}Hello, here's how you would define a variant for version 2.2 (released in 2006, it's vintage!):"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7054
+#, no-wrap
+msgid ""
+"(use-modules (gnu packages base))    ;for 'hello'\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7066
+#, no-wrap
+msgid ""
+"(define hello-2.2\n"
+"  (package\n"
+"    (inherit hello)\n"
+"    (version \"2.2\")\n"
+"    (source (origin\n"
+"              (method url-fetch)\n"
+"              (uri (string-append \"mirror://gnu/hello/hello-\" version\n"
+"                                  \".tar.gz\"))\n"
+"              (sha256\n"
+"               (base32\n"
+"                \"0lappv4slgb5spyqbh6yl5r013zv72yqg2pcl30mginf3wdqd8k9\"))))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7075
+msgid "The example above corresponds to what the @option{--with-source} package transformation option does.  Essentially @code{hello-2.2} preserves all the fields of @code{hello}, except @code{version} and @code{source}, which it overrides.  Note that the original @code{hello} variable is still there, in the @code{(gnu packages base)} module, unchanged.  When you define a custom package like this, you are really @emph{adding} a new package definition; the original one remains available."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7081
+msgid "You can just as well define variants with a different set of dependencies than the original package.  For example, the default @code{gdb} package depends on @code{guile}, but since that is an optional dependency, you can define a variant that removes that dependency like so:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7085
+#, no-wrap
+msgid ""
+"(use-modules (gnu packages gdb)    ;for 'gdb'\n"
+"             (srfi srfi-1))        ;for 'alist-delete'\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7091
+#, no-wrap
+msgid ""
+"(define gdb-sans-guile\n"
+"  (package\n"
+"    (inherit gdb)\n"
+"    (inputs (alist-delete \"guile\"\n"
+"                          (package-inputs gdb)))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7097
+msgid "The @code{alist-delete} call above removes the tuple from the @code{inputs} field that has @code{\"guile\"} as its first element (@pxref{SRFI-1 Association Lists,,, guile, GNU Guile Reference Manual})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7105
+msgid "In some cases, you may find it useful to write functions (``procedures'', in Scheme parlance) that return a package based on some parameters.  For example, consider the @code{luasocket} library for the Lua programming language.  We want to create @code{luasocket} packages for major versions of Lua.  One way to do that is to define a procedure that takes a Lua package and returns a @code{luasocket} package that depends on it:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7116
+#, no-wrap
+msgid ""
+"(define (make-lua-socket name lua)\n"
+"  ;; Return a luasocket package built with LUA.\n"
+"  (package\n"
+"    (name name)\n"
+"    (version \"3.0\")\n"
+"    ;; several fields omitted\n"
+"    (inputs\n"
+"     `((\"lua\" ,lua)))\n"
+"    (synopsis \"Socket library for Lua\")))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7119
+#, no-wrap
+msgid ""
+"(define-public lua5.1-socket\n"
+"  (make-lua-socket \"lua5.1-socket\" lua-5.1))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7122
+#, no-wrap
+msgid ""
+"(define-public lua5.2-socket\n"
+"  (make-lua-socket \"lua5.2-socket\" lua-5.2))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7130
+msgid "Here we have defined packages @code{lua5.1-socket} and @code{lua5.2-socket} by calling @code{make-lua-socket} with different arguments.  @xref{Procedures,,, guile, GNU Guile Reference Manual}, for more info on procedures.  Having top-level public definitions for these two packages means that they can be referred to from the command line (@pxref{Package Modules})."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7131
+#, no-wrap
+msgid "package transformations"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7136
+msgid "These are pretty simple package variants.  As a convenience, the @code{(guix transformations)} module provides a high-level interface that directly maps to the more sophisticated package transformation options (@pxref{Package Transformation Options}):"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7137
+#, no-wrap
+msgid "{Scheme Procedure} options->transformation @var{opts}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7141
+msgid "Return a procedure that, when passed an object to build (package, derivation, etc.), applies the transformations specified by @var{opts} and returns the resulting objects.  @var{opts} must be a list of symbol/string pairs such as:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7145
+#, no-wrap
+msgid ""
+"((with-branch . \"guile-gcrypt=master\")\n"
+" (without-tests . \"libgcrypt\"))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7149
+msgid "Each symbol names a transformation and the corresponding string is an argument to that transformation."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7152
+msgid "For instance, a manifest equivalent to this command:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:7157
+#, no-wrap
+msgid ""
+"guix build guix \\\n"
+"  --with-branch=guile-gcrypt=master \\\n"
+"  --with-debug-info=zlib\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7161
+msgid "... would look like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7164
+#, no-wrap
+msgid ""
+"(use-modules (guix transformations))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7170
+#, no-wrap
+msgid ""
+"(define transform\n"
+"  ;; The package transformation procedure.\n"
+"  (options->transformation\n"
+"   '((with-branch . \"guile-gcrypt=master\")\n"
+"     (with-debug-info . \"zlib\"))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7173
+#, no-wrap
+msgid ""
+"(packages->manifest\n"
+" (list (transform (specification->package \"guix\"))))\n"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:5562
+#: guix-git/doc/guix.texi:7175
+#, no-wrap
+msgid "input rewriting"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7176
+#, no-wrap
+msgid "dependency graph rewriting"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7183
+msgid "The @code{options->transformation} procedure is convenient, but it's perhaps also not as flexible as you may like.  How is it implemented? The astute reader probably noticed that most package transformation options go beyond the superficial changes shown in the first examples of this section: they involve @dfn{input rewriting}, whereby the dependency graph of a package is rewritten by replacing specific inputs by others."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7187
+msgid "Dependency graph rewriting, for the purposes of swapping packages in the graph, is what the @code{package-input-rewriting} procedure in @code{(guix packages)} implements."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7188
+#, no-wrap
+msgid "{Scheme Procedure} package-input-rewriting @var{replacements} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7195
+msgid "[@var{rewrite-name}] [#:deep? #t] Return a procedure that, when passed a package, replaces its direct and indirect dependencies, including implicit inputs when @var{deep?} is true, according to @var{replacements}.  @var{replacements} is a list of package pairs; the first element of each pair is the package to replace, and the second one is the replacement."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7198
+msgid "Optionally, @var{rewrite-name} is a one-argument procedure that takes the name of a package and returns its new name after rewrite."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:7202 guix-git/doc/guix.texi:10528
+msgid "Consider this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7208
+#, no-wrap
+msgid ""
+"(define libressl-instead-of-openssl\n"
+"  ;; This is a procedure to replace OPENSSL by LIBRESSL,\n"
+"  ;; recursively.\n"
+"  (package-input-rewriting `((,openssl . ,libressl))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7211
+#, no-wrap
+msgid ""
+"(define git-with-libressl\n"
+"  (libressl-instead-of-openssl git))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7219
+msgid "Here we first define a rewriting procedure that replaces @var{openssl} with @var{libressl}.  Then we use it to define a @dfn{variant} of the @var{git} package that uses @var{libressl} instead of @var{openssl}.  This is exactly what the @option{--with-input} command-line option does (@pxref{Package Transformation Options, @option{--with-input}})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7222
+msgid "The following variant of @code{package-input-rewriting} can match packages to be replaced by name rather than by identity."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7223
+#, no-wrap
+msgid "{Scheme Procedure} package-input-rewriting/spec @var{replacements} [#:deep? #t]"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7230
+msgid "Return a procedure that, given a package, applies the given @var{replacements} to all the package graph, including implicit inputs unless @var{deep?} is false.  @var{replacements} is a list of spec/procedures pair; each spec is a package specification such as @code{\"gcc\"} or @code{\"guile@@2\"}, and each procedure takes a matching package and returns a replacement for that package."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7233
+msgid "The example above could be rewritten this way:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7238
+#, no-wrap
+msgid ""
+"(define libressl-instead-of-openssl\n"
+"  ;; Replace all the packages called \"openssl\" with LibreSSL.\n"
+"  (package-input-rewriting/spec `((\"openssl\" . ,(const libressl)))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7243
+msgid "The key difference here is that, this time, packages are matched by spec and not by identity.  In other words, any package in the graph that is called @code{openssl} will be replaced."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:7247
+msgid "A more generic procedure to rewrite a package dependency graph is @code{package-mapping}: it supports arbitrary changes to nodes in the graph."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7248
+#, no-wrap
+msgid "{Scheme Procedure} package-mapping @var{proc} [@var{cut?}] [#:deep? #f]"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:7253
+msgid "Return a procedure that, given a package, applies @var{proc} to all the packages depended on and returns the resulting package.  The procedure stops recursion when @var{cut?} returns true for a given package.  When @var{deep?} is true, @var{proc} is applied to implicit inputs as well."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7259
 #, no-wrap
 msgid "build system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5567
+#: guix-git/doc/guix.texi:7264
 msgid "Each package definition specifies a @dfn{build system} and arguments for that build system (@pxref{Defining Packages}).  This @code{build-system} field represents the build procedure of the package, as well as implicit dependencies of that build procedure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5571
+#: guix-git/doc/guix.texi:7268
 msgid "Build systems are @code{<build-system>} objects.  The interface to create and manipulate them is provided by the @code{(guix build-system)} module, and actual build systems are exported by specific modules."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5572
+#: guix-git/doc/guix.texi:7269
 #, no-wrap
 msgid "bag (low-level package representation)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5579
-msgid "Under the hood, build systems first compile package objects to @dfn{bags}.  A @dfn{bag} is like a package, but with less ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, including some that were implicitly added by the build system.  This intermediate representation is then compiled to a derivation (@pxref{Derivations})."
+#: guix-git/doc/guix.texi:7279
+msgid "Under the hood, build systems first compile package objects to @dfn{bags}.  A @dfn{bag} is like a package, but with less ornamentation---in other words, a bag is a lower-level representation of a package, which includes all the inputs of that package, including some that were implicitly added by the build system.  This intermediate representation is then compiled to a derivation (@pxref{Derivations}).  The @code{package-with-c-toolchain} is an example of a way to change the implicit inputs that a package's build system pulls in (@pxref{package Reference, @code{package-with-c-toolchain}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5587
+#: guix-git/doc/guix.texi:7287
 msgid "Build systems accept an optional list of @dfn{arguments}.  In package definitions, these are passed @i{via} the @code{arguments} field (@pxref{Defining Packages}).  They are typically keyword arguments (@pxref{Optional Arguments, keyword arguments in Guile,, guile, GNU Guile Reference Manual}).  The value of these arguments is usually evaluated in the @dfn{build stratum}---i.e., by a Guile process launched by the daemon (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5591
-msgid "The main build system is @var{gnu-build-system}, which implements the standard build procedure for GNU and many other packages.  It is provided by the @code{(guix build-system gnu)} module."
+#: guix-git/doc/guix.texi:7291
+msgid "The main build system is @code{gnu-build-system}, which implements the standard build procedure for GNU and many other packages.  It is provided by the @code{(guix build-system gnu)} module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5592
+#: guix-git/doc/guix.texi:7292
 #, no-wrap
 msgid "{Scheme Variable} gnu-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5596
-msgid "@var{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})."
+#: guix-git/doc/guix.texi:7296
+msgid "@code{gnu-build-system} represents the GNU Build System, and variants thereof (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5597 doc/guix.texi:6259
+#: guix-git/doc/guix.texi:7297 guix-git/doc/guix.texi:8223
+#: guix-git/doc/guix.texi:8678
 #, no-wrap
 msgid "build phases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5604
-msgid "In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence.  In practice, a few additional steps are often needed.  All these steps are split up in separate @dfn{phases}, notably@footnote{Please see the @code{(guix build gnu-build-system)} modules for more details about the build phases.}:"
+#: guix-git/doc/guix.texi:7304
+msgid "In a nutshell, packages using it are configured, built, and installed with the usual @code{./configure && make && make check && make install} command sequence.  In practice, a few additional steps are often needed.  All these steps are split up in separate @dfn{phases}.  @xref{Build Phases}, for more info on build phases and ways to customize them."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7311
+msgid "In addition, this build system ensures that the ``standard'' environment for GNU packages is available.  This includes tools such as GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list).  We call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7315
+msgid "This build system supports a number of keyword arguments, which can be passed @i{via} the @code{arguments} field of a package.  Here are some of the main parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5606
+#: guix-git/doc/guix.texi:7317
 #, no-wrap
-msgid "unpack"
+msgid "#:phases"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5610
-msgid "Unpack the source tarball, and change the current directory to the extracted source tree.  If the source is actually a directory, copy it to the build tree, and enter that directory."
+#: guix-git/doc/guix.texi:7320
+msgid "This argument specifies build-side code that evaluates to an alist of build phases.  @xref{Build Phases}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5611
-#, no-wrap
-msgid "patch-source-shebangs"
-msgstr ""
+#: guix-git/doc/guix.texi:7321
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "#:configure-flags"
+msgstr "系统配置"
 
 #. type: table
-#: doc/guix.texi:5615
-msgid "Patch shebangs encountered in source files so they refer to the right store file names.  For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}."
+#: guix-git/doc/guix.texi:7324
+msgid "This is a list of flags (strings) passed to the @command{configure} script.  @xref{Defining Packages}, for an example."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5616 doc/guix.texi:6217 doc/guix.texi:6265
+#: guix-git/doc/guix.texi:7325
 #, no-wrap
-msgid "configure"
+msgid "#:make-flags"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5620
-msgid "Run the @file{configure} script with a number of default options, such as @code{--prefix=/gnu/store/@dots{}}, as well as the options specified by the @code{#:configure-flags} argument."
+#: guix-git/doc/guix.texi:7329
+msgid "This list of strings contains flags passed as arguments to @command{make} invocations in the @code{build}, @code{check}, and @code{install} phases."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5621 doc/guix.texi:5810 doc/guix.texi:6222 doc/guix.texi:6269
-#: doc/guix.texi:24390
+#: guix-git/doc/guix.texi:7330
 #, no-wrap
-msgid "build"
+msgid "#:out-of-source?"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5625
-msgid "Run @code{make} with the list of flags specified with @code{#:make-flags}.  If the @code{#:parallel-build?} argument is true (the default), build with @code{make -j}."
+#: guix-git/doc/guix.texi:7333
+msgid "This Boolean, @code{#f} by default, indicates whether to run builds in a build directory separate from the source tree."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:7338
+msgid "When it is true, the @code{configure} phase creates a separate build directory, changes to that directory, and runs the @code{configure} script from there.  This is useful for packages that require it, such as @code{glibc}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5626 doc/guix.texi:5820 doc/guix.texi:6226
+#: guix-git/doc/guix.texi:7339
 #, no-wrap
-msgid "check"
+msgid "#:tests?"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5631
-msgid "Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed.  If the @code{#:parallel-tests?} argument is true (the default), run @code{make check -j}."
+#: guix-git/doc/guix.texi:7342
+msgid "This Boolean, @code{#t} by default, indicates whether the @code{check} phase should run the package's test suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5632 doc/guix.texi:5828 doc/guix.texi:6230 doc/guix.texi:6273
+#: guix-git/doc/guix.texi:7343
 #, no-wrap
-msgid "install"
+msgid "#:test-target"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5634
-msgid "Run @code{make install} with the flags listed in @code{#:make-flags}."
+#: guix-git/doc/guix.texi:7346
+msgid "This string, @code{\"check\"} by default, gives the name of the makefile target used by the @code{check} phase."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5635
+#: guix-git/doc/guix.texi:7347
 #, no-wrap
-msgid "patch-shebangs"
+msgid "#:parallel-build?"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:7348
+#, no-wrap
+msgid "#:parallel-tests?"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5637
-msgid "Patch shebangs on the installed executable files."
+#: guix-git/doc/guix.texi:7355
+msgid "These Boolean values specify whether to build, respectively run the test suite, in parallel, with the @code{-j} flag of @command{make}.  When they are true, @code{make} is passed @code{-j@var{n}}, where @var{n} is the number specified as the @option{--cores} option of @command{guix-daemon} or that of the @command{guix} client command (@pxref{Common Build Options, @option{--cores}})."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:7356
+#, no-wrap
+msgid "RUNPATH, validation"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5638
+#: guix-git/doc/guix.texi:7357
 #, no-wrap
-msgid "strip"
+msgid "#:validate-runpath?"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5642
-msgid "Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when available (@pxref{Installing Debugging Files})."
+#: guix-git/doc/guix.texi:7361
+msgid "This Boolean, @code{#t} by default, determines whether to ``validate'' the @code{RUNPATH} of ELF binaries (@code{.so} shared libraries as well as executables) previously installed by the @code{install} phase."
 msgstr ""
 
-#. type: vindex
-#: doc/guix.texi:5644
-#, no-wrap
-msgid "%standard-phases"
+#. type: table
+#: guix-git/doc/guix.texi:7369
+msgid "This validation step consists in making sure that all the shared libraries needed by an ELF binaries, which are listed as @code{DT_NEEDED} entries in its @code{PT_DYNAMIC} segment, appear in the @code{DT_RUNPATH} entry of that binary.  In other words, it ensures that running or using those binaries will not result in a ``file not found'' error at run time.  @xref{Options, @option{-rpath},, ld, The GNU Linker}, for more information on @code{RUNPATH}."
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:5649
-msgid "The build-side module @code{(guix build gnu-build-system)} defines @var{%standard-phases} as the default list of build phases.  @var{%standard-phases} is a list of symbol/procedure pairs, where the procedure implements the actual phase."
+#. type: item
+#: guix-git/doc/guix.texi:7370
+#, fuzzy, no-wrap
+#| msgid "substituter"
+msgid "#:substitutable?"
+msgstr "substitutes"
+
+#. type: table
+#: guix-git/doc/guix.texi:7374
+msgid "This Boolean, @code{#t} by default, tells whether the package outputs should be substitutable---i.e., whether users should be able to obtain substitutes for them instead of building locally (@pxref{Substitutes})."
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:5652
-msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter.  For instance, passing:"
+#. type: item
+#: guix-git/doc/guix.texi:7375
+#, no-wrap
+msgid "#:allowed-references"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:5655
+#. type: itemx
+#: guix-git/doc/guix.texi:7376
 #, no-wrap
-msgid "#:phases (modify-phases %standard-phases (delete 'configure))\n"
+msgid "#:disallowed-references"
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:5659
-msgid "means that all the phases described above will be used, except the @code{configure} phase."
+#. type: table
+#: guix-git/doc/guix.texi:7381
+msgid "When true, these arguments must be a list of dependencies that must not appear among the references of the build results.  If, upon build completion, some of these references are retained, the build process fails."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:7386
+msgid "This is useful to ensure that a package does not erroneously keep a reference to some of it build-time inputs, in cases where doing so would, for example, unnecessarily increase its size (@pxref{Invoking guix size})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5666
-msgid "In addition, this build system ensures that the ``standard'' environment for GNU packages is available.  This includes tools such as GCC, libc, Coreutils, Bash, Make, Diffutils, grep, and sed (see the @code{(guix build-system gnu)} module for a complete list).  We call these the @dfn{implicit inputs} of a package, because package definitions do not have to mention them."
+#: guix-git/doc/guix.texi:7389
+msgid "Most other build systems support these keyword arguments."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:5673
-msgid "Other @code{<build-system>} objects are defined to support other conventions and tools used by free software packages.  They inherit most of @var{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed.  Some of these build systems are listed below."
+#: guix-git/doc/guix.texi:7396
+msgid "Other @code{<build-system>} objects are defined to support other conventions and tools used by free software packages.  They inherit most of @code{gnu-build-system}, and differ mainly in the set of inputs implicitly added to the build process, and in the list of phases executed.  Some of these build systems are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5674
+#: guix-git/doc/guix.texi:7397
 #, no-wrap
 msgid "{Scheme Variable} ant-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5678
+#: guix-git/doc/guix.texi:7401
 msgid "This variable is exported by @code{(guix build-system ant)}.  It implements the build procedure for Java packages that can be built with @url{https://ant.apache.org/, Ant build tool}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5683
+#: guix-git/doc/guix.texi:7406
 msgid "It adds both @code{ant} and the @dfn{Java Development Kit} (JDK) as provided by the @code{icedtea} package to the set of inputs.  Different packages can be specified with the @code{#:ant} and @code{#:jdk} parameters, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5689
+#: guix-git/doc/guix.texi:7412
 msgid "When the original package does not provide a suitable Ant build file, the parameter @code{#:jar-name} can be used to generate a minimal Ant build file @file{build.xml} with tasks to build the specified jar archive.  In this case the parameter @code{#:source-dir} can be used to specify the source sub-directory, defaulting to ``src''."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5697
-msgid "The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar.  This makes the jar file executable.  The @code{#:test-include} parameter can be used to specify the list of junit tests to run. It defaults to @code{(list \"**/*Test.java\")}.  The @code{#:test-exclude} can be used to disable some tests. It defaults to @code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests."
+#: guix-git/doc/guix.texi:7420
+msgid "The @code{#:main-class} parameter can be used with the minimal ant buildfile to specify the main class of the resulting jar.  This makes the jar file executable.  The @code{#:test-include} parameter can be used to specify the list of junit tests to run.  It defaults to @code{(list \"**/*Test.java\")}.  The @code{#:test-exclude} can be used to disable some tests.  It defaults to @code{(list \"**/Abstract*.java\")}, because abstract classes cannot be run as tests."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5701
+#: guix-git/doc/guix.texi:7424
 msgid "The parameter @code{#:build-target} can be used to specify the Ant task that should be run during the @code{build} phase.  By default the ``jar'' task will be run."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5704
+#: guix-git/doc/guix.texi:7427
 #, no-wrap
 msgid "{Scheme Variable} android-ndk-build-system"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5705
+#: guix-git/doc/guix.texi:7428
 #, no-wrap
 msgid "Android distribution"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5706
+#: guix-git/doc/guix.texi:7429
 #, no-wrap
 msgid "Android NDK build system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5710
+#: guix-git/doc/guix.texi:7433
 msgid "This variable is exported by @code{(guix build-system android-ndk)}.  It implements a build procedure for Android NDK (native development kit)  packages using a Guix-specific build process."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5714
-msgid "The build system assumes that packages install their public interface (header) files to the subdirectory \"include\" of the \"out\" output and their libraries to the subdirectory \"lib\" of the \"out\" output."
+#: guix-git/doc/guix.texi:7437
+msgid "The build system assumes that packages install their public interface (header) files to the subdirectory @file{include} of the @code{out} output and their libraries to the subdirectory @file{lib} the @code{out} output."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5717
+#: guix-git/doc/guix.texi:7440
 msgid "It's also assumed that the union of all the dependencies of a package has no conflicting files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5720
+#: guix-git/doc/guix.texi:7443
 msgid "For the time being, cross-compilation is not supported - so right now the libraries and header files are assumed to be host tools."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5723
+#: guix-git/doc/guix.texi:7446
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/source"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:5724
+#: guix-git/doc/guix.texi:7447
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/sbcl"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:5725
+#: guix-git/doc/guix.texi:7448
 #, no-wrap
 msgid "{Scheme Variable} asdf-build-system/ecl"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5731
-msgid "These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://common-lisp.net/project/asdf/, ``ASDF''}. ASDF is a system definition facility for Common Lisp programs and libraries."
+#: guix-git/doc/guix.texi:7454
+msgid "These variables, exported by @code{(guix build-system asdf)}, implement build procedures for Common Lisp packages using @url{https://common-lisp.net/project/asdf/, ``ASDF''}.  ASDF is a system definition facility for Common Lisp programs and libraries."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5738
-msgid "The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp implementation, via ASDF.  The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a particular implementation understands.  These build systems can also be used to produce executable programs, or lisp images which contain a set of packages pre-loaded."
+#: guix-git/doc/guix.texi:7461
+msgid "The @code{asdf-build-system/source} system installs the packages in source form, and can be loaded using any common lisp implementation, via ASDF@.  The others, such as @code{asdf-build-system/sbcl}, install binary systems in the format which a particular implementation understands.  These build systems can also be used to produce executable programs, or lisp images which contain a set of packages pre-loaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5742
+#: guix-git/doc/guix.texi:7465
 msgid "The build system uses naming conventions.  For binary packages, the package name should be prefixed with the lisp implementation, such as @code{sbcl-} for @code{asdf-build-system/sbcl}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5746
+#: guix-git/doc/guix.texi:7469
 msgid "Additionally, the corresponding source package should be labeled using the same convention as python packages (see @ref{Python Modules}), using the @code{cl-} prefix."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5751
-msgid "For binary packages, each system should be defined as a Guix package.  If one package @code{origin} contains several systems, package variants can be created in order to build all the systems.  Source packages, which use @code{asdf-build-system/source}, may contain several systems."
+#: guix-git/doc/guix.texi:7477
+msgid "In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be used.  They should be called in a build phase after the @code{create-asdf-configuration} phase, so that the system which was just built can be used within the resulting image.  @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-program} argument."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5758
-msgid "In order to create executable programs and images, the build-side procedures @code{build-program} and @code{build-image} can be used.  They should be called in a build phase after the @code{create-symlinks} phase, so that the system which was just built can be used within the resulting image.  @code{build-program} requires a list of Common Lisp expressions to be passed as the @code{#:entry-program} argument."
+#: guix-git/doc/guix.texi:7486
+msgid "By default, all the @file{.asd} files present in the sources are read to find system definitions.  The @code{#:asd-files} parameter can be used to specify the list of @file{.asd} files to read.  Furthermore, if the package defines a system for its tests in a separate file, it will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter.  If it is not set, the files @code{<system>-tests.asd}, @code{<system>-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5767
-msgid "If the system is not defined within its own @code{.asd} file of the same name, then the @code{#:asd-file} parameter should be used to specify which file the system is defined in.  Furthermore, if the package defines a system for its tests in a separate file, it will be loaded before the tests are run if it is specified by the @code{#:test-asd-file} parameter.  If it is not set, the files @code{<system>-tests.asd}, @code{<system>-test.asd}, @code{tests.asd}, and @code{test.asd} will be tried if they exist."
+#: guix-git/doc/guix.texi:7491
+msgid "If for some reason the package must be named in a different way than the naming conventions suggest, or if several systems must be compiled, the @code{#:asd-systems} parameter can be used to specify the list of system names."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5771
-msgid "If for some reason the package must be named in a different way than the naming conventions suggest, the @code{#:asd-system-name} parameter can be used to specify the name of the system."
-msgstr ""
-
-#. type: defvr
-#: doc/guix.texi:5774
+#: guix-git/doc/guix.texi:7494
 #, no-wrap
 msgid "{Scheme Variable} cargo-build-system"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5775
+#: guix-git/doc/guix.texi:7495
 #, no-wrap
 msgid "Rust programming language"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5776
+#: guix-git/doc/guix.texi:7496
 #, no-wrap
 msgid "Cargo (Rust build system)"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5780
+#: guix-git/doc/guix.texi:7500
 msgid "This variable is exported by @code{(guix build-system cargo)}.  It supports builds of packages using Cargo, the build tool of the @uref{https://www.rust-lang.org, Rust programming language}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5785
-msgid "In its @code{configure} phase, this build system replaces dependencies specified in the @file{Cargo.toml} file with inputs to the Guix package.  The @code{install} phase installs the binaries, and it also installs the source code and @file{Cargo.toml} file."
+#: guix-git/doc/guix.texi:7503
+msgid "It adds @code{rustc} and @code{cargo} to the set of inputs.  A different Rust package can be specified with the @code{#:rust} parameter."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7513
+msgid "Regular cargo dependencies should be added to the package definition similarly to other packages; those needed only at build time to native-inputs, others to inputs.  If you need to add source-only crates then you should add them to via the @code{#:cargo-inputs} parameter as a list of name and spec pairs, where the spec can be a package or a source definition.  Note that the spec must evaluate to a path to a gzipped tarball which includes a @code{Cargo.toml} file at its root, or it will be ignored.  Similarly, cargo dev-dependencies should be added to the package definition via the @code{#:cargo-development-inputs} parameter."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7523
+msgid "In its @code{configure} phase, this build system will make any source inputs specified in the @code{#:cargo-inputs} and @code{#:cargo-development-inputs} parameters available to cargo.  It will also remove an included @code{Cargo.lock} file to be recreated by @code{cargo} during the @code{build} phase.  The @code{package} phase will run @code{cargo package} to create a source crate for future use.  The @code{install} phase installs the binaries defined by the crate.  Unless @code{install-source? #f} is defined it will also install a source crate repository of itself and unpacked sources, to ease in future hacking on rust packages."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7525
+#, no-wrap
+msgid "{Scheme Variable} chicken-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7530
+msgid "This variable is exported by @code{(guix build-system chicken)}.  It builds @uref{https://call-cc.org/, CHICKEN Scheme} modules, also called ``eggs'' or ``extensions''.  CHICKEN generates C source code, which then gets compiled by a C compiler, in this case GCC."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7533
+msgid "This build system adds @code{chicken} to the package inputs, as well as the packages of @code{gnu-build-system}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7537
+msgid "The build system can't (yet) deduce the egg's name automatically, so just like with @code{go-build-system} and its @code{#:import-path}, you should define @code{#:egg-name} in the package's @code{arguments} field."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7539
+msgid "For example, if you are packaging the @code{srfi-1} egg:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7542
+#, no-wrap
+msgid "(arguments '(#:egg-name \"srfi-1\"))\n"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7547
+msgid "Egg dependencies must be defined in @code{propagated-inputs}, not @code{inputs} because CHICKEN doesn't embed absolute references in compiled eggs.  Test dependencies should go to @code{native-inputs}, as usual."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7549
+#, no-wrap
+msgid "{Scheme Variable} copy-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7553
+msgid "This variable is exported by @code{(guix build-system copy)}.  It supports builds of simple packages that don't require much compiling, mostly just moving files around."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7558
+msgid "It adds much of the @code{gnu-build-system} packages to the set of inputs.  Because of this, the @code{copy-build-system} does not require all the boilerplate code often needed for the @code{trivial-build-system}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7563
+msgid "To further simplify the file installation process, an @code{#:install-plan} argument is exposed to let the packager specify which files go where.  The install plan is a list of @code{(@var{source} @var{target} [@var{filters}])}.  @var{filters} are optional."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7565
+#, no-wrap
+msgid "When @var{source} matches a file or directory without trailing slash, install it to @var{target}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7567
+#, no-wrap
+msgid "If @var{target} has a trailing slash, install @var{source} basename beneath @var{target}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7568
+#, no-wrap
+msgid "Otherwise install @var{source} as @var{target}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7571
+#, no-wrap
+msgid "When @var{source} is a directory with a trailing slash, or when @var{filters} are used,"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7574
+msgid "the trailing slash of @var{target} is implied with the same meaning as above."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7575
+#, no-wrap
+msgid "Without @var{filters}, install the full @var{source} @emph{content} to @var{target}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7576
+#, no-wrap
+msgid "With @var{filters} among @code{#:include}, @code{#:include-regexp}, @code{#:exclude},"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7579
+msgid "@code{#:exclude-regexp}, only select files are installed depending on the filters.  Each filters is specified by a list of strings."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7580
+#, no-wrap
+msgid "With @code{#:include}, install all the files which the path suffix matches"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7582
+msgid "at least one of the elements in the given list."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7582
+#, no-wrap
+msgid "With @code{#:include-regexp}, install all the files which the"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7585
+msgid "subpaths match at least one of the regular expressions in the given list."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7585
+#, no-wrap
+msgid "The @code{#:exclude} and @code{#:exclude-regexp} filters"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7590
+msgid "are the complement of their inclusion counterpart.  Without @code{#:include} flags, install all files but those matching the exclusion filters.  If both inclusions and exclusions are specified, the exclusions are done on top of the inclusions."
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7594
+msgid "In all cases, the paths relative to @var{source} are preserved within @var{target}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7597
+msgid "Examples:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7599
+#, no-wrap
+msgid "@code{(\"foo/bar\" \"share/my-app/\")}: Install @file{bar} to @file{share/my-app/bar}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7600
+#, no-wrap
+msgid "@code{(\"foo/bar\" \"share/my-app/baz\")}: Install @file{bar} to @file{share/my-app/baz}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7601
+#, no-wrap
+msgid "@code{(\"foo/\" \"share/my-app\")}: Install the content of @file{foo} inside @file{share/my-app},"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7603
+msgid "e.g., install @file{foo/sub/file} to @file{share/my-app/sub/file}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7603
+#, no-wrap
+msgid "@code{(\"foo/\" \"share/my-app\" #:include (\"sub/file\"))}: Install only @file{foo/sub/file} to"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7605
+msgid "@file{share/my-app/sub/file}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7605
+#, no-wrap
+msgid "@code{(\"foo/sub\" \"share/my-app\" #:include (\"file\"))}: Install @file{foo/sub/file} to"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:7607
+msgid "@file{share/my-app/file}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5787
+#: guix-git/doc/guix.texi:7611
 #, no-wrap
 msgid "Clojure (programming language)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:5788
+#: guix-git/doc/guix.texi:7612
 #, no-wrap
 msgid "simple Clojure build system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5789
+#: guix-git/doc/guix.texi:7613
 #, no-wrap
 msgid "{Scheme Variable} clojure-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5794
+#: guix-git/doc/guix.texi:7618
 msgid "This variable is exported by @code{(guix build-system clojure)}.  It implements a simple build procedure for @uref{https://clojure.org/, Clojure} packages using plain old @code{compile} in Clojure.  Cross-compilation is not supported yet."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5798
+#: guix-git/doc/guix.texi:7622
 msgid "It adds @code{clojure}, @code{icedtea} and @code{zip} to the set of inputs.  Different packages can be specified with the @code{#:clojure}, @code{#:jdk} and @code{#:zip} parameters, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5804
+#: guix-git/doc/guix.texi:7628
 msgid "A list of source directories, test directories and jar names can be specified with the @code{#:source-dirs}, @code{#:test-dirs} and @code{#:jar-names} parameters, respectively.  Compile directory and main class can be specified with the @code{#:compile-dir} and @code{#:main-class} parameters, respectively.  Other parameters are documented below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5807
-msgid "This build system is an extension of @var{ant-build-system}, but with the following phases changed:"
+#: guix-git/doc/guix.texi:7631
+msgid "This build system is an extension of @code{ant-build-system}, but with the following phases changed:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7634 guix-git/doc/guix.texi:8186
+#: guix-git/doc/guix.texi:8233 guix-git/doc/guix.texi:8302
+#: guix-git/doc/guix.texi:32958
+#, no-wrap
+msgid "build"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5819
+#: guix-git/doc/guix.texi:7643
 msgid "This phase calls @code{compile} in Clojure to compile source files and runs @command{jar} to create jars from both source files and compiled files according to the include list and exclude list specified in @code{#:aot-include} and @code{#:aot-exclude}, respectively.  The exclude list has priority over the include list.  These lists consist of symbols representing Clojure libraries or the special keyword @code{#:all} representing all Clojure libraries found under the source directories.  The parameter @code{#:omit-source?} decides if source should be included into the jars."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:7644 guix-git/doc/guix.texi:8190
+#: guix-git/doc/guix.texi:8307
+#, no-wrap
+msgid "check"
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:5827
+#: guix-git/doc/guix.texi:7651
 msgid "This phase runs tests according to the include list and exclude list specified in @code{#:test-include} and @code{#:test-exclude}, respectively.  Their meanings are analogous to that of @code{#:aot-include} and @code{#:aot-exclude}, except that the special keyword @code{#:all} now stands for all Clojure libraries found under the test directories.  The parameter @code{#:tests?} decides if tests should be run."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:7652 guix-git/doc/guix.texi:8194
+#: guix-git/doc/guix.texi:8237 guix-git/doc/guix.texi:8313
+#, no-wrap
+msgid "install"
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:5830
+#: guix-git/doc/guix.texi:7654
 msgid "This phase installs all jars built previously."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5833
+#: guix-git/doc/guix.texi:7657
 msgid "Apart from the above, this build system also contains an additional phase:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5836
+#: guix-git/doc/guix.texi:7660
 #, no-wrap
 msgid "install-doc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5841
-msgid "This phase installs all top-level files with base name matching @var{%doc-regex}.  A different regex can be specified with the @code{#:doc-regex} parameter.  All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well."
+#: guix-git/doc/guix.texi:7665
+msgid "This phase installs all top-level files with base name matching @code{%doc-regex}.  A different regex can be specified with the @code{#:doc-regex} parameter.  All files (recursively) inside the documentation directories specified in @code{#:doc-dirs} are installed as well."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5844
+#: guix-git/doc/guix.texi:7668
 #, no-wrap
 msgid "{Scheme Variable} cmake-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5848
+#: guix-git/doc/guix.texi:7672
 msgid "This variable is exported by @code{(guix build-system cmake)}.  It implements the build procedure for packages using the @url{https://www.cmake.org, CMake build tool}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5852
+#: guix-git/doc/guix.texi:7676
 msgid "It automatically adds the @code{cmake} package to the set of inputs.  Which package is used can be specified with the @code{#:cmake} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5859
+#: guix-git/doc/guix.texi:7683
 msgid "The @code{#:configure-flags} parameter is taken as a list of flags passed to the @command{cmake} command.  The @code{#:build-type} parameter specifies in abstract terms the flags passed to the compiler; it defaults to @code{\"RelWithDebInfo\"} (short for ``release mode with debugging information''), which roughly means that code is compiled with @code{-O2 -g}, as is the case for Autoconf-based packages by default."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5861
+#: guix-git/doc/guix.texi:7685
 #, no-wrap
 msgid "{Scheme Variable} dune-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5868
+#: guix-git/doc/guix.texi:7692
 msgid "This variable is exported by @code{(guix build-system dune)}.  It supports builds of packages using @uref{https://dune.build/, Dune}, a build tool for the OCaml programming language.  It is implemented as an extension of the @code{ocaml-build-system} which is described below.  As such, the @code{#:ocaml} and @code{#:findlib} parameters can be passed to this build system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5872
+#: guix-git/doc/guix.texi:7696
 msgid "It automatically adds the @code{dune} package to the set of inputs.  Which package is used can be specified with the @code{#:dune} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5876
+#: guix-git/doc/guix.texi:7700
 msgid "There is no @code{configure} phase because dune packages typically don't need to be configured.  The @code{#:build-flags} parameter is taken as a list of flags passed to the @code{dune} command during the build."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5880
+#: guix-git/doc/guix.texi:7704
 msgid "The @code{#:jbuild?} parameter can be passed to use the @code{jbuild} command instead of the more recent @code{dune} command while building a package.  Its default value is @code{#f}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5885
+#: guix-git/doc/guix.texi:7709
 msgid "The @code{#:package} parameter can be passed to specify a package name, which is useful when a package contains multiple packages and you want to build only one of them.  This is equivalent to passing the @code{-p} argument to @code{dune}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5887
+#: guix-git/doc/guix.texi:7711
 #, no-wrap
 msgid "{Scheme Variable} go-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5892
+#: guix-git/doc/guix.texi:7716
 msgid "This variable is exported by @code{(guix build-system go)}.  It implements a build procedure for Go packages using the standard @url{https://golang.org/cmd/go/#hdr-Compile_packages_and_dependencies, Go build mechanisms}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5903
+#: guix-git/doc/guix.texi:7727
 msgid "The user is expected to provide a value for the key @code{#:import-path} and, in some cases, @code{#:unpack-path}.  The @url{https://golang.org/doc/code.html#ImportPaths, import path} corresponds to the file system path expected by the package's build scripts and any referring packages, and provides a unique way to refer to a Go package.  It is typically based on a combination of the package source code's remote URI and file system hierarchy structure.  In some cases, you will need to unpack the package's source code to a different directory structure than the one indicated by the import path, and @code{#:unpack-path} should be used in such cases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5908
+#: guix-git/doc/guix.texi:7732
 msgid "Packages that provide Go libraries should install their source code into the built output.  The key @code{#:install-source?}, which defaults to @code{#t}, controls whether or not the source code is installed.  It can be set to @code{#f} for packages that only provide executable files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5910
+#: guix-git/doc/guix.texi:7734
 #, no-wrap
 msgid "{Scheme Variable} glib-or-gtk-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5913
+#: guix-git/doc/guix.texi:7737
 msgid "This variable is exported by @code{(guix build-system glib-or-gtk)}.  It is intended for use with packages making use of GLib or GTK+."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5916
-msgid "This build system adds the following two phases to the ones defined by @var{gnu-build-system}:"
+#: guix-git/doc/guix.texi:7740
+msgid "This build system adds the following two phases to the ones defined by @code{gnu-build-system}:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5918 doc/guix.texi:6246
+#: guix-git/doc/guix.texi:7742 guix-git/doc/guix.texi:8210
 #, no-wrap
 msgid "glib-or-gtk-wrap"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5925
-msgid "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the programs in launch scripts that appropriately set the @code{XDG_DATA_DIRS} and @code{GTK_PATH} environment variables."
+#: guix-git/doc/guix.texi:7749
+msgid "The phase @code{glib-or-gtk-wrap} ensures that programs in @file{bin/} are able to find GLib ``schemas'' and @uref{https://developer.gnome.org/gtk3/stable/gtk-running.html, GTK+ modules}.  This is achieved by wrapping the programs in launch scripts that appropriately set the @env{XDG_DATA_DIRS} and @env{GTK_PATH} environment variables."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5932
+#: guix-git/doc/guix.texi:7756
 msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:glib-or-gtk-wrap-excluded-outputs} parameter.  This is useful when an output is known not to contain any GLib or GTK+ binaries, and where wrapping would gratuitously add a dependency of that output on GLib and GTK+."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:5933 doc/guix.texi:6250
+#: guix-git/doc/guix.texi:7757 guix-git/doc/guix.texi:8214
 #, no-wrap
 msgid "glib-or-gtk-compile-schemas"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:5941
+#: guix-git/doc/guix.texi:7765
 msgid "The phase @code{glib-or-gtk-compile-schemas} makes sure that all @uref{https://developer.gnome.org/gio/stable/glib-compile-schemas.html, GSettings schemas} of GLib are compiled.  Compilation is performed by the @command{glib-compile-schemas} program.  It is provided by the package @code{glib:bin} which is automatically imported by the build system.  The @code{glib} package providing @command{glib-compile-schemas} can be specified with the @code{#:glib} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5944
+#: guix-git/doc/guix.texi:7768
 msgid "Both phases are executed after the @code{install} phase."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5946
+#: guix-git/doc/guix.texi:7770
 #, no-wrap
 msgid "{Scheme Variable} guile-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5953
+#: guix-git/doc/guix.texi:7777
 msgid "This build system is for Guile packages that consist exclusively of Scheme code and that are so lean that they don't even have a makefile, let alone a @file{configure} script.  It compiles Scheme code using @command{guild compile} (@pxref{Compilation,,, guile, GNU Guile Reference Manual}) and installs the @file{.scm} and @file{.go} files in the right place.  It also installs documentation."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5956
-msgid "This build system supports cross-compilation by using the @code{--target} option of @command{guild compile}."
+#: guix-git/doc/guix.texi:7780
+msgid "This build system supports cross-compilation by using the @option{--target} option of @samp{guild compile}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5959
+#: guix-git/doc/guix.texi:7783
 msgid "Packages built with @code{guile-build-system} must provide a Guile package in their @code{native-inputs} field."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5961
+#: guix-git/doc/guix.texi:7785
+#, no-wrap
+msgid "{Scheme Variable} julia-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7792
+msgid "This variable is exported by @code{(guix build-system julia)}.  It implements the build procedure used by @uref{https://julialang.org/, julia} packages, which essentially is similar to running @samp{julia -e 'using Pkg; Pkg.add(package)'} in an environment where @env{JULIA_LOAD_PATH} contains the paths to all Julia package inputs.  Tests are run by calling @code{/test/runtests.jl}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7796
+msgid "The Julia package name is read from the file @file{Project.toml}.  This value can be overridden by passing the argument @code{#:julia-package-name} (which must be correctly capitalized)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7800
+msgid "Julia packages usually manage their binary dependencies via @code{JLLWrappers.jl}, a Julia package that creates a module (named after the wrapped library followed by @code{_jll.jl}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7805
+msgid "To add the binary path @code{_jll.jl} packages, you need to patch the files under @file{src/wrappers/}, replacing the call to the macro @code{JLLWrappers.@@generate_wrapper_header}, adding as a second argument containing the store path the binary."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7809
+msgid "As an example, in the MbedTLS Julia package, we add a build phase (@pxref{Build Phases}) to insert the absolute file name of the wrapped MbedTLS package:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:7821
+#, no-wrap
+msgid ""
+"(add-after 'unpack 'override-binary-path\n"
+"  (lambda* (#:key inputs #:allow-other-keys)\n"
+"    (for-each (lambda (wrapper)\n"
+"                (substitute* wrapper\n"
+"                  ((\"generate_wrapper_header.*\")\n"
+"                   (string-append\n"
+"                    \"generate_wrapper_header(\\\"MbedTLS\\\", \\\"\"\n"
+"                    (assoc-ref inputs \"mbedtls-apache\") \"\\\")\\n\"))))\n"
+"              ;; There's a Julia file for each platform, override them all.\n"
+"              (find-files \"src/wrappers/\" \"\\\\.jl$\"))))\n"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7829
+msgid "Some older packages that aren't using @file{Package.toml} yet, will require this file to be created, too.  The function @code{julia-create-package-toml} helps creating the file.  You need to pass the outputs and the source of the package, it's name (the same as the @code{file-name} parameter), the package uuid, the package version, and a list of dependencies specified by their name and their uuid."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7831
+#, no-wrap
+msgid "{Scheme Variable} maven-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7838
+msgid "This variable is exported by @code{(guix build-system maven)}.  It implements a build procedure for @uref{https://maven.apache.org, Maven} packages.  Maven is a dependency and lifecycle management tool for Java.  A user of Maven specifies dependencies and plugins in a @file{pom.xml} file that Maven reads.  When Maven does not have one of the dependencies or plugins in its repository, it will download them and use them to build the package."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7848
+msgid "The maven build system ensures that maven will not try to download any dependency by running in offline mode.  Maven will fail if a dependency is missing.  Before running Maven, the @file{pom.xml} (and subprojects) are modified to specify the version of dependencies and plugins that match the versions available in the guix build environment.  Dependencies and plugins must be installed in the fake maven repository at @file{lib/m2}, and are symlinked into a proper repository before maven is run.  Maven is instructed to use that repository for the build and installs built artifacts there.  Changed files are copied to the @file{lib/m2} directory of the package output."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7851
+msgid "You can specify a @file{pom.xml} file with the @code{#:pom-file} argument, or let the build system use the default @file{pom.xml} file in the sources."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7857
+msgid "In case you need to specify a dependency's version manually, you can use the @code{#:local-packages} argument.  It takes an association list where the key is the groupId of the package and its value is an association list where the key is the artifactId of the package and its value is the version you want to override in the @file{pom.xml}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7863
+msgid "Some packages use dependencies or plugins that are not useful at runtime nor at build time in Guix.  You can alter the @file{pom.xml} file to remove them using the @code{#:exclude} argument.  Its value is an association list where the key is the groupId of the plugin or dependency you want to remove, and the value is a list of artifactId you want to remove."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7866
+msgid "You can override the default @code{jdk} and @code{maven} packages with the corresponding argument, @code{#:jdk} and @code{#:maven}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7871
+msgid "The @code{#:maven-plugins} argument is a list of maven plugins used during the build, with the same format as the @code{inputs} fields of the package declaration.  Its default value is @code{(default-maven-plugins)} which is also exported."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7873
 #, no-wrap
 msgid "{Scheme Variable} minify-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5964
+#: guix-git/doc/guix.texi:7876
 msgid "This variable is exported by @code{(guix build-system minify)}.  It implements a minification procedure for simple JavaScript packages."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5970
+#: guix-git/doc/guix.texi:7882
 msgid "It adds @code{uglify-js} to the set of inputs and uses it to compress all JavaScript files in the @file{src} directory.  A different minifier package can be specified with the @code{#:uglify-js} parameter, but it is expected that the package writes the minified code to the standard output."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5974
+#: guix-git/doc/guix.texi:7886
 msgid "When the input JavaScript files are not all located in the @file{src} directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5976
+#: guix-git/doc/guix.texi:7888
 #, no-wrap
 msgid "{Scheme Variable} ocaml-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5982
+#: guix-git/doc/guix.texi:7894
 msgid "This variable is exported by @code{(guix build-system ocaml)}.  It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists of choosing the correct set of commands to run for each package.  OCaml packages can expect many different commands to be run.  This build system will try some of them."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5992
+#: guix-git/doc/guix.texi:7904
 msgid "When the package has a @file{setup.ml} file present at the top-level, it will run @code{ocaml setup.ml -configure}, @code{ocaml setup.ml -build} and @code{ocaml setup.ml -install}.  The build system will assume that this file was generated by @uref{http://oasis.forge.ocamlcore.org/, OASIS} and will take care of setting the prefix and enabling tests if they are not disabled.  You can pass configure and build flags with the @code{#:configure-flags} and @code{#:build-flags}.  The @code{#:test-flags} key can be passed to change the set of flags used to enable tests.  The @code{#:use-make?} key can be used to bypass this system in the build and install phases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:5997
+#: guix-git/doc/guix.texi:7909
 msgid "When the package has a @file{configure} file, it is assumed that it is a hand-made configure script that requires a different argument format than in the @code{gnu-build-system}.  You can add more flags with the @code{#:configure-flags} key."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6001
+#: guix-git/doc/guix.texi:7913
 msgid "When the package has a @file{Makefile} file (or @code{#:use-make?} is @code{#t}), it will be used and more flags can be passed to the build and install phases with the @code{#:make-flags} key."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6009
+#: guix-git/doc/guix.texi:7921
 msgid "Finally, some packages do not have these files and use a somewhat standard location for its build system.  In that case, the build system will run @code{ocaml pkg/pkg.ml} or @code{ocaml pkg/build.ml} and take care of providing the path to the required findlib module.  Additional flags can be passed via the @code{#:build-flags} key.  Install is taken care of by @command{opam-installer}.  In this case, the @code{opam} package must be added to the @code{native-inputs} field of the package definition."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6017
-msgid "Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix.  In particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml compiler directory.  In guix though, these libraries cannot be found and we use @code{CAML_LD_LIBRARY_PATH}.  This variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed."
+#: guix-git/doc/guix.texi:7929
+msgid "Note that most OCaml packages assume they will be installed in the same directory as OCaml, which is not what we want in guix.  In particular, they will install @file{.so} files in their module's directory, which is usually fine because it is in the OCaml compiler directory.  In guix though, these libraries cannot be found and we use @env{CAML_LD_LIBRARY_PATH}.  This variable points to @file{lib/ocaml/site-lib/stubslibs} and this is where @file{.so} libraries should be installed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6019
+#: guix-git/doc/guix.texi:7931
 #, no-wrap
 msgid "{Scheme Variable} python-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6024
+#: guix-git/doc/guix.texi:7936
 msgid "This variable is exported by @code{(guix build-system python)}.  It implements the more or less standard build procedure used by Python packages, which consists in running @code{python setup.py build} and then @code{python setup.py install --prefix=/gnu/store/@dots{}}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6028
-msgid "For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their @code{PYTHONPATH} environment variable points to all the Python libraries they depend on."
+#: guix-git/doc/guix.texi:7940
+msgid "For packages that install stand-alone Python programs under @code{bin/}, it takes care of wrapping these programs so that their @env{PYTHONPATH} environment variable points to all the Python libraries they depend on."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6034
+#: guix-git/doc/guix.texi:7946
 msgid "Which Python package is used to perform the build can be specified with the @code{#:python} parameter.  This is a useful way to force a package to be built for a specific version of the Python interpreter, which might be necessary if the package is only compatible with a single interpreter version."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6039
-msgid "By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does.  Some packages are not compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools} parameter to @code{#f}."
+#: guix-git/doc/guix.texi:7951
+msgid "By default guix calls @code{setup.py} under control of @code{setuptools}, much like @command{pip} does.  Some packages are not compatible with setuptools (and pip), thus you can disable this by setting the @code{#:use-setuptools?} parameter to @code{#f}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6041
+#: guix-git/doc/guix.texi:7953
 #, no-wrap
 msgid "{Scheme Variable} perl-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6053
+#: guix-git/doc/guix.texi:7965
 msgid "This variable is exported by @code{(guix build-system perl)}.  It implements the standard build procedure for Perl packages, which either consists in running @code{perl Build.PL --prefix=/gnu/store/@dots{}}, followed by @code{Build} and @code{Build install}; or in running @code{perl Makefile.PL PREFIX=/gnu/store/@dots{}}, followed by @code{make} and @code{make install}, depending on which of @code{Build.PL} or @code{Makefile.PL} is present in the package distribution.  Preference is given to the former if both @code{Build.PL} and @code{Makefile.PL} exist in the package distribution.  This preference can be reversed by specifying @code{#t} for the @code{#:make-maker?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6057
+#: guix-git/doc/guix.texi:7969
 msgid "The initial @code{perl Makefile.PL} or @code{perl Build.PL} invocation passes flags specified by the @code{#:make-maker-flags} or @code{#:module-build-flags} parameter, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6059
+#: guix-git/doc/guix.texi:7971
 msgid "Which Perl package is used can be specified with @code{#:perl}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6061
+#: guix-git/doc/guix.texi:7973
+#, no-wrap
+msgid "{Scheme Variable} renpy-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7977
+msgid "This variable is exported by @code{(guix build-system renpy)}.  It implements the more or less standard build procedure used by Ren'py games, which consists of loading @code{#:game} once, thereby creating bytecode for it."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7980
+msgid "It further creates a wrapper script in @code{bin/} and a desktop entry in @code{share/applications}, both of which can be used to launch the game."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7984
+msgid "Which Ren'py package is used can be specified with @code{#:renpy}.  Games can also be installed in outputs other than ``out'' by using @code{#:output}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7986
+#, no-wrap
+msgid "{Scheme Variable} qt-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7989
+msgid "This variable is exported by @code{(guix build-system qt)}.  It is intended for use with applications using Qt or KDE."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:7992
+msgid "This build system adds the following two phases to the ones defined by @code{cmake-build-system}:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:7994
+#, no-wrap
+msgid "check-setup"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8001
+msgid "The phase @code{check-setup} prepares the environment for running the checks as commonly used by Qt test programs.  For now this only sets some environment variables: @code{QT_QPA_PLATFORM=offscreen}, @code{DBUS_FATAL_WARNINGS=0} and @code{CTEST_OUTPUT_ON_FAILURE=1}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8004
+msgid "This phase is added before the @code{check} phase.  It's a separate phase to ease adjusting if necessary."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8005
+#, no-wrap
+msgid "qt-wrap"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8011
+msgid "The phase @code{qt-wrap} searches for Qt5 plugin paths, QML paths and some XDG in the inputs and output.  In case some path is found, all programs in the output's @file{bin/}, @file{sbin/}, @file{libexec/} and @file{lib/libexec/} directories are wrapped in scripts defining the necessary environment variables."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8017
+msgid "It is possible to exclude specific package outputs from that wrapping process by listing their names in the @code{#:qt-wrap-excluded-outputs} parameter.  This is useful when an output is known not to contain any Qt binaries, and where wrapping would gratuitously add a dependency of that output on Qt, KDE, or such."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8019
+msgid "This phase is added after the @code{install} phase."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:8022
 #, no-wrap
 msgid "{Scheme Variable} r-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6069
-msgid "This variable is exported by @code{(guix build-system r)}.  It implements the build procedure used by @uref{https://r-project.org, R} packages, which essentially is little more than running @code{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where @code{R_LIBS_SITE} contains the paths to all R package inputs.  Tests are run after installation using the R function @code{tools::testInstalledPackage}."
+#: guix-git/doc/guix.texi:8030
+msgid "This variable is exported by @code{(guix build-system r)}.  It implements the build procedure used by @uref{https://r-project.org, R} packages, which essentially is little more than running @samp{R CMD INSTALL --library=/gnu/store/@dots{}} in an environment where @env{R_LIBS_SITE} contains the paths to all R package inputs.  Tests are run after installation using the R function @code{tools::testInstalledPackage}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6071
+#: guix-git/doc/guix.texi:8032
 #, no-wrap
 msgid "{Scheme Variable} rakudo-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6079
-msgid "This variable is exported by @code{(guix build-system rakudo)}.  It implements the build procedure used by @uref{https://rakudo.org/, Rakudo} for @uref{https://perl6.org/, Perl6} packages. It installs the package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and installs the binaries, library files and the resources, as well as wrap the files under the @code{bin/} directory.  Tests can be skipped by passing @code{#f} to the @code{tests?} parameter."
+#: guix-git/doc/guix.texi:8040
+msgid "This variable is exported by @code{(guix build-system rakudo)}.  It implements the build procedure used by @uref{https://rakudo.org/, Rakudo} for @uref{https://perl6.org/, Perl6} packages.  It installs the package to @code{/gnu/store/@dots{}/NAME-VERSION/share/perl6} and installs the binaries, library files and the resources, as well as wrap the files under the @code{bin/} directory.  Tests can be skipped by passing @code{#f} to the @code{tests?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6087
+#: guix-git/doc/guix.texi:8048
 msgid "Which rakudo package is used can be specified with @code{rakudo}.  Which perl6-tap-harness package used for the tests can be specified with @code{#:prove6} or removed by passing @code{#f} to the @code{with-prove6?} parameter.  Which perl6-zef package used for tests and installing can be specified with @code{#:zef} or removed by passing @code{#f} to the @code{with-zef?} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6089
+#: guix-git/doc/guix.texi:8050
 #, no-wrap
 msgid "{Scheme Variable} texlive-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6094
-msgid "This variable is exported by @code{(guix build-system texlive)}.  It is used to build TeX packages in batch mode with a specified engine.  The build system sets the @code{TEXINPUTS} variable to find all TeX source files in the inputs."
+#: guix-git/doc/guix.texi:8055
+msgid "This variable is exported by @code{(guix build-system texlive)}.  It is used to build TeX packages in batch mode with a specified engine.  The build system sets the @env{TEXINPUTS} variable to find all TeX source files in the inputs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6103
+#: guix-git/doc/guix.texi:8064
 msgid "By default it runs @code{luatex} on all files ending on @code{ins}.  A different engine and format can be specified with the @code{#:tex-format} argument.  Different build targets can be specified with the @code{#:build-targets} argument, which expects a list of file names.  The build system adds only @code{texlive-bin} and @code{texlive-latex-base} (both from @code{(gnu packages tex}) to the inputs.  Both can be overridden with the arguments @code{#:texlive-bin} and @code{#:texlive-latex-base}, respectively."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6106
+#: guix-git/doc/guix.texi:8067
 msgid "The @code{#:tex-directory} parameter tells the build system where to install the built files under the texmf tree."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6108
+#: guix-git/doc/guix.texi:8069
 #, no-wrap
 msgid "{Scheme Variable} ruby-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6112
+#: guix-git/doc/guix.texi:8073
 msgid "This variable is exported by @code{(guix build-system ruby)}.  It implements the RubyGems build procedure used by Ruby packages, which involves running @code{gem build} followed by @code{gem install}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6120
+#: guix-git/doc/guix.texi:8081
 msgid "The @code{source} field of a package that uses this build system typically references a gem archive, since this is the format that Ruby developers use when releasing their software.  The build system unpacks the gem archive, potentially patches the source, runs the test suite, repackages the gem, and installs it.  Additionally, directories and tarballs may be referenced to allow building unreleased gems from Git or a traditional source release tarball."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6124
+#: guix-git/doc/guix.texi:8085
 msgid "Which Ruby package is used can be specified with the @code{#:ruby} parameter.  A list of additional flags to be passed to the @command{gem} command can be specified with the @code{#:gem-flags} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6126
+#: guix-git/doc/guix.texi:8087
 #, no-wrap
 msgid "{Scheme Variable} waf-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6132
+#: guix-git/doc/guix.texi:8093
 msgid "This variable is exported by @code{(guix build-system waf)}.  It implements a build procedure around the @code{waf} script.  The common phases---@code{configure}, @code{build}, and @code{install}---are implemented by passing their names as arguments to the @code{waf} script."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6136
+#: guix-git/doc/guix.texi:8097
 msgid "The @code{waf} script is executed by the Python interpreter.  Which Python package is used to run the script can be specified with the @code{#:python} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6138
+#: guix-git/doc/guix.texi:8099
 #, no-wrap
 msgid "{Scheme Variable} scons-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6144
+#: guix-git/doc/guix.texi:8105
 msgid "This variable is exported by @code{(guix build-system scons)}.  It implements the build procedure used by the SCons software construction tool.  This build system runs @code{scons} to build the package, @code{scons test} to run tests, and then @code{scons install} to install the package."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6149
-msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter.  The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter."
+#: guix-git/doc/guix.texi:8112
+msgid "Additional flags to be passed to @code{scons} can be specified with the @code{#:scons-flags} parameter.  The default build and install targets can be overridden with @code{#:build-targets} and @code{#:install-targets} respectively.  The version of Python used to run SCons can be specified by selecting the appropriate SCons package with the @code{#:scons} parameter."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6151
+#: guix-git/doc/guix.texi:8114
 #, no-wrap
 msgid "{Scheme Variable} haskell-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6165
+#: guix-git/doc/guix.texi:8128
 msgid "This variable is exported by @code{(guix build-system haskell)}.  It implements the Cabal build procedure used by Haskell packages, which involves running @code{runhaskell Setup.hs configure --prefix=/gnu/store/@dots{}} and @code{runhaskell Setup.hs build}.  Instead of installing the package by running @code{runhaskell Setup.hs install}, to avoid trying to register libraries in the read-only compiler store directory, the build system uses @code{runhaskell Setup.hs copy}, followed by @code{runhaskell Setup.hs register}.  In addition, the build system generates the package documentation by running @code{runhaskell Setup.hs haddock}, unless @code{#:haddock? #f} is passed.  Optional Haddock parameters can be passed with the help of the @code{#:haddock-flags} parameter.  If the file @code{Setup.hs} is not found, the build system looks for @code{Setup.lhs} instead."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6168
+#: guix-git/doc/guix.texi:8131
 msgid "Which Haskell compiler is used can be specified with the @code{#:haskell} parameter which defaults to @code{ghc}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6170
+#: guix-git/doc/guix.texi:8133
 #, no-wrap
 msgid "{Scheme Variable} dub-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6175
+#: guix-git/doc/guix.texi:8138
 msgid "This variable is exported by @code{(guix build-system dub)}.  It implements the Dub build procedure used by D packages, which involves running @code{dub build} and @code{dub run}.  Installation is done by copying the files manually."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6178
+#: guix-git/doc/guix.texi:8141
 msgid "Which D compiler is used can be specified with the @code{#:ldc} parameter which defaults to @code{ldc}."
 msgstr ""
 
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:8144
+msgid "emacs-build-system"
+msgstr ""
+
 #. type: defvr
-#: doc/guix.texi:6180
+#: guix-git/doc/guix.texi:8144
 #, no-wrap
 msgid "{Scheme Variable} emacs-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6184
+#: guix-git/doc/guix.texi:8148
 msgid "This variable is exported by @code{(guix build-system emacs)}.  It implements an installation procedure similar to the packaging system of Emacs itself (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6191
-msgid "It first creates the @code{@var{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files.  Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted.  Each package is installed in its own directory under @file{share/emacs/site-lisp/guix.d}."
+#: guix-git/doc/guix.texi:8154
+msgid "It first creates the @code{@code{package}-autoloads.el} file, then it byte compiles all Emacs Lisp files.  Differently from the Emacs packaging system, the Info documentation files are moved to the standard documentation directory and the @file{dir} file is deleted.  The Elisp package files are installed directly under @file{share/emacs/site-lisp}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6193
+#: guix-git/doc/guix.texi:8156
 #, no-wrap
 msgid "{Scheme Variable} font-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6199
+#: guix-git/doc/guix.texi:8162
 msgid "This variable is exported by @code{(guix build-system font)}.  It implements an installation procedure for font packages where upstream provides pre-compiled TrueType, OpenType, etc.@: font files that merely need to be copied into place.  It copies font files to standard locations in the output directory."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6201
+#: guix-git/doc/guix.texi:8164
 #, no-wrap
 msgid "{Scheme Variable} meson-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6205
+#: guix-git/doc/guix.texi:8168
 msgid "This variable is exported by @code{(guix build-system meson)}.  It implements the build procedure for packages that use @url{https://mesonbuild.com, Meson} as their build system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6211
+#: guix-git/doc/guix.texi:8174
 msgid "It adds both Meson and @uref{https://ninja-build.org/, Ninja} to the set of inputs, and they can be changed with the parameters @code{#:meson} and @code{#:ninja} if needed.  The default Meson is @code{meson-for-build}, which is special because it doesn't clear the @code{RUNPATH} of binaries and libraries when they are installed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6214
-msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed to some specific for Meson:"
+#: guix-git/doc/guix.texi:8177
+msgid "This build system is an extension of @code{gnu-build-system}, but with the following phases changed to some specific for Meson:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8180 guix-git/doc/guix.texi:8229
+#: guix-git/doc/guix.texi:8297
+#, no-wrap
+msgid "configure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6221
-msgid "The phase runs @code{meson} with the flags specified in @code{#:configure-flags}.  The flag @code{--build-type} is always set to @code{plain} unless something else is specified in @code{#:build-type}."
+#: guix-git/doc/guix.texi:8185
+msgid "The phase runs @code{meson} with the flags specified in @code{#:configure-flags}.  The flag @option{--buildtype} is always set to @code{debugoptimized} unless something else is specified in @code{#:build-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6225
+#: guix-git/doc/guix.texi:8189
 msgid "The phase runs @code{ninja} to build the package in parallel by default, but this can be changed with @code{#:parallel-build?}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6229
+#: guix-git/doc/guix.texi:8193
 msgid "The phase runs @code{ninja} with the target specified in @code{#:test-target}, which is @code{\"test\"} by default."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6232
+#: guix-git/doc/guix.texi:8196
 msgid "The phase runs @code{ninja install} and can not be changed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6235
+#: guix-git/doc/guix.texi:8199
 msgid "Apart from that, the build system also adds the following phases:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6238
+#: guix-git/doc/guix.texi:8202
 #, no-wrap
 msgid "fix-runpath"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6245
+#: guix-git/doc/guix.texi:8209
 msgid "This phase ensures that all binaries can find the libraries they need.  It searches for required libraries in subdirectories of the package being built, and adds those to @code{RUNPATH} where needed.  It also removes references to libraries left over from the build phase by @code{meson-for-build}, such as test dependencies, that aren't actually required for the program to run."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6249 doc/guix.texi:6253
+#: guix-git/doc/guix.texi:8213 guix-git/doc/guix.texi:8217
 msgid "This phase is the phase provided by @code{glib-or-gtk-build-system}, and it is not enabled by default.  It can be enabled with @code{#:glib-or-gtk?}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6256
+#: guix-git/doc/guix.texi:8220
 #, no-wrap
 msgid "{Scheme Variable} linux-module-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6258
-msgid "@var{linux-module-build-system} allows building Linux kernel modules."
+#: guix-git/doc/guix.texi:8222
+msgid "@code{linux-module-build-system} allows building Linux kernel modules."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6262
-msgid "This build system is an extension of @var{gnu-build-system}, but with the following phases changed:"
+#: guix-git/doc/guix.texi:8226
+msgid "This build system is an extension of @code{gnu-build-system}, but with the following phases changed:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6268
+#: guix-git/doc/guix.texi:8232
 msgid "This phase configures the environment so that the Linux kernel's Makefile can be used to build the external kernel module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6272
+#: guix-git/doc/guix.texi:8236
 msgid "This phase uses the Linux kernel's Makefile in order to build the external kernel module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6276
+#: guix-git/doc/guix.texi:8240
 msgid "This phase uses the Linux kernel's Makefile in order to install the external kernel module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6281
-msgid "It is possible and useful to specify the Linux kernel to use for building the module (in the \"arguments\" form of a package using the linux-module-build-system, use the key #:linux to specify it)."
+#: guix-git/doc/guix.texi:8245
+msgid "It is possible and useful to specify the Linux kernel to use for building the module (in the @code{arguments} form of a package using the @code{linux-module-build-system}, use the key @code{#:linux} to specify it)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:8247
+#, no-wrap
+msgid "{Scheme Variable} node-build-system"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:8252
+msgid "This variable is exported by @code{(guix build-system node)}.  It implements the build procedure used by @uref{https://nodejs.org, Node.js}, which implements an approximation of the @code{npm install} command, followed by an @code{npm test} command."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:8256
+msgid "Which Node.js package is used to interpret the @code{npm} commands can be specified with the @code{#:node} parameter which defaults to @code{node}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6287
+#: guix-git/doc/guix.texi:8262
 msgid "Lastly, for packages that do not need anything as sophisticated, a ``trivial'' build system is provided.  It is trivial in the sense that it provides basically no support: it does not pull any implicit inputs, and does not have a notion of build phases."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6288
+#: guix-git/doc/guix.texi:8263
 #, no-wrap
 msgid "{Scheme Variable} trivial-build-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6290
+#: guix-git/doc/guix.texi:8265
 msgid "This variable is exported by @code{(guix build-system trivial)}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6295
+#: guix-git/doc/guix.texi:8270
 msgid "This build system requires a @code{#:builder} argument.  This argument must be a Scheme expression that builds the package output(s)---as with @code{build-expression->derivation} (@pxref{Derivations, @code{build-expression->derivation}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6301
+#: guix-git/doc/guix.texi:8275
+#, fuzzy, no-wrap
+#| msgid "inputs, for Python packages"
+msgid "build phases, for packages"
+msgstr "Python软件包的输入"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8281
+msgid "Almost all package build systems implement a notion @dfn{build phases}: a sequence of actions that the build system executes, when you build the package, leading to the installed byproducts in the store.  A notable exception is the ``bare-bones'' @code{trivial-build-system} (@pxref{Build Systems})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8285
+msgid "As discussed in the previous section, those build systems provide a standard list of phases.  For @code{gnu-build-system}, the main build phases are the following:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8287
+#, no-wrap
+msgid "unpack"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8291
+msgid "Unpack the source tarball, and change the current directory to the extracted source tree.  If the source is actually a directory, copy it to the build tree, and enter that directory."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8292
+#, no-wrap
+msgid "patch-source-shebangs"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8296
+msgid "Patch shebangs encountered in source files so they refer to the right store file names.  For instance, this changes @code{#!/bin/sh} to @code{#!/gnu/store/@dots{}-bash-4.3/bin/sh}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8301
+msgid "Run the @file{configure} script with a number of default options, such as @option{--prefix=/gnu/store/@dots{}}, as well as the options specified by the @code{#:configure-flags} argument."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8306
+msgid "Run @code{make} with the list of flags specified with @code{#:make-flags}.  If the @code{#:parallel-build?} argument is true (the default), build with @code{make -j}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8312
+msgid "Run @code{make check}, or some other target specified with @code{#:test-target}, unless @code{#:tests? #f} is passed.  If the @code{#:parallel-tests?} argument is true (the default), run @code{make check -j}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8315
+msgid "Run @code{make install} with the flags listed in @code{#:make-flags}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8316
+#, no-wrap
+msgid "patch-shebangs"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8318
+msgid "Patch shebangs on the installed executable files."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:8319
+#, no-wrap
+msgid "strip"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:8323
+msgid "Strip debugging symbols from ELF files (unless @code{#:strip-binaries?} is false), copying them to the @code{debug} output when available (@pxref{Installing Debugging Files})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8332
+msgid "Other build systems have similar phases, with some variations.  For example, @code{cmake-build-system} has same-named phases but its @code{configure} phases runs @code{cmake} instead of @code{./configure}.  Others, such as @code{python-build-system}, have a wholly different list of standard phases.  All this code runs on the @dfn{build side}: it is evaluated when you actually build the package, in a dedicated build process spawned by the build daemon (@pxref{Invoking guix-daemon})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8339
+msgid "Build phases are represented as association lists or ``alists'' (@pxref{Association Lists,,, guile, GNU Guile Reference Manual}) where each key is a symbol for the name of the phase and the associated value is a procedure that accepts an arbitrary number of arguments.  By convention, those procedures receive information about the build in the form of @dfn{keyword parameters}, which they can use or ignore."
+msgstr ""
+
+#. type: vindex
+#: guix-git/doc/guix.texi:8340
+#, no-wrap
+msgid "%standard-phases"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8346
+msgid "For example, here is how @code{(guix build gnu-build-system)} defines @code{%standard-phases}, the variable holding its alist of build phases@footnote{We present a simplified view of those build phases, but do take a look at @code{(guix build gnu-build-system)} to see all the details!}:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8349
+#, no-wrap
+msgid ""
+";; The build phases of 'gnu-build-system'.\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8353
+#, no-wrap
+msgid ""
+"(define* (unpack #:key source #:allow-other-keys)\n"
+"  ;; Extract the source tarball.\n"
+"  (invoke \"tar\" \"xvf\" source))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8359
+#, no-wrap
+msgid ""
+"(define* (configure #:key outputs #:allow-other-keys)\n"
+"  ;; Run the 'configure' script.  Install to output \"out\".\n"
+"  (let ((out (assoc-ref outputs \"out\")))\n"
+"    (invoke \"./configure\"\n"
+"            (string-append \"--prefix=\" out))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8363
+#, no-wrap
+msgid ""
+"(define* (build #:allow-other-keys)\n"
+"  ;; Compile.\n"
+"  (invoke \"make\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8370
+#, no-wrap
+msgid ""
+"(define* (check #:key (test-target \"check\") (tests? #true)\n"
+"                #:allow-other-keys)\n"
+"  ;; Run the test suite.\n"
+"  (if tests?\n"
+"      (invoke \"make\" test-target)\n"
+"      (display \"test suite not run\\n\")))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8374
+#, no-wrap
+msgid ""
+"(define* (install #:allow-other-keys)\n"
+"  ;; Install files to the prefix 'configure' specified.\n"
+"  (invoke \"make\" \"install\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8383
+#, no-wrap
+msgid ""
+"(define %standard-phases\n"
+"  ;; The list of standard phases (quite a few are omitted\n"
+"  ;; for brevity).  Each element is a symbol/procedure pair.\n"
+"  (list (cons 'unpack unpack)\n"
+"        (cons 'configure configure)\n"
+"        (cons 'build build)\n"
+"        (cons 'check check)\n"
+"        (cons 'install install)))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8393
+msgid "This shows how @code{%standard-phases} is defined as a list of symbol/procedure pairs (@pxref{Pairs,,, guile, GNU Guile Reference Manual}).  The first pair associates the @code{unpack} procedure with the @code{unpack} symbol---a name; the second pair defines the @code{configure} phase similarly, and so on.  When building a package that uses @code{gnu-build-system} with its default list of phases, those phases are executed sequentially.  You can see the name of each phase started and completed in the build log of packages that you build."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8399
+msgid "Let's now look at the procedures themselves.  Each one is defined with @code{define*}: @code{#:key} lists keyword parameters the procedure accepts, possibly with a default value, and @code{#:allow-other-keys} specifies that other keyword parameters are ignored (@pxref{Optional Arguments,,, guile, GNU Guile Reference Manual})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8415
+msgid "The @code{unpack} procedure honors the @code{source} parameter, which the build system uses to pass the file name of the source tarball (or version control checkout), and it ignores other parameters.  The @code{configure} phase only cares about the @code{outputs} parameter, an alist mapping package output names to their store file name (@pxref{Packages with Multiple Outputs}).  It extracts the file name of for @code{out}, the default output, and passes it to @command{./configure} as the installation prefix, meaning that @command{make install} will eventually copy all the files in that directory (@pxref{Configuration, configuration and makefile conventions,, standards, GNU Coding Standards}).  @code{build} and @code{install} ignore all their arguments.  @code{check} honors the @code{test-target} argument, which specifies the name of the Makefile target to run tests; it prints a message and skips tests when @code{tests?} is false."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8416
+#, no-wrap
+msgid "build phases, customizing"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8425
+msgid "The list of phases used for a particular package can be changed with the @code{#:phases} parameter of the build system.  Changing the set of build phases boils down to building a new alist of phases based on the @code{%standard-phases} alist described above.  This can be done with standard alist procedures such as @code{alist-delete} (@pxref{SRFI-1 Association Lists,,, guile, GNU Guile Reference Manual}); however, it is more convenient to do so with @code{modify-phases} (@pxref{Build Utilities, @code{modify-phases}})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8430
+msgid "Here is an example of a package definition that removes the @code{configure} phase of @code{%standard-phases} and inserts a new phase before the @code{build} phase, called @code{set-prefix-in-makefile}:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8450
+#, no-wrap
+msgid ""
+"(define-public example\n"
+"  (package\n"
+"    (name \"example\")\n"
+"    ;; other fields omitted\n"
+"    (build-system gnu-build-system)\n"
+"    (arguments\n"
+"     '(#:phases (modify-phases %standard-phases\n"
+"                  (delete 'configure)\n"
+"                  (add-before 'build 'set-prefix-in-makefile\n"
+"                    (lambda* (#:key outputs #:allow-other-keys)\n"
+"                      ;; Modify the makefile so that its\n"
+"                      ;; 'PREFIX' variable points to \"out\".\n"
+"                      (let ((out (assoc-ref outputs \"out\")))\n"
+"                        (substitute* \"Makefile\"\n"
+"                          ((\"PREFIX =.*\")\n"
+"                           (string-append \"PREFIX = \"\n"
+"                                          out \"\\n\")))\n"
+"                        #true))))))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8456
+msgid "The new phase that is inserted is written as an anonymous procedure, introduced with @code{lambda*}; it honors the @code{outputs} parameter we have seen before.  @xref{Build Utilities}, for more about the helpers used by this phase, and for more examples of @code{modify-phases}."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8457 guix-git/doc/guix.texi:9430
+#, no-wrap
+msgid "code staging"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8458 guix-git/doc/guix.texi:9431
+#, fuzzy, no-wrap
+#| msgid "formatting, of code"
+msgid "staging, of code"
+msgstr "代码格式化"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8465
+msgid "Keep in mind that build phases are code evaluated at the time the package is actually built.  This explains why the whole @code{modify-phases} expression above is quoted (it comes after the @code{'} or apostrophe): it is @dfn{staged} for later execution.  @xref{G-Expressions}, for an explanation of code staging and the @dfn{code strata} involved."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8475
+msgid "As soon as you start writing non-trivial package definitions (@pxref{Defining Packages}) or other build actions (@pxref{G-Expressions}), you will likely start looking for helpers for ``shell-like'' actions---creating directories, copying and deleting files recursively, manipulating build phases, and so on.  The @code{(guix build utils)} module provides such utility procedures."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8479
+msgid "Most build systems load @code{(guix build utils)} (@pxref{Build Systems}).  Thus, when writing custom build phases for your package definitions, you can usually assume those procedures are in scope."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8484
+msgid "When writing G-expressions, you can import @code{(guix build utils)} on the ``build side'' using @code{with-imported-modules} and then put it in scope with the @code{use-modules} form (@pxref{Using Guile Modules,,, guile, GNU Guile Reference Manual}):"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8491
+#, no-wrap
+msgid ""
+"(with-imported-modules '((guix build utils))  ;import it\n"
+"  (computed-file \"empty-tree\"\n"
+"                 #~(begin\n"
+"                     ;; Put it in scope.\n"
+"                     (use-modules (guix build utils))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8494
+#, no-wrap
+msgid ""
+"                     ;; Happily use its 'mkdir-p' procedure.\n"
+"                     (mkdir-p (string-append #$output \"/a/b/c\")))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8498
+msgid "The remainder of this section is the reference for most of the utility procedures provided by @code{(guix build utils)}."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:8501
+#, no-wrap
+msgid "Dealing with Store File Names"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8504
+msgid "This section documents procedures that deal with store file names."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8505
+#, no-wrap
+msgid "{Scheme Procedure} %store-directory"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8507
+#, fuzzy
+#| msgid "Purely functional interface to the store."
+msgid "Return the directory name of the store."
+msgstr "仓库的纯函数式接口。"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8509
+#, no-wrap
+msgid "{Scheme Procedure} store-file-name? @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8511
+msgid "Return true if @var{file} is in the store."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8513
+#, no-wrap
+msgid "{Scheme Procedure} strip-store-file-name @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8516
+msgid "Strip the @file{/gnu/store} and hash from @var{file}, a store file name.  The result is typically a @code{\"@var{package}-@var{version}\"} string."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8518
+#, no-wrap
+msgid "{Scheme Procedure} package-name->name+version @var{name}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8523
+msgid "Given @var{name}, a package name like @code{\"foo-0.9.1b\"}, return two values: @code{\"foo\"} and @code{\"0.9.1b\"}.  When the version part is unavailable, @var{name} and @code{#f} are returned.  The first hyphen followed by a digit is considered to introduce the version part."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:8525
+#, fuzzy, no-wrap
+#| msgid "File Systems"
+msgid "File Types"
+msgstr "文件系统"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8528
+msgid "The procedures below deal with files and file types."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8529
+#, no-wrap
+msgid "{Scheme Procedure} directory-exists? @var{dir}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8531
+msgid "Return @code{#t} if @var{dir} exists and is a directory."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8533
+#, no-wrap
+msgid "{Scheme Procedure} executable-file? @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8535
+msgid "Return @code{#t} if @var{file} exists and is executable."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8537
+#, no-wrap
+msgid "{Scheme Procedure} symbolic-link? @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8539
+msgid "Return @code{#t} if @var{file} is a symbolic link (aka. a ``symlink'')."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8541
+#, no-wrap
+msgid "{Scheme Procedure} elf-file? @var{file}"
+msgstr ""
+
+#. type: deffnx
+#: guix-git/doc/guix.texi:8542
+#, no-wrap
+msgid "{Scheme Procedure} ar-file? @var{file}"
+msgstr ""
+
+#. type: deffnx
+#: guix-git/doc/guix.texi:8543
+#, no-wrap
+msgid "{Scheme Procedure} gzip-file? @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8546
+msgid "Return @code{#t} if @var{file} is, respectively, an ELF file, an @code{ar} archive (such as a @file{.a} static library), or a gzip file."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8548
+#, no-wrap
+msgid "{Scheme Procedure} reset-gzip-timestamp @var{file} [#:keep-mtime? #t]"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8552
+msgid "If @var{file} is a gzip file, reset its embedded timestamp (as with @command{gzip --no-name}) and return true.  Otherwise return @code{#f}.  When @var{keep-mtime?} is true, preserve @var{file}'s modification time."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:8554
+#, no-wrap
+msgid "File Manipulation"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8561
+msgid "The following procedures and macros help create, modify, and delete files.  They provide functionality comparable to common shell utilities such as @command{mkdir -p}, @command{cp -r}, @command{rm -r}, and @command{sed}.  They complement Guile's extensive, but low-level, file system interface (@pxref{POSIX,,, guile, GNU Guile Reference Manual})."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8562
+#, no-wrap
+msgid "{Scheme Syntax} with-directory-excursion @var{directory} @var{body}@dots{}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8564
+msgid "Run @var{body} with @var{directory} as the process's current directory."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8571
+msgid "Essentially, this macro changes the current directory to @var{directory} before evaluating @var{body}, using @code{chdir} (@pxref{Processes,,, guile, GNU Guile Reference Manual}).  It changes back to the initial directory when the dynamic extent of @var{body} is left, be it @i{via} normal procedure return or @i{via} a non-local exit such as an exception."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8573
+#, no-wrap
+msgid "{Scheme Procedure} mkdir-p @var{dir}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8575
+msgid "Create directory @var{dir} and all its ancestors."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8577
+#, no-wrap
+msgid "{Scheme Procedure} install-file @var{file} @var{directory}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8580
+msgid "Create @var{directory} if it does not exist and copy @var{file} in there under the same name."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8582
+#, no-wrap
+msgid "{Scheme Procedure} make-file-writable @var{file}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8584
+msgid "Make @var{file} writable for its owner."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8586
+#, no-wrap
+msgid "{Scheme Procedure} copy-recursively @var{source} @var{destination} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8593
+msgid "[#:log (current-output-port)] [#:follow-symlinks? #f] [#:keep-mtime? #f] Copy @var{source} directory to @var{destination}.  Follow symlinks if @var{follow-symlinks?} is true; otherwise, just preserve them.  When @var{keep-mtime?} is true, keep the modification time of the files in @var{source} on those of @var{destination}.  Write verbose output to the @var{log} port."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8595
+#, no-wrap
+msgid "{Scheme Procedure} delete-file-recursively @var{dir} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8600
+msgid "[#:follow-mounts? #f] Delete @var{dir} recursively, like @command{rm -rf}, without following symlinks.  Don't follow mount points either, unless @var{follow-mounts?} is true.  Report but ignore errors."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8602
+#, no-wrap
+msgid "{Scheme Syntax} substitute* @var{file} @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8607
+msgid "((@var{regexp} @var{match-var}@dots{}) @var{body}@dots{}) @dots{} Substitute @var{regexp} in @var{file} by the string returned by @var{body}.  @var{body} is evaluated with each @var{match-var} bound to the corresponding positional regexp sub-expression.  For example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8614
+#, no-wrap
+msgid ""
+"(substitute* file\n"
+"  ((\"hello\")\n"
+"   \"good morning\\n\")\n"
+"  ((\"foo([a-z]+)bar(.*)$\" all letters end)\n"
+"   (string-append \"baz\" letter end)))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8620
+msgid "Here, anytime a line of @var{file} contains @code{hello}, it is replaced by @code{good morning}.  Anytime a line of @var{file} matches the second regexp, @code{all} is bound to the complete match, @code{letters} is bound to the first sub-expression, and @code{end} is bound to the last one."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8623
+msgid "When one of the @var{match-var} is @code{_}, no variable is bound to the corresponding match substring."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8626
+msgid "Alternatively, @var{file} may be a list of file names, in which case they are all subject to the substitutions."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8629
+msgid "Be careful about using @code{$} to match the end of a line; by itself it won't match the terminating newline of a line."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:8631
+#, fuzzy, no-wrap
+#| msgid "File Systems"
+msgid "File Search"
+msgstr "文件系统"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8633
+#, no-wrap
+msgid "file, searching"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8635
+msgid "This section documents procedures to search and filter files."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8636
+#, no-wrap
+msgid "{Scheme Procedure} file-name-predicate @var{regexp}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8639
+msgid "Return a predicate that returns true when passed a file name whose base name matches @var{regexp}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8641
+#, no-wrap
+msgid "{Scheme Procedure} find-files @var{dir} [@var{pred}] @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8652
+msgid "[#:stat lstat] [#:directories? #f] [#:fail-on-error? #f] Return the lexicographically sorted list of files under @var{dir} for which @var{pred} returns true.  @var{pred} is passed two arguments: the absolute file name, and its stat buffer; the default predicate always returns true.  @var{pred} can also be a regular expression, in which case it is equivalent to @code{(file-name-predicate @var{pred})}.  @var{stat} is used to obtain file information; using @code{lstat} means that symlinks are not followed.  If @var{directories?} is true, then directories will also be included.  If @var{fail-on-error?} is true, raise an exception upon error."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8656
+msgid "Here are a few examples where we assume that the current directory is the root of the Guix source tree:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8661
+#, no-wrap
+msgid ""
+";; List all the regular files in the current directory.\n"
+"(find-files \".\")\n"
+"@result{} (\"./.dir-locals.el\" \"./.gitignore\" @dots{})\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8665
+#, no-wrap
+msgid ""
+";; List all the .scm files under gnu/services.\n"
+"(find-files \"gnu/services\" \"\\\\.scm$\")\n"
+"@result{} (\"gnu/services/admin.scm\" \"gnu/services/audio.scm\" @dots{})\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8669
+#, no-wrap
+msgid ""
+";; List ar files in the current directory.\n"
+"(find-files \".\" (lambda (file stat) (ar-file? file)))\n"
+"@result{} (\"./libformat.a\" \"./libstore.a\" @dots{})\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8671
+#, no-wrap
+msgid "{Scheme Procedure} which @var{program}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8674
+msgid "Return the complete file name for @var{program} as found in @code{$PATH}, or @code{#f} if @var{program} could not be found."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8685
+msgid "The @code{(guix build utils)} also contains tools to manipulate build phases as used by build systems (@pxref{Build Systems}).  Build phases are represented as association lists or ``alists'' (@pxref{Association Lists,,, guile, GNU Guile Reference Manual}) where each key is a symbol naming the phase and the associated value is a procedure (@pxref{Build Phases})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8689
+msgid "Guile core and the @code{(srfi srfi-1)} module both provide tools to manipulate alists.  The @code{(guix build utils)} module complements those with tools written with build phases in mind."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8690
+#, fuzzy, no-wrap
+#| msgid "build daemon"
+msgid "build phases, modifying"
+msgstr "构建后台进程"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8691
+#, no-wrap
+msgid "{Scheme Syntax} modify-phases @var{phases} @var{clause}@dots{}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8694
+msgid "Modify @var{phases} sequentially as per each @var{clause}, which may have one of the following forms:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8700
+#, no-wrap
+msgid ""
+"(delete @var{old-phase-name})\n"
+"(replace @var{old-phase-name} @var{new-phase})\n"
+"(add-before @var{old-phase-name} @var{new-phase-name} @var{new-phase})\n"
+"(add-after @var{old-phase-name} @var{new-phase-name} @var{new-phase})\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:8704
+msgid "Where every @var{phase-name} above is an expression evaluating to a symbol, and @var{new-phase} an expression evaluating to a procedure."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8715
+msgid "The example below is taken from the definition of the @code{grep} package.  It adds a phase to run after the @code{install} phase, called @code{fix-egrep-and-fgrep}.  That phase is a procedure (@code{lambda*} is for anonymous procedures) that takes a @code{#:outputs} keyword argument and ignores extra keyword arguments (@pxref{Optional Arguments,,, guile, GNU Guile Reference Manual}, for more on @code{lambda*} and optional and keyword arguments.)  The phase uses @code{substitute*} to modify the installed @file{egrep} and @file{fgrep} scripts so that they refer to @code{grep} by its absolute file name:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8729
+#, no-wrap
+msgid ""
+"(modify-phases %standard-phases\n"
+"  (add-after 'install 'fix-egrep-and-fgrep\n"
+"    ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its\n"
+"    ;; absolute file name instead of searching for it in $PATH.\n"
+"    (lambda* (#:key outputs #:allow-other-keys)\n"
+"      (let* ((out (assoc-ref outputs \"out\"))\n"
+"             (bin (string-append out \"/bin\")))\n"
+"        (substitute* (list (string-append bin \"/egrep\")\n"
+"                           (string-append bin \"/fgrep\"))\n"
+"          ((\"^exec grep\")\n"
+"           (string-append \"exec \" bin \"/grep\")))\n"
+"        #t))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:8736
+msgid "In the example below, phases are modified in two ways: the standard @code{configure} phase is deleted, presumably because the package does not have a @file{configure} script or anything similar, and the default @code{install} phase is replaced by one that manually copies the executable files to be installed:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:8749
+#, no-wrap
+msgid ""
+"(modify-phases %standard-phases\n"
+"  (delete 'configure)      ;no 'configure' script\n"
+"  (replace 'install\n"
+"    (lambda* (#:key outputs #:allow-other-keys)\n"
+"      ;; The package's Makefile doesn't provide an \"install\"\n"
+"      ;; rule so do it by ourselves.\n"
+"      (let ((bin (string-append (assoc-ref outputs \"out\")\n"
+"                                \"/bin\")))\n"
+"        (install-file \"footswitch\" bin)\n"
+"        (install-file \"scythe\" bin)\n"
+"        #t))))\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:8757
 #, no-wrap
 msgid "store items"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6302
+#: guix-git/doc/guix.texi:8758
 #, no-wrap
 msgid "store paths"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6313
+#: guix-git/doc/guix.texi:8769
 msgid "Conceptually, the @dfn{store} is the place where derivations that have been built successfully are stored---by default, @file{/gnu/store}.  Sub-directories in the store are referred to as @dfn{store items} or sometimes @dfn{store paths}.  The store has an associated database that contains information such as the store paths referred to by each store path, and the list of @emph{valid} store items---results of successful builds.  This database resides in @file{@var{localstatedir}/guix/db}, where @var{localstatedir} is the state directory specified @i{via} @option{--localstatedir} at configure time, usually @file{/var}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6318
+#: guix-git/doc/guix.texi:8774
 msgid "The store is @emph{always} accessed by the daemon on behalf of its clients (@pxref{Invoking guix-daemon}).  To manipulate the store, clients connect to the daemon over a Unix-domain socket, send requests to it, and read the result---these are remote procedure calls, or RPCs."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6323
+#: guix-git/doc/guix.texi:8779
 msgid "Users must @emph{never} modify files under @file{/gnu/store} directly.  This would lead to inconsistencies and break the immutability assumptions of Guix's functional model (@pxref{Introduction})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6327
+#: guix-git/doc/guix.texi:8783
 msgid "@xref{Invoking guix gc, @command{guix gc --verify}}, for information on how to check the integrity of the store and attempt recovery from accidental modifications."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6334
-msgid "The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs.  These are described below.  By default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by the @code{GUIX_DAEMON_SOCKET} environment variable."
+#: guix-git/doc/guix.texi:8790
+msgid "The @code{(guix store)} module provides procedures to connect to the daemon, and to perform RPCs.  These are described below.  By default, @code{open-connection}, and thus all the @command{guix} commands, connect to the local daemon or to the URI specified by the @env{GUIX_DAEMON_SOCKET} environment variable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6335
+#: guix-git/doc/guix.texi:8791
 #, no-wrap
 msgid "{Environment Variable} GUIX_DAEMON_SOCKET"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6340
+#: guix-git/doc/guix.texi:8796
 msgid "When set, the value of this variable should be a file name or a URI designating the daemon endpoint.  When it is a file name, it denotes a Unix-domain socket to connect to.  In addition to file names, the supported URI schemes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:6342 doc/guix.texi:18633
+#: guix-git/doc/guix.texi:8798 guix-git/doc/guix.texi:24528
 #, no-wrap
 msgid "file"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:6343
+#: guix-git/doc/guix.texi:8799
 #, no-wrap
 msgid "unix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6347
+#: guix-git/doc/guix.texi:8803
 msgid "These are for Unix-domain sockets.  @code{file:///var/guix/daemon-socket/socket} is equivalent to @file{/var/guix/daemon-socket/socket}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6348
+#: guix-git/doc/guix.texi:8804
 #, no-wrap
 msgid "guix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6356
+#: guix-git/doc/guix.texi:8812
 msgid "These URIs denote connections over TCP/IP, without encryption nor authentication of the remote host.  The URI must specify the host name and optionally a port number (by default port 44146 is used):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6359
+#: guix-git/doc/guix.texi:8815
 #, no-wrap
 msgid "guix://master.guix.example.org:1234\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6364
+#: guix-git/doc/guix.texi:8820
 msgid "This setup is suitable on local networks, such as clusters, where only trusted nodes may connect to the build daemon at @code{master.guix.example.org}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6368
-msgid "The @code{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @code{--listen}})."
+#: guix-git/doc/guix.texi:8824
+msgid "The @option{--listen} option of @command{guix-daemon} can be used to instruct it to listen for TCP connections (@pxref{Invoking guix-daemon, @option{--listen}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6369
+#: guix-git/doc/guix.texi:8825
 #, no-wrap
 msgid "ssh"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6370
+#: guix-git/doc/guix.texi:8826
 #, no-wrap
 msgid "SSH access to build daemons"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6374
-msgid "These URIs allow you to connect to a remote daemon over SSH@footnote{This feature requires Guile-SSH (@pxref{Requirements}).}.  A typical URL might look like this:"
+#: guix-git/doc/guix.texi:8832
+msgid "These URIs allow you to connect to a remote daemon over SSH@.  This feature requires Guile-SSH (@pxref{Requirements}) and a working @command{guile} binary in @env{PATH} on the destination machine.  It supports public key and GSSAPI authentication.  A typical URL might look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6377
+#: guix-git/doc/guix.texi:8835
 #, no-wrap
 msgid "ssh://charlie@@guix.example.org:22\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:6381
+#: guix-git/doc/guix.texi:8839
 msgid "As for @command{guix copy}, the usual OpenSSH client configuration files are honored (@pxref{Invoking guix copy})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6384
+#: guix-git/doc/guix.texi:8842
 msgid "Additional URI schemes may be supported in the future."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:6391
+#: guix-git/doc/guix.texi:8849
 msgid "The ability to connect to remote build daemons is considered experimental as of @value{VERSION}.  Please get in touch with us to share any problems or suggestions you may have (@pxref{Contributing})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6394
+#: guix-git/doc/guix.texi:8852
 #, no-wrap
 msgid "{Scheme Procedure} open-connection [@var{uri}] [#:reserve-space? #t]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6399
+#: guix-git/doc/guix.texi:8857
 msgid "Connect to the daemon over the Unix-domain socket at @var{uri} (a string).  When @var{reserve-space?} is true, instruct it to reserve a little bit of extra space on the file system so that the garbage collector can still operate should the disk become full.  Return a server object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6402
-msgid "@var{file} defaults to @var{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}."
+#: guix-git/doc/guix.texi:8860
+msgid "@var{file} defaults to @code{%default-socket-path}, which is the normal location given the options that were passed to @command{configure}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6404
+#: guix-git/doc/guix.texi:8862
 #, no-wrap
 msgid "{Scheme Procedure} close-connection @var{server}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6406
+#: guix-git/doc/guix.texi:8864
 msgid "Close the connection to @var{server}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6408
+#: guix-git/doc/guix.texi:8866
 #, no-wrap
 msgid "{Scheme Variable} current-build-output-port"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6411
+#: guix-git/doc/guix.texi:8869
 msgid "This variable is bound to a SRFI-39 parameter, which refers to the port where build and error logs sent by the daemon should be written."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6415
+#: guix-git/doc/guix.texi:8873
 msgid "Procedures that make RPCs all take a server object as their first argument."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6416
+#: guix-git/doc/guix.texi:8874
 #, no-wrap
 msgid "{Scheme Procedure} valid-path? @var{server} @var{path}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6417
+#: guix-git/doc/guix.texi:8875
 #, no-wrap
 msgid "invalid store items"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6422
-msgid "Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed build.)"
+#: guix-git/doc/guix.texi:8880
+msgid "Return @code{#t} when @var{path} designates a valid store item and @code{#f} otherwise (an invalid item may exist on disk but still be invalid, for instance because it is the result of an aborted or failed build)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6425
+#: guix-git/doc/guix.texi:8883
 msgid "A @code{&store-protocol-error} condition is raised if @var{path} is not prefixed by the store directory (@file{/gnu/store})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6427
+#: guix-git/doc/guix.texi:8885
 #, no-wrap
 msgid "{Scheme Procedure} add-text-to-store @var{server} @var{name} @var{text} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6431
+#: guix-git/doc/guix.texi:8889
 msgid "Add @var{text} under file @var{name} in the store, and return its store path.  @var{references} is the list of store paths referred to by the resulting store path."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6433
+#: guix-git/doc/guix.texi:8891
 #, no-wrap
-msgid "{Scheme Procedure} build-derivations @var{server} @var{derivations}"
+msgid "{Scheme Procedure} build-derivations @var{store} @var{derivations} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6437
-msgid "Build @var{derivations} (a list of @code{<derivation>} objects or derivation paths), and return when the worker is done building them.  Return @code{#t} on success."
+#: guix-git/doc/guix.texi:8896
+msgid "[@var{mode}] Build @var{derivations}, a list of @code{<derivation>} objects, @file{.drv} file names, or derivation/output pairs, using the specified @var{mode}---@code{(build-mode normal)} by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6443
+#: guix-git/doc/guix.texi:8902
 msgid "Note that the @code{(guix monads)} module provides a monad as well as monadic versions of the above procedures, with the goal of making it more convenient to work with code that accesses the store (@pxref{The Store Monad})."
 msgstr ""
 
 #. type: i{#1}
-#: doc/guix.texi:6446
+#: guix-git/doc/guix.texi:8905
 msgid "This section is currently incomplete."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6450
+#: guix-git/doc/guix.texi:8909
 #, no-wrap
 msgid "derivations"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6454
+#: guix-git/doc/guix.texi:8913
 msgid "Low-level build actions and the environment in which they are performed are represented by @dfn{derivations}.  A derivation contains the following pieces of information:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6459
+#: guix-git/doc/guix.texi:8918
 msgid "The outputs of the derivation---derivations produce at least one file or directory in the store, but may produce more."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6461
+#: guix-git/doc/guix.texi:8920
 #, no-wrap
 msgid "build-time dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6462
+#: guix-git/doc/guix.texi:8921
 #, no-wrap
 msgid "dependencies, build-time"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6466
-msgid "The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, etc.)"
+#: guix-git/doc/guix.texi:8925
+msgid "The inputs of the derivations---i.e., its build-time dependencies---which may be other derivations or plain files in the store (patches, build scripts, etc.)."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6469
+#: guix-git/doc/guix.texi:8928
 msgid "The system type targeted by the derivation---e.g., @code{x86_64-linux}."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6473
+#: guix-git/doc/guix.texi:8932
 msgid "The file name of a build script in the store, along with the arguments to be passed."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:6476
+#: guix-git/doc/guix.texi:8935
 msgid "A list of environment variables to be defined."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6479
+#: guix-git/doc/guix.texi:8938
 #, no-wrap
 msgid "derivation path"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6487
-msgid "Derivations allow clients of the daemon to communicate build actions to the store.  They exist in two forms: as an in-memory representation, both on the client- and daemon-side, and as files in the store whose name end in @code{.drv}---these files are referred to as @dfn{derivation paths}.  Derivations paths can be passed to the @code{build-derivations} procedure to perform the build actions they prescribe (@pxref{The Store})."
+#: guix-git/doc/guix.texi:8946
+msgid "Derivations allow clients of the daemon to communicate build actions to the store.  They exist in two forms: as an in-memory representation, both on the client- and daemon-side, and as files in the store whose name end in @file{.drv}---these files are referred to as @dfn{derivation paths}.  Derivations paths can be passed to the @code{build-derivations} procedure to perform the build actions they prescribe (@pxref{The Store})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6488
+#: guix-git/doc/guix.texi:8947
 #, no-wrap
 msgid "fixed-output derivations"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6495
+#: guix-git/doc/guix.texi:8954
 msgid "Operations such as file downloads and version-control checkouts for which the expected content hash is known in advance are modeled as @dfn{fixed-output derivations}.  Unlike regular derivations, the outputs of a fixed-output derivation are independent of its inputs---e.g., a source code download produces the same result regardless of the download method and tools being used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:6496 doc/guix.texi:9483
+#: guix-git/doc/guix.texi:8955 guix-git/doc/guix.texi:12445
 #, no-wrap
 msgid "references"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6497
+#: guix-git/doc/guix.texi:8956
 #, no-wrap
 msgid "run-time dependencies"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6498
+#: guix-git/doc/guix.texi:8957
 #, no-wrap
 msgid "dependencies, run-time"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6505
+#: guix-git/doc/guix.texi:8964
 msgid "The outputs of derivations---i.e., the build results---have a set of @dfn{references}, as reported by the @code{references} RPC or the @command{guix gc --references} command (@pxref{Invoking guix gc}).  References are the set of run-time dependencies of the build results.  References are a subset of the inputs of the derivation; this subset is automatically computed by the build daemon by scanning all the files in the outputs."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6510
+#: guix-git/doc/guix.texi:8969
 msgid "The @code{(guix derivations)} module provides a representation of derivations as Scheme objects, along with procedures to create and otherwise manipulate derivations.  The lowest-level primitive to create a derivation is the @code{derivation} procedure:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6511
+#: guix-git/doc/guix.texi:8970
 #, no-wrap
 msgid "{Scheme Procedure} derivation @var{store} @var{name} @var{builder} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6520
+#: guix-git/doc/guix.texi:8979
 msgid "@var{args} [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:inputs '()] [#:env-vars '()] @ [#:system (%current-system)] [#:references-graphs #f] @ [#:allowed-references #f] [#:disallowed-references #f] @ [#:leaked-env-vars #f] [#:local-build? #f] @ [#:substitutable? #t] [#:properties '()] Build a derivation with the given arguments, and return the resulting @code{<derivation>} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6527
+#: guix-git/doc/guix.texi:8986
 msgid "When @var{hash} and @var{hash-algo} are given, a @dfn{fixed-output derivation} is created---i.e., one whose result is known in advance, such as a file download.  If, in addition, @var{recursive?} is true, then that fixed output may be an executable file or a directory and @var{hash} must be the hash of an archive containing this output."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6532
+#: guix-git/doc/guix.texi:8991
 msgid "When @var{references-graphs} is true, it must be a list of file name/store path pairs.  In that case, the reference graph of each store path is exported in the build environment in the corresponding file, in a simple text format."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6537
+#: guix-git/doc/guix.texi:8996
 msgid "When @var{allowed-references} is true, it must be a list of store items or outputs that the derivation's output may refer to.  Likewise, @var{disallowed-references}, if true, must be a list of things the outputs may @emph{not} refer to."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6544
+#: guix-git/doc/guix.texi:9003
 msgid "When @var{leaked-env-vars} is true, it must be a list of strings denoting environment variables that are allowed to ``leak'' from the daemon's environment to the build environment.  This is only applicable to fixed-output derivations---i.e., when @var{hash} is true.  The main use is to allow variables such as @code{http_proxy} to be passed to derivations that download files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6549
+#: guix-git/doc/guix.texi:9008
 msgid "When @var{local-build?} is true, declare that the derivation is not a good candidate for offloading and should rather be built locally (@pxref{Daemon Offload Setup}).  This is the case for small derivations where the costs of data transfers would outweigh the benefits."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6554
+#: guix-git/doc/guix.texi:9013
 msgid "When @var{substitutable?} is false, declare that substitutes of the derivation's output should not be used (@pxref{Substitutes}).  This is useful, for instance, when building packages that capture details of the host CPU instruction set."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6557
+#: guix-git/doc/guix.texi:9016
 msgid "@var{properties} must be an association list describing ``properties'' of the derivation.  It is kept as-is, uninterpreted, in the derivation."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6563
+#: guix-git/doc/guix.texi:9022
 msgid "Here's an example with a shell script as its builder, assuming @var{store} is an open connection to the daemon, and @var{bash} points to a Bash executable in the store:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:6568
+#: guix-git/doc/guix.texi:9027
 #, no-wrap
 msgid ""
 "(use-modules (guix utils)\n"
@@ -12235,7 +16986,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:6577
+#: guix-git/doc/guix.texi:9036
 #, no-wrap
 msgid ""
 "(let ((builder   ; add the Bash script to the store\n"
@@ -12249,48 +17000,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6584
+#: guix-git/doc/guix.texi:9043
 msgid "As can be guessed, this primitive is cumbersome to use directly.  A better approach is to write build scripts in Scheme, of course! The best course of action for that is to write the build code as a ``G-expression'', and to pass it to @code{gexp->derivation}.  For more information, @pxref{G-Expressions}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6589
+#: guix-git/doc/guix.texi:9048
 msgid "Once upon a time, @code{gexp->derivation} did not exist and constructing derivations with build code written in Scheme was achieved with @code{build-expression->derivation}, documented below.  This procedure is now deprecated in favor of the much nicer @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6590
+#: guix-git/doc/guix.texi:9049
 #, no-wrap
 msgid "{Scheme Procedure} build-expression->derivation @var{store} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6606
+#: guix-git/doc/guix.texi:9065
 msgid "@var{name} @var{exp} @ [#:system (%current-system)] [#:inputs '()] @ [#:outputs '(\"out\")] [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:local-build? #f] [#:substitutable? #t] [#:guile-for-build #f] Return a derivation that executes Scheme expression @var{exp} as a builder for derivation @var{name}.  @var{inputs} must be a list of @code{(name drv-path sub-drv)} tuples; when @var{sub-drv} is omitted, @code{\"out\"} is assumed.  @var{modules} is a list of names of Guile modules from the current search path to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6614
+#: guix-git/doc/guix.texi:9073
 msgid "@var{exp} is evaluated in an environment where @code{%outputs} is bound to a list of output/path pairs, and where @code{%build-inputs} is bound to a list of string/output-path pairs made from @var{inputs}.  Optionally, @var{env-vars} is a list of string pairs specifying the name and value of environment variables visible to the builder.  The builder terminates by passing the result of @var{exp} to @code{exit}; thus, when @var{exp} returns @code{#f}, the build is considered to have failed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6618
+#: guix-git/doc/guix.texi:9077
 msgid "@var{exp} is built using @var{guile-for-build} (a derivation).  When @var{guile-for-build} is omitted or is @code{#f}, the value of the @code{%guile-for-build} fluid is used instead."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6623
+#: guix-git/doc/guix.texi:9082
 msgid "See the @code{derivation} procedure for the meaning of @var{references-graphs}, @var{allowed-references}, @var{disallowed-references}, @var{local-build?}, and @var{substitutable?}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6628
+#: guix-git/doc/guix.texi:9087
 msgid "Here's an example of a single-output derivation that creates a directory containing one file:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:6636
+#: guix-git/doc/guix.texi:9095
 #, no-wrap
 msgid ""
 "(let ((builder '(let ((out (assoc-ref %outputs \"out\")))\n"
@@ -12303,51 +17054,51 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:6638
+#: guix-git/doc/guix.texi:9097
 #, no-wrap
 msgid "@result{} #<derivation /gnu/store/@dots{}-goo.drv => @dots{}>\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6644
+#: guix-git/doc/guix.texi:9103
 #, no-wrap
 msgid "monad"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6650
+#: guix-git/doc/guix.texi:9109
 msgid "The procedures that operate on the store described in the previous sections all take an open connection to the build daemon as their first argument.  Although the underlying model is functional, they either have side effects or depend on the current state of the store."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6656
+#: guix-git/doc/guix.texi:9115
 msgid "The former is inconvenient: the connection to the build daemon has to be carried around in all those functions, making it impossible to compose functions that do not take that parameter with functions that do.  The latter can be problematic: since store operations have side effects and/or depend on external state, they have to be properly sequenced."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6657
+#: guix-git/doc/guix.texi:9116
 #, no-wrap
 msgid "monadic values"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6658
+#: guix-git/doc/guix.texi:9117
 #, no-wrap
 msgid "monadic functions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6668
+#: guix-git/doc/guix.texi:9127
 msgid "This is where the @code{(guix monads)} module comes in.  This module provides a framework for working with @dfn{monads}, and a particularly useful monad for our uses, the @dfn{store monad}.  Monads are a construct that allows two things: associating ``context'' with values (in our case, the context is the store), and building sequences of computations (here computations include accesses to the store).  Values in a monad---values that carry this additional context---are called @dfn{monadic values}; procedures that return such values are called @dfn{monadic procedures}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6670
+#: guix-git/doc/guix.texi:9129
 msgid "Consider this ``normal'' procedure:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6679
+#. type: lisp
+#: guix-git/doc/guix.texi:9138
 #, no-wrap
 msgid ""
 "(define (sh-symlink store)\n"
@@ -12360,12 +17111,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6683
+#: guix-git/doc/guix.texi:9142
 msgid "Using @code{(guix monads)} and @code{(guix gexp)}, it may be rewritten as a monadic function:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6691
+#. type: lisp
+#: guix-git/doc/guix.texi:9150
 #, no-wrap
 msgid ""
 "(define (sh-symlink)\n"
@@ -12377,17 +17128,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6698
+#: guix-git/doc/guix.texi:9157
 msgid "There are several things to note in the second version: the @code{store} parameter is now implicit and is ``threaded'' in the calls to the @code{package->derivation} and @code{gexp->derivation} monadic procedures, and the monadic value returned by @code{package->derivation} is @dfn{bound} using @code{mlet} instead of plain @code{let}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6702
+#: guix-git/doc/guix.texi:9161
 msgid "As it turns out, the call to @code{package->derivation} can even be omitted since it will take place implicitly, as we will see later (@pxref{G-Expressions}):"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6708
+#. type: lisp
+#: guix-git/doc/guix.texi:9167
 #, no-wrap
 msgid ""
 "(define (sh-symlink)\n"
@@ -12397,12 +17148,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6717
+#: guix-git/doc/guix.texi:9176
 msgid "Calling the monadic @code{sh-symlink} has no effect.  As someone once said, ``you exit a monad like you exit a building on fire: by running''.  So, to exit the monad and get the desired effect, one must use @code{run-with-store}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6721
+#. type: lisp
+#: guix-git/doc/guix.texi:9180
 #, no-wrap
 msgid ""
 "(run-with-store (open-connection) (sh-symlink))\n"
@@ -12410,12 +17161,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6727
+#: guix-git/doc/guix.texi:9186
 msgid "Note that the @code{(guix monad-repl)} module extends the Guile REPL with new ``meta-commands'' to make it easier to deal with monadic procedures: @code{run-in-store}, and @code{enter-store-monad}.  The former is used to ``run'' a single monadic value through the store:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6731
+#: guix-git/doc/guix.texi:9190
 #, no-wrap
 msgid ""
 "scheme@@(guile-user)> ,run-in-store (package->derivation hello)\n"
@@ -12423,12 +17174,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6735
+#: guix-git/doc/guix.texi:9194
 msgid "The latter enters a recursive REPL, where all the return values are automatically run through the store:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:6744
+#: guix-git/doc/guix.texi:9203
 #, no-wrap
 msgid ""
 "scheme@@(guile-user)> ,enter-store-monad\n"
@@ -12441,50 +17192,50 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6749
+#: guix-git/doc/guix.texi:9208
 msgid "Note that non-monadic values cannot be returned in the @code{store-monad} REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6752
+#: guix-git/doc/guix.texi:9211
 msgid "The main syntactic forms to deal with monads in general are provided by the @code{(guix monads)} module and are described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6753
+#: guix-git/doc/guix.texi:9212
 #, no-wrap
 msgid "{Scheme Syntax} with-monad @var{monad} @var{body} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6756
+#: guix-git/doc/guix.texi:9215
 msgid "Evaluate any @code{>>=} or @code{return} forms in @var{body} as being in @var{monad}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6758
+#: guix-git/doc/guix.texi:9217
 #, no-wrap
 msgid "{Scheme Syntax} return @var{val}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6760
+#: guix-git/doc/guix.texi:9219
 msgid "Return a monadic value that encapsulates @var{val}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6762
+#: guix-git/doc/guix.texi:9221
 #, no-wrap
 msgid "{Scheme Syntax} >>= @var{mval} @var{mproc} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6769
+#: guix-git/doc/guix.texi:9228
 msgid "@dfn{Bind} monadic value @var{mval}, passing its ``contents'' to monadic procedures @var{mproc}@dots{}@footnote{This operation is commonly referred to as ``bind'', but that name denotes an unrelated procedure in Guile.  Thus we use this somewhat cryptic symbol inherited from the Haskell language.}.  There can be one @var{mproc} or several of them, as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6777
+#. type: lisp
+#: guix-git/doc/guix.texi:9236
 #, no-wrap
 msgid ""
 "(run-with-state\n"
@@ -12496,8 +17247,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6780
+#. type: lisp
+#: guix-git/doc/guix.texi:9239
 #, no-wrap
 msgid ""
 "@result{} 4\n"
@@ -12505,99 +17256,99 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6783
+#: guix-git/doc/guix.texi:9242
 #, no-wrap
 msgid "{Scheme Syntax} mlet @var{monad} ((@var{var} @var{mval}) ...) @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6785
+#: guix-git/doc/guix.texi:9244
 msgid "@var{body} ..."
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:6785
+#: guix-git/doc/guix.texi:9244
 #, no-wrap
 msgid "{Scheme Syntax} mlet* @var{monad} ((@var{var} @var{mval}) ...) @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6797
+#: guix-git/doc/guix.texi:9256
 msgid "@var{body} ...  Bind the variables @var{var} to the monadic values @var{mval} in @var{body}, which is a sequence of expressions.  As with the bind operator, this can be thought of as ``unpacking'' the raw, non-monadic value ``contained'' in @var{mval} and making @var{var} refer to that raw, non-monadic value within the scope of the @var{body}.  The form (@var{var} -> @var{val}) binds @var{var} to the ``normal'' value @var{val}, as per @code{let}.  The binding operations occur in sequence from left to right.  The last expression of @var{body} must be a monadic expression, and its result will become the result of the @code{mlet} or @code{mlet*} when run in the @var{monad}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6800
+#: guix-git/doc/guix.texi:9259
 msgid "@code{mlet*} is to @code{mlet} what @code{let*} is to @code{let} (@pxref{Local Bindings,,, guile, GNU Guile Reference Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6802
+#: guix-git/doc/guix.texi:9261
 #, no-wrap
 msgid "{Scheme System} mbegin @var{monad} @var{mexp} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6806
+#: guix-git/doc/guix.texi:9265
 msgid "Bind @var{mexp} and the following monadic expressions in sequence, returning the result of the last expression.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6810
+#: guix-git/doc/guix.texi:9269
 msgid "This is akin to @code{mlet}, except that the return values of the monadic expressions are ignored.  In that sense, it is analogous to @code{begin}, but applied to monadic expressions."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6812
+#: guix-git/doc/guix.texi:9271
 #, no-wrap
 msgid "{Scheme System} mwhen @var{condition} @var{mexp0} @var{mexp*} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6817
+#: guix-git/doc/guix.texi:9276
 msgid "When @var{condition} is true, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is false, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6819
+#: guix-git/doc/guix.texi:9278
 #, no-wrap
 msgid "{Scheme System} munless @var{condition} @var{mexp0} @var{mexp*} ..."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6824
+#: guix-git/doc/guix.texi:9283
 msgid "When @var{condition} is false, evaluate the sequence of monadic expressions @var{mexp0}..@var{mexp*} as in an @code{mbegin}.  When @var{condition} is true, return @code{*unspecified*} in the current monad.  Every expression in the sequence must be a monadic expression."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6826
+#: guix-git/doc/guix.texi:9285
 #, no-wrap
 msgid "state monad"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6830
+#: guix-git/doc/guix.texi:9289
 msgid "The @code{(guix monads)} module provides the @dfn{state monad}, which allows an additional value---the state---to be @emph{threaded} through monadic procedure calls."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6831
+#: guix-git/doc/guix.texi:9290
 #, no-wrap
 msgid "{Scheme Variable} %state-monad"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6834
+#: guix-git/doc/guix.texi:9293
 msgid "The state monad.  Procedures in the state monad can access and change the state that is threaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6838
+#: guix-git/doc/guix.texi:9297
 msgid "Consider the example below.  The @code{square} procedure returns a value in the state monad.  It returns the square of its argument, but also increments the current state value:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6845
+#. type: lisp
+#: guix-git/doc/guix.texi:9304
 #, no-wrap
 msgid ""
 "(define (square x)\n"
@@ -12608,8 +17359,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6849
+#. type: lisp
+#: guix-git/doc/guix.texi:9308
 #, no-wrap
 msgid ""
 "(run-with-state (sequence %state-monad (map square (iota 3))) 0)\n"
@@ -12618,147 +17369,147 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6853
-msgid "When ``run'' through @var{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls."
+#: guix-git/doc/guix.texi:9312
+msgid "When ``run'' through @code{%state-monad}, we obtain that additional state value, which is the number of @code{square} calls."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6855
+#: guix-git/doc/guix.texi:9314
 #, no-wrap
 msgid "{Monadic Procedure} current-state"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6857
+#: guix-git/doc/guix.texi:9316
 msgid "Return the current state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6859
+#: guix-git/doc/guix.texi:9318
 #, no-wrap
 msgid "{Monadic Procedure} set-current-state @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6862
+#: guix-git/doc/guix.texi:9321
 msgid "Set the current state to @var{value} and return the previous state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6864
+#: guix-git/doc/guix.texi:9323
 #, no-wrap
 msgid "{Monadic Procedure} state-push @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6867
+#: guix-git/doc/guix.texi:9326
 msgid "Push @var{value} to the current state, which is assumed to be a list, and return the previous state as a monadic value."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6869
+#: guix-git/doc/guix.texi:9328
 #, no-wrap
 msgid "{Monadic Procedure} state-pop"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6872
+#: guix-git/doc/guix.texi:9331
 msgid "Pop a value from the current state and return it as a monadic value.  The state is assumed to be a list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6874
+#: guix-git/doc/guix.texi:9333
 #, no-wrap
 msgid "{Scheme Procedure} run-with-state @var{mval} [@var{state}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6877
+#: guix-git/doc/guix.texi:9336
 msgid "Run monadic value @var{mval} starting with @var{state} as the initial state.  Return two values: the resulting value, and the resulting state."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6881
+#: guix-git/doc/guix.texi:9340
 msgid "The main interface to the store monad, provided by the @code{(guix store)} module, is as follows."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6882
+#: guix-git/doc/guix.texi:9341
 #, no-wrap
 msgid "{Scheme Variable} %store-monad"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6884
-msgid "The store monad---an alias for @var{%state-monad}."
+#: guix-git/doc/guix.texi:9343
+msgid "The store monad---an alias for @code{%state-monad}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:6888
-msgid "Values in the store monad encapsulate accesses to the store.  When its effect is needed, a value of the store monad must be ``evaluated'' by passing it to the @code{run-with-store} procedure (see below.)"
+#: guix-git/doc/guix.texi:9347
+msgid "Values in the store monad encapsulate accesses to the store.  When its effect is needed, a value of the store monad must be ``evaluated'' by passing it to the @code{run-with-store} procedure (see below)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6890
+#: guix-git/doc/guix.texi:9349
 #, no-wrap
 msgid "{Scheme Procedure} run-with-store @var{store} @var{mval} [#:guile-for-build] [#:system (%current-system)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6893
+#: guix-git/doc/guix.texi:9352
 msgid "Run @var{mval}, a monadic value in the store monad, in @var{store}, an open store connection."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6895
+#: guix-git/doc/guix.texi:9354
 #, no-wrap
 msgid "{Monadic Procedure} text-file @var{name} @var{text} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6899
+#: guix-git/doc/guix.texi:9358
 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{text}, a string.  @var{references} is a list of store items that the resulting text file refers to; it defaults to the empty list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6901
+#: guix-git/doc/guix.texi:9360
 #, no-wrap
 msgid "{Monadic Procedure} binary-file @var{name} @var{data} [@var{references}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6905
+#: guix-git/doc/guix.texi:9364
 msgid "Return as a monadic value the absolute file name in the store of the file containing @var{data}, a bytevector.  @var{references} is a list of store items that the resulting binary file refers to; it defaults to the empty list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6907
+#: guix-git/doc/guix.texi:9366
 #, no-wrap
 msgid "{Monadic Procedure} interned-file @var{file} [@var{name}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6912
+#: guix-git/doc/guix.texi:9371
 msgid "[#:recursive? #t] [#:select? (const #t)] Return the name of @var{file} once interned in the store.  Use @var{name} as its store name, or the basename of @var{file} if @var{name} is omitted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6916 doc/guix.texi:7329
+#: guix-git/doc/guix.texi:9375 guix-git/doc/guix.texi:9798
 msgid "When @var{recursive?} is true, the contents of @var{file} are added recursively; if @var{file} designates a flat file and @var{recursive?} is true, its contents are added, and its permission bits are kept."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6921 doc/guix.texi:7334
+#: guix-git/doc/guix.texi:9380 guix-git/doc/guix.texi:9803
 msgid "When @var{recursive?} is true, call @code{(@var{select?} @var{file} @var{stat})} for each directory entry, where @var{file} is the entry's absolute file name and @var{stat} is the result of @code{lstat}; exclude entries for which @var{select?} does not return true."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6923
+#: guix-git/doc/guix.texi:9382
 msgid "The example below adds a file to the store, under two different names:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6929
+#. type: lisp
+#: guix-git/doc/guix.texi:9388
 #, no-wrap
 msgid ""
 "(run-with-store (open-connection)\n"
@@ -12768,116 +17519,121 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:6931
+#. type: lisp
+#: guix-git/doc/guix.texi:9390
 #, no-wrap
 msgid "@result{} (\"/gnu/store/rwm@dots{}-README\" \"/gnu/store/44i@dots{}-LEGU-MIN\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6937
+#: guix-git/doc/guix.texi:9396
 msgid "The @code{(guix packages)} module exports the following package-related monadic procedures:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6938
+#: guix-git/doc/guix.texi:9397
 #, no-wrap
 msgid "{Monadic Procedure} package-file @var{package} [@var{file}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6946
+#: guix-git/doc/guix.texi:9405
 msgid "[#:system (%current-system)] [#:target #f] @ [#:output \"out\"] Return as a monadic value in the absolute file name of @var{file} within the @var{output} directory of @var{package}.  When @var{file} is omitted, return the name of the @var{output} directory of @var{package}.  When @var{target} is true, use it as a cross-compilation target triplet."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6948
+#: guix-git/doc/guix.texi:9409
+msgid "Note that this procedure does @emph{not} build @var{package}.  Thus, the result might or might not designate an existing file.  We recommend not using this procedure unless you know what you are doing."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:9411
 #, no-wrap
 msgid "{Monadic Procedure} package->derivation @var{package} [@var{system}]"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:6949
+#: guix-git/doc/guix.texi:9412
 #, no-wrap
 msgid "{Monadic Procedure} package->cross-derivation @var{package} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:6953
+#: guix-git/doc/guix.texi:9416
 msgid "@var{target} [@var{system}] Monadic version of @code{package-derivation} and @code{package-cross-derivation} (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6959
+#: guix-git/doc/guix.texi:9422
 #, no-wrap
 msgid "G-expression"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6960
+#: guix-git/doc/guix.texi:9423
 #, no-wrap
 msgid "build code quoting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6966
+#: guix-git/doc/guix.texi:9429
 msgid "So we have ``derivations'', which represent a sequence of build actions to be performed to produce an item in the store (@pxref{Derivations}).  These build actions are performed when asking the daemon to actually build the derivations; they are run by the daemon in a container (@pxref{Invoking guix-daemon})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:6967
+#: guix-git/doc/guix.texi:9432
 #, no-wrap
 msgid "strata of code"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6979
-msgid "It should come as no surprise that we like to write these build actions in Scheme.  When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop.  Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, etc."
+#: guix-git/doc/guix.texi:9444
+msgid "It should come as no surprise that we like to write these build actions in Scheme.  When we do that, we end up with two @dfn{strata} of Scheme code@footnote{The term @dfn{stratum} in this context was coined by Manuel Serrano et al.@: in the context of their work on Hop.  Oleg Kiselyov, who has written insightful @url{http://okmij.org/ftp/meta-programming/#meta-scheme, essays and code on this topic}, refers to this kind of code generation as @dfn{staging}.}: the ``host code''---code that defines packages, talks to the daemon, etc.---and the ``build code''---code that actually performs build actions, such as making directories, invoking @command{make}, and so on (@pxref{Build Phases})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6986
+#: guix-git/doc/guix.texi:9451
 msgid "To describe a derivation and its build actions, one typically needs to embed build code inside host code.  It boils down to manipulating build code as data, and the homoiconicity of Scheme---code has a direct representation as data---comes in handy for that.  But we need more than the normal @code{quasiquote} mechanism in Scheme to construct build expressions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:6995
+#: guix-git/doc/guix.texi:9460
 msgid "The @code{(guix gexp)} module implements @dfn{G-expressions}, a form of S-expressions adapted to build expressions.  G-expressions, or @dfn{gexps}, consist essentially of three syntactic forms: @code{gexp}, @code{ungexp}, and @code{ungexp-splicing} (or simply: @code{#~}, @code{#$}, and @code{#$@@}), which are comparable to @code{quasiquote}, @code{unquote}, and @code{unquote-splicing}, respectively (@pxref{Expression Syntax, @code{quasiquote},, guile, GNU Guile Reference Manual}).  However, there are major differences:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7000
+#: guix-git/doc/guix.texi:9465
 msgid "Gexps are meant to be written to a file and run or manipulated by other processes."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7005
+#: guix-git/doc/guix.texi:9470
 msgid "When a high-level object such as a package or derivation is unquoted inside a gexp, the result is as if its output file name had been introduced."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:7010
+#: guix-git/doc/guix.texi:9475
 msgid "Gexps carry information about the packages or derivations they refer to, and these dependencies are automatically added as inputs to the build processes that use them."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7012 doc/guix.texi:7516
+#: guix-git/doc/guix.texi:9477 guix-git/doc/guix.texi:10034
 #, no-wrap
 msgid "lowering, of high-level objects in gexps"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7022
-msgid "This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to derivations or files in the store can be defined, such that these objects can also be inserted into gexps.  For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below.)"
+#: guix-git/doc/guix.texi:9487
+msgid "This mechanism is not limited to package and derivation objects: @dfn{compilers} able to ``lower'' other high-level objects to derivations or files in the store can be defined, such that these objects can also be inserted into gexps.  For example, a useful type of high-level objects that can be inserted in a gexp is ``file-like objects'', which make it easy to add files to the store and to refer to them in derivations and such (see @code{local-file} and @code{plain-file} below)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7024
+#: guix-git/doc/guix.texi:9489
 msgid "To illustrate the idea, here is an example of a gexp:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7032
+#. type: lisp
+#: guix-git/doc/guix.texi:9497
 #, no-wrap
 msgid ""
 "(define build-exp\n"
@@ -12889,70 +17645,71 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7037
+#: guix-git/doc/guix.texi:9502
 msgid "This gexp can be passed to @code{gexp->derivation}; we obtain a derivation that builds a directory containing exactly one symlink to @file{/gnu/store/@dots{}-coreutils-8.22/bin/ls}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7040
+#. type: lisp
+#: guix-git/doc/guix.texi:9505
 #, no-wrap
 msgid "(gexp->derivation \"the-thing\" build-exp)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7048
+#: guix-git/doc/guix.texi:9513
 msgid "As one would expect, the @code{\"/gnu/store/@dots{}-coreutils-8.22\"} string is substituted to the reference to the @var{coreutils} package in the actual build code, and @var{coreutils} is automatically made an input to the derivation.  Likewise, @code{#$output} (equivalent to @code{(ungexp output)}) is replaced by a string containing the directory name of the output of the derivation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7049
+#: guix-git/doc/guix.texi:9514
 #, no-wrap
 msgid "cross compilation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7055
+#: guix-git/doc/guix.texi:9520
 msgid "In a cross-compilation context, it is useful to distinguish between references to the @emph{native} build of a package---that can run on the host---versus references to cross builds of a package.  To that end, the @code{#+} plays the same role as @code{#$}, but is a reference to a native package build:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7065
+#. type: lisp
+#: guix-git/doc/guix.texi:9531
 #, no-wrap
 msgid ""
 "(gexp->derivation \"vi\"\n"
 "   #~(begin\n"
 "       (mkdir #$output)\n"
+"       (mkdir (string-append #$output \"/bin\"))\n"
 "       (system* (string-append #+coreutils \"/bin/ln\")\n"
 "                \"-s\"\n"
 "                (string-append #$emacs \"/bin/emacs\")\n"
 "                (string-append #$output \"/bin/vi\")))\n"
-"   #:target \"mips64el-linux-gnu\")\n"
+"   #:target \"aarch64-linux-gnu\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7071
+#: guix-git/doc/guix.texi:9537
 msgid "In the example above, the native build of @var{coreutils} is used, so that @command{ln} can actually run on the host; but then the cross-compiled build of @var{emacs} is referenced."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7072
+#: guix-git/doc/guix.texi:9538
 #, no-wrap
 msgid "imported modules, for gexps"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7073
+#: guix-git/doc/guix.texi:9539
 #, no-wrap
 msgid "with-imported-modules"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7078
+#: guix-git/doc/guix.texi:9544
 msgid "Another gexp feature is @dfn{imported modules}: sometimes you want to be able to use certain Guile modules from the ``host environment'' in the gexp, so those modules should be imported in the ``build environment''.  The @code{with-imported-modules} form allows you to express that:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7089
+#. type: lisp
+#: guix-git/doc/guix.texi:9555
 #, no-wrap
 msgid ""
 "(let ((build (with-imported-modules '((guix build utils))\n"
@@ -12967,37 +17724,37 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7095
+#: guix-git/doc/guix.texi:9561
 msgid "In this example, the @code{(guix build utils)} module is automatically pulled into the isolated build environment of our gexp, such that @code{(use-modules (guix build utils))} works as expected."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7096
+#: guix-git/doc/guix.texi:9562
 #, no-wrap
 msgid "module closure"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7097
+#: guix-git/doc/guix.texi:9563
 #, no-wrap
 msgid "source-module-closure"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7104
+#: guix-git/doc/guix.texi:9570
 msgid "Usually you want the @emph{closure} of the module to be imported---i.e., the module itself and all the modules it depends on---rather than just the module; failing to do that, attempts to use the module will fail because of missing dependent modules.  The @code{source-module-closure} procedure computes the closure of a module by looking at its source file headers, which comes in handy in this case:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7107
+#. type: lisp
+#: guix-git/doc/guix.texi:9573
 #, no-wrap
 msgid ""
 "(use-modules (guix modules))   ;for 'source-module-closure'\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7116
+#. type: lisp
+#: guix-git/doc/guix.texi:9582
 #, no-wrap
 msgid ""
 "(with-imported-modules (source-module-closure\n"
@@ -13011,32 +17768,32 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7118
+#: guix-git/doc/guix.texi:9584
 #, no-wrap
 msgid "extensions, for gexps"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:7119
+#: guix-git/doc/guix.texi:9585
 #, no-wrap
 msgid "with-extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7124
+#: guix-git/doc/guix.texi:9590
 msgid "In the same vein, sometimes you want to import not just pure-Scheme modules, but also ``extensions'' such as Guile bindings to C libraries or other ``full-blown'' packages.  Say you need the @code{guile-json} package available on the build side, here's how you would do it:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7127
+#. type: lisp
+#: guix-git/doc/guix.texi:9593
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages guile))  ;for 'guile-json'\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7133
+#. type: lisp
+#: guix-git/doc/guix.texi:9599
 #, no-wrap
 msgid ""
 "(with-extensions (list guile-json)\n"
@@ -13047,184 +17804,184 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7136
+#: guix-git/doc/guix.texi:9602
 msgid "The syntactic form to construct gexps is summarized below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7137
+#: guix-git/doc/guix.texi:9603
 #, no-wrap
 msgid "{Scheme Syntax} #~@var{exp}"
 msgstr ""
 
 #. type: deffnx
-#: doc/guix.texi:7138
+#: guix-git/doc/guix.texi:9604
 #, no-wrap
 msgid "{Scheme Syntax} (gexp @var{exp})"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7141
+#: guix-git/doc/guix.texi:9607
 msgid "Return a G-expression containing @var{exp}.  @var{exp} may contain one or more of the following forms:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7143
+#: guix-git/doc/guix.texi:9609
 #, no-wrap
 msgid "#$@var{obj}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7144
+#: guix-git/doc/guix.texi:9610
 #, no-wrap
 msgid "(ungexp @var{obj})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7149
+#: guix-git/doc/guix.texi:9615
 msgid "Introduce a reference to @var{obj}.  @var{obj} may have one of the supported types, for example a package or a derivation, in which case the @code{ungexp} form is replaced by its output file name---e.g., @code{\"/gnu/store/@dots{}-coreutils-8.22}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7152
+#: guix-git/doc/guix.texi:9618
 msgid "If @var{obj} is a list, it is traversed and references to supported objects are substituted similarly."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7155
+#: guix-git/doc/guix.texi:9621
 msgid "If @var{obj} is another gexp, its contents are inserted and its dependencies are added to those of the containing gexp."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7157
+#: guix-git/doc/guix.texi:9623
 msgid "If @var{obj} is another kind of object, it is inserted as is."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7158
+#: guix-git/doc/guix.texi:9624
 #, no-wrap
 msgid "#$@var{obj}:@var{output}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7159
+#: guix-git/doc/guix.texi:9625
 #, no-wrap
 msgid "(ungexp @var{obj} @var{output})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7163
+#: guix-git/doc/guix.texi:9629
 msgid "This is like the form above, but referring explicitly to the @var{output} of @var{obj}---this is useful when @var{obj} produces multiple outputs (@pxref{Packages with Multiple Outputs})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7164
+#: guix-git/doc/guix.texi:9630
 #, no-wrap
 msgid "#+@var{obj}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7165
+#: guix-git/doc/guix.texi:9631
 #, no-wrap
 msgid "#+@var{obj}:output"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7166
+#: guix-git/doc/guix.texi:9632
 #, no-wrap
 msgid "(ungexp-native @var{obj})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7167
+#: guix-git/doc/guix.texi:9633
 #, no-wrap
 msgid "(ungexp-native @var{obj} @var{output})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7170
+#: guix-git/doc/guix.texi:9636
 msgid "Same as @code{ungexp}, but produces a reference to the @emph{native} build of @var{obj} when used in a cross compilation context."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7171
+#: guix-git/doc/guix.texi:9637
 #, no-wrap
 msgid "#$output[:@var{output}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7172
+#: guix-git/doc/guix.texi:9638
 #, no-wrap
 msgid "(ungexp output [@var{output}])"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7175
+#: guix-git/doc/guix.texi:9641
 msgid "Insert a reference to derivation output @var{output}, or to the main output when @var{output} is omitted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7177
+#: guix-git/doc/guix.texi:9643
 msgid "This only makes sense for gexps passed to @code{gexp->derivation}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7178
+#: guix-git/doc/guix.texi:9644
 #, no-wrap
 msgid "#$@@@var{lst}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7179
+#: guix-git/doc/guix.texi:9645
 #, no-wrap
 msgid "(ungexp-splicing @var{lst})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7182
+#: guix-git/doc/guix.texi:9648
 msgid "Like the above, but splices the contents of @var{lst} inside the containing list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7183
+#: guix-git/doc/guix.texi:9649
 #, no-wrap
 msgid "#+@@@var{lst}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7184
+#: guix-git/doc/guix.texi:9650
 #, no-wrap
 msgid "(ungexp-native-splicing @var{lst})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7187
+#: guix-git/doc/guix.texi:9653
 msgid "Like the above, but refers to native builds of the objects listed in @var{lst}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7192
-msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below.)"
+#: guix-git/doc/guix.texi:9658
+msgid "G-expressions created by @code{gexp} or @code{#~} are run-time objects of the @code{gexp?} type (see below)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7194
+#: guix-git/doc/guix.texi:9660
 #, no-wrap
 msgid "{Scheme Syntax} with-imported-modules @var{modules} @var{body}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7197
+#: guix-git/doc/guix.texi:9663
 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{modules} in their execution environment."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7201
+#: guix-git/doc/guix.texi:9667
 msgid "Each item in @var{modules} can be the name of a module, such as @code{(guix build utils)}, or it can be a module name, followed by an arrow, followed by a file-like object:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7207
+#. type: lisp
+#: guix-git/doc/guix.texi:9673
 #, no-wrap
 msgid ""
 "`((guix build utils)\n"
@@ -13234,80 +17991,80 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7212
+#: guix-git/doc/guix.texi:9678
 msgid "In the example above, the first two modules are taken from the search path, and the last one is created from the given file-like object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7216
+#: guix-git/doc/guix.texi:9682
 msgid "This form has @emph{lexical} scope: it has an effect on the gexps directly defined in @var{body}@dots{}, but not on those defined, say, in procedures called from @var{body}@dots{}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7218
+#: guix-git/doc/guix.texi:9684
 #, no-wrap
 msgid "{Scheme Syntax} with-extensions @var{extensions} @var{body}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7223
+#: guix-git/doc/guix.texi:9689
 msgid "Mark the gexps defined in @var{body}@dots{} as requiring @var{extensions} in their build and execution environment.  @var{extensions} is typically a list of package objects such as those defined in the @code{(gnu packages guile)} module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7228
+#: guix-git/doc/guix.texi:9694
 msgid "Concretely, the packages listed in @var{extensions} are added to the load path while compiling imported modules in @var{body}@dots{}; they are also added to the load path of the gexp returned by @var{body}@dots{}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7230
+#: guix-git/doc/guix.texi:9696
 #, no-wrap
 msgid "{Scheme Procedure} gexp? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7232
+#: guix-git/doc/guix.texi:9698
 msgid "Return @code{#t} if @var{obj} is a G-expression."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7238
-msgid "G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store.  The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads.)"
+#: guix-git/doc/guix.texi:9704
+msgid "G-expressions are meant to be written to disk, either as code building some derivation, or as plain files in the store.  The monadic procedures below allow you to do that (@pxref{The Store Monad}, for more information about monads)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7239
+#: guix-git/doc/guix.texi:9705
 #, no-wrap
 msgid "{Monadic Procedure} gexp->derivation @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7257
-msgid "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @var{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}.  When @var{target} is true, it is used as the cross-compilation target triplet for packages referred to by @var{exp}."
+#: guix-git/doc/guix.texi:9723
+msgid "[#:system (%current-system)] [#:target #f] [#:graft? #t] @ [#:hash #f] [#:hash-algo #f] @ [#:recursive? #f] [#:env-vars '()] [#:modules '()] @ [#:module-path @code{%load-path}] @ [#:effective-version \"2.2\"] @ [#:references-graphs #f] [#:allowed-references #f] @ [#:disallowed-references #f] @ [#:leaked-env-vars #f] @ [#:script-name (string-append @var{name} \"-builder\")] @ [#:deprecation-warnings #f] @ [#:local-build? #f] [#:substitutable? #t] @ [#:properties '()] [#:guile-for-build #f] Return a derivation @var{name} that runs @var{exp} (a gexp) with @var{guile-for-build} (a derivation) on @var{system}; @var{exp} is stored in a file called @var{script-name}.  When @var{target} is true, it is used as the cross-compilation target triplet for packages referred to by @var{exp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7265
+#: guix-git/doc/guix.texi:9731
 msgid "@var{modules} is deprecated in favor of @code{with-imported-modules}.  Its meaning is to make @var{modules} available in the evaluation context of @var{exp}; @var{modules} is a list of names of Guile modules searched in @var{module-path} to be copied in the store, compiled, and made available in the load path during the execution of @var{exp}---e.g., @code{((guix build utils) (guix build gnu-build-system))}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7268
+#: guix-git/doc/guix.texi:9734
 msgid "@var{effective-version} determines the string to use when adding extensions of @var{exp} (see @code{with-extensions}) to the search path---e.g., @code{\"2.2\"}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7271
+#: guix-git/doc/guix.texi:9737
 msgid "@var{graft?} determines whether packages referred to by @var{exp} should be grafted when applicable."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7274
+#: guix-git/doc/guix.texi:9740
 msgid "When @var{references-graphs} is true, it must be a list of tuples of one of the following forms:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7281
+#: guix-git/doc/guix.texi:9747
 #, no-wrap
 msgid ""
 "(@var{file-name} @var{package})\n"
@@ -13318,38 +18075,38 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7287
+#: guix-git/doc/guix.texi:9753
 msgid "The right-hand-side of each element of @var{references-graphs} is automatically made an input of the build process of @var{exp}.  In the build environment, each @var{file-name} contains the reference graph of the corresponding item, in a simple text format."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7293
+#: guix-git/doc/guix.texi:9759
 msgid "@var{allowed-references} must be either @code{#f} or a list of output names and packages.  In the latter case, the list denotes store items that the result is allowed to refer to.  Any reference to another store item will lead to a build error.  Similarly for @var{disallowed-references}, which can list items that must not be referenced by the outputs."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7296
+#: guix-git/doc/guix.texi:9762
 msgid "@var{deprecation-warnings} determines whether to show deprecation warnings while compiling modules.  It can be @code{#f}, @code{#t}, or @code{'detailed}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7298
+#: guix-git/doc/guix.texi:9764
 msgid "The other arguments are as for @code{derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7300
+#: guix-git/doc/guix.texi:9766
 #, no-wrap
 msgid "file-like objects"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7305
+#: guix-git/doc/guix.texi:9771
 msgid "The @code{local-file}, @code{plain-file}, @code{computed-file}, @code{program-file}, and @code{scheme-file} procedures below return @dfn{file-like objects}.  That is, when unquoted in a G-expression, these objects lead to a file in the store.  Consider this G-expression:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7309
+#. type: lisp
+#: guix-git/doc/guix.texi:9775
 #, no-wrap
 msgid ""
 "#~(system* #$(file-append glibc \"/sbin/nscd\") \"-f\"\n"
@@ -13357,84 +18114,84 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7318
+#: guix-git/doc/guix.texi:9784
 msgid "The effect here is to ``intern'' @file{/tmp/my-nscd.conf} by copying it to the store.  Once expanded, for instance @i{via} @code{gexp->derivation}, the G-expression refers to that copy under @file{/gnu/store}; thus, modifying or removing the file in @file{/tmp} does not have any effect on what the G-expression does.  @code{plain-file} can be used similarly; it differs in that the file content is directly passed as a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7319
+#: guix-git/doc/guix.texi:9785
 #, no-wrap
 msgid "{Scheme Procedure} local-file @var{file} [@var{name}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7325
-msgid "[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be used in a gexp.  If @var{file} is a relative file name, it is looked up relative to the source file where this form appears.  @var{file} will be added to the store under @var{name}--by default the base name of @var{file}."
+#: guix-git/doc/guix.texi:9794
+msgid "[#:recursive? #f] [#:select? (const #t)] Return an object representing local file @var{file} to add to the store; this object can be used in a gexp.  If @var{file} is a literal string denoting a relative file name, it is looked up relative to the source file where it appears; if @var{file} is not a literal string, it is looked up relative to the current working directory at run time.  @var{file} will be added to the store under @var{name}--by default the base name of @var{file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7337
+#: guix-git/doc/guix.texi:9806
 msgid "This is the declarative counterpart of the @code{interned-file} monadic procedure (@pxref{The Store Monad, @code{interned-file}})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7339
+#: guix-git/doc/guix.texi:9808
 #, no-wrap
 msgid "{Scheme Procedure} plain-file @var{name} @var{content}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7342
+#: guix-git/doc/guix.texi:9811
 msgid "Return an object representing a text file called @var{name} with the given @var{content} (a string or a bytevector) to be added to the store."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7344
+#: guix-git/doc/guix.texi:9813
 msgid "This is the declarative counterpart of @code{text-file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7346
+#: guix-git/doc/guix.texi:9815
 #, no-wrap
 msgid "{Scheme Procedure} computed-file @var{name} @var{gexp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7351
-msgid "[#:options '(#:local-build? #t)] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}.  @var{options} is a list of additional arguments to pass to @code{gexp->derivation}."
+#: guix-git/doc/guix.texi:9822
+msgid "[#:local-build? #t] [#:options '()] Return an object representing the store item @var{name}, a file or directory computed by @var{gexp}.  When @var{local-build?} is true (the default), the derivation is built locally.  @var{options} is a list of additional arguments to pass to @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7353
+#: guix-git/doc/guix.texi:9824
 msgid "This is the declarative counterpart of @code{gexp->derivation}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7355
+#: guix-git/doc/guix.texi:9826
 #, no-wrap
 msgid "{Monadic Procedure} gexp->script @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7360
-msgid "[#:guile (default-guile)] [#:module-path %load-path] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path.  Look up @var{exp}'s modules in @var{module-path}."
+#: guix-git/doc/guix.texi:9832
+msgid "[#:guile (default-guile)] [#:module-path %load-path] @ [#:system (%current-system)] [#:target #f] Return an executable script @var{name} that runs @var{exp} using @var{guile}, with @var{exp}'s imported modules in its search path.  Look up @var{exp}'s modules in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7363
+#: guix-git/doc/guix.texi:9835
 msgid "The example below builds a script that simply invokes the @command{ls} command:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7366
+#. type: lisp
+#: guix-git/doc/guix.texi:9838
 #, no-wrap
 msgid ""
 "(use-modules (guix gexp) (gnu packages base))\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7370
+#. type: lisp
+#: guix-git/doc/guix.texi:9842
 #, no-wrap
 msgid ""
 "(gexp->script \"list-files\"\n"
@@ -13443,12 +18200,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7375
+#: guix-git/doc/guix.texi:9847
 msgid "When ``running'' it through the store (@pxref{The Store Monad, @code{run-with-store}}), we obtain a derivation that produces an executable file @file{/gnu/store/@dots{}-list-files} along these lines:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7380
+#: guix-git/doc/guix.texi:9852
 #, no-wrap
 msgid ""
 "#!/gnu/store/@dots{}-guile-2.0.11/bin/guile -ds\n"
@@ -13457,76 +18214,76 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7383
+#: guix-git/doc/guix.texi:9855
 #, no-wrap
 msgid "{Scheme Procedure} program-file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7388
+#: guix-git/doc/guix.texi:9860
 msgid "[#:guile #f] [#:module-path %load-path] Return an object representing the executable store item @var{name} that runs @var{gexp}.  @var{guile} is the Guile package used to execute that script.  Imported modules of @var{gexp} are looked up in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7390
+#: guix-git/doc/guix.texi:9862
 msgid "This is the declarative counterpart of @code{gexp->script}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7392
+#: guix-git/doc/guix.texi:9864
 #, no-wrap
 msgid "{Monadic Procedure} gexp->file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7399
+#: guix-git/doc/guix.texi:9871
 msgid "[#:set-load-path? #t] [#:module-path %load-path] @ [#:splice? #f] @ [#:guile (default-guile)] Return a derivation that builds a file @var{name} containing @var{exp}.  When @var{splice?} is true, @var{exp} is considered to be a list of expressions that will be spliced in the resulting file."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7404
+#: guix-git/doc/guix.texi:9876
 msgid "When @var{set-load-path?} is true, emit code in the resulting file to set @code{%load-path} and @code{%load-compiled-path} to honor @var{exp}'s imported modules.  Look up @var{exp}'s modules in @var{module-path}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7407
+#: guix-git/doc/guix.texi:9879
 msgid "The resulting file holds references to all the dependencies of @var{exp} or a subset thereof."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7409
+#: guix-git/doc/guix.texi:9881
 #, no-wrap
-msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} [#:splice? #f]"
+msgid "{Scheme Procedure} scheme-file @var{name} @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7412
-msgid "Return an object representing the Scheme file @var{name} that contains @var{exp}."
+#: guix-git/doc/guix.texi:9885
+msgid "[#:splice? #f] [#:set-load-path? #t] Return an object representing the Scheme file @var{name} that contains @var{exp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7414
+#: guix-git/doc/guix.texi:9887
 msgid "This is the declarative counterpart of @code{gexp->file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7416
+#: guix-git/doc/guix.texi:9889
 #, no-wrap
 msgid "{Monadic Procedure} text-file* @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7422
+#: guix-git/doc/guix.texi:9895
 msgid "Return as a monadic value a derivation that builds a text file containing all of @var{text}.  @var{text} may list, in addition to strings, objects of any type that can be used in a gexp: packages, derivations, local file objects, etc.  The resulting store file holds references to all these."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7427
+#: guix-git/doc/guix.texi:9900
 msgid "This variant should be preferred over @code{text-file} anytime the file to create will reference items from the store.  This is typically the case when building a configuration file that embeds store file names, like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7435
+#. type: lisp
+#: guix-git/doc/guix.texi:9908
 #, no-wrap
 msgid ""
 "(define (profile.sh)\n"
@@ -13538,23 +18295,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7440
+#: guix-git/doc/guix.texi:9913
 msgid "In this example, the resulting @file{/gnu/store/@dots{}-profile.sh} file will reference @var{coreutils}, @var{grep}, and @var{sed}, thereby preventing them from being garbage-collected during its lifetime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7442
+#: guix-git/doc/guix.texi:9915
 #, no-wrap
 msgid "{Scheme Procedure} mixed-text-file @var{name} @var{text} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7446
+#: guix-git/doc/guix.texi:9919
 msgid "Return an object representing store file @var{name} containing @var{text}.  @var{text} is a sequence of strings and file-like objects, as in:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7450
+#. type: lisp
+#: guix-git/doc/guix.texi:9923
 #, no-wrap
 msgid ""
 "(mixed-text-file \"profile\"\n"
@@ -13562,23 +18319,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7453
+#: guix-git/doc/guix.texi:9926
 msgid "This is the declarative counterpart of @code{text-file*}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7455
+#: guix-git/doc/guix.texi:9928
 #, no-wrap
 msgid "{Scheme Procedure} file-union @var{name} @var{files}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7460
+#: guix-git/doc/guix.texi:9933
 msgid "Return a @code{<computed-file>} that builds a directory containing all of @var{files}.  Each item in @var{files} must be a two-element list where the first element is the file name to use in the new directory, and the second element is a gexp denoting the target file.  Here's an example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7467
+#. type: lisp
+#: guix-git/doc/guix.texi:9940
 #, no-wrap
 msgid ""
 "(file-union \"etc\"\n"
@@ -13589,50 +18346,50 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7470
+#: guix-git/doc/guix.texi:9943
 msgid "This yields an @code{etc} directory containing these two files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7472
+#: guix-git/doc/guix.texi:9945
 #, no-wrap
 msgid "{Scheme Procedure} directory-union @var{name} @var{things}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7475
+#: guix-git/doc/guix.texi:9948
 msgid "Return a directory that is the union of @var{things}, where @var{things} is a list of file-like objects denoting directories.  For example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7478
+#. type: lisp
+#: guix-git/doc/guix.texi:9951
 #, no-wrap
 msgid "(directory-union \"guile+emacs\" (list guile emacs))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7481
+#: guix-git/doc/guix.texi:9954
 msgid "yields a directory that is the union of the @code{guile} and @code{emacs} packages."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7483
+#: guix-git/doc/guix.texi:9956
 #, no-wrap
 msgid "{Scheme Procedure} file-append @var{obj} @var{suffix} @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7487
+#: guix-git/doc/guix.texi:9960
 msgid "Return a file-like object that expands to the concatenation of @var{obj} and @var{suffix}, where @var{obj} is a lowerable object and each @var{suffix} is a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7489
+#: guix-git/doc/guix.texi:9962
 msgid "As an example, consider this gexp:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7494
+#. type: lisp
+#: guix-git/doc/guix.texi:9967
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -13641,12 +18398,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7497
+#: guix-git/doc/guix.texi:9970
 msgid "The same effect could be achieved with:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:7502
+#. type: lisp
+#: guix-git/doc/guix.texi:9975
 #, no-wrap
 msgid ""
 "(gexp->script \"run-uname\"\n"
@@ -13655,50 +18412,170 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7508
+#: guix-git/doc/guix.texi:9981
 msgid "There is one difference though: in the @code{file-append} case, the resulting script contains the absolute file name as a string, whereas in the second case, the resulting script contains a @code{(string-append @dots{})} expression to construct the file name @emph{at run time}."
 msgstr ""
 
+#. type: deffn
+#: guix-git/doc/guix.texi:9983
+#, no-wrap
+msgid "{Scheme Syntax} let-system @var{system} @var{body}@dots{}"
+msgstr ""
+
+#. type: deffnx
+#: guix-git/doc/guix.texi:9984
+#, no-wrap
+msgid "{Scheme Syntax} let-system (@var{system} @var{target}) @var{body}@dots{}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:9987
+#, fuzzy
+#| msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
+msgid "Bind @var{system} to the currently targeted system---e.g., @code{\"x86_64-linux\"}---within @var{body}."
+msgstr "远程机器的系统类型--如，@code{\"x86_64-linux\"}。"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:9992
+msgid "In the second case, additionally bind @var{target} to the current cross-compilation target---a GNU triplet such as @code{\"arm-linux-gnueabihf\"}---or @code{#f} if we are not cross-compiling."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:9995
+msgid "@code{let-system} is useful in the occasional case where the object spliced into the gexp depends on the target system, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:10006
+#, no-wrap
+msgid ""
+"#~(system*\n"
+"   #+(let-system system\n"
+"       (cond ((string-prefix? \"armhf-\" system)\n"
+"              (file-append qemu \"/bin/qemu-system-arm\"))\n"
+"             ((string-prefix? \"x86_64-\" system)\n"
+"              (file-append qemu \"/bin/qemu-system-x86_64\"))\n"
+"             (else\n"
+"              (error \"dunno!\"))))\n"
+"   \"-net\" \"user\" #$image)\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:10009
+#, no-wrap
+msgid "{Scheme Syntax} with-parameters ((@var{parameter} @var{value}) @dots{}) @var{exp}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:10015
+msgid "This macro is similar to the @code{parameterize} form for dynamically-bound @dfn{parameters} (@pxref{Parameters,,, guile, GNU Guile Reference Manual}).  The key difference is that it takes effect when the file-like object returned by @var{exp} is lowered to a derivation or store item."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:10018
+msgid "A typical use of @code{with-parameters} is to force the system in effect for a given object:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:10022
+#, no-wrap
+msgid ""
+"(with-parameters ((%current-system \"i686-linux\"))\n"
+"  coreutils)\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:10026
+msgid "The example above returns an object that corresponds to the i686 build of Coreutils, regardless of the current value of @code{%current-system}."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:7515
+#: guix-git/doc/guix.texi:10033
 msgid "Of course, in addition to gexps embedded in ``host'' code, there are also modules containing build tools.  To make it clear that they are meant to be used in the build stratum, these modules are kept in the @code{(guix build @dots{})} name space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7521
+#: guix-git/doc/guix.texi:10039
 msgid "Internally, high-level objects are @dfn{lowered}, using their compiler, to either derivations or store items.  For instance, lowering a package yields a derivation, and lowering a @code{plain-file} yields a store item.  This is achieved using the @code{lower-object} monadic procedure."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7522
+#: guix-git/doc/guix.texi:10040
 #, no-wrap
 msgid "{Monadic Procedure} lower-object @var{obj} [@var{system}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:7528
-msgid "[#:target #f] Return as a value in @var{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, cross-compiling for @var{target} if @var{target} is true.  @var{obj} must be an object that has an associated gexp compiler, such as a @code{<package>}."
+#: guix-git/doc/guix.texi:10046
+msgid "[#:target #f] Return as a value in @code{%store-monad} the derivation or store item corresponding to @var{obj} for @var{system}, cross-compiling for @var{target} if @var{target} is true.  @var{obj} must be an object that has an associated gexp compiler, such as a @code{<package>}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:7531
+#: guix-git/doc/guix.texi:10049
 #, no-wrap
 msgid "Invoking @command{guix repl}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7533
+#: guix-git/doc/guix.texi:10051
+#, fuzzy, no-wrap
+#| msgid "read-eval-print loop"
+msgid "REPL, read-eval-print loop, script"
+msgstr "read-eval-print loop"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10061
+msgid "The @command{guix repl} command makes it easier to program Guix in Guile by launching a Guile @dfn{read-eval-print loop} (REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}), or by running Guile scripts (@pxref{Running Guile Scripts,,, guile, GNU Guile Reference Manual}).  Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its dependencies are available in the search path."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10066
 #, no-wrap
-msgid "REPL, read-eval-print loop"
+msgid "guix repl @var{options} [@var{file} @var{args}]\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7539
-msgid "The @command{guix repl} command spawns a Guile @dfn{read-eval-print loop} (REPL) for interactive programming (@pxref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}).  Compared to just launching the @command{guile} command, @command{guix repl} guarantees that all the Guix modules and all its dependencies are available in the search path.  You can use it this way:"
+#: guix-git/doc/guix.texi:10070
+msgid "When a @var{file} argument is provided, @var{file} is executed as a Guile scripts:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7545
+#: guix-git/doc/guix.texi:10073
+#, no-wrap
+msgid "guix repl my-script.scm\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10077
+msgid "To pass arguments to the script, use @code{--} to prevent them from being interpreted as arguments to @command{guix repl} itself:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10080
+#, no-wrap
+msgid "guix repl -- my-script.scm --input=foo.txt\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10085
+msgid "To make a script executable directly from the shell, using the guix executable that is on the user's search path, add the following two lines at the top of the script:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10089
+#, no-wrap
+msgid ""
+"@code{#!/usr/bin/env -S guix repl --}\n"
+"@code{!#}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10092
+msgid "Without a file name argument, a Guile REPL is started:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10098
 #, no-wrap
 msgid ""
 "$ guix repl\n"
@@ -13708,462 +18585,487 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7552
+#: guix-git/doc/guix.texi:10105
 msgid "In addition, @command{guix repl} implements a simple machine-readable REPL protocol for use by @code{(guix inferior)}, a facility to interact with @dfn{inferiors}, separate processes running a potentially different revision of Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7554
+#: guix-git/doc/guix.texi:10107
 msgid "The available options are as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7556 doc/guix.texi:9516
+#: guix-git/doc/guix.texi:10109 guix-git/doc/guix.texi:12501
 #, no-wrap
 msgid "--type=@var{type}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7557 doc/guix.texi:9517 doc/guix.texi:24566
+#: guix-git/doc/guix.texi:10110 guix-git/doc/guix.texi:12502
+#: guix-git/doc/guix.texi:33191
 #, no-wrap
 msgid "-t @var{type}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7559
+#: guix-git/doc/guix.texi:10112
 msgid "Start a REPL of the given @var{TYPE}, which can be one of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7561
+#: guix-git/doc/guix.texi:10114
 #, no-wrap
 msgid "guile"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7563
+#: guix-git/doc/guix.texi:10116
 msgid "This is default, and it spawns a standard full-featured Guile REPL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7563
+#: guix-git/doc/guix.texi:10116
 #, no-wrap
 msgid "machine"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7566
+#: guix-git/doc/guix.texi:10119
 msgid "Spawn a REPL that uses the machine-readable protocol.  This is the protocol that the @code{(guix inferior)} module speaks."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7572
+#: guix-git/doc/guix.texi:10125
 msgid "By default, @command{guix repl} reads from standard input and writes to standard output.  When this option is passed, it will instead listen for connections on @var{endpoint}.  Here are examples of valid options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7574
+#: guix-git/doc/guix.texi:10127
 #, no-wrap
 msgid "--listen=tcp:37146"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7576
+#: guix-git/doc/guix.texi:10129
 msgid "Accept connections on localhost on port 37146."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7577
+#: guix-git/doc/guix.texi:10130
 #, no-wrap
 msgid "--listen=unix:/tmp/socket"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7579
+#: guix-git/doc/guix.texi:10132
 msgid "Accept connections on the Unix-domain socket @file{/tmp/socket}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:10134 guix-git/doc/guix.texi:10238
+#: guix-git/doc/guix.texi:11970 guix-git/doc/guix.texi:12150
+#: guix-git/doc/guix.texi:12295 guix-git/doc/guix.texi:12549
+#, no-wrap
+msgid "--load-path=@var{directory}"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:10135 guix-git/doc/guix.texi:10239
+#: guix-git/doc/guix.texi:12151 guix-git/doc/guix.texi:12296
+#: guix-git/doc/guix.texi:12550
+#, no-wrap
+msgid "-L @var{directory}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10138 guix-git/doc/guix.texi:10242
+#: guix-git/doc/guix.texi:11973 guix-git/doc/guix.texi:12154
+#: guix-git/doc/guix.texi:12299 guix-git/doc/guix.texi:12553
+msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10141
+msgid "This allows users to define their own packages and make them visible to the script or REPL."
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:10142 guix-git/doc/guix.texi:10701
+#, no-wrap
+msgid "-q"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10145
+msgid "Inhibit loading of the @file{~/.guile} file.  By default, that configuration file is loaded when spawning a @code{guile} REPL."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:7590
+#: guix-git/doc/guix.texi:10155
 msgid "This section describes Guix command-line utilities.  Some of them are primarily targeted at developers and users who write new package definitions, while others are more generally useful.  They complement the Scheme programming interface of Guix in a convenient way."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7612
+#: guix-git/doc/guix.texi:10177
 #, no-wrap
 msgid "package building"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:7613
+#: guix-git/doc/guix.texi:10178
 #, no-wrap
 msgid "guix build"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7619
+#: guix-git/doc/guix.texi:10184
 msgid "The @command{guix build} command builds packages or derivations and their dependencies, and prints the resulting store paths.  Note that it does not modify the user's profile---this is the job of the @command{guix package} command (@pxref{Invoking guix package}).  Thus, it is mainly useful for distribution developers."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7624
+#: guix-git/doc/guix.texi:10189
 #, no-wrap
 msgid "guix build @var{options} @var{package-or-derivation}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7629
+#: guix-git/doc/guix.texi:10194
 msgid "As an example, the following command builds the latest versions of Emacs and of Guile, displays their build logs, and finally displays the resulting directories:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7632
+#: guix-git/doc/guix.texi:10197
 #, no-wrap
 msgid "guix build emacs guile\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7635
+#: guix-git/doc/guix.texi:10200
 msgid "Similarly, the following command builds all the available packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7639
+#: guix-git/doc/guix.texi:10204
 #, no-wrap
 msgid ""
 "guix build --quiet --keep-going \\\n"
-"  `guix package -A | cut -f1,2 --output-delimiter=@@`\n"
+"  $(guix package -A | cut -f1,2 --output-delimiter=@@)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7647
+#: guix-git/doc/guix.texi:10212
 msgid "@var{package-or-derivation} may be either the name of a package found in the software distribution such as @code{coreutils} or @code{coreutils@@8.20}, or a derivation such as @file{/gnu/store/@dots{}-coreutils-8.19.drv}.  In the former case, a package with the corresponding name (and optionally version) is searched for among the GNU distribution modules (@pxref{Package Modules})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7652
-msgid "Alternatively, the @code{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful when disambiguating among several same-named packages or package variants is needed."
+#: guix-git/doc/guix.texi:10217
+msgid "Alternatively, the @option{--expression} option may be used to specify a Scheme expression that evaluates to a package; this is useful when disambiguating among several same-named packages or package variants is needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7655
+#: guix-git/doc/guix.texi:10220
 msgid "There may be zero or more @var{options}.  The available options are described in the subsections below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7670
+#: guix-git/doc/guix.texi:10235
 msgid "A number of options that control the build process are common to @command{guix build} and other commands that can spawn builds, such as @command{guix package} or @command{guix archive}.  These are the following:"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:7673
-#, no-wrap
-msgid "--load-path=@var{directory}"
-msgstr ""
-
-#. type: itemx
-#: doc/guix.texi:7674
-#, no-wrap
-msgid "-L @var{directory}"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7677
-msgid "Add @var{directory} to the front of the package module search path (@pxref{Package Modules})."
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:7680
+#: guix-git/doc/guix.texi:10245 guix-git/doc/guix.texi:11976
+#: guix-git/doc/guix.texi:12157 guix-git/doc/guix.texi:12302
+#: guix-git/doc/guix.texi:12556
 msgid "This allows users to define their own packages and make them visible to the command-line tools."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7681
+#: guix-git/doc/guix.texi:10246
 #, no-wrap
 msgid "--keep-failed"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7682
+#: guix-git/doc/guix.texi:10247
 #, no-wrap
 msgid "-K"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7688
+#: guix-git/doc/guix.texi:10253
 msgid "Keep the build tree of failed builds.  Thus, if a build fails, its build tree is kept under @file{/tmp}, in a directory whose name is shown at the end of the build log.  This is useful when debugging build issues.  @xref{Debugging Build Failures}, for tips and tricks on how to debug build issues."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7692
-msgid "This option has no effect when connecting to a remote daemon with a @code{guix://} URI (@pxref{The Store, the @code{GUIX_DAEMON_SOCKET} variable})."
+#: guix-git/doc/guix.texi:10257
+msgid "This option implies @option{--no-offload}, and it has no effect when connecting to a remote daemon with a @code{guix://} URI (@pxref{The Store, the @env{GUIX_DAEMON_SOCKET} variable})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7693
+#: guix-git/doc/guix.texi:10258
 #, no-wrap
 msgid "--keep-going"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7694
+#: guix-git/doc/guix.texi:10259
 #, no-wrap
 msgid "-k"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7697
+#: guix-git/doc/guix.texi:10262
 msgid "Keep going when some of the derivations fail to build; return only once all the builds have either completed or failed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7700
+#: guix-git/doc/guix.texi:10265
 msgid "The default behavior is to stop as soon as one of the specified derivations has failed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7704
+#: guix-git/doc/guix.texi:10269
 msgid "Do not build the derivations."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:7706
+#: guix-git/doc/guix.texi:10271
 msgid "fallback-option"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7706
+#: guix-git/doc/guix.texi:10271
 #, no-wrap
 msgid "--fallback"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7709
+#: guix-git/doc/guix.texi:10274
 msgid "When substituting a pre-built binary fails, fall back to building packages locally (@pxref{Substitution Failure})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:7715
+#: guix-git/doc/guix.texi:10280
 msgid "client-substitute-urls"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7715
+#: guix-git/doc/guix.texi:10280
 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs, overriding the default list of URLs of @command{guix-daemon} (@pxref{daemon-substitute-urls,, @command{guix-daemon} URLs})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7719
+#: guix-git/doc/guix.texi:10284
 msgid "This means that substitutes may be downloaded from @var{urls}, provided they are signed by a key authorized by the system administrator (@pxref{Substitutes})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7722
+#: guix-git/doc/guix.texi:10287
 msgid "When @var{urls} is the empty string, substitutes are effectively disabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7728
+#: guix-git/doc/guix.texi:10293
 #, no-wrap
 msgid "--no-grafts"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7732
+#: guix-git/doc/guix.texi:10297
 msgid "Do not ``graft'' packages.  In practice, this means that package updates available as grafts are not applied.  @xref{Security Updates}, for more information on grafts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7733
+#: guix-git/doc/guix.texi:10298
 #, no-wrap
 msgid "--rounds=@var{n}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7736
+#: guix-git/doc/guix.texi:10301
 msgid "Build each derivation @var{n} times in a row, and raise an error if consecutive build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7741
+#: guix-git/doc/guix.texi:10306
 msgid "This is a useful way to detect non-deterministic builds processes.  Non-deterministic build processes are a problem because they make it practically impossible for users to @emph{verify} whether third-party binaries are genuine.  @xref{Invoking guix challenge}, for more."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7747
-msgid "Note that, currently, the differing build results are not kept around, so you will have to manually investigate in case of an error---e.g., by stashing one of the build results with @code{guix archive --export} (@pxref{Invoking guix archive}), then rebuilding, and finally comparing the two results."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7752
-msgid "Do not attempt to offload builds @i{via} the ``build hook'' of the daemon (@pxref{Daemon Offload Setup}).  That is, always build things locally instead of offloading builds to remote machines."
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:7759
-msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--max-silent-time}})."
+#: guix-git/doc/guix.texi:10322
+msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @option{--max-silent-time}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7766
-msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @code{--timeout}})."
+#: guix-git/doc/guix.texi:10329
+msgid "By default, the daemon's setting is honored (@pxref{Invoking guix-daemon, @option{--timeout}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7769
+#: guix-git/doc/guix.texi:10332
 #, no-wrap
 msgid "verbosity, of the command-line tools"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7770
+#: guix-git/doc/guix.texi:10333
 #, no-wrap
 msgid "build logs, verbosity"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7771
+#: guix-git/doc/guix.texi:10334
 #, no-wrap
 msgid "-v @var{level}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7772
+#: guix-git/doc/guix.texi:10335
 #, no-wrap
 msgid "--verbosity=@var{level}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7776
-msgid "Use the given verbosity @var{level}, an integer.  Choosing 0 means that no output is produced, 1 is for quiet output, and 2 shows all the build log output on standard error."
+#: guix-git/doc/guix.texi:10340
+msgid "Use the given verbosity @var{level}, an integer.  Choosing 0 means that no output is produced, 1 is for quiet output; 2 is similar to 1 but it additionally displays download URLs; 3 shows all the build log output on standard error."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7781
+#: guix-git/doc/guix.texi:10345
 msgid "Allow the use of up to @var{n} CPU cores for the build.  The special value @code{0} means to use as many CPU cores as available."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7787
-msgid "Allow at most @var{n} build jobs in parallel.  @xref{Invoking guix-daemon, @code{--max-jobs}}, for details about this option and the equivalent @command{guix-daemon} option."
+#: guix-git/doc/guix.texi:10351
+msgid "Allow at most @var{n} build jobs in parallel.  @xref{Invoking guix-daemon, @option{--max-jobs}}, for details about this option and the equivalent @command{guix-daemon} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7788
+#: guix-git/doc/guix.texi:10352
 #, no-wrap
 msgid "--debug=@var{level}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7792
+#: guix-git/doc/guix.texi:10356
 msgid "Produce debugging output coming from the build daemon.  @var{level} must be an integer between 0 and 5; higher means more verbose output.  Setting a level of 4 or more may be helpful when debugging setup issues with the build daemon."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7799
+#: guix-git/doc/guix.texi:10363
 msgid "Behind the scenes, @command{guix build} is essentially an interface to the @code{package-derivation} procedure of the @code{(guix packages)} module, and to the @code{build-derivations} procedure of the @code{(guix derivations)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7803
-msgid "In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support building honor the @code{GUIX_BUILD_OPTIONS} environment variable."
+#: guix-git/doc/guix.texi:10367
+msgid "In addition to options explicitly passed on the command line, @command{guix build} and other @command{guix} commands that support building honor the @env{GUIX_BUILD_OPTIONS} environment variable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7804
+#: guix-git/doc/guix.texi:10368
 #, no-wrap
 msgid "{Environment Variable} GUIX_BUILD_OPTIONS"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7809
+#: guix-git/doc/guix.texi:10373
 msgid "Users can define this variable to a list of command line options that will automatically be used by @command{guix build} and other @command{guix} commands that can perform builds, as in the example below:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7812
+#: guix-git/doc/guix.texi:10376
 #, no-wrap
 msgid "$ export GUIX_BUILD_OPTIONS=\"--no-substitutes -c 2 -L /foo/bar\"\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:7816
+#: guix-git/doc/guix.texi:10380
 msgid "These options are parsed independently, and the result is appended to the parsed command-line options."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7822
+#: guix-git/doc/guix.texi:10386
 #, no-wrap
 msgid "package variants"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:7830
+#: guix-git/doc/guix.texi:10394
 msgid "Another set of command-line options supported by @command{guix build} and also @command{guix package} are @dfn{package transformation options}.  These are options that make it possible to define @dfn{package variants}---for instance, packages built from different source code.  This is a convenient way to create customized packages on the fly without having to type in the definitions of package variants (@pxref{Defining Packages})."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:10398
+msgid "Package transformation options are preserved across upgrades: @command{guix upgrade} attempts to apply transformation options initially used when creating the profile to the upgraded packages."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10403
+msgid "The available options are listed below.  Most commands support them and also support a @option{--help-transform} option that lists all the available options and a synopsis (these options are not shown in the @option{--help} output for brevity)."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:7833
+#: guix-git/doc/guix.texi:10406
 #, no-wrap
 msgid "--with-source=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7834
+#: guix-git/doc/guix.texi:10407
 #, no-wrap
 msgid "--with-source=@var{package}=@var{source}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:7835
+#: guix-git/doc/guix.texi:10408
 #, no-wrap
 msgid "--with-source=@var{package}@@@var{version}=@var{source}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7840
+#: guix-git/doc/guix.texi:10413
 msgid "Use @var{source} as the source of @var{package}, and @var{version} as its version number.  @var{source} must be a file name or a URL, as for @command{guix download} (@pxref{Invoking guix download})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7846
+#: guix-git/doc/guix.texi:10419
 msgid "When @var{package} is omitted, it is taken to be the package name specified on the command line that matches the base of @var{source}---e.g., if @var{source} is @code{/src/guile-2.0.10.tar.gz}, the corresponding package is @code{guile}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7849
+#: guix-git/doc/guix.texi:10422
 msgid "Likewise, when @var{version} is omitted, the version string is inferred from @var{source}; in the previous example, it is @code{2.0.10}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7854
+#: guix-git/doc/guix.texi:10427
 msgid "This option allows users to try out versions of packages other than the one provided by the distribution.  The example below downloads @file{ed-1.7.tar.gz} from a GNU mirror and uses that as the source for the @code{ed} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7857
+#: guix-git/doc/guix.texi:10430
 #, no-wrap
 msgid "guix build ed --with-source=mirror://gnu/ed/ed-1.7.tar.gz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7861
-msgid "As a developer, @code{--with-source} makes it easy to test release candidates:"
+#: guix-git/doc/guix.texi:10434
+msgid "As a developer, @option{--with-source} makes it easy to test release candidates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7864
+#: guix-git/doc/guix.texi:10437
 #, no-wrap
 msgid "guix build guile --with-source=../guile-2.0.9.219-e1bb7.tar.xz\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7867
+#: guix-git/doc/guix.texi:10440
 msgid "@dots{} or to build from a checkout in a pristine environment:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7871
+#: guix-git/doc/guix.texi:10444
 #, no-wrap
 msgid ""
 "$ git clone git://git.sv.gnu.org/guix.git\n"
@@ -14171,94 +19073,186 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7873
+#: guix-git/doc/guix.texi:10446
 #, no-wrap
 msgid "--with-input=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7878
+#: guix-git/doc/guix.texi:10451
 msgid "Replace dependency on @var{package} by a dependency on @var{replacement}.  @var{package} must be a package name, and @var{replacement} must be a package specification such as @code{guile} or @code{guile@@1.8}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7882
+#: guix-git/doc/guix.texi:10455
 msgid "For instance, the following command builds Guix, but replaces its dependency on the current stable version of Guile with a dependency on the legacy version of Guile, @code{guile@@2.0}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7885
+#: guix-git/doc/guix.texi:10458
 #, no-wrap
 msgid "guix build --with-input=guile=guile@@2.0 guix\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7890
+#: guix-git/doc/guix.texi:10463
 msgid "This is a recursive, deep replacement.  So in this example, both @code{guix} and its dependency @code{guile-json} (which also depends on @code{guile}) get rebuilt against @code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7893
+#: guix-git/doc/guix.texi:10466
 msgid "This is implemented using the @code{package-input-rewriting} Scheme procedure (@pxref{Defining Packages, @code{package-input-rewriting}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7894
+#: guix-git/doc/guix.texi:10467
 #, no-wrap
 msgid "--with-graft=@var{package}=@var{replacement}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7900
-msgid "This is similar to @code{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, @var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}.  @xref{Security Updates}, for more information on grafts."
+#: guix-git/doc/guix.texi:10473
+msgid "This is similar to @option{--with-input} but with an important difference: instead of rebuilding the whole dependency chain, @var{replacement} is built and then @dfn{grafted} onto the binaries that were initially referring to @var{package}.  @xref{Security Updates}, for more information on grafts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7904
+#: guix-git/doc/guix.texi:10477
 msgid "For example, the command below grafts version 3.5.4 of GnuTLS onto Wget and all its dependencies, replacing references to the version of GnuTLS they currently refer to:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7907
+#: guix-git/doc/guix.texi:10480
 #, no-wrap
 msgid "guix build --with-graft=gnutls=gnutls@@3.5.4 wget\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7916
+#: guix-git/doc/guix.texi:10489
 msgid "This has the advantage of being much faster than rebuilding everything.  But there is a caveat: it works if and only if @var{package} and @var{replacement} are strictly compatible---for example, if they provide a library, the application binary interface (ABI) of those libraries must be compatible.  If @var{replacement} is somehow incompatible with @var{package}, then the resulting package may be unusable.  Use with care!"
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:10490 guix-git/doc/guix.texi:34534
+#, no-wrap
+msgid "debugging info, rebuilding"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:10491
+#, no-wrap
+msgid "--with-debug-info=@var{package}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10496
+msgid "Build @var{package} in a way that preserves its debugging info and graft it onto packages that depend on it.  This is useful if @var{package} does not already provide debugging info as a @code{debug} output (@pxref{Installing Debugging Files})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10502
+msgid "For example, suppose you're experiencing a crash in Inkscape and would like to see what's up in GLib, a library deep down in Inkscape's dependency graph.  GLib lacks a @code{debug} output, so debugging is tough.  Fortunately, you rebuild GLib with debugging info and tack it on Inkscape:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10505 guix-git/doc/guix.texi:34565
+#, no-wrap
+msgid "guix install inkscape --with-debug-info=glib\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10509
+msgid "Only GLib needs to be recompiled so this takes a reasonable amount of time.  @xref{Installing Debugging Files}, for more info."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:10515
+msgid "Under the hood, this option works by passing the @samp{#:strip-binaries? #f} to the build system of the package of interest (@pxref{Build Systems}).  Most build systems support that option but some do not.  In that case, an error is raised."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:10519
+msgid "Likewise, if a C/C++ package is built without @code{-g} (which is rarely the case), debugging info will remain unavailable even when @code{#:strip-binaries?} is false."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:10521
+#, no-wrap
+msgid "tool chain, changing the build tool chain of a package"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:10522
+#, no-wrap
+msgid "--with-c-toolchain=@var{package}=@var{toolchain}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10526
+msgid "This option changes the compilation of @var{package} and everything that depends on it so that they get built with @var{toolchain} instead of the default GNU tool chain for C/C++."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10533
+#, no-wrap
+msgid ""
+"guix build octave-cli \\\n"
+"  --with-c-toolchain=fftw=gcc-toolchain@@10 \\\n"
+"  --with-c-toolchain=fftwf=gcc-toolchain@@10\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10540
+msgid "The command above builds a variant of the @code{fftw} and @code{fftwf} packages using version 10 of @code{gcc-toolchain} instead of the default tool chain, and then builds a variant of the GNU@tie{}Octave command-line interface using them.  GNU@tie{}Octave itself is also built with @code{gcc-toolchain@@10}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10544
+msgid "This other example builds the Hardware Locality (@code{hwloc}) library and its dependents up to @code{intel-mpi-benchmarks} with the Clang C compiler:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10548
+#, no-wrap
+msgid ""
+"guix build --with-c-toolchain=hwloc=clang-toolchain \\\n"
+"           intel-mpi-benchmarks\n"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:10557
+msgid "There can be application binary interface (ABI) incompatibilities among tool chains.  This is particularly true of the C++ standard library and run-time support libraries such as that of OpenMP@.  By rebuilding all dependents with the same tool chain, @option{--with-c-toolchain} minimizes the risks of incompatibility but cannot entirely eliminate them.  Choose @var{package} wisely."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:7917
+#: guix-git/doc/guix.texi:10559
 #, no-wrap
 msgid "--with-git-url=@var{package}=@var{url}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7918
+#: guix-git/doc/guix.texi:10560
 #, no-wrap
 msgid "Git, using the latest commit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7919
+#: guix-git/doc/guix.texi:10561
 #, no-wrap
 msgid "latest commit, building"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7923
+#: guix-git/doc/guix.texi:10565
 msgid "Build @var{package} from the latest commit of the @code{master} branch of the Git repository at @var{url}.  Git sub-modules of the repository are fetched, recursively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7926
+#: guix-git/doc/guix.texi:10568
 msgid "For example, the following command builds the NumPy Python library against the latest commit of the master branch of Python itself:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7930
+#: guix-git/doc/guix.texi:10572
 #, no-wrap
 msgid ""
 "guix build python-numpy \\\n"
@@ -14266,179 +19260,329 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7934
-msgid "This option can also be combined with @code{--with-branch} or @code{--with-commit} (see below)."
+#: guix-git/doc/guix.texi:10576
+msgid "This option can also be combined with @option{--with-branch} or @option{--with-commit} (see below)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:7935 doc/guix.texi:20626
+#: guix-git/doc/guix.texi:10577 guix-git/doc/guix.texi:27233
 #, no-wrap
 msgid "continuous integration"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7941
+#: guix-git/doc/guix.texi:10583
 msgid "Obviously, since it uses the latest commit of the given branch, the result of such a command varies over time.  Nevertheless it is a convenient way to rebuild entire software stacks against the latest commit of one or more packages.  This is particularly useful in the context of continuous integration (CI)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7945
+#: guix-git/doc/guix.texi:10587
 msgid "Checkouts are kept in a cache under @file{~/.cache/guix/checkouts} to speed up consecutive accesses to the same repository.  You may want to clean it up once in a while to save disk space."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7946
+#: guix-git/doc/guix.texi:10588
 #, no-wrap
 msgid "--with-branch=@var{package}=@var{branch}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7952
-msgid "Build @var{package} from the latest commit of @var{branch}.  If the @code{source} field of @var{package} is an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object, the repository URL is taken from that @code{source}.  Otherwise you have to use @code{--with-git-url} to specify the URL of the Git repository."
+#: guix-git/doc/guix.texi:10594
+msgid "Build @var{package} from the latest commit of @var{branch}.  If the @code{source} field of @var{package} is an origin with the @code{git-fetch} method (@pxref{origin Reference}) or a @code{git-checkout} object, the repository URL is taken from that @code{source}.  Otherwise you have to use @option{--with-git-url} to specify the URL of the Git repository."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7957
+#: guix-git/doc/guix.texi:10599
 msgid "For instance, the following command builds @code{guile-sqlite3} from the latest commit of its @code{master} branch, and then builds @code{guix} (which depends on it) and @code{cuirass} (which depends on @code{guix}) against this specific @code{guile-sqlite3} build:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:7960
+#: guix-git/doc/guix.texi:10602
 #, no-wrap
 msgid "guix build --with-branch=guile-sqlite3=master cuirass\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7962
+#: guix-git/doc/guix.texi:10604
 #, no-wrap
 msgid "--with-commit=@var{package}=@var{commit}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7966
-msgid "This is similar to @code{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch.  @var{commit} must be a valid Git commit SHA1 identifier."
+#: guix-git/doc/guix.texi:10608
+msgid "This is similar to @option{--with-branch}, except that it builds from @var{commit} rather than the tip of a branch.  @var{commit} must be a valid Git commit SHA1 identifier or a tag."
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:7973
-msgid "The command-line options presented below are specific to @command{guix build}."
+#. type: item
+#: guix-git/doc/guix.texi:10609
+#, no-wrap
+msgid "--with-patch=@var{package}=@var{file}"
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:10616
+msgid "Add @var{file} to the list of patches applied to @var{package}, where @var{package} is a spec such as @code{python@@3.8} or @code{glibc}.  @var{file} must contain a patch; it is applied with the flags specified in the @code{origin} of @var{package} (@pxref{origin Reference}), which by default includes @code{-p1} (@pxref{patch Directories,,, diffutils, Comparing and Merging Files})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10619
+msgid "As an example, the command below rebuilds Coreutils with the GNU C Library (glibc) patched with the given patch:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10622
+#, no-wrap
+msgid "guix build coreutils --with-patch=glibc=./glibc-frob.patch\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10626
+msgid "In this example, glibc itself as well as everything that leads to Coreutils in the dependency graph is rebuilt."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:10627
+#, fuzzy, no-wrap
+#| msgid "package version"
+msgid "upstream, latest version"
+msgstr "软件包版本"
+
 #. type: item
-#: doc/guix.texi:7976
+#: guix-git/doc/guix.texi:10628
+#, fuzzy, no-wrap
+#| msgid "--log-compression=@var{type}"
+msgid "--with-latest=@var{package}"
+msgstr "--log-compression=@var{type}"
+
+#. type: table
+#: guix-git/doc/guix.texi:10633
+msgid "So you like living on the bleeding edge? This option is for you! It replaces occurrences of @var{package} in the dependency graph with its latest upstream version, as reported by @command{guix refresh} (@pxref{Invoking guix refresh})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10637
+msgid "It does so by determining the latest upstream release of @var{package} (if possible), downloading it, and authenticating it @emph{if} it comes with an OpenPGP signature."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10640
+msgid "As an example, the command below builds Guix against the latest version of Guile-JSON:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10643
 #, no-wrap
-msgid "--quiet"
+msgid "guix build guix --with-latest=guile-json\n"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:7977
+#. type: table
+#: guix-git/doc/guix.texi:10652
+msgid "There are limitations.  First, in cases where the tool cannot or does not know how to authenticate source code, you are at risk of running malicious code; a warning is emitted in this case.  Second, this option simply changes the source used in the existing package definitions, which is not always sufficient: there might be additional dependencies that need to be added, patches to apply, and more generally the quality assurance work that Guix developers normally do will be missing."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10657
+msgid "You've been warned! In all the other cases, it's a snappy way to stay on top.  We encourage you to submit patches updating the actual package definitions once you have successfully tested an upgrade (@pxref{Contributing})."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:10658
+#, fuzzy, no-wrap
+#| msgid "test suite"
+msgid "test suite, skipping"
+msgstr "测试套件"
+
+#. type: item
+#: guix-git/doc/guix.texi:10659
 #, no-wrap
-msgid "-q"
+msgid "--without-tests=@var{package}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10665
+msgid "Build @var{package} without running its tests.  This can be useful in situations where you want to skip the lengthy test suite of a intermediate package, or if a package's test suite fails in a non-deterministic fashion.  It should be used with care because running the test suite is a good way to ensure a package is working as intended."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7981
-msgid "Build quietly, without displaying the build log; this is equivalent to @code{--verbosity=0}.  Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option."
+#: guix-git/doc/guix.texi:10669
+msgid "Turning off tests leads to a different store item.  Consequently, when using this option, anything that depends on @var{package} must be rebuilt, as in this example:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:10672
+#, no-wrap
+msgid "guix install --without-tests=python python-notebook\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10678
+msgid "The command above installs @code{python-notebook} on top of @code{python} built without running its test suite.  To do so, it also rebuilds everything that depends on @code{python}, including @code{python-notebook} itself."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10684
+msgid "Internally, @option{--without-tests} relies on changing the @code{#:tests?} option of a package's @code{check} phase (@pxref{Build Systems}).  Note that some packages use a customized @code{check} phase that does not respect a @code{#:tests? #f} setting.  Therefore, @option{--without-tests} has no effect on these packages."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10691
+msgid "Wondering how to achieve the same effect using Scheme code, for example in your manifest, or how to write your own package transformation? @xref{Defining Package Variants}, for an overview of the programming interfaces available."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:10697
+msgid "The command-line options presented below are specific to @command{guix build}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:7982
+#: guix-git/doc/guix.texi:10700
+#, no-wrap
+msgid "--quiet"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10705
+msgid "Build quietly, without displaying the build log; this is equivalent to @option{--verbosity=0}.  Upon completion, the build log is kept in @file{/var} (or similar) and can always be retrieved using the @option{--log-file} option."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:10706
 #, no-wrap
 msgid "--file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7986
+#: guix-git/doc/guix.texi:10710
 msgid "Build the package, derivation, or other file-like object that the code within @var{file} evaluates to (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7989
+#: guix-git/doc/guix.texi:10713
 msgid "As an example, @var{file} might contain a package definition like this (@pxref{Defining Packages}):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:7997
+#: guix-git/doc/guix.texi:10722
+msgid "The @var{file} may also contain a JSON representation of one or more package definitions.  Running @code{guix build -f} on @file{hello.json} with the following contents would result in building the packages @code{myhello} and @code{greeter}:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:10727
+#, fuzzy, no-wrap
+#| msgid "--listen=@var{endpoint}"
+msgid "--manifest=@var{manifest}"
+msgstr "--listen=@var{endpoint}"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:10728
+#, fuzzy, no-wrap
+#| msgid "-c @var{n}"
+msgid "-m @var{manifest}"
+msgstr "-c @var{n}"
+
+#. type: table
+#: guix-git/doc/guix.texi:10731
+msgid "Build all packages listed in the given @var{manifest} (@pxref{profile-manifest, @option{--manifest}})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10735
 msgid "Build the package or derivation @var{expr} evaluates to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8001
+#: guix-git/doc/guix.texi:10739
 msgid "For example, @var{expr} may be @code{(@@ (gnu packages guile)  guile-1.8)}, which unambiguously designates this specific variant of version 1.8 of Guile."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8005
+#: guix-git/doc/guix.texi:10743
 msgid "Alternatively, @var{expr} may be a G-expression, in which case it is used as a build program passed to @code{gexp->derivation} (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8009
+#: guix-git/doc/guix.texi:10747
 msgid "Lastly, @var{expr} may refer to a zero-argument monadic procedure (@pxref{The Store Monad}).  The procedure must return a derivation as a monadic value, which is then passed through @code{run-with-store}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8010
+#: guix-git/doc/guix.texi:10748
 #, no-wrap
 msgid "--source"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8011
+#: guix-git/doc/guix.texi:10749
 #, no-wrap
 msgid "-S"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8014
+#: guix-git/doc/guix.texi:10752
 msgid "Build the source derivations of the packages, rather than the packages themselves."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8018
+#: guix-git/doc/guix.texi:10756
 msgid "For instance, @code{guix build -S gcc} returns something like @file{/gnu/store/@dots{}-gcc-4.7.2.tar.bz2}, which is the GCC source tarball."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8022
+#: guix-git/doc/guix.texi:10760
 msgid "The returned source tarball is the result of applying any patches and code snippets specified in the package @code{origin} (@pxref{Defining Packages})."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:10761
+#, no-wrap
+msgid "source, verification"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10767
+msgid "As with other derivations, the result of building a source derivation can be verified using the @option{--check} option (@pxref{build-check}).  This is useful to validate that a (potentially already built or substituted, thus cached) package source matches against its declared hash."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:10772
+msgid "Note that @command{guix build -S} compiles the sources only of the specified packages.  They do not include the sources of statically linked dependencies and by themselves are insufficient for reproducing the packages."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:8023
+#: guix-git/doc/guix.texi:10773
 #, no-wrap
 msgid "--sources"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8030
-msgid "Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively.  This is a handy way to obtain a local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network access.  It is an extension of the @code{--source} option and can accept one of the following optional argument values:"
+#: guix-git/doc/guix.texi:10780
+msgid "Fetch and return the source of @var{package-or-derivation} and all their dependencies, recursively.  This is a handy way to obtain a local copy of all the source code needed to build @var{packages}, allowing you to eventually build them even without network access.  It is an extension of the @option{--source} option and can accept one of the following optional argument values:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8032 doc/guix.texi:9394
+#: guix-git/doc/guix.texi:10782 guix-git/doc/guix.texi:12356
 #, no-wrap
 msgid "package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8035
-msgid "This value causes the @code{--sources} option to behave in the same way as the @code{--source} option."
+#: guix-git/doc/guix.texi:10785
+msgid "This value causes the @option{--sources} option to behave in the same way as the @option{--source} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8036 doc/guix.texi:13887
+#: guix-git/doc/guix.texi:10786 guix-git/doc/guix.texi:18302
 #, no-wrap
 msgid "all"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8039
+#: guix-git/doc/guix.texi:10789
 msgid "Build the source derivations of all packages, including any source that might be listed as @code{inputs}.  This is the default value."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8045
+#: guix-git/doc/guix.texi:10795
 #, no-wrap
 msgid ""
 "$ guix build --sources tzdata\n"
@@ -14448,18 +19592,18 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8047
+#: guix-git/doc/guix.texi:10797
 #, no-wrap
 msgid "transitive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8051
+#: guix-git/doc/guix.texi:10801
 msgid "Build the source derivations of all packages, as well of all transitive inputs to the packages.  This can be used e.g.@: to prefetch package source for later offline building."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8062
+#: guix-git/doc/guix.texi:10812
 #, no-wrap
 msgid ""
 "$ guix build --sources=transitive tzdata\n"
@@ -14474,212 +19618,206 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8072
+#: guix-git/doc/guix.texi:10822
 msgid "Attempt to build for @var{system}---e.g., @code{i686-linux}---instead of the system type of the build host.  The @command{guix build} command allows you to repeat this option several times, in which case it builds for all the specified systems; other commands ignore extraneous @option{-s} options."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8077
-msgid "The @code{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation.  See @code{--target} below for information on cross-compilation."
+#: guix-git/doc/guix.texi:10827
+msgid "The @option{--system} flag is for @emph{native} compilation and must not be confused with cross-compilation.  See @option{--target} below for information on cross-compilation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8084
-msgid "An example use of this is on Linux-based systems, which can emulate different personalities.  For instance, passing @code{--system=i686-linux} on an @code{x86_64-linux} system or @code{--system=armhf-linux} on an @code{aarch64-linux} system allows you to build packages in a complete 32-bit environment."
+#: guix-git/doc/guix.texi:10834
+msgid "An example use of this is on Linux-based systems, which can emulate different personalities.  For instance, passing @option{--system=i686-linux} on an @code{x86_64-linux} system or @option{--system=armhf-linux} on an @code{aarch64-linux} system allows you to build packages in a complete 32-bit environment."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:8089
+#: guix-git/doc/guix.texi:10839
 msgid "Building for an @code{armhf-linux} system is unconditionally enabled on @code{aarch64-linux} machines, although certain aarch64 chipsets do not allow for this functionality, notably the ThunderX."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8095
+#: guix-git/doc/guix.texi:10845
 msgid "Similarly, when transparent emulation with QEMU and @code{binfmt_misc} is enabled (@pxref{Virtualization Services, @code{qemu-binfmt-service-type}}), you can build for any system for which a QEMU @code{binfmt_misc} handler is installed."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8099
+#: guix-git/doc/guix.texi:10849
 msgid "Builds for a system other than that of the machine you are using can also be offloaded to a remote machine of the right architecture.  @xref{Daemon Offload Setup}, for more information on offloading."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8105
-msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"mips64el-linux-gnu\"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})."
+#: guix-git/doc/guix.texi:10855
+msgid "Cross-build for @var{triplet}, which must be a valid GNU triplet, such as @code{\"aarch64-linux-gnu\"} (@pxref{Specifying Target Triplets, GNU configuration triplets,, autoconf, Autoconf})."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:8107
+#: guix-git/doc/guix.texi:10857
 msgid "build-check"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8107
+#: guix-git/doc/guix.texi:10857
 #, no-wrap
 msgid "--check"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8108
+#: guix-git/doc/guix.texi:10858
 #, no-wrap
 msgid "determinism, checking"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8109
+#: guix-git/doc/guix.texi:10859
 #, no-wrap
 msgid "reproducibility, checking"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8113
+#: guix-git/doc/guix.texi:10863
 msgid "Rebuild @var{package-or-derivation}, which are already available in the store, and raise an error if the build results are not bit-for-bit identical."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8118
+#: guix-git/doc/guix.texi:10868
 msgid "This mechanism allows you to check whether previously installed substitutes are genuine (@pxref{Substitutes}), or whether the build result of a package is deterministic.  @xref{Invoking guix challenge}, for more background information and tools."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8123
+#: guix-git/doc/guix.texi:10873
 #, no-wrap
 msgid "--repair"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8124
+#: guix-git/doc/guix.texi:10874
 #, no-wrap
 msgid "repairing store items"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8128
+#: guix-git/doc/guix.texi:10878
 msgid "Attempt to repair the specified store items, if they are corrupt, by re-downloading or rebuilding them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8130
+#: guix-git/doc/guix.texi:10880
 msgid "This operation is not atomic and thus restricted to @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8131
+#: guix-git/doc/guix.texi:10881
 #, no-wrap
 msgid "--derivations"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:8132 doc/guix.texi:24561
-#, no-wrap
-msgid "-d"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:8135
+#: guix-git/doc/guix.texi:10885
 msgid "Return the derivation paths, not the output paths, of the given packages."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8138
+#: guix-git/doc/guix.texi:10888
 #, no-wrap
 msgid "GC roots, adding"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8139
+#: guix-git/doc/guix.texi:10889
 #, no-wrap
 msgid "garbage collector roots, adding"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8142 doc/guix.texi:24592
+#: guix-git/doc/guix.texi:10892 guix-git/doc/guix.texi:33222
 msgid "Make @var{file} a symlink to the result, and register it as a garbage collector root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8148
+#: guix-git/doc/guix.texi:10898
 msgid "Consequently, the results of this @command{guix build} invocation are protected from garbage collection until @var{file} is removed.  When that option is omitted, build results are eligible for garbage collection as soon as the build completes.  @xref{Invoking guix gc}, for more on GC roots."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8149
+#: guix-git/doc/guix.texi:10899
 #, no-wrap
 msgid "--log-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8150
+#: guix-git/doc/guix.texi:10900
 #, no-wrap
 msgid "build logs, access"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8154
+#: guix-git/doc/guix.texi:10904
 msgid "Return the build log file names or URLs for the given @var{package-or-derivation}, or raise an error if build logs are missing."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8157
+#: guix-git/doc/guix.texi:10907
 msgid "This works regardless of how packages or derivations are specified.  For instance, the following invocations are equivalent:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8163
+#: guix-git/doc/guix.texi:10913
 #, no-wrap
 msgid ""
-"guix build --log-file `guix build -d guile`\n"
-"guix build --log-file `guix build guile`\n"
+"guix build --log-file $(guix build -d guile)\n"
+"guix build --log-file $(guix build guile)\n"
 "guix build --log-file guile\n"
 "guix build --log-file -e '(@@ (gnu packages guile) guile-2.0)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8168
-msgid "If a log is unavailable locally, and unless @code{--no-substitutes} is passed, the command looks for a corresponding log on one of the substitute servers (as specified with @code{--substitute-urls}.)"
+#: guix-git/doc/guix.texi:10918
+msgid "If a log is unavailable locally, and unless @option{--no-substitutes} is passed, the command looks for a corresponding log on one of the substitute servers (as specified with @option{--substitute-urls})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8171
+#: guix-git/doc/guix.texi:10921
 msgid "So for instance, imagine you want to see the build log of GDB on MIPS, but you are actually on an @code{x86_64} machine:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8175
+#: guix-git/doc/guix.texi:10925
 #, no-wrap
 msgid ""
-"$ guix build --log-file gdb -s mips64el-linux\n"
+"$ guix build --log-file gdb -s aarch64-linux\n"
 "https://@value{SUBSTITUTE-SERVER}/log/@dots{}-gdb-7.10\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8178
+#: guix-git/doc/guix.texi:10928
 msgid "You can freely access a huge library of build logs!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8183
+#: guix-git/doc/guix.texi:10933
 #, no-wrap
 msgid "build failures, debugging"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8189
+#: guix-git/doc/guix.texi:10939
 msgid "When defining a new package (@pxref{Defining Packages}), you will probably find yourself spending some time debugging and tweaking the build until it succeeds.  To do that, you need to operate the build commands yourself in an environment as close as possible to the one the build daemon uses."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8194
-msgid "To that end, the first thing to do is to use the @option{--keep-failed} or @option{-K} option of @command{guix build}, which will keep the failed build tree in @file{/tmp} or whatever directory you specified as @code{TMPDIR} (@pxref{Invoking guix build, @code{--keep-failed}})."
+#: guix-git/doc/guix.texi:10944
+msgid "To that end, the first thing to do is to use the @option{--keep-failed} or @option{-K} option of @command{guix build}, which will keep the failed build tree in @file{/tmp} or whatever directory you specified as @env{TMPDIR} (@pxref{Common Build Options, @option{--keep-failed}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8200
+#: guix-git/doc/guix.texi:10950
 msgid "From there on, you can @command{cd} to the failed build tree and source the @file{environment-variables} file, which contains all the environment variable definitions that were in place when the build failed.  So let's say you're debugging a build failure in package @code{foo}; a typical session would look like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8207
+#: guix-git/doc/guix.texi:10957
 #, no-wrap
 msgid ""
 "$ guix build foo -K\n"
@@ -14690,22 +19828,22 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8211
+#: guix-git/doc/guix.texi:10961
 msgid "Now, you can invoke commands as if you were the daemon (almost) and troubleshoot your build process."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8217
+#: guix-git/doc/guix.texi:10967
 msgid "Sometimes it happens that, for example, a package's tests pass when you run them manually but they fail when the daemon runs them.  This can happen because the daemon runs builds in containers where, unlike in our environment above, network access is missing, @file{/bin/sh} does not exist, etc. (@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8220
+#: guix-git/doc/guix.texi:10970
 msgid "In such cases, you may need to run inspect the build process from within a container similar to the one the build daemon creates:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8228
+#: guix-git/doc/guix.texi:10978
 #, no-wrap
 msgid ""
 "$ guix build -K foo\n"
@@ -14717,251 +19855,289 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8237
-msgid "Here, @command{guix environment -C} creates a container and spawns a new shell in it (@pxref{Invoking guix environment}).  The @command{--ad-hoc strace gdb} part adds the @command{strace} and @command{gdb} commands to the container, which would may find handy while debugging.  The @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages (@pxref{Security Updates}, for more info on grafts)."
+#: guix-git/doc/guix.texi:10987
+msgid "Here, @command{guix environment -C} creates a container and spawns a new shell in it (@pxref{Invoking guix environment}).  The @command{--ad-hoc strace gdb} part adds the @command{strace} and @command{gdb} commands to the container, which you may find handy while debugging.  The @option{--no-grafts} option makes sure we get the exact same environment, with ungrafted packages (@pxref{Security Updates}, for more info on grafts)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8240
+#: guix-git/doc/guix.texi:10990
 msgid "To get closer to a container like that used by the build daemon, we can remove @file{/bin/sh}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8243
+#: guix-git/doc/guix.texi:10993
 #, no-wrap
 msgid "[env]# rm /bin/sh\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8247
+#: guix-git/doc/guix.texi:10997
 msgid "(Don't worry, this is harmless: this is all happening in the throw-away container created by @command{guix environment}.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8250
+#: guix-git/doc/guix.texi:11000
 msgid "The @command{strace} command is probably not in the search path, but we can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8253
+#: guix-git/doc/guix.texi:11003
 #, no-wrap
 msgid "[env]# $GUIX_ENVIRONMENT/bin/strace -f -o log make check\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8258
+#: guix-git/doc/guix.texi:11008
 msgid "In this way, not only you will have reproduced the environment variables the daemon uses, you will also be running the build process in a container similar to the one the daemon uses."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8261
+#: guix-git/doc/guix.texi:11011
 #, no-wrap
 msgid "Invoking @command{guix edit}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8263
+#: guix-git/doc/guix.texi:11013
 #, no-wrap
 msgid "guix edit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8264
+#: guix-git/doc/guix.texi:11014
 #, no-wrap
 msgid "package definition, editing"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8269
+#: guix-git/doc/guix.texi:11019
 msgid "So many packages, so many source files! The @command{guix edit} command facilitates the life of users and packagers by pointing their editor at the source file containing the definition of the specified packages.  For instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8272
+#: guix-git/doc/guix.texi:11022
 #, no-wrap
 msgid "guix edit gcc@@4.9 vim\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8278
-msgid "launches the program specified in the @code{VISUAL} or in the @code{EDITOR} environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim."
+#: guix-git/doc/guix.texi:11028
+msgid "launches the program specified in the @env{VISUAL} or in the @env{EDITOR} environment variable to view the recipe of GCC@tie{}4.9.3 and that of Vim."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:11034
+msgid "If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @env{GUIX_PACKAGE_PATH} (@pxref{Package Modules}), you will be able to edit the package recipes.  In other cases, you will be able to examine the read-only recipes for packages currently in the store."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8284
-msgid "If you are using a Guix Git checkout (@pxref{Building from Git}), or have created your own packages on @code{GUIX_PACKAGE_PATH} (@pxref{Package Modules}), you will be able to edit the package recipes.  In other cases, you will be able to examine the read-only recipes for packages currently in the store."
+#: guix-git/doc/guix.texi:11039
+msgid "Instead of @env{GUIX_PACKAGE_PATH}, the command-line option @option{--load-path=@var{directory}} (or in short @option{-L @var{directory}}) allows you to add @var{directory} to the front of the package module search path and so make your own packages visible."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8287
+#: guix-git/doc/guix.texi:11041
 #, no-wrap
 msgid "Invoking @command{guix download}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8289
+#: guix-git/doc/guix.texi:11043
 #, no-wrap
 msgid "guix download"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8290
+#: guix-git/doc/guix.texi:11044
 #, no-wrap
 msgid "downloading package sources"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8297
+#: guix-git/doc/guix.texi:11051
 msgid "When writing a package definition, developers typically need to download a source tarball, compute its SHA256 hash, and write that hash in the package definition (@pxref{Defining Packages}).  The @command{guix download} tool helps with this task: it downloads a file from the given URI, adds it to the store, and prints both its file name in the store and its SHA256 hash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8304
+#: guix-git/doc/guix.texi:11058
 msgid "The fact that the downloaded file is added to the store saves bandwidth: when the developer eventually tries to build the newly defined package with @command{guix build}, the source tarball will not have to be downloaded again because it is already in the store.  It is also a convenient way to temporarily stash files, which may be deleted eventually (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8312
+#: guix-git/doc/guix.texi:11066
 msgid "The @command{guix download} command supports the same URIs as used in package definitions.  In particular, it supports @code{mirror://} URIs.  @code{https} URIs (HTTP over TLS) are supported @emph{provided} the Guile bindings for GnuTLS are available in the user's environment; when they are not available, an error is raised.  @xref{Guile Preparations, how to install the GnuTLS bindings for Guile,, gnutls-guile, GnuTLS-Guile}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8317
-msgid "@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory pointed to by the @code{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is used."
+#: guix-git/doc/guix.texi:11071
+msgid "@command{guix download} verifies HTTPS server certificates by loading the certificates of X.509 authorities from the directory pointed to by the @env{SSL_CERT_DIR} environment variable (@pxref{X.509 Certificates}), unless @option{--no-check-certificate} is used."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8319 doc/guix.texi:9636
+#: guix-git/doc/guix.texi:11073 guix-git/doc/guix.texi:12655
 msgid "The following options are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8321 doc/guix.texi:8360
+#: guix-git/doc/guix.texi:11075 guix-git/doc/guix.texi:11119
+#, no-wrap
+msgid "--hash=@var{algorithm}"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:11076 guix-git/doc/guix.texi:11120
+#, no-wrap
+msgid "-H @var{algorithm}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11079
+msgid "Compute a hash using the specified @var{algorithm}.  @xref{Invoking guix hash}, for more information."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11080 guix-git/doc/guix.texi:11129
 #, no-wrap
 msgid "--format=@var{fmt}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8322 doc/guix.texi:8361
+#: guix-git/doc/guix.texi:11081 guix-git/doc/guix.texi:11130
 #, no-wrap
 msgid "-f @var{fmt}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8325
+#: guix-git/doc/guix.texi:11084
 msgid "Write the hash in the format specified by @var{fmt}.  For more information on the valid values for @var{fmt}, @pxref{Invoking guix hash}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8326
+#: guix-git/doc/guix.texi:11085
 #, no-wrap
 msgid "--no-check-certificate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8328
+#: guix-git/doc/guix.texi:11087
 msgid "Do not validate the X.509 certificates of HTTPS servers."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8332
+#: guix-git/doc/guix.texi:11091
 msgid "When using this option, you have @emph{absolutely no guarantee} that you are communicating with the authentic server responsible for the given URL, which makes you vulnerable to ``man-in-the-middle'' attacks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8333
+#: guix-git/doc/guix.texi:11092
 #, no-wrap
 msgid "--output=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8334
+#: guix-git/doc/guix.texi:11093
 #, no-wrap
 msgid "-o @var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8337
+#: guix-git/doc/guix.texi:11096
 msgid "Save the downloaded file to @var{file} instead of adding it to the store."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8340
+#: guix-git/doc/guix.texi:11099
 #, no-wrap
 msgid "Invoking @command{guix hash}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8342
+#: guix-git/doc/guix.texi:11101
 #, no-wrap
 msgid "guix hash"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8347
-msgid "The @command{guix hash} command computes the SHA256 hash of a file.  It is primarily a convenience tool for anyone contributing to the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining Packages})."
+#: guix-git/doc/guix.texi:11106
+msgid "The @command{guix hash} command computes the hash of a file.  It is primarily a convenience tool for anyone contributing to the distribution: it computes the cryptographic hash of a file, which can be used in the definition of a package (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8352
+#: guix-git/doc/guix.texi:11111
 #, no-wrap
 msgid "guix hash @var{option} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8357
+#: guix-git/doc/guix.texi:11116
 msgid "When @var{file} is @code{-} (a hyphen), @command{guix hash} computes the hash of data read from standard input.  @command{guix hash} has the following options:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8363
+#: guix-git/doc/guix.texi:11123
+msgid "Compute a hash using the specified @var{algorithm}, @code{sha256} by default."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11128
+msgid "@var{algorithm} must the name of a cryptographic hash algorithm supported by Libgcrypt @i{via} Guile-Gcrypt---e.g., @code{sha512} or @code{sha3-256} (@pxref{Hash Functions,,, guile-gcrypt, Guile-Gcrypt Reference Manual})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11132
 msgid "Write the hash in the format specified by @var{fmt}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8366
-msgid "Supported formats: @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)."
+#: guix-git/doc/guix.texi:11135
+msgid "Supported formats: @code{base64}, @code{nix-base32}, @code{base32}, @code{base16} (@code{hex} and @code{hexadecimal} can be used as well)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8370
+#: guix-git/doc/guix.texi:11139
 msgid "If the @option{--format} option is not specified, @command{guix hash} will output the hash in @code{nix-base32}.  This representation is used in the definitions of packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8374
+#: guix-git/doc/guix.texi:11143
 msgid "Compute the hash on @var{file} recursively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8383
+#: guix-git/doc/guix.texi:11152
 msgid "In this case, the hash is computed on an archive containing @var{file}, including its children if it is a directory.  Some of the metadata of @var{file} is part of the archive; for instance, when @var{file} is a regular file, the hash is different depending on whether @var{file} is executable or not.  Metadata such as time stamps has no impact on the hash (@pxref{Invoking guix archive})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8384
+#: guix-git/doc/guix.texi:11153
 #, no-wrap
 msgid "--exclude-vcs"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8385
+#: guix-git/doc/guix.texi:11154 guix-git/doc/guix.texi:12142
 #, no-wrap
 msgid "-x"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8388
-msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)"
+#: guix-git/doc/guix.texi:11157
+msgid "When combined with @option{--recursive}, exclude version control system directories (@file{.bzr}, @file{.git}, @file{.hg}, etc.)."
+msgstr ""
+
+#. type: vindex
+#: guix-git/doc/guix.texi:11158
+#, no-wrap
+msgid "git-fetch"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8393
+#: guix-git/doc/guix.texi:11162
 msgid "As an example, here is how you would compute the hash of a Git checkout, which is useful when using the @code{git-fetch} method (@pxref{origin Reference}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8398
+#: guix-git/doc/guix.texi:11167
 #, no-wrap
 msgid ""
 "$ git clone http://example.org/foo.git\n"
@@ -14970,299 +20146,330 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8402 doc/guix.texi:8407
+#: guix-git/doc/guix.texi:11171 guix-git/doc/guix.texi:11176
 #, no-wrap
 msgid "Invoking @command{guix import}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8404
+#: guix-git/doc/guix.texi:11173
 #, no-wrap
 msgid "importing packages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8405
+#: guix-git/doc/guix.texi:11174
 #, no-wrap
 msgid "package import"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8406
+#: guix-git/doc/guix.texi:11175
 #, no-wrap
 msgid "package conversion"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8414
+#: guix-git/doc/guix.texi:11183
 msgid "The @command{guix import} command is useful for people who would like to add a package to the distribution with as little work as possible---a legitimate demand.  The command knows of a few repositories from which it can ``import'' package metadata.  The result is a package definition, or a template thereof, in the format we know (@pxref{Defining Packages})."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8419
+#: guix-git/doc/guix.texi:11188
 #, no-wrap
 msgid "guix import @var{importer} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8425
-msgid "@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other options specific to @var{importer}.  Currently, the available ``importers'' are:"
+#: guix-git/doc/guix.texi:11193
+msgid "@var{importer} specifies the source from which to import package metadata, and @var{options} specifies a package identifier and other options specific to @var{importer}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:11197
+msgid "Some of the importers rely on the ability to run the @command{gpgv} command.  For these, GnuPG must be installed and in @code{$PATH}; run @code{guix install gnupg} if needed."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:11199
+msgid "Currently, the available ``importers'' are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8427 doc/guix.texi:8927
+#: guix-git/doc/guix.texi:11201 guix-git/doc/guix.texi:11789
 #, no-wrap
 msgid "gnu"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8431
+#: guix-git/doc/guix.texi:11205
 msgid "Import metadata for the given GNU package.  This provides a template for the latest version of that GNU package, including the hash of its source tarball, and its canonical synopsis and description."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8434
+#: guix-git/doc/guix.texi:11208
 msgid "Additional information such as the package dependencies and its license needs to be figured out manually."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8437
+#: guix-git/doc/guix.texi:11211
 msgid "For example, the following command returns a package definition for GNU@tie{}Hello:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8440
+#: guix-git/doc/guix.texi:11214
 #, no-wrap
 msgid "guix import gnu hello\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8443 doc/guix.texi:8670 doc/guix.texi:8720 doc/guix.texi:8749
+#: guix-git/doc/guix.texi:11217 guix-git/doc/guix.texi:11457
+#: guix-git/doc/guix.texi:11507 guix-git/doc/guix.texi:11536
 msgid "Specific command-line options are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8445 doc/guix.texi:9076
+#: guix-git/doc/guix.texi:11219 guix-git/doc/guix.texi:11950
 #, no-wrap
 msgid "--key-download=@var{policy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8449
-msgid "As for @code{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature.  @xref{Invoking guix refresh, @code{--key-download}}."
+#: guix-git/doc/guix.texi:11223
+msgid "As for @command{guix refresh}, specify the policy to handle missing OpenPGP keys when verifying the package signature.  @xref{Invoking guix refresh, @option{--key-download}}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8451 doc/guix.texi:8452 doc/guix.texi:8945
+#: guix-git/doc/guix.texi:11225 guix-git/doc/guix.texi:11226
+#: guix-git/doc/guix.texi:11811
 #, no-wrap
 msgid "pypi"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8459
+#: guix-git/doc/guix.texi:11233
 msgid "Import metadata from the @uref{https://pypi.python.org/, Python Package Index}.  Information is taken from the JSON-formatted description available at @code{pypi.python.org} and usually includes all the relevant information, including package dependencies.  For maximum efficiency, it is recommended to install the @command{unzip} utility, so that the importer can unzip Python wheels and gather data from them."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8462
+#: guix-git/doc/guix.texi:11236
 msgid "The command below imports metadata for the @code{itsdangerous} Python package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8465
+#: guix-git/doc/guix.texi:11239
 #, no-wrap
 msgid "guix import pypi itsdangerous\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8473 doc/guix.texi:8498 doc/guix.texi:8693 doc/guix.texi:8734
-#: doc/guix.texi:8781
+#: guix-git/doc/guix.texi:11247 guix-git/doc/guix.texi:11272
+#: guix-git/doc/guix.texi:11480 guix-git/doc/guix.texi:11521
+#: guix-git/doc/guix.texi:11568 guix-git/doc/guix.texi:11593
+#: guix-git/doc/guix.texi:11609 guix-git/doc/guix.texi:11640
 msgid "Traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8475 doc/guix.texi:8476 doc/guix.texi:8947
+#: guix-git/doc/guix.texi:11249 guix-git/doc/guix.texi:11250
+#: guix-git/doc/guix.texi:11813
 #, no-wrap
 msgid "gem"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8485
+#: guix-git/doc/guix.texi:11259
 msgid "Import metadata from @uref{https://rubygems.org/, RubyGems}.  Information is taken from the JSON-formatted description available at @code{rubygems.org} and includes most relevant information, including runtime dependencies.  There are some caveats, however.  The metadata doesn't distinguish between synopses and descriptions, so the same string is used for both fields.  Additionally, the details of non-Ruby dependencies required to build native extensions is unavailable and left as an exercise to the packager."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8487
+#: guix-git/doc/guix.texi:11261
 msgid "The command below imports metadata for the @code{rails} Ruby package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8490
+#: guix-git/doc/guix.texi:11264
 #, no-wrap
 msgid "guix import gem rails\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8500 doc/guix.texi:8943
+#: guix-git/doc/guix.texi:11274 guix-git/doc/guix.texi:11809
 #, no-wrap
 msgid "cpan"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8501
+#: guix-git/doc/guix.texi:11275
 #, no-wrap
 msgid "CPAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8509
+#: guix-git/doc/guix.texi:11283
 msgid "Import metadata from @uref{https://www.metacpan.org/, MetaCPAN}.  Information is taken from the JSON-formatted metadata provided through @uref{https://fastapi.metacpan.org/, MetaCPAN's API} and includes most relevant information, such as module dependencies.  License information should be checked closely.  If Perl is available in the store, then the @code{corelist} utility will be used to filter core modules out of the list of dependencies."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8512
-msgid "The command command below imports metadata for the @code{Acme::Boolean} Perl module:"
+#: guix-git/doc/guix.texi:11286
+msgid "The command command below imports metadata for the Acme::Boolean Perl module:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8515
+#: guix-git/doc/guix.texi:11289
 #, no-wrap
 msgid "guix import cpan Acme::Boolean\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8517 doc/guix.texi:8939
+#: guix-git/doc/guix.texi:11291 guix-git/doc/guix.texi:11805
 #, no-wrap
 msgid "cran"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8518
+#: guix-git/doc/guix.texi:11292
 #, no-wrap
 msgid "CRAN"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8519
+#: guix-git/doc/guix.texi:11293
 #, no-wrap
 msgid "Bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8523
+#: guix-git/doc/guix.texi:11297
 msgid "Import metadata from @uref{https://cran.r-project.org/, CRAN}, the central repository for the @uref{https://r-project.org, GNU@tie{}R statistical and graphical environment}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8525
-msgid "Information is extracted from the @code{DESCRIPTION} file of the package."
+#: guix-git/doc/guix.texi:11299
+msgid "Information is extracted from the @file{DESCRIPTION} file of the package."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8528
-msgid "The command command below imports metadata for the @code{Cairo} R package:"
+#: guix-git/doc/guix.texi:11301
+msgid "The command command below imports metadata for the Cairo R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8531
+#: guix-git/doc/guix.texi:11304
 #, no-wrap
 msgid "guix import cran Cairo\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8536
-msgid "When @code{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix."
+#: guix-git/doc/guix.texi:11309
+msgid "When @option{--recursive} is added, the importer will traverse the dependency graph of the given upstream package recursively and generate package expressions for all those packages that are not yet in Guix."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11316
+msgid "When @option{--style=specification} is added, the importer will generate package definitions whose inputs are package specifications instead of references to package variables.  This is useful when generated package definitions are to be appended to existing user modules, as the list of used package modules need not be changed.  The default is @option{--style=variable}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8541
-msgid "When @code{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R packages for for the analysis and comprehension of high-throughput genomic data in bioinformatics."
+#: guix-git/doc/guix.texi:11321
+msgid "When @option{--archive=bioconductor} is added, metadata is imported from @uref{https://www.bioconductor.org/, Bioconductor}, a repository of R packages for the analysis and comprehension of high-throughput genomic data in bioinformatics."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8544
-msgid "Information is extracted from the @code{DESCRIPTION} file of a package published on the web interface of the Bioconductor SVN repository."
+#: guix-git/doc/guix.texi:11324
+msgid "Information is extracted from the @file{DESCRIPTION} file contained in the package archive."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8547
-msgid "The command below imports metadata for the @code{GenomicRanges} R package:"
+#: guix-git/doc/guix.texi:11326
+msgid "The command below imports metadata for the GenomicRanges R package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8550
+#: guix-git/doc/guix.texi:11329
 #, no-wrap
 msgid "guix import cran --archive=bioconductor GenomicRanges\n"
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:11334
+msgid "Finally, you can also import R packages that have not yet been published on CRAN or Bioconductor as long as they are in a git repository.  Use @option{--archive=git} followed by the URL of the git repository:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:11337
+#, no-wrap
+msgid "guix import cran --archive=git https://github.com/immunogenomics/harmony\n"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:8552
+#: guix-git/doc/guix.texi:11339
 #, no-wrap
 msgid "texlive"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8553
+#: guix-git/doc/guix.texi:11340
 #, no-wrap
 msgid "TeX Live"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8554
+#: guix-git/doc/guix.texi:11341
 #, no-wrap
 msgid "CTAN"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8558
+#: guix-git/doc/guix.texi:11345
 msgid "Import metadata from @uref{https://www.ctan.org/, CTAN}, the comprehensive TeX archive network for TeX packages that are part of the @uref{https://www.tug.org/texlive/, TeX Live distribution}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8563
+#: guix-git/doc/guix.texi:11350
 msgid "Information about the package is obtained through the XML API provided by CTAN, while the source code is downloaded from the SVN repository of the Tex Live project.  This is done because the CTAN does not keep versioned archives."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8566
+#: guix-git/doc/guix.texi:11353
 msgid "The command command below imports metadata for the @code{fontspec} TeX package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8569
+#: guix-git/doc/guix.texi:11356
 #, no-wrap
 msgid "guix import texlive fontspec\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8575
-msgid "When @code{--archive=DIRECTORY} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in the TeX Live SVN repository, but from the specified sibling directory under the same root."
+#: guix-git/doc/guix.texi:11362
+msgid "When @option{--archive=@var{directory}} is added, the source code is downloaded not from the @file{latex} sub-directory of the @file{texmf-dist/source} tree in the TeX Live SVN repository, but from the specified sibling @var{directory} under the same root."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8579
+#: guix-git/doc/guix.texi:11366
 msgid "The command below imports metadata for the @code{ifxetex} package from CTAN while fetching the sources from the directory @file{texmf/source/generic}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8582
+#: guix-git/doc/guix.texi:11369
 #, no-wrap
 msgid "guix import texlive --archive=generic ifxetex\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8585
+#: guix-git/doc/guix.texi:11372
 #, no-wrap
 msgid "JSON, import"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8588
+#: guix-git/doc/guix.texi:11375
 msgid "Import package metadata from a local JSON file.  Consider the following example package definition in JSON format:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8601
+#: guix-git/doc/guix.texi:11388
 #, no-wrap
 msgid ""
 "@{\n"
@@ -15274,22 +20481,22 @@ msgid ""
 "  \"synopsis\": \"Hello, GNU world: An example GNU package\",\n"
 "  \"description\": \"GNU Hello prints a greeting.\",\n"
 "  \"license\": \"GPL-3.0+\",\n"
-"  \"native-inputs\": [\"gcc@@6\"]\n"
+"  \"native-inputs\": [\"gettext\"]\n"
 "@}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8607
+#: guix-git/doc/guix.texi:11394
 msgid "The field names are the same as for the @code{<package>} record (@xref{Defining Packages}).  References to other packages are provided as JSON lists of quoted package specification strings such as @code{guile} or @code{guile@@2.0}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8610
+#: guix-git/doc/guix.texi:11397
 msgid "The importer also supports a more explicit source definition using the common fields for @code{<origin>} records:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8623
+#: guix-git/doc/guix.texi:11410
 #, no-wrap
 msgid ""
 "@{\n"
@@ -15306,288 +20513,387 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8627
+#: guix-git/doc/guix.texi:11414
 msgid "The command below reads metadata from the JSON file @code{hello.json} and outputs a package expression:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8630
+#: guix-git/doc/guix.texi:11417
 #, no-wrap
 msgid "guix import json hello.json\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8632
+#: guix-git/doc/guix.texi:11419
 #, no-wrap
 msgid "nix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8641
+#: guix-git/doc/guix.texi:11428
 msgid "Import metadata from a local copy of the source of the @uref{https://nixos.org/nixpkgs/, Nixpkgs distribution}@footnote{This relies on the @command{nix-instantiate} command of @uref{https://nixos.org/nix/, Nix}.}.  Package definitions in Nixpkgs are typically written in a mixture of Nix-language and Bash code.  This command only imports the high-level package structure that is written in the Nix language.  It normally includes all the basic fields of a package definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8644
+#: guix-git/doc/guix.texi:11431
 msgid "When importing a GNU package, the synopsis and descriptions are replaced by their canonical upstream variant."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8646
+#: guix-git/doc/guix.texi:11433
 msgid "Usually, you will first need to do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8649
+#: guix-git/doc/guix.texi:11436
 #, no-wrap
 msgid "export NIX_REMOTE=daemon\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8653
+#: guix-git/doc/guix.texi:11440
 msgid "so that @command{nix-instantiate} does not try to open the Nix database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8657
+#: guix-git/doc/guix.texi:11444
 msgid "As an example, the command below imports the package definition of LibreOffice (more precisely, it imports the definition of the package bound to the @code{libreoffice} top-level attribute):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8660
+#: guix-git/doc/guix.texi:11447
 #, no-wrap
 msgid "guix import nix ~/path/to/nixpkgs libreoffice\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8662 doc/guix.texi:8663 doc/guix.texi:8951
+#: guix-git/doc/guix.texi:11449 guix-git/doc/guix.texi:11450
+#: guix-git/doc/guix.texi:11817
 #, no-wrap
 msgid "hackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8668
+#: guix-git/doc/guix.texi:11455
 msgid "Import metadata from the Haskell community's central package archive @uref{https://hackage.haskell.org/, Hackage}.  Information is taken from Cabal files and includes all the relevant information, including package dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8672
+#: guix-git/doc/guix.texi:11459
 #, no-wrap
 msgid "--stdin"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8673
+#: guix-git/doc/guix.texi:11460
 #, no-wrap
 msgid "-s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8675
+#: guix-git/doc/guix.texi:11462
 msgid "Read a Cabal file from standard input."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8675 doc/guix.texi:8722
+#: guix-git/doc/guix.texi:11462 guix-git/doc/guix.texi:11509
 #, no-wrap
 msgid "--no-test-dependencies"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:8676 doc/guix.texi:8723
-#, no-wrap
-msgid "-t"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:8678 doc/guix.texi:8725
+#: guix-git/doc/guix.texi:11465 guix-git/doc/guix.texi:11512
 msgid "Do not include dependencies required only by the test suites."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8678
+#: guix-git/doc/guix.texi:11465
 #, no-wrap
 msgid "--cabal-environment=@var{alist}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8679
+#: guix-git/doc/guix.texi:11466
 #, no-wrap
 msgid "-e @var{alist}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8688
+#: guix-git/doc/guix.texi:11475
 msgid "@var{alist} is a Scheme alist defining the environment in which the Cabal conditionals are evaluated.  The accepted keys are: @code{os}, @code{arch}, @code{impl} and a string representing the name of a flag.  The value associated with a flag has to be either the symbol @code{true} or @code{false}.  The value associated with other keys has to conform to the Cabal file format definition.  The default value associated with the keys @code{os}, @code{arch} and @code{impl} is @samp{linux}, @samp{x86_64} and @samp{ghc}, respectively."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8698
-msgid "The command below imports metadata for the latest version of the @code{HTTP} Haskell package without including test dependencies and specifying the value of the flag @samp{network-uri} as @code{false}:"
+#: guix-git/doc/guix.texi:11485
+msgid "The command below imports metadata for the latest version of the HTTP Haskell package without including test dependencies and specifying the value of the flag @samp{network-uri} as @code{false}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8701
+#: guix-git/doc/guix.texi:11488
 #, no-wrap
 msgid "guix import hackage -t -e \"'((\\\"network-uri\\\" . false))\" HTTP\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8705
+#: guix-git/doc/guix.texi:11492
 msgid "A specific package version may optionally be specified by following the package name by an at-sign and a version number as in the following example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8708
+#: guix-git/doc/guix.texi:11495
 #, no-wrap
 msgid "guix import hackage mtl@@2.1.3.1\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8710 doc/guix.texi:8711 doc/guix.texi:8953
+#: guix-git/doc/guix.texi:11497 guix-git/doc/guix.texi:11498
+#: guix-git/doc/guix.texi:11819
 #, no-wrap
 msgid "stackage"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8718
+#: guix-git/doc/guix.texi:11505
 msgid "The @code{stackage} importer is a wrapper around the @code{hackage} one.  It takes a package name, looks up the package version included in a long-term support (LTS) @uref{https://www.stackage.org, Stackage} release and uses the @code{hackage} importer to retrieve its metadata.  Note that it is up to you to select an LTS release compatible with the GHC compiler used by Guix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8725
+#: guix-git/doc/guix.texi:11512
 #, no-wrap
 msgid "--lts-version=@var{version}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8726
+#: guix-git/doc/guix.texi:11513
 #, no-wrap
 msgid "-l @var{version}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8729
+#: guix-git/doc/guix.texi:11516
 msgid "@var{version} is the desired LTS release version.  If omitted the latest release is used."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8738
-msgid "The command below imports metadata for the @code{HTTP} Haskell package included in the LTS Stackage release version 7.18:"
+#: guix-git/doc/guix.texi:11525
+msgid "The command below imports metadata for the HTTP Haskell package included in the LTS Stackage release version 7.18:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8741
+#: guix-git/doc/guix.texi:11528
 #, no-wrap
 msgid "guix import stackage --lts-version=7.18 HTTP\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8743 doc/guix.texi:8744 doc/guix.texi:8937
+#: guix-git/doc/guix.texi:11530 guix-git/doc/guix.texi:11531
+#: guix-git/doc/guix.texi:11803
 #, no-wrap
 msgid "elpa"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8747
+#: guix-git/doc/guix.texi:11534
 msgid "Import metadata from an Emacs Lisp Package Archive (ELPA) package repository (@pxref{Packages,,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8751
+#: guix-git/doc/guix.texi:11538
 #, no-wrap
 msgid "--archive=@var{repo}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8752
+#: guix-git/doc/guix.texi:11539
 #, no-wrap
 msgid "-a @var{repo}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8756
+#: guix-git/doc/guix.texi:11543
 msgid "@var{repo} identifies the archive repository from which to retrieve the information.  Currently the supported repositories and their identifiers are:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8760
+#: guix-git/doc/guix.texi:11547
 msgid "@uref{https://elpa.gnu.org/packages, GNU}, selected by the @code{gnu} identifier.  This is the default."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8766
+#: guix-git/doc/guix.texi:11553
 msgid "Packages from @code{elpa.gnu.org} are signed with one of the keys contained in the GnuPG keyring at @file{share/emacs/25.1/etc/package-keyring.gpg} (or similar) in the @code{emacs} package (@pxref{Package Installation, ELPA package signatures,, emacs, The GNU Emacs Manual})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8770
+#: guix-git/doc/guix.texi:11557
 msgid "@uref{https://stable.melpa.org/packages, MELPA-Stable}, selected by the @code{melpa-stable} identifier."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:8774
+#: guix-git/doc/guix.texi:11561
 msgid "@uref{https://melpa.org/packages, MELPA}, selected by the @code{melpa} identifier."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8783 doc/guix.texi:8784 doc/guix.texi:8955
+#: guix-git/doc/guix.texi:11570 guix-git/doc/guix.texi:11571
+#: guix-git/doc/guix.texi:11821
 #, no-wrap
 msgid "crate"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8787
-msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}."
+#: guix-git/doc/guix.texi:11574
+msgid "Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}, as in this example:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:11577
+#, no-wrap
+msgid "guix import crate blake2-rfc\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11580
+msgid "The crate importer also allows you to specify a version string:"
 msgstr ""
 
+#. type: example
+#: guix-git/doc/guix.texi:11583
+#, no-wrap
+msgid "guix import crate constant-time-eq@@0.1.0\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11586 guix-git/doc/guix.texi:11602
+#: guix-git/doc/guix.texi:11633
+#, fuzzy
+#| msgid "Additional Build Options"
+msgid "Additional options include:"
+msgstr "额外的构建选项"
+
 #. type: item
-#: doc/guix.texi:8788
+#: guix-git/doc/guix.texi:11595
 #, no-wrap
 msgid "opam"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8789
+#: guix-git/doc/guix.texi:11596
 #, no-wrap
 msgid "OPAM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:8790
+#: guix-git/doc/guix.texi:11597
 #, no-wrap
 msgid "OCaml"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8793
+#: guix-git/doc/guix.texi:11600
 msgid "Import metadata from the @uref{https://opam.ocaml.org/, OPAM} package repository used by the OCaml community."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:11609
+#, no-wrap
+msgid "--repo"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11611
+msgid "Select the given repository (a repository name).  Possible values include:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11612
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{opam}, the default opam repository,"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:11613
+#, no-wrap
+msgid "@code{coq} or @code{coq-released}, the stable repository for coq packages,"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11614
+#, no-wrap
+msgid "@code{coq-core-dev}, the repository that contains development versions of coq,"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11615
+#, no-wrap
+msgid "@code{coq-extra-dev}, the repository that contains development versions"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:11617
+#, fuzzy
+#| msgid "Defining new packages."
+msgid "of coq packages."
+msgstr "定义新软件包。"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:11620 guix-git/doc/guix.texi:11621
+#, no-wrap
+msgid "go"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11624
+msgid "Import metadata for a Go module using @uref{https://proxy.golang.org, proxy.golang.org}."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:11627
+#, no-wrap
+msgid "guix import go gopkg.in/yaml.v2\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11631
+msgid "It is possible to use a package specification with a @code{@@VERSION} suffix to import a specific version."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11640
+#, no-wrap
+msgid "--pin-versions"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11648
+msgid "When using this option, the importer preserves the exact versions of the Go modules dependencies instead of using their latest available versions.  This can be useful when attempting to import packages that recursively depend on former versions of themselves to build.  When using this mode, the symbol of the package is made by appending the version to its name, so that multiple versions of the same package can coexist."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:8798
+#: guix-git/doc/guix.texi:11654
 msgid "The structure of the @command{guix import} code is modular.  It would be useful to have more importers for other package formats, and your help is welcome here (@pxref{Contributing})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:8800
+#: guix-git/doc/guix.texi:11656
 #, no-wrap
 msgid "Invoking @command{guix refresh}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:8802
+#: guix-git/doc/guix.texi:11658
 #, no-wrap
 msgid "guix refresh"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8807
-msgid "The primary audience of the @command{guix refresh} command is developers of the GNU software distribution.  By default, it reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:"
+#: guix-git/doc/guix.texi:11666
+msgid "The primary audience of the @command{guix refresh} command is packagers.  As a user, you may be interested in the @option{--with-latest} option, which can bring you package update superpowers built upon @command{guix refresh} (@pxref{Package Transformation Options, @option{--with-latest}}).  By default, @command{guix refresh} reports any packages provided by the distribution that are outdated compared to the latest upstream version, like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8812
+#: guix-git/doc/guix.texi:11671
 #, no-wrap
 msgid ""
 "$ guix refresh\n"
@@ -15596,12 +20902,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8816
-msgid "Alternately, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:"
+#: guix-git/doc/guix.texi:11675
+msgid "Alternatively, one can specify packages to consider, in which case a warning is emitted for packages that lack an updater:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8821
+#: guix-git/doc/guix.texi:11680
 #, no-wrap
 msgid ""
 "$ guix refresh coreutils guile guile-ssh\n"
@@ -15610,34 +20916,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8830
+#: guix-git/doc/guix.texi:11689
 msgid "@command{guix refresh} browses the upstream repository of each package and determines the highest version number of the releases therein.  The command knows how to update specific types of packages: GNU packages, ELPA packages, etc.---see the documentation for @option{--type} below.  There are many packages, though, for which it lacks a method to determine whether a new upstream release is available.  However, the mechanism is extensible, so feel free to get in touch with us to add a new method!"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8835
+#: guix-git/doc/guix.texi:11694
 msgid "Consider the packages specified, and all the packages upon which they depend."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8843
+#: guix-git/doc/guix.texi:11702
 #, no-wrap
 msgid ""
 "$ guix refresh --recursive coreutils\n"
-"gnu/packages/acl.scm:35:2: warning: no updater for acl\n"
-"gnu/packages/m4.scm:30:12: info: 1.4.18 is already the latest version of m4\n"
+"gnu/packages/acl.scm:40:13: acl would be upgraded from 2.2.53 to 2.3.1\n"
+"gnu/packages/m4.scm:30:12: 1.4.18 is already the latest version of m4\n"
 "gnu/packages/xml.scm:68:2: warning: no updater for expat\n"
-"gnu/packages/multiprecision.scm:40:12: info: 6.1.2 is already the latest version of gmp\n"
+"gnu/packages/multiprecision.scm:40:12: 6.1.2 is already the latest version of gmp\n"
 "@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8851
+#: guix-git/doc/guix.texi:11710
 msgid "Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help.  Most updaters honor the @code{upstream-name} property in package definitions, which can be used to that effect:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:8858
+#. type: lisp
+#: guix-git/doc/guix.texi:11717
 #, no-wrap
 msgid ""
 "(define-public network-manager\n"
@@ -15648,237 +20954,275 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8870
-msgid "When passed @code{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}).  This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpg}, and finally computing its hash.  When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix refresh} reports an error."
+#: guix-git/doc/guix.texi:11726
+msgid "When passed @option{--update}, it modifies distribution source files to update the version numbers and source tarball hashes of those package recipes (@pxref{Defining Packages}).  This is achieved by downloading each package's latest source tarball and its associated OpenPGP signature, authenticating the downloaded tarball against its signature using @command{gpgv}, and finally computing its hash---note that GnuPG must be installed and in @code{$PATH}; run @code{guix install gnupg} if needed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8872
+#: guix-git/doc/guix.texi:11732
+msgid "When the public key used to sign the tarball is missing from the user's keyring, an attempt is made to automatically retrieve it from a public key server; when this is successful, the key is added to the user's keyring; otherwise, @command{guix refresh} reports an error."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:11734
 msgid "The following options are supported:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8880 doc/guix.texi:9538
+#: guix-git/doc/guix.texi:11742 guix-git/doc/guix.texi:12537
 msgid "This is useful to precisely refer to a package, as in this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8883
+#: guix-git/doc/guix.texi:11745
 #, no-wrap
 msgid "guix refresh -l -e '(@@@@ (gnu packages commencement) glibc-final)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8887
-msgid "This command lists the dependents of the ``final'' libc (essentially all the packages.)"
+#: guix-git/doc/guix.texi:11749
+msgid "This command lists the dependents of the ``final'' libc (essentially all the packages)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8888
+#: guix-git/doc/guix.texi:11750
 #, no-wrap
 msgid "--update"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8889
+#: guix-git/doc/guix.texi:11751
 #, no-wrap
 msgid "-u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8893
+#: guix-git/doc/guix.texi:11755
 msgid "Update distribution source files (package recipes) in place.  This is usually run from a checkout of the Guix source tree (@pxref{Running Guix Before It Is Installed}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8896
+#: guix-git/doc/guix.texi:11758
 #, no-wrap
 msgid "$ ./pre-inst-env guix refresh -s non-core -u\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8899
+#: guix-git/doc/guix.texi:11761
 msgid "@xref{Defining Packages}, for more information on package definitions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8900
+#: guix-git/doc/guix.texi:11762
 #, no-wrap
 msgid "--select=[@var{subset}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8901
+#: guix-git/doc/guix.texi:11763
 #, no-wrap
 msgid "-s @var{subset}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8904
+#: guix-git/doc/guix.texi:11766
 msgid "Select all the packages in @var{subset}, one of @code{core} or @code{non-core}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8911
+#: guix-git/doc/guix.texi:11773
 msgid "The @code{core} subset refers to all the packages at the core of the distribution---i.e., packages that are used to build ``everything else''.  This includes GCC, libc, Binutils, Bash, etc.  Usually, changing one of these packages in the distribution entails a rebuild of all the others.  Thus, such updates are an inconvenience to users in terms of build time or bandwidth used to achieve the upgrade."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8915
+#: guix-git/doc/guix.texi:11777
 msgid "The @code{non-core} subset refers to the remaining packages.  It is typically useful in cases where an update of the core packages would be inconvenient."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8920
-msgid "Select all the packages from the manifest in @var{file}. This is useful to check if any packages of the user manifest can be updated."
+#: guix-git/doc/guix.texi:11782
+msgid "Select all the packages from the manifest in @var{file}.  This is useful to check if any packages of the user manifest can be updated."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8921
+#: guix-git/doc/guix.texi:11783
 #, no-wrap
 msgid "--type=@var{updater}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8922
+#: guix-git/doc/guix.texi:11784
 #, no-wrap
 msgid "-t @var{updater}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8925
+#: guix-git/doc/guix.texi:11787
 msgid "Select only packages handled by @var{updater} (may be a comma-separated list of updaters).  Currently, @var{updater} may be one of:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8929
+#: guix-git/doc/guix.texi:11791
 msgid "the updater for GNU packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8929
+#: guix-git/doc/guix.texi:11791
+#, no-wrap
+msgid "savannah"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11793
+msgid "the updater for packages hosted at @uref{https://savannah.gnu.org, Savannah};"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11793
+#, no-wrap
+msgid "sourceforge"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11795
+msgid "the updater for packages hosted at @uref{https://sourceforge.net, SourceForge};"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:11795
 #, no-wrap
 msgid "gnome"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8931
+#: guix-git/doc/guix.texi:11797
 msgid "the updater for GNOME packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8931
+#: guix-git/doc/guix.texi:11797
 #, no-wrap
 msgid "kde"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8933
+#: guix-git/doc/guix.texi:11799
 msgid "the updater for KDE packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8933
+#: guix-git/doc/guix.texi:11799
 #, no-wrap
 msgid "xorg"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8935
+#: guix-git/doc/guix.texi:11801
 msgid "the updater for X.org packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8935
+#: guix-git/doc/guix.texi:11801
 #, no-wrap
 msgid "kernel.org"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8937
+#: guix-git/doc/guix.texi:11803
 msgid "the updater for packages hosted on kernel.org;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8939
+#: guix-git/doc/guix.texi:11805
 msgid "the updater for @uref{https://elpa.gnu.org/, ELPA} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8941
+#: guix-git/doc/guix.texi:11807
 msgid "the updater for @uref{https://cran.r-project.org/, CRAN} packages;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8941
+#: guix-git/doc/guix.texi:11807
 #, no-wrap
 msgid "bioconductor"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8943
+#: guix-git/doc/guix.texi:11809
 msgid "the updater for @uref{https://www.bioconductor.org/, Bioconductor} R packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8945
+#: guix-git/doc/guix.texi:11811
 msgid "the updater for @uref{https://www.cpan.org/, CPAN} packages;"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8947
+#: guix-git/doc/guix.texi:11813
 msgid "the updater for @uref{https://pypi.python.org, PyPI} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8949
+#: guix-git/doc/guix.texi:11815
 msgid "the updater for @uref{https://rubygems.org, RubyGems} packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8949
+#: guix-git/doc/guix.texi:11815
 #, no-wrap
 msgid "github"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8951
+#: guix-git/doc/guix.texi:11817
 msgid "the updater for @uref{https://github.com, GitHub} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8953
+#: guix-git/doc/guix.texi:11819
 msgid "the updater for @uref{https://hackage.haskell.org, Hackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8955
+#: guix-git/doc/guix.texi:11821
 msgid "the updater for @uref{https://www.stackage.org, Stackage} packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8957
+#: guix-git/doc/guix.texi:11823
 msgid "the updater for @uref{https://crates.io, Crates} packages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8957
+#: guix-git/doc/guix.texi:11823
 #, no-wrap
 msgid "launchpad"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:8959
+#: guix-git/doc/guix.texi:11825
 msgid "the updater for @uref{https://launchpad.net, Launchpad} packages."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:11825
+#, no-wrap
+msgid "generic-html"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11828
+msgid "a generic updater that crawls the HTML page where the source tarball of the package is hosted, when applicable."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:8963
+#: guix-git/doc/guix.texi:11832
 msgid "For instance, the following command only checks for updates of Emacs packages hosted at @code{elpa.gnu.org} and for updates of CRAN packages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:8968
+#: guix-git/doc/guix.texi:11837
 #, no-wrap
 msgid ""
 "$ guix refresh --type=elpa,cran\n"
@@ -15886,78 +21230,86 @@ msgid ""
 "gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11.88.9\n"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:8974
-msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:"
+#. type: item
+#: guix-git/doc/guix.texi:11839
+#, no-wrap
+msgid "--list-updaters"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:8977
+#. type: itemx
+#: guix-git/doc/guix.texi:11840
 #, no-wrap
-msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n"
+msgid "-L"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:8983
-msgid "The command above specifically updates the @code{emacs} and @code{idutils} packages.  The @code{--select} option would have no effect in this case."
+#. type: table
+#: guix-git/doc/guix.texi:11842
+msgid "List available updaters and exit (see @option{--type} above)."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:11845
+msgid "For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:8988
-msgid "When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade and should be checked for compatibility.  For this the following option may be used when passing @command{guix refresh} one or more package names:"
+#: guix-git/doc/guix.texi:11849
+msgid "In addition, @command{guix refresh} can be passed one or more package names, as in this example:"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:8991
+#. type: example
+#: guix-git/doc/guix.texi:11852
 #, no-wrap
-msgid "--list-updaters"
+msgid "$ ./pre-inst-env guix refresh -u emacs idutils gcc@@4.8\n"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:8992
-#, no-wrap
-msgid "-L"
+#. type: Plain text
+#: guix-git/doc/guix.texi:11859
+msgid "The command above specifically updates the @code{emacs} and @code{idutils} packages.  The @option{--select} option would have no effect in this case.  You might also want to update definitions that correspond to the packages installed in your profile:"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:8994
-msgid "List available updaters and exit (see @option{--type} above.)"
+#. type: example
+#: guix-git/doc/guix.texi:11863
+#, no-wrap
+msgid ""
+"$ ./pre-inst-env guix refresh -u \\\n"
+"       $(guix package --list-installed | cut -f1)\n"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:8997
-msgid "For each updater, display the fraction of packages it covers; at the end, display the fraction of packages covered by all these updaters."
+#. type: Plain text
+#: guix-git/doc/guix.texi:11869
+msgid "When considering whether to upgrade a package, it is sometimes convenient to know which packages would be affected by the upgrade and should be checked for compatibility.  For this the following option may be used when passing @command{guix refresh} one or more package names:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:8998
+#: guix-git/doc/guix.texi:11872
 #, no-wrap
 msgid "--list-dependent"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:8999 doc/guix.texi:9215
+#: guix-git/doc/guix.texi:11873 guix-git/doc/guix.texi:12132
 #, no-wrap
 msgid "-l"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9002
+#: guix-git/doc/guix.texi:11876
 msgid "List top-level dependent packages that would need to be rebuilt as a result of upgrading one or more packages."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9006
+#: guix-git/doc/guix.texi:11880
 msgid "@xref{Invoking guix graph, the @code{reverse-package} type of @command{guix graph}}, for information on how to visualize the list of dependents of a package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9012
-msgid "Be aware that the @code{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an upgrade.  More rebuilds might be required under some circumstances."
+#: guix-git/doc/guix.texi:11886
+msgid "Be aware that the @option{--list-dependent} option only @emph{approximates} the rebuilds that would be required as a result of an upgrade.  More rebuilds might be required under some circumstances."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9017
+#: guix-git/doc/guix.texi:11891
 #, no-wrap
 msgid ""
 "$ guix refresh --list-dependent flex\n"
@@ -15966,23 +21318,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9021
+#: guix-git/doc/guix.texi:11895
 msgid "The command above lists a set of packages that could be built to check for compatibility with an upgraded @code{flex} package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9024
+#: guix-git/doc/guix.texi:11898
 #, no-wrap
 msgid "--list-transitive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9026
+#: guix-git/doc/guix.texi:11900
 msgid "List all the packages which one or more packages depend upon."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9031
+#: guix-git/doc/guix.texi:11905
 #, no-wrap
 msgid ""
 "$ guix refresh --list-transitive flex\n"
@@ -15991,60 +21343,60 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9037
+#: guix-git/doc/guix.texi:11911
 msgid "The command above lists a set of packages which, when changed, would cause @code{flex} to be rebuilt."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9039
+#: guix-git/doc/guix.texi:11913
 msgid "The following options can be used to customize GnuPG operation:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9042
+#: guix-git/doc/guix.texi:11916
 #, no-wrap
 msgid "--gpg=@var{command}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9045
+#: guix-git/doc/guix.texi:11919
 msgid "Use @var{command} as the GnuPG 2.x command.  @var{command} is searched for in @code{$PATH}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9046
+#: guix-git/doc/guix.texi:11920
 #, no-wrap
 msgid "--keyring=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9052
+#: guix-git/doc/guix.texi:11926
 msgid "Use @var{file} as the keyring for upstream keys.  @var{file} must be in the @dfn{keybox format}.  Keybox files usually have a name ending in @file{.kbx} and the GNU@tie{}Privacy Guard (GPG) can manipulate these files (@pxref{kbxutil, @command{kbxutil},, gnupg, Using the GNU Privacy Guard}, for information on a tool to manipulate keybox files)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9058
-msgid "When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys.  OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see @option{--key-download} below.)"
+#: guix-git/doc/guix.texi:11932
+msgid "When this option is omitted, @command{guix refresh} uses @file{~/.config/guix/upstream/trustedkeys.kbx} as the keyring for upstream signing keys.  OpenPGP signatures are checked against keys from this keyring; missing keys are downloaded to this keyring as well (see @option{--key-download} below)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9061
+#: guix-git/doc/guix.texi:11935
 msgid "You can export keys from your default GPG keyring into a keybox file using commands like this one:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9064
+#: guix-git/doc/guix.texi:11938
 #, no-wrap
 msgid "gpg --export rms@@gnu.org | kbxutil --import-openpgp >> mykeyring.kbx\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9067
+#: guix-git/doc/guix.texi:11941
 msgid "Likewise, you can fetch keys to a specific keybox file like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9071
+#: guix-git/doc/guix.texi:11945
 #, no-wrap
 msgid ""
 "gpg --no-default-keyring --keyring mykeyring.kbx \\\n"
@@ -16052,187 +21404,241 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9075
-msgid "@ref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard}, for more information on GPG's @option{--keyring} option."
+#: guix-git/doc/guix.texi:11949
+msgid "@xref{GPG Configuration Options, @option{--keyring},, gnupg, Using the GNU Privacy Guard}, for more information on GPG's @option{--keyring} option."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9079
+#: guix-git/doc/guix.texi:11953
 msgid "Handle missing OpenPGP keys according to @var{policy}, which may be one of:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9081 doc/guix.texi:16048
+#: guix-git/doc/guix.texi:11955 guix-git/doc/guix.texi:20822
 #, no-wrap
 msgid "always"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9084
+#: guix-git/doc/guix.texi:11958
 msgid "Always download missing OpenPGP keys from the key server, and add them to the user's GnuPG keyring."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9085 doc/guix.texi:16050
+#: guix-git/doc/guix.texi:11959 guix-git/doc/guix.texi:20824
 #, no-wrap
 msgid "never"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9087
+#: guix-git/doc/guix.texi:11961
 msgid "Never try to download missing OpenPGP keys.  Instead just bail out."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9088
+#: guix-git/doc/guix.texi:11962
 #, no-wrap
 msgid "interactive"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9091
+#: guix-git/doc/guix.texi:11965
 msgid "When a package signed with an unknown OpenPGP key is encountered, ask the user whether to download it or not.  This is the default behavior."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9093
+#: guix-git/doc/guix.texi:11967
 #, no-wrap
 msgid "--key-server=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9095
+#: guix-git/doc/guix.texi:11969
 msgid "Use @var{host} as the OpenPGP key server when importing a public key."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9108
-msgid "The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases.  When used repeatedly e.g.@: when refreshing all packages, GitHub will eventually refuse to answer any further API requests.  By default 60 API requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this.  Authentication with GitHub through the use of an API token alleviates these limits.  To use an API token, set the environment variable @code{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise."
+#: guix-git/doc/guix.texi:11989
+msgid "The @code{github} updater uses the @uref{https://developer.github.com/v3/, GitHub API} to query for new releases.  When used repeatedly e.g.@: when refreshing all packages, GitHub will eventually refuse to answer any further API requests.  By default 60 API requests per hour are allowed, and a full refresh on all GitHub packages in Guix requires more than this.  Authentication with GitHub through the use of an API token alleviates these limits.  To use an API token, set the environment variable @env{GUIX_GITHUB_TOKEN} to a token procured from @uref{https://github.com/settings/tokens} or otherwise."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9111
+#: guix-git/doc/guix.texi:11992
 #, no-wrap
 msgid "Invoking @command{guix lint}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9113
+#: guix-git/doc/guix.texi:11994
 #, no-wrap
 msgid "guix lint"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9114
+#: guix-git/doc/guix.texi:11995
 #, no-wrap
 msgid "package, checking for errors"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9120
-msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style.  It runs a number of checks on a given set of packages in order to find common mistakes in their definitions.  Available @dfn{checkers} include (see @code{--list-checkers} for a complete list):"
+#: guix-git/doc/guix.texi:12001
+msgid "The @command{guix lint} command is meant to help package developers avoid common errors and use a consistent style.  It runs a number of checks on a given set of packages in order to find common mistakes in their definitions.  Available @dfn{checkers} include (see @option{--list-checkers} for a complete list):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9126
+#: guix-git/doc/guix.texi:12007
 msgid "Validate certain typographical and stylistic rules about package descriptions and synopses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9127
+#: guix-git/doc/guix.texi:12008
 #, no-wrap
 msgid "inputs-should-be-native"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9129
+#: guix-git/doc/guix.texi:12010
 msgid "Identify inputs that should most likely be native inputs."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9132
+#: guix-git/doc/guix.texi:12013
 #, no-wrap
 msgid "mirror-url"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9133
+#: guix-git/doc/guix.texi:12014
 #, no-wrap
 msgid "github-url"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9134
+#: guix-git/doc/guix.texi:12015
 #, no-wrap
 msgid "source-file-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9141
-msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid.  Suggest a @code{mirror://} URL when applicable.  If the @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub URL.  Check that the source file name is meaningful, e.g.@: is not just a version number or ``git-checkout'', without a declared @code{file-name} (@pxref{origin Reference})."
+#: guix-git/doc/guix.texi:12022
+msgid "Probe @code{home-page} and @code{source} URLs and report those that are invalid.  Suggest a @code{mirror://} URL when applicable.  If the @code{source} URL redirects to a GitHub URL, recommend usage of the GitHub URL@.  Check that the source file name is meaningful, e.g.@: is not just a version number or ``git-checkout'', without a declared @code{file-name} (@pxref{origin Reference})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9142
+#: guix-git/doc/guix.texi:12023
 #, no-wrap
 msgid "source-unstable-tarball"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9146
+#: guix-git/doc/guix.texi:12027
 msgid "Parse the @code{source} URL to determine if a tarball from GitHub is autogenerated or if it is a release tarball.  Unfortunately GitHub's autogenerated tarballs are sometimes regenerated."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:12031
+msgid "Check that the derivation of the given packages can be successfully computed for all the supported systems (@pxref{Derivations})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12032
+#, no-wrap
+msgid "profile-collisions"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12038
+msgid "Check whether installing the given packages in a profile would lead to collisions.  Collisions occur when several packages with the same name but a different version or a different store file name are propagated.  @xref{package Reference, @code{propagated-inputs}}, for more information on propagated inputs."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12039
+#, no-wrap
+msgid "archival"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:12040
+#, no-wrap
+msgid "Software Heritage, source code archive"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:12041
+#, no-wrap
+msgid "archival of source code, Software Heritage"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12044
+msgid "Checks whether the package's source code is archived at @uref{https://www.softwareheritage.org, Software Heritage}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12052
+msgid "When the source code that is not archived comes from a version-control system (VCS)---e.g., it's obtained with @code{git-fetch}, send Software Heritage a ``save'' request so that it eventually archives it.  This ensures that the source will remain available in the long term, and that Guix can fall back to Software Heritage should the source code disappear from its original host.  The status of recent ``save'' requests can be @uref{https://archive.softwareheritage.org/save/#requests, viewed on-line}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12057
+msgid "When source code is a tarball obtained with @code{url-fetch}, simply print a message when it is not archived.  As of this writing, Software Heritage does not allow requests to save arbitrary tarballs; we are working on ways to ensure that non-VCS source code is also archived."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12063
+msgid "Software Heritage @uref{https://archive.softwareheritage.org/api/#rate-limiting, limits the request rate per IP address}.  When the limit is reached, @command{guix lint} prints a message and the @code{archival} checker stops doing anything until that limit has been reset."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:9147
+#: guix-git/doc/guix.texi:12064
 #, no-wrap
 msgid "cve"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9148 doc/guix.texi:25526
+#: guix-git/doc/guix.texi:12065 guix-git/doc/guix.texi:34598
 #, no-wrap
 msgid "security vulnerabilities"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9149
+#: guix-git/doc/guix.texi:12066
 #, no-wrap
 msgid "CVE, Common Vulnerabilities and Exposures"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9154
-msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/download.cfm#CVE_FEED, published by the US NIST}."
+#: guix-git/doc/guix.texi:12071
+msgid "Report known vulnerabilities found in the Common Vulnerabilities and Exposures (CVE) databases of the current and past year @uref{https://nvd.nist.gov/vuln/data-feeds, published by the US NIST}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9156
+#: guix-git/doc/guix.texi:12073
 msgid "To view information about a particular vulnerability, visit pages such as:"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:9160
+#: guix-git/doc/guix.texi:12077
 msgid "https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: indicateurl{#1}
-#: doc/guix.texi:9162
+#: guix-git/doc/guix.texi:12079
 msgid "https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-YYYY-ABCD"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9167
+#: guix-git/doc/guix.texi:12084
 msgid "where @code{CVE-YYYY-ABCD} is the CVE identifier---e.g., @code{CVE-2015-7554}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9172
-msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/cpe.cfm,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:"
+#: guix-git/doc/guix.texi:12089
+msgid "Package developers can specify in package recipes the @uref{https://nvd.nist.gov/products/cpe,Common Platform Enumeration (CPE)} name and version of the package when they differ from the name or version that Guix uses, as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:9180
+#. type: lisp
+#: guix-git/doc/guix.texi:12097
 #, no-wrap
 msgid ""
 "(package\n"
@@ -16240,16 +21646,16 @@ msgid ""
 "  ;; @dots{}\n"
 "  ;; CPE calls this package \"grub2\".\n"
 "  (properties '((cpe-name . \"grub2\")\n"
-"                (cpe-version . \"2.3\")))\n"
+"                (cpe-version . \"2.3\"))))\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9187
+#: guix-git/doc/guix.texi:12104
 msgid "Some entries in the CVE database do not specify which version of a package they apply to, and would thus ``stick around'' forever.  Package developers who found CVE alerts and verified they can be ignored can declare them as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:9197
+#. type: lisp
+#: guix-git/doc/guix.texi:12114
 #, no-wrap
 msgid ""
 "(package\n"
@@ -16263,91 +21669,113 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9199
+#: guix-git/doc/guix.texi:12116
 #, no-wrap
 msgid "formatting"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9202
+#: guix-git/doc/guix.texi:12119
 msgid "Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9208
+#: guix-git/doc/guix.texi:12125
 #, no-wrap
 msgid "guix lint @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9212
+#: guix-git/doc/guix.texi:12129
 msgid "If no package is given on the command line, then all packages are checked.  The @var{options} may be zero or more of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9214
+#: guix-git/doc/guix.texi:12131
 #, no-wrap
 msgid "--list-checkers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9218
+#: guix-git/doc/guix.texi:12135
 msgid "List and describe all the available checkers that will be run on packages and exit."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9219
+#: guix-git/doc/guix.texi:12136
 #, no-wrap
 msgid "--checkers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9220
+#: guix-git/doc/guix.texi:12137
 #, no-wrap
 msgid "-c"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9223
-msgid "Only enable the checkers specified in a comma-separated list using the names returned by @code{--list-checkers}."
+#: guix-git/doc/guix.texi:12140
+msgid "Only enable the checkers specified in a comma-separated list using the names returned by @option{--list-checkers}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12141
+#, no-wrap
+msgid "--exclude"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12145
+msgid "Only disable the checkers specified in a comma-separated list using the names returned by @option{--list-checkers}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12146
+#, no-wrap
+msgid "--no-network"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12149
+msgid "Only enable the checkers that do not depend on Internet access."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9227
+#: guix-git/doc/guix.texi:12161
 #, no-wrap
 msgid "Invoking @command{guix size}"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:9229
+#. type: code{#1}
+#: guix-git/doc/guix.texi:12163 guix-git/doc/guix.texi:33534
 #, no-wrap
 msgid "size"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9230
+#: guix-git/doc/guix.texi:12164
 #, no-wrap
 msgid "package size"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9232
+#: guix-git/doc/guix.texi:12166
 #, no-wrap
 msgid "guix size"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9239
+#: guix-git/doc/guix.texi:12173
 msgid "The @command{guix size} command helps package developers profile the disk usage of packages.  It is easy to overlook the impact of an additional dependency added to a package, or the impact of using a single output for a package that could easily be split (@pxref{Packages with Multiple Outputs}).  Such are the typical issues that @command{guix size} can highlight."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9244
+#: guix-git/doc/guix.texi:12178
 msgid "The command can be passed one or more package specifications such as @code{gcc@@4.8} or @code{guile:debug}, or a file name in the store.  Consider this example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9257
+#: guix-git/doc/guix.texi:12191
 #, no-wrap
 msgid ""
 "$ guix size coreutils\n"
@@ -16364,43 +21792,54 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9263
+#: guix-git/doc/guix.texi:12197
 msgid "The store items listed here constitute the @dfn{transitive closure} of Coreutils---i.e., Coreutils and all its dependencies, recursively---as would be returned by:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9266
+#: guix-git/doc/guix.texi:12200
 #, no-wrap
 msgid "$ guix gc -R /gnu/store/@dots{}-coreutils-8.23\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9274
+#: guix-git/doc/guix.texi:12208
 msgid "Here the output shows three columns next to store items.  The first column, labeled ``total'', shows the size in mebibytes (MiB) of the closure of the store item---that is, its own size plus the size of all its dependencies.  The next column, labeled ``self'', shows the size of the item itself.  The last column shows the ratio of the size of the item itself to the space occupied by all the items listed here."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9280
+#: guix-git/doc/guix.texi:12214
 msgid "In this example, we see that the closure of Coreutils weighs in at 79@tie{}MiB, most of which is taken by libc and GCC's run-time support libraries.  (That libc and GCC's libraries represent a large fraction of the closure is not a problem @i{per se} because they are always available on the system anyway.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9289
+#: guix-git/doc/guix.texi:12217
+msgid "Since the command also accepts store file names, assessing the size of a build result is straightforward:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12220
+#, no-wrap
+msgid "guix size $(guix system build config.scm)\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12230
 msgid "When the package(s) passed to @command{guix size} are available in the store@footnote{More precisely, @command{guix size} looks for the @emph{ungrafted} variant of the given package(s), as returned by @code{guix build @var{package} --no-grafts}.  @xref{Security Updates}, for information on grafts.}, @command{guix size} queries the daemon to determine its dependencies, and measures its size in the store, similar to @command{du -ms --apparent-size} (@pxref{du invocation,,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9294
+#: guix-git/doc/guix.texi:12235
 msgid "When the given packages are @emph{not} in the store, @command{guix size} reports information based on the available substitutes (@pxref{Substitutes}).  This makes it possible it to profile disk usage of store items that are not even on disk, only available remotely."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9296
+#: guix-git/doc/guix.texi:12237
 msgid "You can also specify several package names:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9306
+#: guix-git/doc/guix.texi:12247
 #, no-wrap
 msgid ""
 "$ guix size coreutils grep sed bash\n"
@@ -16414,705 +21853,836 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9312
+#: guix-git/doc/guix.texi:12253
 msgid "In this example we see that the combination of the four packages takes 102.3@tie{}MiB in total, which is much less than the sum of each closure since they have a lot of dependencies in common."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9314
+#: guix-git/doc/guix.texi:12259
+msgid "When looking at the profile returned by @command{guix size}, you may find yourself wondering why a given package shows up in the profile at all.  To understand it, you can use @command{guix graph --path -t references} to display the shortest path between the two packages (@pxref{Invoking guix graph})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12261
 msgid "The available options are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9320
+#: guix-git/doc/guix.texi:12267
 msgid "Use substitute information from @var{urls}.  @xref{client-substitute-urls, the same option for @code{guix build}}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9321
+#: guix-git/doc/guix.texi:12268
 #, no-wrap
 msgid "--sort=@var{key}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9323
+#: guix-git/doc/guix.texi:12270
 msgid "Sort lines according to @var{key}, one of the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9325
+#: guix-git/doc/guix.texi:12272
 #, no-wrap
 msgid "self"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9327
+#: guix-git/doc/guix.texi:12274
 msgid "the size of each item (the default);"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9329
+#: guix-git/doc/guix.texi:12276
 msgid "the total size of the item's closure."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9331
+#: guix-git/doc/guix.texi:12278
 #, no-wrap
 msgid "--map-file=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9333
+#: guix-git/doc/guix.texi:12280
 msgid "Write a graphical map of disk usage in PNG format to @var{file}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9335
+#: guix-git/doc/guix.texi:12282
 msgid "For the example above, the map looks like this:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9338
+#: guix-git/doc/guix.texi:12285
 msgid "@image{images/coreutils-size-map,5in,, map of Coreutils disk usage produced by @command{guix size}}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9343
+#: guix-git/doc/guix.texi:12290
 msgid "This option requires that @uref{https://wingolog.org/software/guile-charting/, Guile-Charting} be installed and visible in Guile's module search path.  When that is not the case, @command{guix size} fails as it tries to load it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9347
+#: guix-git/doc/guix.texi:12294
 msgid "Consider packages for @var{system}---e.g., @code{x86_64-linux}."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9351
+#: guix-git/doc/guix.texi:12305
 #, no-wrap
 msgid "Invoking @command{guix graph}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9353
+#: guix-git/doc/guix.texi:12307
 #, no-wrap
 msgid "DAG"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9354
+#: guix-git/doc/guix.texi:12308
 #, no-wrap
 msgid "guix graph"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9368
-msgid "Packages and their dependencies form a @dfn{graph}, specifically a directed acyclic graph (DAG).  It can quickly become difficult to have a mental model of the package DAG, so the @command{guix graph} command provides a visual representation of the DAG.  By default, @command{guix graph} emits a DAG representation in the input format of @uref{https://www.graphviz.org/, Graphviz}, so its output can be passed directly to the @command{dot} command of Graphviz.  It can also emit an HTML page with embedded JavaScript code to display a ``chord diagram'' in a Web browser, using the @uref{https://d3js.org/, d3.js} library, or emit Cypher queries to construct a graph in a graph database supporting the @uref{https://www.opencypher.org/, openCypher} query language.  The general syntax is:"
+#: guix-git/doc/guix.texi:12323
+msgid "Packages and their dependencies form a @dfn{graph}, specifically a directed acyclic graph (DAG).  It can quickly become difficult to have a mental model of the package DAG, so the @command{guix graph} command provides a visual representation of the DAG@.  By default, @command{guix graph} emits a DAG representation in the input format of @uref{https://www.graphviz.org/, Graphviz}, so its output can be passed directly to the @command{dot} command of Graphviz.  It can also emit an HTML page with embedded JavaScript code to display a ``chord diagram'' in a Web browser, using the @uref{https://d3js.org/, d3.js} library, or emit Cypher queries to construct a graph in a graph database supporting the @uref{https://www.opencypher.org/, openCypher} query language.  With @option{--path}, it simply displays the shortest path between two packages.  The general syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9371
+#: guix-git/doc/guix.texi:12326
 #, no-wrap
 msgid "guix graph @var{options} @var{package}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9376
+#: guix-git/doc/guix.texi:12331
 msgid "For example, the following command generates a PDF file representing the package DAG for the GNU@tie{}Core Utilities, showing its build-time dependencies:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9379
+#: guix-git/doc/guix.texi:12334
 #, no-wrap
 msgid "guix graph coreutils | dot -Tpdf > dag.pdf\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9382
+#: guix-git/doc/guix.texi:12337
 msgid "The output looks like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9384
+#: guix-git/doc/guix.texi:12339
 msgid "@image{images/coreutils-graph,2in,,Dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9386
+#: guix-git/doc/guix.texi:12341
 msgid "Nice little graph, no?"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9392
+#: guix-git/doc/guix.texi:12344
+msgid "You may find it more pleasant to navigate the graph interactively with @command{xdot} (from the @code{xdot} package):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12347
+#, no-wrap
+msgid "guix graph coreutils | xdot -\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12354
 msgid "But there is more than one graph! The one above is concise: it is the graph of package objects, omitting implicit inputs such as GCC, libc, grep, etc.  It is often useful to have such a concise graph, but sometimes one may want to see more details.  @command{guix graph} supports several types of graphs, allowing you to choose the level of detail:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9398
+#: guix-git/doc/guix.texi:12360
 msgid "This is the default type used in the example above.  It shows the DAG of package objects, excluding implicit dependencies.  It is concise, but filters out many details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9399
+#: guix-git/doc/guix.texi:12361
 #, no-wrap
 msgid "reverse-package"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9401
+#: guix-git/doc/guix.texi:12363
 msgid "This shows the @emph{reverse} DAG of packages.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9404
+#: guix-git/doc/guix.texi:12366
 #, no-wrap
 msgid "guix graph --type=reverse-package ocaml\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9409
-msgid "...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see @code{reverse-bag} below.)"
+#: guix-git/doc/guix.texi:12371
+msgid "...@: yields the graph of packages that @emph{explicitly} depend on OCaml (if you are also interested in cases where OCaml is an implicit dependency, see @code{reverse-bag} below)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9414
+#: guix-git/doc/guix.texi:12376
 msgid "Note that for core packages this can yield huge graphs.  If all you want is to know the number of packages that depend on a given package, use @command{guix refresh --list-dependent} (@pxref{Invoking guix refresh, @option{--list-dependent}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9415
+#: guix-git/doc/guix.texi:12377
 #, no-wrap
 msgid "bag-emerged"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9417
+#: guix-git/doc/guix.texi:12379
 msgid "This is the package DAG, @emph{including} implicit inputs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9419
+#: guix-git/doc/guix.texi:12381
 msgid "For instance, the following command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9422
+#: guix-git/doc/guix.texi:12384
 #, no-wrap
-msgid "guix graph --type=bag-emerged coreutils | dot -Tpdf > dag.pdf\n"
+msgid "guix graph --type=bag-emerged coreutils\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9425
+#: guix-git/doc/guix.texi:12387
 msgid "...@: yields this bigger graph:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9427
+#: guix-git/doc/guix.texi:12389
 msgid "@image{images/coreutils-bag-graph,,5in,Detailed dependency graph of the GNU Coreutils}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9430
+#: guix-git/doc/guix.texi:12392
 msgid "At the bottom of the graph, we see all the implicit inputs of @var{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9434
+#: guix-git/doc/guix.texi:12396
 msgid "Now, note that the dependencies of these implicit inputs---that is, the @dfn{bootstrap dependencies} (@pxref{Bootstrapping})---are not shown here, for conciseness."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9435
+#: guix-git/doc/guix.texi:12397
 #, no-wrap
 msgid "bag"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9438
+#: guix-git/doc/guix.texi:12400
 msgid "Similar to @code{bag-emerged}, but this time including all the bootstrap dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9439
+#: guix-git/doc/guix.texi:12401
 #, no-wrap
 msgid "bag-with-origins"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9441
+#: guix-git/doc/guix.texi:12403
 msgid "Similar to @code{bag}, but also showing origins and their dependencies."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9442
+#: guix-git/doc/guix.texi:12404
 #, no-wrap
 msgid "reverse-bag"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9445
+#: guix-git/doc/guix.texi:12407
 msgid "This shows the @emph{reverse} DAG of packages.  Unlike @code{reverse-package}, it also takes implicit dependencies into account.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9448
+#: guix-git/doc/guix.texi:12410
 #, no-wrap
 msgid "guix graph -t reverse-bag dune\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9455
+#: guix-git/doc/guix.texi:12417
 msgid "...@: yields the graph of all packages that depend on Dune, directly or indirectly.  Since Dune is an @emph{implicit} dependency of many packages @i{via} @code{dune-build-system}, this shows a large number of packages, whereas @code{reverse-package} would show very few if any."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9461
+#: guix-git/doc/guix.texi:12423
 msgid "This is the most detailed representation: It shows the DAG of derivations (@pxref{Derivations}) and plain store items.  Compared to the above representation, many additional nodes are visible, including build scripts, patches, Guile modules, etc."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9464
+#: guix-git/doc/guix.texi:12426
 msgid "For this type of graph, it is also possible to pass a @file{.drv} file name instead of a package name, as in:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9467
+#: guix-git/doc/guix.texi:12429
 #, no-wrap
-msgid "guix graph -t derivation `guix system build -d my-config.scm`\n"
+msgid "guix graph -t derivation $(guix system build -d my-config.scm)\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9469
+#: guix-git/doc/guix.texi:12431
 #, no-wrap
 msgid "module"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9473
+#: guix-git/doc/guix.texi:12435
 msgid "This is the graph of @dfn{package modules} (@pxref{Package Modules}).  For example, the following command shows the graph for the package module that defines the @code{guile} package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9476
+#: guix-git/doc/guix.texi:12438
 #, no-wrap
-msgid "guix graph -t module guile | dot -Tpdf > module-graph.pdf\n"
+msgid "guix graph -t module guile | xdot -\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9481
+#: guix-git/doc/guix.texi:12443
 msgid "All the types above correspond to @emph{build-time dependencies}.  The following graph type represents the @emph{run-time dependencies}:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9486
+#: guix-git/doc/guix.texi:12448
 msgid "This is the graph of @dfn{references} of a package output, as returned by @command{guix gc --references} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9489
+#: guix-git/doc/guix.texi:12451
 msgid "If the given package output is not available in the store, @command{guix graph} attempts to obtain dependency information from substitutes."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9493
+#: guix-git/doc/guix.texi:12455
 msgid "Here you can also pass a store file name instead of a package name.  For example, the command below produces the reference graph of your profile (which can be big!):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9496
+#: guix-git/doc/guix.texi:12458
 #, no-wrap
-msgid "guix graph -t references `readlink -f ~/.guix-profile`\n"
+msgid "guix graph -t references $(readlink -f ~/.guix-profile)\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9498
+#: guix-git/doc/guix.texi:12460
 #, no-wrap
 msgid "referrers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9501
+#: guix-git/doc/guix.texi:12463
 msgid "This is the graph of the @dfn{referrers} of a store item, as returned by @command{guix gc --referrers} (@pxref{Invoking guix gc})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9507
+#: guix-git/doc/guix.texi:12469
 msgid "This relies exclusively on local information from your store.  For instance, let us suppose that the current Inkscape is available in 10 profiles on your machine; @command{guix graph -t referrers inkscape} will show a graph rooted at Inkscape and with those 10 profiles linked to it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9510
+#: guix-git/doc/guix.texi:12472
 msgid "It can help determine what is preventing a store item from being garbage collected."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:12475
+#, fuzzy, no-wrap
+#| msgid "more than 1,200 dependent packages"
+msgid "shortest path, between packages"
+msgstr "超过1200个受影响的软件包"
+
 #. type: Plain text
-#: doc/guix.texi:9514
+#: guix-git/doc/guix.texi:12482
+msgid "Often, the graph of the package you are interested in does not fit on your screen, and anyway all you want to know is @emph{why} that package actually depends on some seemingly unrelated package.  The @option{--path} option instructs @command{guix graph} to display the shortest path between two packages (or derivations, or store items, etc.):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12496
+#, no-wrap
+msgid ""
+"$ guix graph --path emacs libunistring\n"
+"emacs@@26.3\n"
+"mailutils@@3.9\n"
+"libunistring@@0.9.10\n"
+"$ guix graph --path -t derivation emacs libunistring\n"
+"/gnu/store/@dots{}-emacs-26.3.drv\n"
+"/gnu/store/@dots{}-mailutils-3.9.drv\n"
+"/gnu/store/@dots{}-libunistring-0.9.10.drv\n"
+"$ guix graph --path -t references emacs libunistring\n"
+"/gnu/store/@dots{}-emacs-26.3\n"
+"/gnu/store/@dots{}-libidn2-2.2.0\n"
+"/gnu/store/@dots{}-libunistring-0.9.10\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12499
 msgid "The available options are the following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9520
+#: guix-git/doc/guix.texi:12505
 msgid "Produce a graph output of @var{type}, where @var{type} must be one of the values listed above."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9521
+#: guix-git/doc/guix.texi:12506
 #, no-wrap
 msgid "--list-types"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9523
+#: guix-git/doc/guix.texi:12508
 msgid "List the supported graph types."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9524
+#: guix-git/doc/guix.texi:12509
 #, no-wrap
 msgid "--backend=@var{backend}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9525
+#: guix-git/doc/guix.texi:12510
 #, no-wrap
 msgid "-b @var{backend}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9527
+#: guix-git/doc/guix.texi:12512
 msgid "Produce a graph using the selected @var{backend}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9528
+#: guix-git/doc/guix.texi:12513
 #, no-wrap
 msgid "--list-backends"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9530
+#: guix-git/doc/guix.texi:12515
 msgid "List the supported graph backends."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9532
+#: guix-git/doc/guix.texi:12517
 msgid "Currently, the available backends are Graphviz and d3.js."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:12518
+#, no-wrap
+msgid "--path"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12523
+msgid "Display the shortest path between two nodes of the type specified by @option{--type}.  The example below shows the shortest path between @code{libreoffice} and @code{llvm} according to the references of @code{libreoffice}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12530
+#, no-wrap
+msgid ""
+"$ guix graph --path -t references libreoffice llvm\n"
+"/gnu/store/@dots{}-libreoffice-6.4.2.2\n"
+"/gnu/store/@dots{}-libepoxy-1.5.4\n"
+"/gnu/store/@dots{}-mesa-19.3.4\n"
+"/gnu/store/@dots{}-llvm-9.0.1\n"
+msgstr ""
+
 #. type: example
-#: doc/guix.texi:9541
+#: guix-git/doc/guix.texi:12540
 #, no-wrap
 msgid "guix graph -e '(@@@@ (gnu packages commencement) gnu-make-final)'\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9546
+#: guix-git/doc/guix.texi:12545
 msgid "Display the graph for @var{system}---e.g., @code{i686-linux}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9549
+#: guix-git/doc/guix.texi:12548
 msgid "The package dependency graph is largely architecture-independent, but there are some architecture-dependent bits that this option allows you to visualize."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:12564
+msgid "On top of that, @command{guix graph} supports all the usual package transformation options (@pxref{Package Transformation Options}).  This makes it easy to view the effect of a graph-rewriting transformation such as @option{--with-input}.  For example, the command below outputs the graph of @code{git} once @code{openssl} has been replaced by @code{libressl} everywhere in the graph:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12567
+#, no-wrap
+msgid "guix graph git --with-input=openssl=libressl\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12570
+msgid "So many possibilities, so much fun!"
+msgstr ""
+
 #. type: section
-#: doc/guix.texi:9554
+#: guix-git/doc/guix.texi:12572
 #, no-wrap
 msgid "Invoking @command{guix publish}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9556
+#: guix-git/doc/guix.texi:12574
 #, no-wrap
 msgid "guix publish"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9560
+#: guix-git/doc/guix.texi:12578
 msgid "The purpose of @command{guix publish} is to enable users to easily share their store with others, who can then use it as a substitute server (@pxref{Substitutes})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9566
-msgid "When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it.  This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Hydra, the software behind the @code{@value{SUBSTITUTE-SERVER}} build farm."
+#: guix-git/doc/guix.texi:12584
+msgid "When @command{guix publish} runs, it spawns an HTTP server which allows anyone with network access to obtain substitutes from it.  This means that any machine running Guix can also act as if it were a build farm, since the HTTP interface is compatible with Cuirass, the software behind the @code{@value{SUBSTITUTE-SERVER}} build farm."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9572
-msgid "For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}).  Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be started as root; the @code{--user} option makes it drop root privileges early on."
+#: guix-git/doc/guix.texi:12590
+msgid "For security, each substitute is signed, allowing recipients to check their authenticity and integrity (@pxref{Substitutes}).  Because @command{guix publish} uses the signing key of the system, which is only readable by the system administrator, it must be started as root; the @option{--user} option makes it drop root privileges early on."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9576
+#: guix-git/doc/guix.texi:12594
 msgid "The signing key pair must be generated before @command{guix publish} is launched, using @command{guix archive --generate-key} (@pxref{Invoking guix archive})."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:12599
+msgid "When the @option{--advertise} option is passed, the server advertises its availability on the local network using multicast DNS (mDNS) and DNS service discovery (DNS-SD), currently @i{via} Guile-Avahi (@pxref{Top,,, guile-avahi, Using Avahi in Guile Scheme Programs})."
+msgstr ""
+
 #. type: example
-#: doc/guix.texi:9581
+#: guix-git/doc/guix.texi:12604
 #, no-wrap
 msgid "guix publish @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9585
+#: guix-git/doc/guix.texi:12608
 msgid "Running @command{guix publish} without any additional arguments will spawn an HTTP server on port 8080:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9588
+#: guix-git/doc/guix.texi:12611
 #, no-wrap
 msgid "guix publish\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9592
-msgid "Once a publishing server has been authorized (@pxref{Invoking guix archive}), the daemon may download substitutes from it:"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:9595
-#, no-wrap
-msgid "guix-daemon --substitute-urls=http://example.org:8080\n"
+#: guix-git/doc/guix.texi:12615
+msgid "Once a publishing server has been authorized, the daemon may download substitutes from it.  @xref{Getting Substitutes from Other Servers}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9604
+#: guix-git/doc/guix.texi:12623
 msgid "By default, @command{guix publish} compresses archives on the fly as it serves them.  This ``on-the-fly'' mode is convenient in that it requires no setup and is immediately available.  However, when serving lots of clients, we recommend using the @option{--cache} option, which enables caching of the archives before they are sent to clients---see below for details.  The @command{guix weather} command provides a handy way to check what a server provides (@pxref{Invoking guix weather})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9611
+#: guix-git/doc/guix.texi:12630
 msgid "As a bonus, @command{guix publish} also serves as a content-addressed mirror for source files referenced in @code{origin} records (@pxref{origin Reference}).  For instance, assuming @command{guix publish} is running on @code{example.org}, the following URL returns the raw @file{hello-2.10.tar.gz} file with the given SHA256 hash (represented in @code{nix-base32} format, @pxref{Invoking guix hash}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9614
+#: guix-git/doc/guix.texi:12633
 #, no-wrap
 msgid "http://example.org/file/hello-2.10.tar.gz/sha256/0ssi1@dots{}ndq1i\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9618
+#: guix-git/doc/guix.texi:12637
 msgid "Obviously, these URLs only work for files that are in the store; in other cases, they return 404 (``Not Found'')."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9619
+#: guix-git/doc/guix.texi:12638
 #, no-wrap
 msgid "build logs, publication"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9621
+#: guix-git/doc/guix.texi:12640
 msgid "Build logs are available from @code{/log} URLs like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9624
+#: guix-git/doc/guix.texi:12643
 #, no-wrap
 msgid "http://example.org/log/gwspk@dots{}-guile-2.2.3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9634
-msgid "When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header.  We recommend running @command{guix-daemon} with @code{--log-compression=gzip} since Web browsers can automatically decompress it, which is not the case with bzip2 compression."
+#: guix-git/doc/guix.texi:12653
+msgid "When @command{guix-daemon} is configured to save compressed build logs, as is the case by default (@pxref{Invoking guix-daemon}), @code{/log} URLs return the compressed log as-is, with an appropriate @code{Content-Type} and/or @code{Content-Encoding} header.  We recommend running @command{guix-daemon} with @option{--log-compression=gzip} since Web browsers can automatically decompress it, which is not the case with Bzip2 compression."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9638
+#: guix-git/doc/guix.texi:12657
 #, no-wrap
 msgid "--port=@var{port}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9639
+#: guix-git/doc/guix.texi:12658
 #, no-wrap
 msgid "-p @var{port}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9641
+#: guix-git/doc/guix.texi:12660
 msgid "Listen for HTTP requests on @var{port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9642 doc/guix.texi:20713
+#: guix-git/doc/guix.texi:12661
 #, no-wrap
 msgid "--listen=@var{host}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9645
+#: guix-git/doc/guix.texi:12664
 msgid "Listen on the network interface for @var{host}.  The default is to accept connections from any interface."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9650
+#: guix-git/doc/guix.texi:12669
 msgid "Change privileges to @var{user} as soon as possible---i.e., once the server socket is open and the signing key has been read."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9651
-#, no-wrap
-msgid "--compression[=@var{level}]"
-msgstr ""
+#: guix-git/doc/guix.texi:12670
+#, fuzzy, no-wrap
+#| msgid "--log-compression=@var{type}"
+msgid "--compression[=@var{method}[:@var{level}]]"
+msgstr "--log-compression=@var{type}"
 
 #. type: itemx
-#: doc/guix.texi:9652
+#: guix-git/doc/guix.texi:12671
 #, no-wrap
-msgid "-C [@var{level}]"
+msgid "-C [@var{method}[:@var{level}]]"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12675
+msgid "Compress data using the given @var{method} and @var{level}.  @var{method} is one of @code{lzip}, @code{zstd}, and @code{gzip}; when @var{method} is omitted, @code{gzip} is used."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12679
+msgid "When @var{level} is zero, disable compression.  The range 1 to 9 corresponds to different compression levels: 1 is the fastest, and 9 is the best (CPU-intensive).  The default is 3."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9657
-msgid "Compress data using the given @var{level}.  When @var{level} is zero, disable compression.  The range 1 to 9 corresponds to different gzip compression levels: 1 is the fastest, and 9 is the best (CPU-intensive).  The default is 3."
+#: guix-git/doc/guix.texi:12686
+msgid "Usually, @code{lzip} compresses noticeably better than @code{gzip} for a small increase in CPU usage; see @uref{https://nongnu.org/lzip/lzip_benchmark.html,benchmarks on the lzip Web page}.  However, @code{lzip} achieves low decompression throughput (on the order of 50@tie{}MiB/s on modern hardware), which can be a bottleneck for someone who downloads over a fast network connection."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9666
+#: guix-git/doc/guix.texi:12690
+msgid "The compression ratio of @code{zstd} is between that of @code{lzip} and that of @code{gzip}; its main advantage is a @uref{https://facebook.github.io/zstd/,high decompression speed}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12699
 msgid "Unless @option{--cache} is used, compression occurs on the fly and the compressed streams are not cached.  Thus, to reduce load on the machine that runs @command{guix publish}, it may be a good idea to choose a low compression level, to run @command{guix publish} behind a caching proxy, or to use @option{--cache}.  Using @option{--cache} has the advantage that it allows @command{guix publish} to add @code{Content-Length} HTTP header to its responses."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:12704
+msgid "This option can be repeated, in which case every substitute gets compressed using all the selected methods, and all of them are advertised.  This is useful when users may not support all the compression methods: they can select the one they support."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:9667
+#: guix-git/doc/guix.texi:12705
 #, no-wrap
 msgid "--cache=@var{directory}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9668
+#: guix-git/doc/guix.texi:12706
 #, no-wrap
 msgid "-c @var{directory}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9671
+#: guix-git/doc/guix.texi:12709
 msgid "Cache archives and meta-data (@code{.narinfo} URLs) to @var{directory} and only serve archives that are in cache."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9679
+#: guix-git/doc/guix.texi:12717
 msgid "When this option is omitted, archives and meta-data are created on-the-fly.  This can reduce the available bandwidth, especially when compression is enabled, since this may become CPU-bound.  Another drawback of the default mode is that the length of archives is not known in advance, so @command{guix publish} does not add a @code{Content-Length} HTTP header to its responses, which in turn prevents clients from knowing the amount of data being downloaded."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9687
-msgid "Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) returns 404 and triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed.  Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees that clients get the best possible bandwidth."
+#: guix-git/doc/guix.texi:12725
+msgid "Conversely, when @option{--cache} is used, the first request for a store item (@i{via} a @code{.narinfo} URL) triggers a background process to @dfn{bake} the archive---computing its @code{.narinfo} and compressing the archive, if needed.  Once the archive is cached in @var{directory}, subsequent requests succeed and are served directly from the cache, which guarantees that clients get the best possible bandwidth."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9691
+#: guix-git/doc/guix.texi:12732
+msgid "That first @code{.narinfo} request nonetheless returns 200, provided the requested store item is ``small enough'', below the cache bypass threshold---see @option{--cache-bypass-threshold} below.  That way, clients do not have to wait until the archive is baked.  For larger store items, the first @code{.narinfo} request returns 404, meaning that clients have to wait until the archive is baked."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12736
 msgid "The ``baking'' process is performed by worker threads.  By default, one thread per CPU core is created, but this can be customized.  See @option{--workers} below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9694
+#: guix-git/doc/guix.texi:12739
 msgid "When @option{--ttl} is used, cached entries are automatically deleted when they have expired."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9695
+#: guix-git/doc/guix.texi:12740
 #, no-wrap
 msgid "--workers=@var{N}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9698
+#: guix-git/doc/guix.texi:12743
 msgid "When @option{--cache} is used, request the allocation of @var{N} worker threads to ``bake'' archives."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9699
+#: guix-git/doc/guix.texi:12744
 #, no-wrap
 msgid "--ttl=@var{ttl}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9703
+#: guix-git/doc/guix.texi:12748
 msgid "Produce @code{Cache-Control} HTTP headers that advertise a time-to-live (TTL) of @var{ttl}.  @var{ttl} must denote a duration: @code{5d} means 5 days, @code{1m} means 1 month, and so on."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9708
+#: guix-git/doc/guix.texi:12753
 msgid "This allows the user's Guix to keep substitute information in cache for @var{ttl}.  However, note that @code{guix publish} does not itself guarantee that the store items it provides will indeed remain available for as long as @var{ttl}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9712
+#: guix-git/doc/guix.texi:12757
 msgid "Additionally, when @option{--cache} is used, cached entries that have not been accessed for @var{ttl} and that no longer have a corresponding item in the store, may be deleted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9713
+#: guix-git/doc/guix.texi:12758
+#, no-wrap
+msgid "--cache-bypass-threshold=@var{size}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12763
+msgid "When used in conjunction with @option{--cache}, store items smaller than @var{size} are immediately available, even when they are not yet in cache.  @var{size} is a size in bytes, or it can be suffixed by @code{M} for megabytes and so on.  The default is @code{10M}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12768
+msgid "``Cache bypass'' allows you to reduce the publication delay for clients at the expense of possibly additional I/O and CPU use on the server side: depending on the client access patterns, those store items can end up being baked several times until a copy is available in cache."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12772
+msgid "Increasing the threshold may be useful for sites that have few users, or to guarantee that users get substitutes even for store items that are not popular."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12773
 #, no-wrap
 msgid "--nar-path=@var{path}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9716
+#: guix-git/doc/guix.texi:12776
 msgid "Use @var{path} as the prefix for the URLs of ``nar'' files (@pxref{Invoking guix archive, normalized archives})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9720
+#: guix-git/doc/guix.texi:12780
 msgid "By default, nars are served at a URL such as @code{/nar/gzip/@dots{}-coreutils-8.25}.  This option allows you to change the @code{/nar} part to @var{path}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9721
+#: guix-git/doc/guix.texi:12781
 #, no-wrap
 msgid "--public-key=@var{file}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9722
+#: guix-git/doc/guix.texi:12782
 #, no-wrap
 msgid "--private-key=@var{file}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9725
+#: guix-git/doc/guix.texi:12785 guix-git/doc/guix.texi:27412
+#: guix-git/doc/guix.texi:27446
 msgid "Use the specific @var{file}s as the public/private key pair used to sign the store items being published."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9732
+#: guix-git/doc/guix.texi:12792
 msgid "The files must correspond to the same key pair (the private key is used for signing and the public key is merely advertised in the signature metadata).  They must contain keys in the canonical s-expression format as produced by @command{guix archive --generate-key} (@pxref{Invoking guix archive}).  By default, @file{/etc/guix/signing-key.pub} and @file{/etc/guix/signing-key.sec} are used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9733
+#: guix-git/doc/guix.texi:12793
 #, no-wrap
 msgid "--repl[=@var{port}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9734
+#: guix-git/doc/guix.texi:12794
 #, no-wrap
 msgid "-r [@var{port}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9738
+#: guix-git/doc/guix.texi:12798
 msgid "Spawn a Guile REPL server (@pxref{REPL Servers,,, guile, GNU Guile Reference Manual}) on @var{port} (37146 by default).  This is used primarily for debugging a running @command{guix publish} server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9744
+#: guix-git/doc/guix.texi:12804
 msgid "Enabling @command{guix publish} on Guix System is a one-liner: just instantiate a @code{guix-publish-service-type} service in the @code{services} field of the @code{operating-system} declaration (@pxref{guix-publish-service-type, @code{guix-publish-service-type}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9747
-msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:”"
+#: guix-git/doc/guix.texi:12807
+msgid "If you are instead running Guix on a ``foreign distro'', follow these instructions:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9751
+#: guix-git/doc/guix.texi:12811
 msgid "If your host distro uses the systemd init system:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9756
+#: guix-git/doc/guix.texi:12816
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/systemd/system/guix-publish.service \\\n"
@@ -17121,7 +22691,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9764
+#: guix-git/doc/guix.texi:12824
 #, no-wrap
 msgid ""
 "# ln -s ~root/.guix-profile/lib/upstart/system/guix-publish.conf /etc/init/\n"
@@ -17129,56 +22699,56 @@ msgid ""
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:9768
+#: guix-git/doc/guix.texi:12828
 msgid "Otherwise, proceed similarly with your distro's init system."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9771
+#: guix-git/doc/guix.texi:12831
 #, no-wrap
 msgid "Invoking @command{guix challenge}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9774
+#: guix-git/doc/guix.texi:12834
 #, no-wrap
 msgid "verifiable builds"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9775
+#: guix-git/doc/guix.texi:12835
 #, no-wrap
 msgid "guix challenge"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9776
+#: guix-git/doc/guix.texi:12836
 #, no-wrap
 msgid "challenge"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9781
+#: guix-git/doc/guix.texi:12841
 msgid "Do the binaries provided by this server really correspond to the source code it claims to build? Is a package build process deterministic? These are the questions the @command{guix challenge} command attempts to answer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9789
+#: guix-git/doc/guix.texi:12849
 msgid "The former is obviously an important question: Before using a substitute server (@pxref{Substitutes}), one had better @emph{verify} that it provides the right binaries, and thus @emph{challenge} it.  The latter is what enables the former: If package builds are deterministic, then independent builds of the package should yield the exact same result, bit for bit; if a server provides a binary different from the one obtained locally, it may be either corrupt or malicious."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9798
+#: guix-git/doc/guix.texi:12858
 msgid "We know that the hash that shows up in @file{/gnu/store} file names is the hash of all the inputs of the process that built the file or directory---compilers, libraries, build scripts, etc. (@pxref{Introduction}).  Assuming deterministic build processes, one store file name should map to exactly one build output.  @command{guix challenge} checks whether there is, indeed, a single mapping by comparing the build outputs of several independent builds of any given store item."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9800
+#: guix-git/doc/guix.texi:12860
 msgid "The command output looks like this:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:9817
+#: guix-git/doc/guix.texi:12872
 #, no-wrap
 msgid ""
 "$ guix challenge --substitute-urls=\"https://@value{SUBSTITUTE-SERVER} https://guix.example.org\"\n"
@@ -17188,19 +22758,40 @@ msgid ""
 "  local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n"
 "  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q\n"
 "  https://guix.example.org/nar/@dots{}-openssl-1.0.2d: 1zy4fmaaqcnjrzzajkdn3f5gmjk754b43qkq47llbyak9z0qjyim\n"
+"  differing files:\n"
+"    /lib/libcrypto.so.1.1\n"
+"    /lib/libssl.so.1.1\n"
+"\n"
+msgstr ""
+
+#. type: smallexample
+#: guix-git/doc/guix.texi:12879
+#, no-wrap
+msgid ""
 "/gnu/store/@dots{}-git-2.5.0 contents differ:\n"
 "  local hash: 00p3bmryhjxrhpn2gxs2fy0a15lnip05l97205pgbk5ra395hyha\n"
 "  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0: 069nb85bv4d4a6slrwjdy8v1cn4cwspm3kdbmyb81d6zckj3nq9f\n"
 "  https://guix.example.org/nar/@dots{}-git-2.5.0: 0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73\n"
+"  differing file:\n"
+"    /libexec/git-core/git-fsck\n"
+"\n"
+msgstr ""
+
+#. type: smallexample
+#: guix-git/doc/guix.texi:12886
+#, no-wrap
+msgid ""
 "/gnu/store/@dots{}-pius-2.1.1 contents differ:\n"
 "  local hash: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n"
 "  https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-pius-2.1.1: 0k4v3m9z1zp8xzzizb7d8kjj72f9172xv078sq4wl73vnq9ig3ax\n"
 "  https://guix.example.org/nar/@dots{}-pius-2.1.1: 1cy25x1a4fzq5rk0pmvc8xhwyffnqz95h2bpvqsz2mpvlbccy0gs\n"
+"  differing file:\n"
+"    /share/man/man1/pius.1.gz\n"
 "\n"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:9819
+#: guix-git/doc/guix.texi:12888
 #, no-wrap
 msgid ""
 "@dots{}\n"
@@ -17208,7 +22799,7 @@ msgid ""
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:9824
+#: guix-git/doc/guix.texi:12893
 #, no-wrap
 msgid ""
 "6,406 store items were analyzed:\n"
@@ -17218,323 +22809,411 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9832
+#: guix-git/doc/guix.texi:12901
 msgid "In this example, @command{guix challenge} first scans the store to determine the set of locally-built derivations---as opposed to store items that were downloaded from a substitute server---and then queries all the substitute servers.  It then reports those store items for which the servers obtained a result different from the local build."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9833
+#: guix-git/doc/guix.texi:12902
 #, no-wrap
 msgid "non-determinism, in package builds"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9844
+#: guix-git/doc/guix.texi:12913
 msgid "As an example, @code{guix.example.org} always gets a different answer.  Conversely, @code{@value{SUBSTITUTE-SERVER}} agrees with local builds, except in the case of Git.  This might indicate that the build process of Git is non-deterministic, meaning that its output varies as a function of various things that Guix does not fully control, in spite of building packages in isolated environments (@pxref{Features}).  Most common sources of non-determinism include the addition of timestamps in build results, the inclusion of random numbers, and directory listings sorted by inode number.  See @uref{https://reproducible-builds.org/docs/}, for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9847
-msgid "To find out what is wrong with this Git binary, we can do something along these lines (@pxref{Invoking guix archive}):"
+#: guix-git/doc/guix.texi:12916
+msgid "To find out what is wrong with this Git binary, the easiest approach is to run:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:12921
+#, no-wrap
+msgid ""
+"guix challenge git \\\n"
+"  --diff=diffoscope \\\n"
+"  --substitute-urls=\"https://@value{SUBSTITUTE-SERVER} https://guix.example.org\"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12925
+msgid "This automatically invokes @command{diffoscope}, which displays detailed information about files that differ."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:12928
+msgid "Alternatively, we can do something along these lines (@pxref{Invoking guix archive}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9852
+#: guix-git/doc/guix.texi:12933
 #, no-wrap
 msgid ""
-"$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/@dots{}-git-2.5.0 \\\n"
-"   | guix archive -x /tmp/git\n"
+"$ wget -q -O - https://@value{SUBSTITUTE-SERVER}/nar/lzip/@dots{}-git-2.5.0 \\\n"
+"   | lzip -d | guix archive -x /tmp/git\n"
 "$ diff -ur --no-dereference /gnu/store/@dots{}-git.2.5.0 /tmp/git\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9861
+#: guix-git/doc/guix.texi:12942
 msgid "This command shows the difference between the files resulting from the local build, and the files resulting from the build on @code{@value{SUBSTITUTE-SERVER}} (@pxref{Overview, Comparing and Merging Files,, diffutils, Comparing and Merging Files}).  The @command{diff} command works great for text files.  When binary files differ, a better option is @uref{https://diffoscope.org/, Diffoscope}, a tool that helps visualize differences for all kinds of files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9869
+#: guix-git/doc/guix.texi:12950
 msgid "Once you have done that work, you can tell whether the differences are due to a non-deterministic build process or to a malicious server.  We try hard to remove sources of non-determinism in packages to make it easier to verify substitutes, but of course, this is a process that involves not just Guix, but a large part of the free software community.  In the meantime, @command{guix challenge} is one tool to help address the problem."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9873
+#: guix-git/doc/guix.texi:12954
 msgid "If you are writing packages for Guix, you are encouraged to check whether @code{@value{SUBSTITUTE-SERVER}} and other substitute servers obtain the same build result as you did with:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9876
+#: guix-git/doc/guix.texi:12957
 #, no-wrap
 msgid "$ guix challenge @var{package}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9881
+#: guix-git/doc/guix.texi:12962
 msgid "where @var{package} is a package specification such as @code{guile@@2.0} or @code{glibc:debug}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9886
+#: guix-git/doc/guix.texi:12967
 #, no-wrap
 msgid "guix challenge @var{options} [@var{packages}@dots{}]\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9893
-msgid "When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of errors.)"
+#: guix-git/doc/guix.texi:12974
+msgid "When a difference is found between the hash of a locally-built item and that of a server-provided substitute, or among substitutes provided by different servers, the command displays it as in the example above and its exit code is 2 (other non-zero exit codes denote other kinds of errors)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9895
+#: guix-git/doc/guix.texi:12976
 msgid "The one option that matters is:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9901
+#: guix-git/doc/guix.texi:12982
 msgid "Consider @var{urls} the whitespace-separated list of substitute source URLs to compare to."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:12983
+#, fuzzy, no-wrap
+#| msgid "--rounds=@var{N}"
+msgid "--diff=@var{mode}"
+msgstr "--rounds=@var{N}"
+
+#. type: table
+#: guix-git/doc/guix.texi:12985
+msgid "Upon mismatches, show differences according to @var{mode}, one of:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12987
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{simple} (the default)"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:12989
+msgid "Show the list of files that differ."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:12990
+#, no-wrap
+msgid "diffoscope"
+msgstr ""
+
+#. type: var{#1}
+#: guix-git/doc/guix.texi:12991
+#, no-wrap
+msgid "command"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12994
+msgid "Invoke @uref{https://diffoscope.org/, Diffoscope}, passing it two directories whose contents do not match."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:12997
+msgid "When @var{command} is an absolute file name, run @var{command} instead of Diffoscope."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:12998 guix-git/doc/guix.texi:16310
+#: guix-git/doc/guix.texi:18299
+#, no-wrap
+msgid "none"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13000
+msgid "Do not show further details about the differences."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13005
+msgid "Thus, unless @option{--diff=none} is passed, @command{guix challenge} downloads the store items from the given substitute servers so that it can compare them."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13006
+#, no-wrap
+msgid "--verbose"
+msgstr ""
+
 #. type: itemx
-#: doc/guix.texi:9903
+#: guix-git/doc/guix.texi:13007
 #, no-wrap
 msgid "-v"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9906
+#: guix-git/doc/guix.texi:13010
 msgid "Show details about matches (identical contents) in addition to information about mismatches."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9910
+#: guix-git/doc/guix.texi:13014
 #, no-wrap
 msgid "Invoking @command{guix copy}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9912
+#: guix-git/doc/guix.texi:13016
 #, no-wrap
 msgid "copy, of store items, over SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9913
+#: guix-git/doc/guix.texi:13017
 #, no-wrap
 msgid "SSH, copy of store items"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9914
+#: guix-git/doc/guix.texi:13018
 #, no-wrap
 msgid "sharing store items across machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:9915
+#: guix-git/doc/guix.texi:13019
 #, no-wrap
 msgid "transferring store items across machines"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9922
+#: guix-git/doc/guix.texi:13026
 msgid "The @command{guix copy} command copies items from the store of one machine to that of another machine over a secure shell (SSH)  connection@footnote{This command is available only when Guile-SSH was found.  @xref{Requirements}, for details.}.  For example, the following command copies the @code{coreutils} package, the user's profile, and all their dependencies over to @var{host}, logged in as @var{user}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9926
+#: guix-git/doc/guix.texi:13030
 #, no-wrap
 msgid ""
 "guix copy --to=@var{user}@@@var{host} \\\n"
-"          coreutils `readlink -f ~/.guix-profile`\n"
+"          coreutils $(readlink -f ~/.guix-profile)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9930
+#: guix-git/doc/guix.texi:13034
 msgid "If some of the items to be copied are already present on @var{host}, they are not actually sent."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9933
+#: guix-git/doc/guix.texi:13037
 msgid "The command below retrieves @code{libreoffice} and @code{gimp} from @var{host}, assuming they are available there:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9936
+#: guix-git/doc/guix.texi:13040
 #, no-wrap
 msgid "guix copy --from=@var{host} libreoffice gimp\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9941
+#: guix-git/doc/guix.texi:13045
 msgid "The SSH connection is established using the Guile-SSH client, which is compatible with OpenSSH: it honors @file{~/.ssh/known_hosts} and @file{~/.ssh/config}, and uses the SSH agent for authentication."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9947
+#: guix-git/doc/guix.texi:13051
 msgid "The key used to sign items that are sent must be accepted by the remote machine.  Likewise, the key used by the remote machine to sign items you are retrieving must be in @file{/etc/guix/acl} so it is accepted by your own daemon.  @xref{Invoking guix archive}, for more information about store item authentication."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9952
+#: guix-git/doc/guix.texi:13056
 #, no-wrap
 msgid "guix copy [--to=@var{spec}|--from=@var{spec}] @var{items}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9955
+#: guix-git/doc/guix.texi:13059
 msgid "You must always specify one of the following options:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9957
+#: guix-git/doc/guix.texi:13061
 #, no-wrap
 msgid "--to=@var{spec}"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:9958
+#: guix-git/doc/guix.texi:13062
 #, no-wrap
 msgid "--from=@var{spec}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:9962
+#: guix-git/doc/guix.texi:13066
 msgid "Specify the host to send to or receive from.  @var{spec} must be an SSH spec such as @code{example.org}, @code{charlie@@example.org}, or @code{charlie@@example.org:2222}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9966
+#: guix-git/doc/guix.texi:13070
 msgid "The @var{items} can be either package names, such as @code{gimp}, or store items, such as @file{/gnu/store/@dots{}-idutils-4.6}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9970
+#: guix-git/doc/guix.texi:13074
 msgid "When specifying the name of a package to send, it is first built if needed, unless @option{--dry-run} was specified.  Common build options are supported (@pxref{Common Build Options})."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:9973
+#: guix-git/doc/guix.texi:13077
 #, no-wrap
 msgid "Invoking @command{guix container}"
 msgstr ""
 
 #. type: command{#1}
-#: doc/guix.texi:9975
+#: guix-git/doc/guix.texi:13079
 #, no-wrap
 msgid "guix container"
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:9979
+#: guix-git/doc/guix.texi:13083
 msgid "As of version @value{VERSION}, this tool is experimental.  The interface is subject to radical change in the future."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9986
+#: guix-git/doc/guix.texi:13090
 msgid "The purpose of @command{guix container} is to manipulate processes running within an isolated environment, commonly known as a ``container'', typically created by the @command{guix environment} (@pxref{Invoking guix environment}) and @command{guix system container} (@pxref{Invoking guix system}) commands."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:9991
+#: guix-git/doc/guix.texi:13095
 #, no-wrap
 msgid "guix container @var{action} @var{options}@dots{}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9995
+#: guix-git/doc/guix.texi:13099
 msgid "@var{action} specifies the operation to perform with a container, and @var{options} specifies the context-specific arguments for the action."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:9997
+#: guix-git/doc/guix.texi:13101
 msgid "The following actions are available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:9999
+#: guix-git/doc/guix.texi:13103
 #, no-wrap
 msgid "exec"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10001
+#: guix-git/doc/guix.texi:13105
 msgid "Execute a command within the context of a running container."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10003
+#: guix-git/doc/guix.texi:13107
 msgid "The syntax is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10006
+#: guix-git/doc/guix.texi:13110
 #, no-wrap
 msgid "guix container exec @var{pid} @var{program} @var{arguments}@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10012
+#: guix-git/doc/guix.texi:13116
 msgid "@var{pid} specifies the process ID of the running container.  @var{program} specifies an executable file name within the root file system of the container.  @var{arguments} are the additional options that will be passed to @var{program}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10016
+#: guix-git/doc/guix.texi:13120
 msgid "The following command launches an interactive login shell inside a Guix system container, started by @command{guix system container}, and whose process ID is 9001:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10019
+#: guix-git/doc/guix.texi:13123
 #, no-wrap
 msgid "guix container exec 9001 /run/current-system/profile/bin/bash --login\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10023
+#: guix-git/doc/guix.texi:13127
 msgid "Note that the @var{pid} cannot be the parent process of a container.  It must be PID 1 of the container or one of its child processes."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10027
+#: guix-git/doc/guix.texi:13131
 #, no-wrap
 msgid "Invoking @command{guix weather}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10036
+#: guix-git/doc/guix.texi:13140
 msgid "Occasionally you're grumpy because substitutes are lacking and you end up building packages by yourself (@pxref{Substitutes}).  The @command{guix weather} command reports on substitute availability on the specified servers so you can have an idea of whether you'll be grumpy today.  It can sometimes be useful info as a user, but it is primarily useful to people running @command{guix publish} (@pxref{Invoking guix publish})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10037
+#: guix-git/doc/guix.texi:13141
 #, no-wrap
 msgid "statistics, for substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10038
+#: guix-git/doc/guix.texi:13142
 #, no-wrap
 msgid "availability of substitutes"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10039
+#: guix-git/doc/guix.texi:13143
 #, no-wrap
 msgid "substitute availability"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10040
+#: guix-git/doc/guix.texi:13144
 #, no-wrap
 msgid "weather, substitute availability"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10042
+#: guix-git/doc/guix.texi:13146
 msgid "Here's a sample run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10054
+#: guix-git/doc/guix.texi:13158
 #, no-wrap
 msgid ""
 "$ guix weather --substitute-urls=https://guix.example.org\n"
@@ -17551,7 +23230,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10064
+#: guix-git/doc/guix.texi:13168
 #, no-wrap
 msgid ""
 "  9.8% (342 out of 3,470) of the missing items are queued\n"
@@ -17566,60 +23245,76 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10066
+#: guix-git/doc/guix.texi:13170
 #, no-wrap
 msgid "continuous integration, statistics"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10077
+#: guix-git/doc/guix.texi:13181
 msgid "As you can see, it reports the fraction of all the packages for which substitutes are available on the server---regardless of whether substitutes are enabled, and regardless of whether this server's signing key is authorized.  It also reports the size of the compressed archives (``nars'') provided by the server, the size the corresponding store items occupy in the store (assuming deduplication is turned off), and the server's throughput.  The second part gives continuous integration (CI) statistics, if the server supports it.  In addition, using the @option{--coverage} option, @command{guix weather} can list ``important'' package substitutes missing on the server (see below)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10083
+#: guix-git/doc/guix.texi:13187
 msgid "To achieve that, @command{guix weather} queries over HTTP(S) meta-data (@dfn{narinfos}) for all the relevant store items.  Like @command{guix challenge}, it ignores signatures on those substitutes, which is innocuous since the command only gathers statistics and cannot install those substitutes."
 msgstr ""
 
+#. type: example
+#: guix-git/doc/guix.texi:13192
+#, no-wrap
+msgid "guix weather @var{options}@dots{} [@var{packages}@dots{}]\n"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:10086
-msgid "Among other things, it is possible to query specific system types and specific package sets.  The available options are listed below."
+#: guix-git/doc/guix.texi:13200
+msgid "When @var{packages} is omitted, @command{guix weather} checks the availability of substitutes for @emph{all} the packages, or for those specified with @option{--manifest}; otherwise it only considers the specified packages.  It is also possible to query specific system types with @option{--system}.  @command{guix weather} exits with a non-zero code when the fraction of available substitutes is below 100%."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:13202
+msgid "The available options are listed below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10092
+#: guix-git/doc/guix.texi:13208
 msgid "@var{urls} is the space-separated list of substitute server URLs to query.  When this option is omitted, the default set of substitute servers is queried."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10098
+#: guix-git/doc/guix.texi:13214
 msgid "Query substitutes for @var{system}---e.g., @code{aarch64-linux}.  This option can be repeated, in which case @command{guix weather} will query substitutes for several system types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10104
+#: guix-git/doc/guix.texi:13220
 msgid "Instead of querying substitutes for all the packages, only ask for those specified in @var{file}.  @var{file} must contain a @dfn{manifest}, as with the @code{-m} option of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:13223
+msgid "This option can be repeated several times, in which case the manifests are concatenated."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:10105
+#: guix-git/doc/guix.texi:13224
 #, no-wrap
 msgid "--coverage[=@var{count}]"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:10106
+#: guix-git/doc/guix.texi:13225
 #, no-wrap
 msgid "-c [@var{count}]"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10112
+#: guix-git/doc/guix.texi:13231
 msgid "Report on substitute coverage for packages: list packages with at least @var{count} dependents (zero by default) for which substitutes are unavailable.  Dependent packages themselves are not listed: if @var{b} depends on @var{a} and @var{a} has no substitutes, only @var{a} is listed, even though @var{b} usually lacks substitutes as well.  The result looks like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10126
+#: guix-git/doc/guix.texi:13245
 #, no-wrap
 msgid ""
 "$ guix weather --substitute-urls=@value{SUBSTITUTE-URL} -c 10\n"
@@ -17637,28 +23332,39 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10131
-msgid "What this example shows is that @code{kcoreaddons} and presumably the 58 packages that depend on it have no substitutes at @code{ci.guix.info}; likewise for @code{qgpgme} and the 46 packages that depend on it."
+#: guix-git/doc/guix.texi:13251
+msgid "What this example shows is that @code{kcoreaddons} and presumably the 58 packages that depend on it have no substitutes at @code{@value{SUBSTITUTE-SERVER}}; likewise for @code{qgpgme} and the 46 packages that depend on it."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10135
+#: guix-git/doc/guix.texi:13255
 msgid "If you are a Guix developer, or if you are taking care of this build farm, you'll probably want to have a closer look at these packages: they may simply fail to build."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:13256
+#, no-wrap
+msgid "--display-missing"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13258
+msgid "Display the list of store items for which substitutes are missing."
+msgstr ""
+
 #. type: section
-#: doc/guix.texi:10138
+#: guix-git/doc/guix.texi:13261
 #, no-wrap
 msgid "Invoking @command{guix processes}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10146
+#: guix-git/doc/guix.texi:13269
 msgid "The @command{guix processes} command can be useful to developers and system administrators, especially on multi-user machines and on build farms: it lists the current sessions (connections to the daemon), as well as information about the processes involved@footnote{Remote sessions, when @command{guix-daemon} is started with @option{--listen} specifying a TCP endpoint, are @emph{not} listed.}.  Here's an example of the information it returns:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10152
+#: guix-git/doc/guix.texi:13275
 #, no-wrap
 msgid ""
 "$ sudo guix processes\n"
@@ -17669,7 +23375,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10156
+#: guix-git/doc/guix.texi:13279
 #, no-wrap
 msgid ""
 "SessionPID: 19402\n"
@@ -17679,7 +23385,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10166
+#: guix-git/doc/guix.texi:13292
 #, no-wrap
 msgid ""
 "SessionPID: 19444\n"
@@ -17688,28 +23394,31 @@ msgid ""
 "LockHeld: /gnu/store/@dots{}-perl-ipc-cmd-0.96.lock\n"
 "LockHeld: /gnu/store/@dots{}-python-six-bootstrap-1.11.0.lock\n"
 "LockHeld: /gnu/store/@dots{}-libjpeg-turbo-2.0.0.lock\n"
-"ChildProcess: 20495: guix offload x86_64-linux 7200 1 28800\n"
-"ChildProcess: 27733: guix offload x86_64-linux 7200 1 28800\n"
-"ChildProcess: 27793: guix offload x86_64-linux 7200 1 28800\n"
+"ChildPID: 20495\n"
+"ChildCommand: guix offload x86_64-linux 7200 1 28800\n"
+"ChildPID: 27733\n"
+"ChildCommand: guix offload x86_64-linux 7200 1 28800\n"
+"ChildPID: 27793\n"
+"ChildCommand: guix offload x86_64-linux 7200 1 28800\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10173
+#: guix-git/doc/guix.texi:13299
 msgid "In this example we see that @command{guix-daemon} has three clients: @command{guix environment}, @command{guix publish}, and the Cuirass continuous integration tool; their process identifier (PID) is given by the @code{ClientPID} field.  The @code{SessionPID} field gives the PID of the @command{guix-daemon} sub-process of this particular session."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10180
-msgid "The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not running as root.)  Last, by looking at the @code{ChildProcess} field, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup})."
+#: guix-git/doc/guix.texi:13306
+msgid "The @code{LockHeld} fields show which store items are currently locked by this session, which corresponds to store items being built or substituted (the @code{LockHeld} field is not displayed when @command{guix processes} is not running as root).  Last, by looking at the @code{ChildPID} and @code{ChildCommand} fields, we understand that these three builds are being offloaded (@pxref{Daemon Offload Setup})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10185
+#: guix-git/doc/guix.texi:13311
 msgid "The output is in Recutils format so we can use the handy @command{recsel} command to select sessions of interest (@pxref{Selection Expressions,,, recutils, GNU recutils manual}).  As an example, the command shows the command line and PID of the client that triggered the build of a Perl package:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10191
+#: guix-git/doc/guix.texi:13317
 #, no-wrap
 msgid ""
 "$ sudo guix processes | \\\n"
@@ -17718,91 +23427,146 @@ msgid ""
 "ClientCommand: cuirass --cache-directory /var/cache/cuirass @dots{}\n"
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:13320
+#, fuzzy
+#| msgid "Additional Build Options"
+msgid "Additional options are listed below."
+msgstr "额外的构建选项"
+
+#. type: table
+#: guix-git/doc/guix.texi:13330
+msgid "The default option.  It outputs a set of Session recutils records that include each @code{ChildProcess} as a field."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13331
+#, no-wrap
+msgid "normalized"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13338
+msgid "Normalize the output records into record sets (@pxref{Record Sets,,, recutils, GNU recutils manual}).  Normalizing into record sets allows joins across record types.  The example below lists the PID of each @code{ChildProcess} and the associated PID for @code{Session} that spawned the @code{ChildProcess} where the @code{Session} was started using @command{guix build}."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:13348
+#, no-wrap
+msgid ""
+"$ guix processes --format=normalized | \\\n"
+"    recsel \\\n"
+"    -j Session \\\n"
+"    -t ChildProcess \\\n"
+"    -p Session.PID,PID \\\n"
+"    -e 'Session.ClientCommand ~ \"guix build\"'\n"
+"PID: 4435\n"
+"Session_PID: 4278\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:13351
+#, no-wrap
+msgid ""
+"PID: 4554\n"
+"Session_PID: 4278\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:13354
+#, no-wrap
+msgid ""
+"PID: 4646\n"
+"Session_PID: 4278\n"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:10197
+#: guix-git/doc/guix.texi:13361
 #, no-wrap
 msgid "system configuration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10203
+#: guix-git/doc/guix.texi:13367
 msgid "Guix System supports a consistent whole-system configuration mechanism.  By that we mean that all aspects of the global system configuration---such as the available system services, timezone and locale settings, user accounts---are declared in a single place.  Such a @dfn{system configuration} can be @dfn{instantiated}---i.e., effected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10213
+#: guix-git/doc/guix.texi:13377
 msgid "One of the advantages of putting all the system configuration under the control of Guix is that it supports transactional system upgrades, and makes it possible to roll back to a previous system instantiation, should something go wrong with the new one (@pxref{Features}).  Another advantage is that it makes it easy to replicate the exact same configuration across different machines, or at different points in time, without having to resort to additional administration tools layered on top of the own tools of the system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10218
+#: guix-git/doc/guix.texi:13382
 msgid "This section describes this mechanism.  First we focus on the system administrator's viewpoint---explaining how the system is configured and instantiated.  Then we show how this mechanism can be extended, for instance to support new system services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10246
+#: guix-git/doc/guix.texi:13411
 msgid "The operating system is configured by providing an @code{operating-system} declaration in a file that can then be passed to the @command{guix system} command (@pxref{Invoking guix system}).  A simple setup, with the default system services, the default Linux-Libre kernel, initial RAM disk, and boot loader looks like this:"
 msgstr ""
 
-#. type: findex
-#: doc/guix.texi:10247
+#. type: code{#1}
+#: guix-git/doc/guix.texi:13412 guix-git/doc/guix.texi:33463
 #, no-wrap
 msgid "operating-system"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:10249
+#: guix-git/doc/guix.texi:13414
 #, no-wrap
 msgid "os-config-bare-bones.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10256
+#: guix-git/doc/guix.texi:13421
 msgid "This example should be self-describing.  Some of the fields defined above, such as @code{host-name} and @code{bootloader}, are mandatory.  Others, such as @code{packages} and @code{services}, can be omitted, in which case they get a default value."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10261
+#: guix-git/doc/guix.texi:13426
 msgid "Below we discuss the effect of some of the most important fields (@pxref{operating-system Reference}, for details about all the available fields), and how to @dfn{instantiate} the operating system using @command{guix system}."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10262
+#: guix-git/doc/guix.texi:13427
 #, no-wrap
 msgid "Bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10264
+#: guix-git/doc/guix.texi:13429
 #, no-wrap
 msgid "legacy boot, on Intel machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10265
+#: guix-git/doc/guix.texi:13430
 #, no-wrap
 msgid "BIOS boot, on Intel machines"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10266
+#: guix-git/doc/guix.texi:13431
 #, no-wrap
 msgid "UEFI boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10267
+#: guix-git/doc/guix.texi:13432
 #, no-wrap
 msgid "EFI boot"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10273
+#: guix-git/doc/guix.texi:13438
 msgid "The @code{bootloader} field describes the method that will be used to boot your system.  Machines based on Intel processors can boot in ``legacy'' BIOS mode, as in the example above.  However, more recent machines rely instead on the @dfn{Unified Extensible Firmware Interface} (UEFI) to boot.  In that case, the @code{bootloader} field should contain something along these lines:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10278
+#. type: lisp
+#: guix-git/doc/guix.texi:13443
 #, no-wrap
 msgid ""
 "(bootloader-configuration\n"
@@ -17811,29 +23575,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10282
+#: guix-git/doc/guix.texi:13447
 msgid "@xref{Bootloader Configuration}, for more information on the available configuration options."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10283
+#: guix-git/doc/guix.texi:13448
 #, no-wrap
 msgid "Globally-Visible Packages"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:10285
+#: guix-git/doc/guix.texi:13450
 #, no-wrap
 msgid "%base-packages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10298
-msgid "The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's @code{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}).  The @var{%base-packages} variable provides all the tools one would expect for basic user and administrator tasks---including the GNU Core Utilities, the GNU Networking Utilities, the GNU Zile lightweight text editor, @command{find}, @command{grep}, etc.  The example above adds GNU@tie{}Screen to those, taken from the @code{(gnu packages screen)} module (@pxref{Package Modules}).  The @code{(list package output)} syntax can be used to add a specific output of a package:"
+#: guix-git/doc/guix.texi:13463
+msgid "The @code{packages} field lists packages that will be globally visible on the system, for all user accounts---i.e., in every user's @env{PATH} environment variable---in addition to the per-user profiles (@pxref{Invoking guix package}).  The @code{%base-packages} variable provides all the tools one would expect for basic user and administrator tasks---including the GNU Core Utilities, the GNU Networking Utilities, the GNU Zile lightweight text editor, @command{find}, @command{grep}, etc.  The example above adds GNU@tie{}Screen to those, taken from the @code{(gnu packages screen)} module (@pxref{Package Modules}).  The @code{(list package output)} syntax can be used to add a specific output of a package:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10302
+#: guix-git/doc/guix.texi:13467
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -17842,7 +23606,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10307
+#: guix-git/doc/guix.texi:13472
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -17852,18 +23616,18 @@ msgid ""
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:10309
+#: guix-git/doc/guix.texi:13474
 #, no-wrap
 msgid "specification->package"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10318
+#: guix-git/doc/guix.texi:13483
 msgid "Referring to packages by variable name, like @code{bind} above, has the advantage of being unambiguous; it also allows typos and such to be diagnosed right away as ``unbound variables''.  The downside is that one needs to know which module defines which package, and to augment the @code{use-package-modules} line accordingly.  To avoid that, one can use the @code{specification->package} procedure of the @code{(gnu packages)} module, which returns the best package for a given name or name and version:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10321
+#: guix-git/doc/guix.texi:13486
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages))\n"
@@ -17871,7 +23635,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10327
+#: guix-git/doc/guix.texi:13492
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -17882,52 +23646,53 @@ msgid ""
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10329
+#: guix-git/doc/guix.texi:13494
 #, no-wrap
 msgid "System Services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10331 doc/guix.texi:23820 doc/guix.texi:24827
+#: guix-git/doc/guix.texi:13496 guix-git/doc/guix.texi:32246
+#: guix-git/doc/guix.texi:33688
 #, no-wrap
 msgid "services"
 msgstr ""
 
 #. type: vindex
-#: doc/guix.texi:10332
+#: guix-git/doc/guix.texi:13497
 #, no-wrap
 msgid "%base-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10342
+#: guix-git/doc/guix.texi:13507
 msgid "The @code{services} field lists @dfn{system services} to be made available when the system starts (@pxref{Services}).  The @code{operating-system} declaration above specifies that, in addition to the basic services, we want the OpenSSH secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{openssh-service-type}}).  Under the hood, @code{openssh-service-type} arranges so that @command{sshd} is started with the right command-line options, possibly with supporting configuration files generated as needed (@pxref{Defining Services})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10343
+#: guix-git/doc/guix.texi:13508
 #, no-wrap
 msgid "customization, of services"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:10344
+#: guix-git/doc/guix.texi:13509
 #, no-wrap
 msgid "modify-services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10348
+#: guix-git/doc/guix.texi:13513
 msgid "Occasionally, instead of using the base services as is, you will want to customize them.  To do this, use @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) to modify the list."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10353
-msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @var{%base-services} list (@pxref{Base Services, @code{%base-services}}).  To do that, you can write the following in your operating system declaration:"
+#: guix-git/doc/guix.texi:13518
+msgid "For example, suppose you want to modify @code{guix-daemon} and Mingetty (the console log-in) in the @code{%base-services} list (@pxref{Base Services, @code{%base-services}}).  To do that, you can write the following in your operating system declaration:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10366
+#: guix-git/doc/guix.texi:13535
 #, no-wrap
 msgid ""
 "(define %my-services\n"
@@ -17936,16 +23701,20 @@ msgid ""
 "    (guix-service-type config =>\n"
 "                       (guix-configuration\n"
 "                        (inherit config)\n"
-"                        (use-substitutes? #f)\n"
-"                        (extra-options '(\"--gc-keep-derivations\"))))\n"
+"                        ;; Fetch substitutes from example.org.\n"
+"                        (substitute-urls\n"
+"                          (list \"https://example.org/guix\"\n"
+"                                \"https://ci.guix.gnu.org\"))))\n"
 "    (mingetty-service-type config =>\n"
 "                           (mingetty-configuration\n"
-"                            (inherit config)))))\n"
+"                            (inherit config)\n"
+"                            ;; Automatially log in as \"guest\".\n"
+"                            (auto-login \"guest\")))))\n"
 "\n"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:10370
+#: guix-git/doc/guix.texi:13539
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -17954,49 +23723,49 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10381
-msgid "This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the @code{mingetty-service-type} instances in the @var{%base-services} list.  Observe how this is accomplished: first, we arrange for the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that it evaluates to the desired configuration.  In particular, notice how we use @code{inherit} to create a new configuration which has the same values as the old configuration, but with a few modifications."
+#: guix-git/doc/guix.texi:13550
+msgid "This changes the configuration---i.e., the service parameters---of the @code{guix-service-type} instance, and that of all the @code{mingetty-service-type} instances in the @code{%base-services} list.  Observe how this is accomplished: first, we arrange for the original configuration to be bound to the identifier @code{config} in the @var{body}, and then we write the @var{body} so that it evaluates to the desired configuration.  In particular, notice how we use @code{inherit} to create a new configuration which has the same values as the old configuration, but with a few modifications."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10388
+#: guix-git/doc/guix.texi:13557
 msgid "The configuration for a typical ``desktop'' usage, with an encrypted root partition, the X11 display server, GNOME and Xfce (users can choose which of these desktop environments to use at the log-in screen by pressing @kbd{F1}), network management, power management, and more, would look like this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:10390
+#: guix-git/doc/guix.texi:13559
 #, no-wrap
 msgid "os-config-desktop.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10395
+#: guix-git/doc/guix.texi:13564
 msgid "A graphical system with a choice of lightweight window managers instead of full-blown desktop environments would look like this:"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:10397
+#: guix-git/doc/guix.texi:13566
 #, no-wrap
 msgid "os-config-lightweight-desktop.texi"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10403
+#: guix-git/doc/guix.texi:13572
 msgid "This example refers to the @file{/boot/efi} file system by its UUID, @code{1234-ABCD}.  Replace this UUID with the right UUID on your system, as returned by the @command{blkid} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10407
-msgid "@xref{Desktop Services}, for the exact list of services provided by @var{%desktop-services}.  @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here."
+#: guix-git/doc/guix.texi:13576
+msgid "@xref{Desktop Services}, for the exact list of services provided by @code{%desktop-services}.  @xref{X.509 Certificates}, for background information about the @code{nss-certs} package that is used here."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10414
-msgid "Again, @var{%desktop-services} is just a list of service objects.  If you want to remove services from there, you can do so using the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}).  For instance, the following expression returns a list that contains all the services in @var{%desktop-services} minus the Avahi service:"
+#: guix-git/doc/guix.texi:13583
+msgid "Again, @code{%desktop-services} is just a list of service objects.  If you want to remove services from there, you can do so using the procedures for list filtering (@pxref{SRFI-1 Filtering and Partitioning,,, guile, GNU Guile Reference Manual}).  For instance, the following expression returns a list that contains all the services in @code{%desktop-services} minus the Avahi service:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10419
+#. type: lisp
+#: guix-git/doc/guix.texi:13588
 #, no-wrap
 msgid ""
 "(remove (lambda (service)\n"
@@ -18004,321 +23773,431 @@ msgid ""
 "        %desktop-services)\n"
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:13591
+msgid "Alternatively, the @code{modify-services} macro can be used:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:13595
+#, no-wrap
+msgid ""
+"(modify-services %desktop-services\n"
+"  (delete avahi-service-type))\n"
+msgstr ""
+
 #. type: unnumberedsubsec
-#: doc/guix.texi:10421
+#: guix-git/doc/guix.texi:13598
 #, no-wrap
 msgid "Instantiating the System"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10428
+#: guix-git/doc/guix.texi:13605
 msgid "Assuming the @code{operating-system} declaration is stored in the @file{my-system-config.scm} file, the @command{guix system reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10436
+#: guix-git/doc/guix.texi:13613
 msgid "The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}.  One should never have to touch files in @file{/etc} or to run commands that modify the system state such as @command{useradd} or @command{grub-install}.  In fact, you must avoid that since that would not only void your warranty but also prevent you from rolling back to previous versions of your system, should you ever need to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10437
+#: guix-git/doc/guix.texi:13614
 #, no-wrap
 msgid "roll-back, of the operating system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10447
+#: guix-git/doc/guix.texi:13624
 msgid "Speaking of roll-back, each time you run @command{guix system reconfigure}, a new @dfn{generation} of the system is created---without modifying or deleting previous generations.  Old system generations get an entry in the bootloader boot menu, allowing you to boot them in case something went wrong with the latest generation.  Reassuring, no? The @command{guix system list-generations} command lists the system generations available on disk.  It is also possible to roll back the system via the commands @command{guix system roll-back} and @command{guix system switch-generation}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10453
+#: guix-git/doc/guix.texi:13630
 msgid "Although the @command{guix system reconfigure} command will not modify previous generations, you must take care when the current generation is not the latest (e.g., after invoking @command{guix system roll-back}), since the operation might overwrite a later generation (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: unnumberedsubsec
-#: doc/guix.texi:10454
+#: guix-git/doc/guix.texi:13631
 #, no-wrap
 msgid "The Programming Interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10459
+#: guix-git/doc/guix.texi:13636
 msgid "At the Scheme level, the bulk of an @code{operating-system} declaration is instantiated with the following monadic procedure (@pxref{The Store Monad}):"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10460
+#: guix-git/doc/guix.texi:13637
 #, no-wrap
 msgid "{Monadic Procedure} operating-system-derivation os"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10463
+#: guix-git/doc/guix.texi:13640
 msgid "Return a derivation that builds @var{os}, an @code{operating-system} object (@pxref{Derivations})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10467
+#: guix-git/doc/guix.texi:13644
 msgid "The output of the derivation is a single directory that refers to all the packages, configuration files, and other supporting files needed to instantiate @var{os}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10472
+#: guix-git/doc/guix.texi:13649
 msgid "This procedure is provided by the @code{(gnu system)} module.  Along with @code{(gnu services)} (@pxref{Services}), this module contains the guts of Guix System.  Make sure to visit it!"
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:10475
+#: guix-git/doc/guix.texi:13652
 #, no-wrap
 msgid "@code{operating-system} Reference"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10480
+#: guix-git/doc/guix.texi:13657
 msgid "This section summarizes all the options available in @code{operating-system} declarations (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10481
+#: guix-git/doc/guix.texi:13658
 #, no-wrap
 msgid "{Data Type} operating-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10485
+#: guix-git/doc/guix.texi:13662
 msgid "This is the data type representing an operating system configuration.  By that, we mean all the global system configuration, not per-user configuration (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10487
+#: guix-git/doc/guix.texi:13664
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{kernel} (default: @code{linux-libre})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:13669
+msgid "The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is fully supported.  Using GNU@tie{}mach with the GNU@tie{}Hurd is experimental and only available when building a virtual machine disk image.}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:13670 guix-git/doc/guix.texi:28954
 #, no-wrap
-msgid "@code{kernel} (default: @var{linux-libre})"
+msgid "hurd"
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:13671
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{hurd} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
 #. type: table
-#: doc/guix.texi:10491
-msgid "The package object of the operating system kernel to use@footnote{Currently only the Linux-libre kernel is supported.  In the future, it will be possible to use the GNU@tie{}Hurd.}."
+#: guix-git/doc/guix.texi:13676
+msgid "The package object of the Hurd to be started by the kernel.  When this field is set, produce a GNU/Hurd operating system.  In that case, @code{kernel} must also be set to the @code{gnumach} package---the microkernel the Hurd runs on."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:13679
+msgid "This feature is experimental and only supported for disk images."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10492
-#, no-wrap
-msgid "@code{kernel-arguments} (default: @code{'(\"quiet\")})"
+#: guix-git/doc/guix.texi:13681
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{kernel-loadable-modules} (default: '())"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:13684
+msgid "A list of objects (usually packages) to collect loadable kernel modules from--e.g. @code{(list ddcci-driver-linux)}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:13685
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{kernel-arguments} (default: @code{%default-kernel-arguments})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
 #. type: table
-#: doc/guix.texi:10495
+#: guix-git/doc/guix.texi:13688
 msgid "List of strings or gexps representing additional arguments to pass on the command-line of the kernel---e.g., @code{(\"console=ttyS0\")}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10496 doc/guix.texi:24031 doc/guix.texi:24050
+#: guix-git/doc/guix.texi:13689 guix-git/doc/guix.texi:32459
+#: guix-git/doc/guix.texi:32478
 #, no-wrap
 msgid "bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10498
+#: guix-git/doc/guix.texi:13691
 msgid "The system bootloader configuration object.  @xref{Bootloader Configuration}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10499 doc/guix.texi:24170
+#: guix-git/doc/guix.texi:13692 guix-git/doc/guix.texi:32648
 #, no-wrap
 msgid "label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10502
+#: guix-git/doc/guix.texi:13695
 msgid "This is the label (a string) as it appears in the bootloader's menu entry.  The default label includes the kernel name and version."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10503 doc/guix.texi:13709 doc/guix.texi:24100
+#: guix-git/doc/guix.texi:13696 guix-git/doc/guix.texi:18123
+#: guix-git/doc/guix.texi:32578
 #, no-wrap
 msgid "@code{keyboard-layout} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10507
-msgid "This field specifies the keyboard layout to use in the console.  It can be either @code{#f}, in which case the default keyboard layout is used (usually US English), or a @code{<keyboard-layout>} record."
+#: guix-git/doc/guix.texi:13701
+msgid "This field specifies the keyboard layout to use in the console.  It can be either @code{#f}, in which case the default keyboard layout is used (usually US English), or a @code{<keyboard-layout>} record. @xref{Keyboard Layout}, for more information."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10512
+#: guix-git/doc/guix.texi:13706
 msgid "This keyboard layout is in effect as soon as the kernel has booted.  For instance, it is the keyboard layout in effect when you type a passphrase if your root file system is on a @code{luks-device-mapping} mapped device (@pxref{Mapped Devices})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:10519
+#: guix-git/doc/guix.texi:13713
 msgid "This does @emph{not} specify the keyboard layout used by the bootloader, nor that used by the graphical display server.  @xref{Bootloader Configuration}, for information on how to specify the bootloader's keyboard layout.  @xref{X Window}, for information on how to specify the keyboard layout used by the X Window System."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10521
+#: guix-git/doc/guix.texi:13715
 #, no-wrap
 msgid "@code{initrd-modules} (default: @code{%base-initrd-modules})"
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:10522 doc/guix.texi:23857 doc/guix.texi:23960
-#: doc/guix.texi:24195
+#. type: cindex
+#: guix-git/doc/guix.texi:13716 guix-git/doc/guix.texi:32283
+#: guix-git/doc/guix.texi:32387
 #, no-wrap
 msgid "initrd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10523 doc/guix.texi:23858 doc/guix.texi:23961
+#: guix-git/doc/guix.texi:13717 guix-git/doc/guix.texi:32284
+#: guix-git/doc/guix.texi:32388
 #, no-wrap
 msgid "initial RAM disk"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10526
+#: guix-git/doc/guix.texi:13720
 msgid "The list of Linux kernel modules that need to be available in the initial RAM disk.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10527
+#: guix-git/doc/guix.texi:13721
 #, no-wrap
 msgid "@code{initrd} (default: @code{base-initrd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10531
+#: guix-git/doc/guix.texi:13725
 msgid "A procedure that returns an initial RAM disk for the Linux kernel.  This field is provided to support low-level customization and should rarely be needed for casual use.  @xref{Initial RAM Disk}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10532
-#, no-wrap
-msgid "@code{firmware} (default: @var{%base-firmware})"
-msgstr ""
+#: guix-git/doc/guix.texi:13726
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{firmware} (default: @code{%base-firmware})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: cindex
-#: doc/guix.texi:10533
+#: guix-git/doc/guix.texi:13727
 #, no-wrap
 msgid "firmware"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10535
+#: guix-git/doc/guix.texi:13729
 msgid "List of firmware packages loadable by the operating system kernel."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10540
+#: guix-git/doc/guix.texi:13734
 msgid "The default includes firmware needed for Atheros- and Broadcom-based WiFi devices (Linux-libre modules @code{ath9k} and @code{b43-open}, respectively).  @xref{Hardware Considerations}, for more info on supported hardware."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10541
+#: guix-git/doc/guix.texi:13735 guix-git/doc/guix.texi:33482
 #, no-wrap
 msgid "host-name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10543
+#: guix-git/doc/guix.texi:13737
 msgid "The host name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10544
+#: guix-git/doc/guix.texi:13738
 #, no-wrap
 msgid "hosts-file"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10545
+#: guix-git/doc/guix.texi:13739
 #, no-wrap
 msgid "hosts file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10550
+#: guix-git/doc/guix.texi:13744
 msgid "A file-like object (@pxref{G-Expressions, file-like objects}) for use as @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  The default is a file with entries for @code{localhost} and @var{host-name}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10551
+#: guix-git/doc/guix.texi:13745
 #, no-wrap
 msgid "@code{mapped-devices} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10553
+#: guix-git/doc/guix.texi:13747
 msgid "A list of mapped devices.  @xref{Mapped Devices}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10554
+#: guix-git/doc/guix.texi:13748
 #, no-wrap
 msgid "file-systems"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10556
+#: guix-git/doc/guix.texi:13750
 msgid "A list of file systems.  @xref{File Systems}."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:13751
+#, no-wrap
+msgid "swap devices"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:13752
+#, no-wrap
+msgid "swap space"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:10557
+#: guix-git/doc/guix.texi:13753
 #, no-wrap
 msgid "@code{swap-devices} (default: @code{'()})"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:10558
+#. type: table
+#: guix-git/doc/guix.texi:13758
+msgid "A list of UUIDs, file system labels, or strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}).  Here are some examples:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13760
 #, no-wrap
-msgid "swap devices"
+msgid "(list (uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\"))"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10565
-msgid "A list of strings identifying devices or files to be used for ``swap space'' (@pxref{Memory Concepts,,, libc, The GNU C Library Reference Manual}).  For example, @code{'(\"/dev/sda3\")} or @code{'(\"/swapfile\")}.  It is possible to specify a swap file in a file system on a mapped device, provided that the necessary device mapping and file system are also specified.  @xref{Mapped Devices} and @ref{File Systems}."
+#: guix-git/doc/guix.texi:13764
+msgid "Use the swap partition with the given UUID@.  You can learn the UUID of a Linux swap partition by running @command{swaplabel @var{device}}, where @var{device} is the @file{/dev} file name of that partition."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10566
+#: guix-git/doc/guix.texi:13765
 #, no-wrap
-msgid "@code{users} (default: @code{%base-user-accounts})"
+msgid "(list (file-system-label \"swap\"))"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:10567
+#. type: table
+#: guix-git/doc/guix.texi:13769
+msgid "Use the partition with label @code{swap}.  Again, the @command{swaplabel} command allows you to view and change the label of a Linux swap partition."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13770
 #, no-wrap
-msgid "@code{groups} (default: @var{%base-groups})"
+msgid "(list \"/swapfile\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10569
+#: guix-git/doc/guix.texi:13772
+msgid "Use the file @file{/swapfile} as swap space."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13773
+#, no-wrap
+msgid "(list \"/dev/sda3\" \"/dev/sdb2\")"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13777
+msgid "Use the @file{/dev/sda3} and @file{/dev/sdb2} partitions as swap space.  We recommend referring to swap devices by UUIDs or labels as shown above instead."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:13783
+msgid "It is possible to specify a swap file in a file system on a mapped device (under @file{/dev/mapper}), provided that the necessary device mapping and file system are also specified.  @xref{Mapped Devices} and @ref{File Systems}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:13784
+#, no-wrap
+msgid "@code{users} (default: @code{%base-user-accounts})"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:13785
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{groups} (default: @code{%base-groups})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:13787
 msgid "List of user accounts and groups.  @xref{User Accounts}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10572
+#: guix-git/doc/guix.texi:13790
 msgid "If the @code{users} list lacks a user account with UID@tie{}0, a ``root'' account with UID@tie{}0 is automatically added."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10573
+#: guix-git/doc/guix.texi:13791
 #, no-wrap
 msgid "@code{skeletons} (default: @code{(default-skeletons)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10577
-msgid "A list target file name/file-like object tuples (@pxref{G-Expressions, file-like objects}).  These are the skeleton files that will be added to the home directory of newly-created user accounts."
+#: guix-git/doc/guix.texi:13795
+msgid "A list of target file name/file-like object tuples (@pxref{G-Expressions, file-like objects}).  These are the skeleton files that will be added to the home directory of newly-created user accounts."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10579
+#: guix-git/doc/guix.texi:13797
 msgid "For instance, a valid value may look like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10585
+#. type: lisp
+#: guix-git/doc/guix.texi:13803
 #, no-wrap
 msgid ""
 "`((\".bashrc\" ,(plain-file \"bashrc\" \"echo Hello\\n\"))\n"
@@ -18328,202 +24207,218 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10587
-#, no-wrap
-msgid "@code{issue} (default: @var{%default-issue})"
-msgstr ""
+#: guix-git/doc/guix.texi:13805
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{issue} (default: @code{%default-issue})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:10590
+#: guix-git/doc/guix.texi:13808
 msgid "A string denoting the contents of the @file{/etc/issue} file, which is displayed when users log in on a text console."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10591
-#, no-wrap
-msgid "@code{packages} (default: @var{%base-packages})"
-msgstr ""
+#: guix-git/doc/guix.texi:13809
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{packages} (default: @code{%base-packages})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
 
 #. type: table
-#: doc/guix.texi:10594
-msgid "The set of packages installed in the global profile, which is accessible at @file{/run/current-system/profile}."
+#: guix-git/doc/guix.texi:13813
+msgid "A list of packages to be installed in the global profile, which is accessible at @file{/run/current-system/profile}.  Each element is either a package variable or a package/output tuple.  Here's a simple example of both:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:13818
+#, no-wrap
+msgid ""
+"(cons* git                     ; the default \"out\" output\n"
+"       (list git \"send-email\") ; another output of git\n"
+"       %base-packages)         ; the default set\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10598
+#: guix-git/doc/guix.texi:13823
 msgid "The default set includes core utilities and it is good practice to install non-core utilities in user profiles (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10599
+#: guix-git/doc/guix.texi:13824
 #, no-wrap
 msgid "timezone"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10601
+#: guix-git/doc/guix.texi:13826
 msgid "A timezone identifying string---e.g., @code{\"Europe/Paris\"}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10605
+#: guix-git/doc/guix.texi:13830
 msgid "You can run the @command{tzselect} command to find out which timezone string corresponds to your region.  Choosing an invalid timezone name causes @command{guix system} to fail."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10606
+#: guix-git/doc/guix.texi:13831 guix-git/doc/guix.texi:19734
 #, no-wrap
 msgid "@code{locale} (default: @code{\"en_US.utf8\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10609
+#: guix-git/doc/guix.texi:13834
 msgid "The name of the default locale (@pxref{Locale Names,,, libc, The GNU C Library Reference Manual}).  @xref{Locales}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10610
-#, no-wrap
-msgid "@code{locale-definitions} (default: @var{%default-locale-definitions})"
-msgstr ""
+#: guix-git/doc/guix.texi:13835
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{locale-definitions} (default: @code{%default-locale-definitions})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
 
 #. type: table
-#: doc/guix.texi:10613
+#: guix-git/doc/guix.texi:13838
 msgid "The list of locale definitions to be compiled and that may be used at run time.  @xref{Locales}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10614
+#: guix-git/doc/guix.texi:13839
 #, no-wrap
 msgid "@code{locale-libcs} (default: @code{(list @var{glibc})})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10618
+#: guix-git/doc/guix.texi:13843
 msgid "The list of GNU@tie{}libc packages whose locale data and tools are used to build the locale definitions.  @xref{Locales}, for compatibility considerations that justify this option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10619
-#, no-wrap
-msgid "@code{name-service-switch} (default: @var{%default-nss})"
-msgstr ""
+#: guix-git/doc/guix.texi:13844
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{name-service-switch} (default: @code{%default-nss})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:10623
+#: guix-git/doc/guix.texi:13848
 msgid "Configuration of the libc name service switch (NSS)---a @code{<name-service-switch>} object.  @xref{Name Service Switch}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10624
-#, no-wrap
-msgid "@code{services} (default: @var{%base-services})"
-msgstr ""
+#: guix-git/doc/guix.texi:13849
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{services} (default: @code{%base-services})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
 
 #. type: table
-#: doc/guix.texi:10626
+#: guix-git/doc/guix.texi:13851
 msgid "A list of service objects denoting system services.  @xref{Services}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10627
+#: guix-git/doc/guix.texi:13852
 #, no-wrap
 msgid "essential services"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10628
+#: guix-git/doc/guix.texi:13853
 #, no-wrap
 msgid "@code{essential-services} (default: ...)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10633
+#: guix-git/doc/guix.texi:13858
 msgid "The list of ``essential services''---i.e., things like instances of @code{system-service-type} and @code{host-name-service-type} (@pxref{Service Reference}), which are derived from the operating system definition itself.  As a user you should @emph{never} need to touch this field."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10634
+#: guix-git/doc/guix.texi:13859
 #, no-wrap
 msgid "@code{pam-services} (default: @code{(base-pam-services)})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10635
+#: guix-git/doc/guix.texi:13860
 #, no-wrap
 msgid "PAM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10636
+#: guix-git/doc/guix.texi:13861
 #, no-wrap
 msgid "pluggable authentication modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10639
+#: guix-git/doc/guix.texi:13864
 msgid "Linux @dfn{pluggable authentication module} (PAM) services."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10640
-#, no-wrap
-msgid "@code{setuid-programs} (default: @var{%setuid-programs})"
-msgstr ""
+#: guix-git/doc/guix.texi:13865
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{setuid-programs} (default: @code{%setuid-programs})"
+msgstr "@code{features} （@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:10643
+#: guix-git/doc/guix.texi:13868
 msgid "List of string-valued G-expressions denoting setuid programs.  @xref{Setuid Programs}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10644
-#, no-wrap
-msgid "@code{sudoers-file} (default: @var{%sudoers-specification})"
-msgstr ""
+#: guix-git/doc/guix.texi:13869
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{sudoers-file} (default: @code{%sudoers-specification})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
 
 #. type: cindex
-#: doc/guix.texi:10645
+#: guix-git/doc/guix.texi:13870
 #, no-wrap
 msgid "sudoers file"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10648
+#: guix-git/doc/guix.texi:13873
 msgid "The contents of the @file{/etc/sudoers} file as a file-like object (@pxref{G-Expressions, @code{local-file} and @code{plain-file}})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10653
+#: guix-git/doc/guix.texi:13878
 msgid "This file specifies which users can use the @command{sudo} command, what they are allowed to do, and what privileges they may gain.  The default is that only @code{root} and members of the @code{wheel} group may use @code{sudo}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10656
+#: guix-git/doc/guix.texi:13881
 #, no-wrap
 msgid "{Scheme Syntax} this-operating-system"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10659
+#: guix-git/doc/guix.texi:13884
 msgid "When used in the @emph{lexical scope} of an operating system field definition, this identifier resolves to the operating system being defined."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10662
+#: guix-git/doc/guix.texi:13887
 msgid "The example below shows how to refer to the operating system being defined in the definition of the @code{label} field:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10665 doc/guix.texi:13330
+#. type: lisp
+#: guix-git/doc/guix.texi:13890 guix-git/doc/guix.texi:17352
 #, no-wrap
 msgid ""
 "(use-modules (gnu) (guix))\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10670
+#. type: lisp
+#: guix-git/doc/guix.texi:13895
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -18533,17 +24428,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:10674
+#: guix-git/doc/guix.texi:13899
 msgid "It is an error to refer to @code{this-operating-system} outside an operating system definition."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10685
+#: guix-git/doc/guix.texi:13910
 msgid "The list of file systems to be mounted is specified in the @code{file-systems} field of the operating system declaration (@pxref{Using the Configuration System}).  Each file system is declared using the @code{file-system} form, like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10691
+#. type: lisp
+#: guix-git/doc/guix.texi:13916
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -18553,67 +24448,67 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10695
+#: guix-git/doc/guix.texi:13920
 msgid "As usual, some of the fields are mandatory---those shown in the example above---while others can be omitted.  These are described below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10696
+#: guix-git/doc/guix.texi:13921
 #, no-wrap
 msgid "{Data Type} file-system"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10699
+#: guix-git/doc/guix.texi:13924
 msgid "Objects of this type represent file systems to be mounted.  They contain the following members:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10701 doc/guix.texi:10892
+#: guix-git/doc/guix.texi:13926 guix-git/doc/guix.texi:14276
 #, no-wrap
 msgid "type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10704
+#: guix-git/doc/guix.texi:13929
 msgid "This is a string specifying the type of the file system---e.g., @code{\"ext4\"}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10705
+#: guix-git/doc/guix.texi:13930
 #, no-wrap
 msgid "mount-point"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10707
+#: guix-git/doc/guix.texi:13932
 msgid "This designates the place where the file system is to be mounted."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10708
+#: guix-git/doc/guix.texi:13933
 #, no-wrap
 msgid "device"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10718
+#: guix-git/doc/guix.texi:13943
 msgid "This names the ``source'' of the file system.  It can be one of three things: a file system label, a file system UUID, or the name of a @file{/dev} node.  Labels and UUIDs offer a way to refer to file systems without having to hard-code their actual device name@footnote{Note that, while it is tempting to use @file{/dev/disk/by-uuid} and similar device names to achieve the same result, this is not recommended: These special device nodes are created by the udev daemon and may be unavailable at the time the device is mounted.}."
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:10719
+#: guix-git/doc/guix.texi:13944
 #, no-wrap
 msgid "file-system-label"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10724
+#: guix-git/doc/guix.texi:13949
 msgid "File system labels are created using the @code{file-system-label} procedure, UUIDs are created using @code{uuid}, and @file{/dev} node are plain strings.  Here's an example of a file system referred to by its label, as shown by the @command{e2label} command:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10730
+#. type: lisp
+#: guix-git/doc/guix.texi:13955
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -18622,19 +24517,20 @@ msgid ""
 "  (device (file-system-label \"my-home\")))\n"
 msgstr ""
 
-#. type: findex
-#: doc/guix.texi:10732
+#. type: code{#1}
+#: guix-git/doc/guix.texi:13957 guix-git/doc/guix.texi:31197
+#: guix-git/doc/guix.texi:31213
 #, no-wrap
 msgid "uuid"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10740
+#: guix-git/doc/guix.texi:13965
 msgid "UUIDs are converted from their string representation (as shown by the @command{tune2fs -l} command) using the @code{uuid} form@footnote{The @code{uuid} form expects 16-byte UUIDs as defined in @uref{https://tools.ietf.org/html/rfc4122, RFC@tie{}4122}.  This is the form of UUID used by the ext2 family of file systems and others, but it is different from ``UUIDs'' found in FAT file systems, for instance.}, like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10746
+#. type: lisp
+#: guix-git/doc/guix.texi:13971
 #, no-wrap
 msgid ""
 "(file-system\n"
@@ -18644,268 +24540,499 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10754
+#: guix-git/doc/guix.texi:13979
 msgid "When the source of a file system is a mapped device (@pxref{Mapped Devices}), its @code{device} field @emph{must} refer to the mapped device name---e.g., @file{\"/dev/mapper/root-partition\"}.  This is required so that the system knows that mounting the file system depends on having the corresponding device mapping established."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10755
+#: guix-git/doc/guix.texi:13980
 #, no-wrap
 msgid "@code{flags} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10762
-msgid "This is a list of symbols denoting mount flags.  Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), @code{no-atime} (do not update file access times), and @code{no-exec} (disallow program execution).  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for more information on these flags."
+#: guix-git/doc/guix.texi:13990
+msgid "This is a list of symbols denoting mount flags.  Recognized flags include @code{read-only}, @code{bind-mount}, @code{no-dev} (disallow access to special files), @code{no-suid} (ignore setuid and setgid bits), @code{no-atime} (do not update file access times), @code{strict-atime} (update file access time), @code{lazy-time} (only update time on the in-memory version of the file inode), and @code{no-exec} (disallow program execution).  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for more information on these flags."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10763
+#: guix-git/doc/guix.texi:13991
 #, no-wrap
 msgid "@code{options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10768
-msgid "This is either @code{#f}, or a string denoting mount options passed to the file system driver.  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for details and run @command{man 8 mount} for options for various file systems."
+#: guix-git/doc/guix.texi:14000
+msgid "This is either @code{#f}, or a string denoting mount options passed to the file system driver.  @xref{Mount-Unmount-Remount,,, libc, The GNU C Library Reference Manual}, for details and run @command{man 8 mount} for options for various file systems.  Note that the @code{file-system-options->alist} and @code{alist->file-system-options} procedures from @code{(gnu system file-systems)} can be used to convert file system options given as an association list to the string representation, and vice-versa."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10769
+#: guix-git/doc/guix.texi:14001
 #, no-wrap
 msgid "@code{mount?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10774
+#: guix-git/doc/guix.texi:14006
 msgid "This value indicates whether to automatically mount the file system when the system is brought up.  When set to @code{#f}, the file system gets an entry in @file{/etc/fstab} (read by the @command{mount} command) but is not automatically mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10775
+#: guix-git/doc/guix.texi:14007
 #, no-wrap
 msgid "@code{needed-for-boot?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10780
+#: guix-git/doc/guix.texi:14012
 msgid "This Boolean value indicates whether the file system is needed when booting.  If that is true, then the file system is mounted when the initial RAM disk (initrd) is loaded.  This is always the case, for instance, for the root file system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10781
+#: guix-git/doc/guix.texi:14013
 #, no-wrap
 msgid "@code{check?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10784
+#: guix-git/doc/guix.texi:14016
 msgid "This Boolean indicates whether the file system needs to be checked for errors before being mounted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10785
+#: guix-git/doc/guix.texi:14017
 #, no-wrap
 msgid "@code{create-mount-point?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10787
+#: guix-git/doc/guix.texi:14019
 msgid "When true, the mount point is created if it does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:10788
+#: guix-git/doc/guix.texi:14020
+#, fuzzy, no-wrap
+#| msgid "@code{max-journal-usage} (default: @code{#f})"
+msgid "@code{mount-may-fail?} (default: @code{#f})"
+msgstr "@code{max-journal-usage}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:14025
+msgid "When true, this indicates that mounting this file system can fail but that should not be considered an error.  This is useful in unusual cases; an example of this is @code{efivarfs}, a file system that can only be mounted on EFI/UEFI systems."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:14026
 #, no-wrap
 msgid "@code{dependencies} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10792
+#: guix-git/doc/guix.texi:14030
 msgid "This is a list of @code{<file-system>} or @code{<mapped-device>} objects representing file systems that must be mounted or mapped devices that must be opened before (and unmounted or closed after) this one."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10796
+#: guix-git/doc/guix.texi:14034
 msgid "As an example, consider a hierarchy of mounts: @file{/sys/fs/cgroup} is a dependency of @file{/sys/fs/cgroup/cpu} and @file{/sys/fs/cgroup/memory}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10799
+#: guix-git/doc/guix.texi:14037
 msgid "Another example is a file system that depends on a mapped device, for example for an encrypted partition (@pxref{Mapped Devices})."
 msgstr ""
 
+#. type: deffn
+#: guix-git/doc/guix.texi:14040
+#, no-wrap
+msgid "{Scheme Procedure} file-system-label @var{str}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14043
+msgid "This procedure returns an opaque file system label from @var{str}, a string:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14047
+#, no-wrap
+msgid ""
+"(file-system-label \"home\")\n"
+"@result{} #<file-system-label \"home\">\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14051
+msgid "File system labels are used to refer to file systems by label rather than by device name.  See above for examples."
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:10804
+#: guix-git/doc/guix.texi:14055
 msgid "The @code{(gnu system file-systems)} exports the following useful variables."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10805
+#: guix-git/doc/guix.texi:14056
 #, no-wrap
 msgid "{Scheme Variable} %base-file-systems"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10810
-msgid "These are essential file systems that are required on normal systems, such as @var{%pseudo-terminal-file-system} and @var{%immutable-store} (see below.)  Operating system declarations should always contain at least these."
+#: guix-git/doc/guix.texi:14061
+msgid "These are essential file systems that are required on normal systems, such as @code{%pseudo-terminal-file-system} and @code{%immutable-store} (see below).  Operating system declarations should always contain at least these."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10812
+#: guix-git/doc/guix.texi:14063
 #, no-wrap
 msgid "{Scheme Variable} %pseudo-terminal-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10818
+#: guix-git/doc/guix.texi:14069
 msgid "This is the file system to be mounted as @file{/dev/pts}.  It supports @dfn{pseudo-terminals} created @i{via} @code{openpty} and similar functions (@pxref{Pseudo-Terminals,,, libc, The GNU C Library Reference Manual}).  Pseudo-terminals are used by terminal emulators such as @command{xterm}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10820
+#: guix-git/doc/guix.texi:14071
 #, no-wrap
 msgid "{Scheme Variable} %shared-memory-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10824
+#: guix-git/doc/guix.texi:14075
 msgid "This file system is mounted as @file{/dev/shm} and is used to support memory sharing across processes (@pxref{Memory-mapped I/O, @code{shm_open},, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10826
+#: guix-git/doc/guix.texi:14077
 #, no-wrap
 msgid "{Scheme Variable} %immutable-store"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10831
+#: guix-git/doc/guix.texi:14082
 msgid "This file system performs a read-only ``bind mount'' of @file{/gnu/store}, making it read-only for all the users including @code{root}.  This prevents against accidental modification by software running as @code{root} or by system administrators."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10834
+#: guix-git/doc/guix.texi:14085
 msgid "The daemon itself is still able to write to the store: it remounts it read-write in its own ``name space.''"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10836
+#: guix-git/doc/guix.texi:14087
 #, no-wrap
 msgid "{Scheme Variable} %binary-format-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10840
+#: guix-git/doc/guix.texi:14091
 msgid "The @code{binfmt_misc} file system, which allows handling of arbitrary executable file types to be delegated to user space.  This requires the @code{binfmt.ko} kernel module to be loaded."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10842
+#: guix-git/doc/guix.texi:14093
 #, no-wrap
 msgid "{Scheme Variable} %fuse-control-file-system"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10846
+#: guix-git/doc/guix.texi:14097
 msgid "The @code{fusectl} file system, which allows unprivileged users to mount and unmount user-space FUSE file systems.  This requires the @code{fuse.ko} kernel module to be loaded."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:14101
+msgid "The @code{(gnu system uuid)} module provides tools to deal with file system ``unique identifiers'' (UUIDs)."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14102
+#, no-wrap
+msgid "{Scheme Procedure} uuid @var{str} [@var{type}]"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14105
+msgid "Return an opaque UUID (unique identifier) object of the given @var{type} (a symbol) by parsing @var{str} (a string):"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14109
+#, no-wrap
+msgid ""
+"(uuid \"4dab5feb-d176-45de-b287-9b0a6e4c01cb\")\n"
+"@result{} #<<uuid> type: dce bv: @dots{}>\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14112
+#, no-wrap
+msgid ""
+"(uuid \"1234-ABCD\" 'fat)\n"
+"@result{} #<<uuid> type: fat bv: @dots{}>\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14116
+msgid "@var{type} may be one of @code{dce}, @code{iso9660}, @code{fat}, @code{ntfs}, or one of the commonly found synonyms for these."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14119
+msgid "UUIDs are another way to unambiguously refer to file systems in operating system configuration.  See the examples above."
+msgstr ""
+
+#. type: subsection
+#: guix-git/doc/guix.texi:14122 guix-git/doc/guix.texi:14123
+#, fuzzy, no-wrap
+#| msgid "Network File System"
+msgid "Btrfs file system"
+msgstr "网络文件系统"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14129
+msgid "The Btrfs has special features, such as subvolumes, that merit being explained in more details.  The following section attempts to cover basic as well as complex uses of a Btrfs file system with the Guix System."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14132
+msgid "In its simplest usage, a Btrfs file system can be described, for example, by:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14138
+#, no-wrap
+msgid ""
+"(file-system\n"
+"  (mount-point \"/home\")\n"
+"  (type \"btrfs\")\n"
+"  (device (file-system-label \"my-home\")))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14144
+msgid "The example below is more complex, as it makes use of a Btrfs subvolume, named @code{rootfs}.  The parent Btrfs file system is labeled @code{my-btrfs-pool}, and is located on an encrypted device (hence the dependency on @code{mapped-devices}):"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14152
+#, no-wrap
+msgid ""
+"(file-system\n"
+"  (device (file-system-label \"my-btrfs-pool\"))\n"
+"  (mount-point \"/\")\n"
+"  (type \"btrfs\")\n"
+"  (options \"subvol=rootfs\")\n"
+"  (dependencies mapped-devices))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14163
+msgid "Some bootloaders, for example GRUB, only mount a Btrfs partition at its top level during the early boot, and rely on their configuration to refer to the correct subvolume path within that top level.  The bootloaders operating in this way typically produce their configuration on a running system where the Btrfs partitions are already mounted and where the subvolume information is readily available.  As an example, @command{grub-mkconfig}, the configuration generator command shipped with GRUB, reads @file{/proc/self/mountinfo} to determine the top-level path of a subvolume."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14171
+msgid "The Guix System produces a bootloader configuration using the operating system configuration as its sole input; it is therefore necessary to extract the subvolume name on which @file{/gnu/store} lives (if any)  from that operating system configuration.  To better illustrate, consider a subvolume named 'rootfs' which contains the root file system data.  In such situation, the GRUB bootloader would only see the top level of the root Btrfs partition, e.g.:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:14178
+#, no-wrap
+msgid ""
+"/                   (top level)\n"
+"├── rootfs          (subvolume directory)\n"
+"    ├── gnu         (normal directory)\n"
+"        ├── store   (normal directory)\n"
+"[...]\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14183
+msgid "Thus, the subvolume name must be prepended to the @file{/gnu/store} path of the kernel, initrd binaries and any other files referred to in the GRUB configuration that must be found during the early boot."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14186
+msgid "The next example shows a nested hierarchy of subvolumes and directories:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:14193
+#, no-wrap
+msgid ""
+"/                   (top level)\n"
+"├── rootfs          (subvolume)\n"
+"    ├── gnu         (normal directory)\n"
+"        ├── store   (subvolume)\n"
+"[...]\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14200
+msgid "This scenario would work without mounting the 'store' subvolume.  Mounting 'rootfs' is sufficient, since the subvolume name matches its intended mount point in the file system hierarchy.  Alternatively, the 'store' subvolume could be referred to by setting the @code{subvol} option to either @code{/rootfs/gnu/store} or @code{rootfs/gnu/store}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14202
+msgid "Finally, a more contrived example of nested subvolumes:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:14209
+#, no-wrap
+msgid ""
+"/                           (top level)\n"
+"├── root-snapshots          (subvolume)\n"
+"    ├── root-current        (subvolume)\n"
+"        ├── guix-store      (subvolume)\n"
+"[...]\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14216
+msgid "Here, the 'guix-store' subvolume doesn't match its intended mount point, so it is necessary to mount it.  The subvolume must be fully specified, by passing its file name to the @code{subvol} option.  To illustrate, the 'guix-store' subvolume could be mounted on @file{/gnu/store} by using a file system declaration such as:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14224
+#, no-wrap
+msgid ""
+"(file-system\n"
+"  (device (file-system-label \"btrfs-pool-1\"))\n"
+"  (mount-point \"/gnu/store\")\n"
+"  (type \"btrfs\")\n"
+"  (options \"subvol=root-snapshots/root-current/guix-store,\\\n"
+"compress-force=zstd,space_cache=v2\"))\n"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:10851
+#: guix-git/doc/guix.texi:14229
 #, no-wrap
 msgid "device mapping"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10852
+#: guix-git/doc/guix.texi:14230
 #, no-wrap
 msgid "mapped devices"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10870
-msgid "The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to @emph{translating} input/output operations made on a file to operations on its backing store.  Thus, the Hurd implements mapped devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}.  A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are deciphered, transparently.  Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or partitions, into a new one that behaves as one partition.  Other examples, not yet implemented, are LVM logical volumes."
+#: guix-git/doc/guix.texi:14247
+msgid "The Linux kernel has a notion of @dfn{device mapping}: a block device, such as a hard disk partition, can be @dfn{mapped} into another device, usually in @code{/dev/mapper/}, with additional processing over the data that flows through it@footnote{Note that the GNU@tie{}Hurd makes no difference between the concept of a ``mapped device'' and that of a file system: both boil down to @emph{translating} input/output operations made on a file to operations on its backing store.  Thus, the Hurd implements mapped devices, like file systems, using the generic @dfn{translator} mechanism (@pxref{Translators,,, hurd, The GNU Hurd Reference Manual}).}.  A typical example is encryption device mapping: all writes to the mapped device are encrypted, and all reads are deciphered, transparently.  Guix extends this notion by considering any device or set of devices that are @dfn{transformed} in some way to create a new device; for instance, RAID devices are obtained by @dfn{assembling} several other devices, such as hard disks or partitions, into a new one that behaves as one partition."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10873
+#: guix-git/doc/guix.texi:14250
 msgid "Mapped devices are declared using the @code{mapped-device} form, defined as follows; for examples, see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10874
+#: guix-git/doc/guix.texi:14251
 #, no-wrap
 msgid "{Data Type} mapped-device"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10877
+#: guix-git/doc/guix.texi:14254
 msgid "Objects of this type represent device mappings that will be made when the system boots up."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10883
-msgid "This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several devices need to be assembled for creating a new one."
+#: guix-git/doc/guix.texi:14261
+msgid "This is either a string specifying the name of the block device to be mapped, such as @code{\"/dev/sda3\"}, or a list of such strings when several devices need to be assembled for creating a new one.  In case of LVM this is a string specifying name of the volume group to be mapped."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:10884 doc/guix.texi:24075
+#: guix-git/doc/guix.texi:14262 guix-git/doc/guix.texi:32551
 #, no-wrap
 msgid "target"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10891
-msgid "This string specifies the name of the resulting mapped device.  For kernel mappers such as encrypted devices of type @code{luks-device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device.  For RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given."
+#: guix-git/doc/guix.texi:14271
+msgid "This string specifies the name of the resulting mapped device.  For kernel mappers such as encrypted devices of type @code{luks-device-mapping}, specifying @code{\"my-partition\"} leads to the creation of the @code{\"/dev/mapper/my-partition\"} device.  For RAID devices of type @code{raid-device-mapping}, the full device name such as @code{\"/dev/md0\"} needs to be given.  LVM logical volumes of type @code{lvm-device-mapping} need to be specified as @code{\"VGNAME-LVNAME\"}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:14272
+#, no-wrap
+msgid "targets"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:10895
+#: guix-git/doc/guix.texi:14275
+msgid "This list of strings specifies names of the resulting mapped devices in case there are several.  The format is identical to @var{target}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:14279
 msgid "This must be a @code{mapped-device-kind} object, which specifies how @var{source} is mapped to @var{target}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10898
+#: guix-git/doc/guix.texi:14282
 #, no-wrap
 msgid "{Scheme Variable} luks-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10902
+#: guix-git/doc/guix.texi:14286
 msgid "This defines LUKS block device encryption using the @command{cryptsetup} command from the package with the same name.  It relies on the @code{dm-crypt} Linux kernel module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10904
+#: guix-git/doc/guix.texi:14288
 #, no-wrap
 msgid "{Scheme Variable} raid-device-mapping"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:10909
+#: guix-git/doc/guix.texi:14293
 msgid "This defines a RAID device, which is assembled using the @code{mdadm} command from the package with the same name.  It requires a Linux kernel module for the appropriate RAID level to be loaded, such as @code{raid456} for RAID-4, RAID-5 or RAID-6, or @code{raid10} for RAID-10."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10911
+#: guix-git/doc/guix.texi:14295
+#, no-wrap
+msgid "LVM, logical volume manager"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:14296
+#, no-wrap
+msgid "{Scheme Variable} lvm-device-mapping"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:14301
+msgid "This defines one or more logical volumes for the Linux @uref{https://www.sourceware.org/lvm2/, Logical Volume Manager (LVM)}.  The volume group is activated by the @command{vgchange} command from the @code{lvm2} package."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:14303
 #, no-wrap
 msgid "disk encryption"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10912
+#: guix-git/doc/guix.texi:14304
 #, no-wrap
 msgid "LUKS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10920
+#: guix-git/doc/guix.texi:14312
 msgid "The following example specifies a mapping from @file{/dev/sda3} to @file{/dev/mapper/home} using LUKS---the @url{https://gitlab.com/cryptsetup/cryptsetup,Linux Unified Key Setup}, a standard mechanism for disk encryption.  The @file{/dev/mapper/home} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10926
+#. type: lisp
+#: guix-git/doc/guix.texi:14318
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -18915,23 +25042,23 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10931
+#: guix-git/doc/guix.texi:14323
 msgid "Alternatively, to become independent of device numbering, one may obtain the LUKS UUID (@dfn{unique identifier}) of the source device by a command like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:10934
+#: guix-git/doc/guix.texi:14326
 #, no-wrap
 msgid "cryptsetup luksUUID /dev/sda3\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10937
+#: guix-git/doc/guix.texi:14329
 msgid "and use it as follows:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10943
+#. type: lisp
+#: guix-git/doc/guix.texi:14335
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -18941,23 +25068,23 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10945
+#: guix-git/doc/guix.texi:14337
 #, no-wrap
 msgid "swap encryption"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10951
+#: guix-git/doc/guix.texi:14343
 msgid "It is also desirable to encrypt swap space, since swap space may contain sensitive data.  One way to accomplish that is to use a swap file in a file system on a device mapped via LUKS encryption.  In this way, the swap file is encrypted because the entire device is encrypted.  @xref{Preparing for Installation,,Disk Partitioning}, for an example."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10954
+#: guix-git/doc/guix.texi:14346
 msgid "A RAID device formed of the partitions @file{/dev/sda1} and @file{/dev/sdb1} may be declared as follows:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10960
+#. type: lisp
+#: guix-git/doc/guix.texi:14352
 #, no-wrap
 msgid ""
 "(mapped-device\n"
@@ -18967,35 +25094,55 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10967
+#: guix-git/doc/guix.texi:14359
 msgid "The @file{/dev/md0} device can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems}).  Note that the RAID level need not be given; it is chosen during the initial creation and formatting of the RAID device and is determined automatically later."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:14362
+msgid "LVM logical volumes ``alpha'' and ``beta'' from volume group ``vg0'' can be declared as follows:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14368
+#, no-wrap
+msgid ""
+"(mapped-device\n"
+"  (source \"vg0\")\n"
+"  (targets (list \"vg0-alpha\" \"vg0-beta\"))\n"
+"  (type lvm-device-mapping))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14373
+msgid "Devices @file{/dev/mapper/vg0-alpha} and @file{/dev/mapper/vg0-beta} can then be used as the @code{device} of a @code{file-system} declaration (@pxref{File Systems})."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:10972
+#: guix-git/doc/guix.texi:14377
 #, no-wrap
 msgid "users"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10973
+#: guix-git/doc/guix.texi:14378
 #, no-wrap
 msgid "accounts"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:10974
+#: guix-git/doc/guix.texi:14379
 #, no-wrap
 msgid "user accounts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10978
+#: guix-git/doc/guix.texi:14383
 msgid "User accounts and groups are entirely managed through the @code{operating-system} declaration.  They are specified with the @code{user-account} and @code{user-group} forms:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:10989
+#. type: lisp
+#: guix-git/doc/guix.texi:14393
 #, no-wrap
 msgid ""
 "(user-account\n"
@@ -19005,154 +25152,187 @@ msgid ""
 "                          \"audio\"   ;sound card\n"
 "                          \"video\"   ;video devices such as webcams\n"
 "                          \"cdrom\")) ;the good ol' CD-ROM\n"
-"  (comment \"Bob's sister\")\n"
-"  (home-directory \"/home/alice\"))\n"
+"  (comment \"Bob's sister\"))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14397
+msgid "Here's a user account that uses a different shell and a custom home directory (the default would be @file{\"/home/bob\"}):"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14405
+#, no-wrap
+msgid ""
+"(user-account\n"
+"  (name \"bob\")\n"
+"  (group \"users\")\n"
+"  (comment \"Alice's bro\")\n"
+"  (shell (file-append zsh \"/bin/zsh\"))\n"
+"  (home-directory \"/home/robert\"))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:10998
+#: guix-git/doc/guix.texi:14414
 msgid "When booting or upon completion of @command{guix system reconfigure}, the system ensures that only the user accounts and groups specified in the @code{operating-system} declaration exist, and with the specified properties.  Thus, account or group creations or modifications made by directly invoking commands such as @command{useradd} are lost upon reconfiguration or reboot.  This ensures that the system remains exactly as declared."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:10999
+#: guix-git/doc/guix.texi:14415
 #, no-wrap
 msgid "{Data Type} user-account"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11002
+#: guix-git/doc/guix.texi:14418
 msgid "Objects of this type represent user accounts.  The following members may be specified:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11006
+#: guix-git/doc/guix.texi:14422
 msgid "The name of the user account."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11007 doc/guix.texi:23811
+#: guix-git/doc/guix.texi:14423 guix-git/doc/guix.texi:32237
 #, no-wrap
 msgid "group"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11008 doc/guix.texi:11075
+#: guix-git/doc/guix.texi:14424 guix-git/doc/guix.texi:14503
 #, no-wrap
 msgid "groups"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11011
+#: guix-git/doc/guix.texi:14427
 msgid "This is the name (a string) or identifier (a number) of the user group this account belongs to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11012
+#: guix-git/doc/guix.texi:14428
 #, no-wrap
 msgid "@code{supplementary-groups} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11015
+#: guix-git/doc/guix.texi:14431
 msgid "Optionally, this can be defined as a list of group names that this account belongs to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11016
+#: guix-git/doc/guix.texi:14432
 #, no-wrap
 msgid "@code{uid} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11020
+#: guix-git/doc/guix.texi:14436
 msgid "This is the user ID for this account (a number), or @code{#f}.  In the latter case, a number is automatically chosen by the system when the account is created."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11021
+#: guix-git/doc/guix.texi:14437
 #, no-wrap
 msgid "@code{comment} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11023
+#: guix-git/doc/guix.texi:14439
 msgid "A comment about the account, such as the account owner's full name."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11024
+#: guix-git/doc/guix.texi:14440
 #, no-wrap
 msgid "home-directory"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11026
+#: guix-git/doc/guix.texi:14442
 msgid "This is the name of the home directory for the account."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11027
+#: guix-git/doc/guix.texi:14443
 #, no-wrap
 msgid "@code{create-home-directory?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11030
+#: guix-git/doc/guix.texi:14446
 msgid "Indicates whether the home directory of this account should be created if it does not exist yet."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11031
+#: guix-git/doc/guix.texi:14447
 #, no-wrap
 msgid "@code{shell} (default: Bash)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11034
-msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions})."
+#: guix-git/doc/guix.texi:14451
+msgid "This is a G-expression denoting the file name of a program to be used as the shell (@pxref{G-Expressions}).  For example, you would refer to the Bash executable like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14454
+#, no-wrap
+msgid "(file-append bash \"/bin/bash\")\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:14458
+msgid "... and to the Zsh executable like that:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14461
+#, no-wrap
+msgid "(file-append zsh \"/bin/zsh\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11035 doc/guix.texi:11093
+#: guix-git/doc/guix.texi:14463 guix-git/doc/guix.texi:14521
 #, no-wrap
 msgid "@code{system?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11039
+#: guix-git/doc/guix.texi:14467
 msgid "This Boolean value indicates whether the account is a ``system'' account.  System accounts are sometimes treated specially; for instance, graphical login managers do not list them."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:11041
+#: guix-git/doc/guix.texi:14469
 msgid "user-account-password"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11041
+#: guix-git/doc/guix.texi:14469
 #, no-wrap
 msgid "password, for user accounts"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11042 doc/guix.texi:11097
+#: guix-git/doc/guix.texi:14470 guix-git/doc/guix.texi:14525
 #, no-wrap
 msgid "@code{password} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11048
+#: guix-git/doc/guix.texi:14476
 msgid "You would normally leave this field to @code{#f}, initialize user passwords as @code{root} with the @command{passwd} command, and then let users change it with @command{passwd}.  Passwords set with @command{passwd} are of course preserved across reboot and reconfiguration."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11052
+#: guix-git/doc/guix.texi:14480
 msgid "If you @emph{do} want to set an initial password for an account, then this field must contain the encrypted password, as a string.  You can use the @code{crypt} procedure for this purpose:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11057
+#. type: lisp
+#: guix-git/doc/guix.texi:14485
 #, no-wrap
 msgid ""
 "(user-account\n"
@@ -19161,8 +25341,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11060
+#. type: lisp
+#: guix-git/doc/guix.texi:14488
 #, no-wrap
 msgid ""
 "  ;; Specify a SHA-512-hashed initial password.\n"
@@ -19170,150 +25350,171 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:11066
+#: guix-git/doc/guix.texi:14494
 msgid "The hash of this initial password will be available in a file in @file{/gnu/store}, readable by all the users, so this method must be used with care."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11071
+#: guix-git/doc/guix.texi:14499
 msgid "@xref{Passphrase Storage,,, libc, The GNU C Library Reference Manual}, for more information on password encryption, and @ref{Encryption,,, guile, GNU Guile Reference Manual}, for information on Guile's @code{crypt} procedure."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11077
+#: guix-git/doc/guix.texi:14505
 msgid "User group declarations are even simpler:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11080
+#. type: lisp
+#: guix-git/doc/guix.texi:14508
 #, no-wrap
 msgid "(user-group (name \"students\"))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11082
+#: guix-git/doc/guix.texi:14510
 #, no-wrap
 msgid "{Data Type} user-group"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11084
+#: guix-git/doc/guix.texi:14512
 msgid "This type is for, well, user groups.  There are just a few fields:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11088
+#: guix-git/doc/guix.texi:14516
 msgid "The name of the group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11089
+#: guix-git/doc/guix.texi:14517 guix-git/doc/guix.texi:29041
 #, no-wrap
 msgid "@code{id} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11092
+#: guix-git/doc/guix.texi:14520
 msgid "The group identifier (a number).  If @code{#f}, a new number is automatically allocated when the group is created."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11096
+#: guix-git/doc/guix.texi:14524
 msgid "This Boolean value indicates whether the group is a ``system'' group.  System groups have low numerical IDs."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11100
+#: guix-git/doc/guix.texi:14528
 msgid "What, user groups can have a password? Well, apparently yes.  Unless @code{#f}, this field specifies the password of the group."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11106
+#: guix-git/doc/guix.texi:14534
 msgid "For convenience, a variable lists all the basic user groups one may expect:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11107
+#: guix-git/doc/guix.texi:14535
 #, no-wrap
 msgid "{Scheme Variable} %base-groups"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11112
+#: guix-git/doc/guix.texi:14540
 msgid "This is the list of basic user groups that users and/or packages expect to be present on the system.  This includes groups such as ``root'', ``wheel'', and ``users'', as well as groups used to control access to specific devices such as ``audio'', ``disk'', and ``cdrom''."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11114
+#: guix-git/doc/guix.texi:14542
 #, no-wrap
 msgid "{Scheme Variable} %base-user-accounts"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11117
+#: guix-git/doc/guix.texi:14545
 msgid "This is the list of basic system accounts that programs may expect to find on a GNU/Linux system, such as the ``nobody'' account."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11120
+#: guix-git/doc/guix.texi:14548
 msgid "Note that the ``root'' account is not included here.  It is a special-case and is automatically added whether or not it is specified."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11126
+#: guix-git/doc/guix.texi:14554
 #, no-wrap
 msgid "keymap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11134
+#: guix-git/doc/guix.texi:14562
 msgid "To specify what each key of your keyboard does, you need to tell the operating system what @dfn{keyboard layout} you want to use.  The default, when nothing is specified, is the US English QWERTY layout for 105-key PC keyboards.  However, German speakers will usually prefer the German QWERTZ layout, French speakers will want the AZERTY layout, and so on; hackers might prefer Dvorak or bépo, and they might even want to further customize the effect of some of the keys.  This section explains how to get that done."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11135
+#: guix-git/doc/guix.texi:14563
 #, no-wrap
 msgid "keyboard layout, definition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11137
+#: guix-git/doc/guix.texi:14565
 msgid "There are three components that will want to know about your keyboard layout:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11144
+#: guix-git/doc/guix.texi:14572
 msgid "The @emph{bootloader} may want to know what keyboard layout you want to use (@pxref{Bootloader Configuration, @code{keyboard-layout}}).  This is useful if you want, for instance, to make sure that you can type the passphrase of your encrypted root partition using the right layout."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11149
+#: guix-git/doc/guix.texi:14577
 msgid "The @emph{operating system kernel}, Linux, will need that so that the console is properly configured (@pxref{operating-system Reference, @code{keyboard-layout}})."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11153
+#: guix-git/doc/guix.texi:14581
 msgid "The @emph{graphical display server}, usually Xorg, also has its own idea of the keyboard layout (@pxref{X Window, @code{keyboard-layout}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11157
+#: guix-git/doc/guix.texi:14585
 msgid "Guix allows you to configure all three separately but, fortunately, it allows you to share the same keyboard layout for all three components."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11158
+#: guix-git/doc/guix.texi:14586
 #, no-wrap
 msgid "XKB, keyboard layouts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11166
-msgid "Keyboard layouts are represented by records created by the @code{keyboard-layout} procedure of @code{(gnu system keyboard)}.  Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as ``fi'' for Finnish or ``jp'' for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options.  In most cases the layout name is all you care about.  Here are a few example:"
+#: guix-git/doc/guix.texi:14594
+msgid "Keyboard layouts are represented by records created by the @code{keyboard-layout} procedure of @code{(gnu system keyboard)}.  Following the X Keyboard extension (XKB), each layout has four attributes: a name (often a language code such as ``fi'' for Finnish or ``jp'' for Japanese), an optional variant name, an optional keyboard model name, and a possibly empty list of additional options.  In most cases the layout name is all you care about."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11171
+#. type: deffn
+#: guix-git/doc/guix.texi:14595
+#, no-wrap
+msgid "{Scheme Procedure} keyboard-layout @var{name} [@var{variant}] @"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14598
+msgid "[#:model] [#:options '()] Return a new keyboard layout with the given @var{name} and @var{variant}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:14602
+msgid "@var{name} must be a string such as @code{\"fr\"}; @var{variant} must be a string such as @code{\"bepo\"} or @code{\"nodeadkeys\"}.  See the @code{xkeyboard-config} package for valid options."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:14605
+msgid "Here are a few examples:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14610
 #, no-wrap
 msgid ""
 ";; The German QWERTZ layout.  Here we assume a standard\n"
@@ -19322,8 +25523,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11174
+#. type: lisp
+#: guix-git/doc/guix.texi:14613
 #, no-wrap
 msgid ""
 ";; The bépo variant of the French layout.\n"
@@ -19331,8 +25532,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11177
+#. type: lisp
+#: guix-git/doc/guix.texi:14616
 #, no-wrap
 msgid ""
 ";; The Catalan layout.\n"
@@ -19340,8 +25541,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11184
+#. type: lisp
+#: guix-git/doc/guix.texi:14619
+#, no-wrap
+msgid ""
+";; Arabic layout with \"Alt-Shift\" to switch to US layout.\n"
+"(keyboard-layout \"ar,us\" #:options '(\"grp:alt_shift_toggle\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:14626
 #, no-wrap
 msgid ""
 ";; The Latin American Spanish layout.  In addition, the\n"
@@ -19353,8 +25563,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11187
+#. type: lisp
+#: guix-git/doc/guix.texi:14629
 #, no-wrap
 msgid ""
 ";; The Russian layout for a ThinkPad keyboard.\n"
@@ -19362,8 +25572,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11192
+#. type: lisp
+#: guix-git/doc/guix.texi:14634
 #, no-wrap
 msgid ""
 ";; The \"US international\" layout, which is the US layout plus\n"
@@ -19373,29 +25583,29 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11196
+#: guix-git/doc/guix.texi:14638
 msgid "See the @file{share/X11/xkb} directory of the @code{xkeyboard-config} package for a complete list of supported layouts, variants, and models."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11197
+#: guix-git/doc/guix.texi:14639
 #, no-wrap
 msgid "keyboard layout, configuration"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11201
+#: guix-git/doc/guix.texi:14643
 msgid "Let's say you want your system to use the Turkish keyboard layout throughout your system---bootloader, console, and Xorg.  Here's what your system configuration would look like:"
 msgstr ""
 
 #. type: findex
-#: doc/guix.texi:11202
+#: guix-git/doc/guix.texi:14644
 #, no-wrap
 msgid "set-xorg-configuration"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11206
+#: guix-git/doc/guix.texi:14648
 #, no-wrap
 msgid ""
 ";; Using the Turkish layout for the bootloader, the console,\n"
@@ -19404,7 +25614,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:11218
+#: guix-git/doc/guix.texi:14660
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19421,76 +25631,76 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11225
+#: guix-git/doc/guix.texi:14667
 msgid "In the example above, for GRUB and for Xorg, we just refer to the @code{keyboard-layout} field defined above, but we could just as well refer to a different layout.  The @code{set-xorg-configuration} procedure communicates the desired Xorg configuration to the graphical log-in manager, by default GDM."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11228
+#: guix-git/doc/guix.texi:14670
 msgid "We've discussed how to specify the @emph{default} keyboard layout of your system when it starts, but you can also adjust it at run time:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11233
+#: guix-git/doc/guix.texi:14675
 msgid "If you're using GNOME, its settings panel has a ``Region & Language'' entry where you can select one or more keyboard layouts."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11238
+#: guix-git/doc/guix.texi:14680
 msgid "Under Xorg, the @command{setxkbmap} command (from the same-named package)  allows you to change the current layout.  For example, this is how you would change the layout to US Dvorak:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11241
+#: guix-git/doc/guix.texi:14683
 #, no-wrap
 msgid "setxkbmap us dvorak\n"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:11248
+#: guix-git/doc/guix.texi:14690
 msgid "The @code{loadkeys} command changes the keyboard layout in effect in the Linux console.  However, note that @code{loadkeys} does @emph{not} use the XKB keyboard layout categorization described above.  The command below loads the French bépo layout:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11251
+#: guix-git/doc/guix.texi:14693
 #, no-wrap
 msgid "loadkeys fr-bepo\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11257
+#: guix-git/doc/guix.texi:14699
 #, no-wrap
 msgid "locale"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11264
+#: guix-git/doc/guix.texi:14706
 msgid "A @dfn{locale} defines cultural conventions for a particular language and region of the world (@pxref{Locales,,, libc, The GNU C Library Reference Manual}).  Each locale has a name that typically has the form @code{@var{language}_@var{territory}.@var{codeset}}---e.g., @code{fr_LU.utf8} designates the locale for the French language, with cultural conventions from Luxembourg, and using the UTF-8 encoding."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11265
+#: guix-git/doc/guix.texi:14707
 #, no-wrap
 msgid "locale definition"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11269
+#: guix-git/doc/guix.texi:14711
 msgid "Usually, you will want to specify the default locale for the machine using the @code{locale} field of the @code{operating-system} declaration (@pxref{operating-system Reference, @code{locale}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11278
+#: guix-git/doc/guix.texi:14720
 msgid "The selected locale is automatically added to the @dfn{locale definitions} known to the system if needed, with its codeset inferred from its name---e.g., @code{bo_CN.utf8} will be assumed to use the @code{UTF-8} codeset.  Additional locale definitions can be specified in the @code{locale-definitions} slot of @code{operating-system}---this is useful, for instance, if the codeset could not be inferred from the locale name.  The default set of locale definitions includes some widely used locales, but not all the available locales, in order to save space."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11281
+#: guix-git/doc/guix.texi:14723
 msgid "For instance, to add the North Frisian locale for Germany, the value of that field may be:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11286
+#. type: lisp
+#: guix-git/doc/guix.texi:14728
 #, no-wrap
 msgid ""
 "(cons (locale-definition\n"
@@ -19499,12 +25709,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11290
+#: guix-git/doc/guix.texi:14732
 msgid "Likewise, to save space, one might want @code{locale-definitions} to list only the locales that are actually used, as in:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11295
+#. type: lisp
+#: guix-git/doc/guix.texi:14737
 #, no-wrap
 msgid ""
 "(list (locale-definition\n"
@@ -19513,122 +25723,122 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11304
-msgid "The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which is the default location where the GNU@tie{}libc provided by Guix looks for locale data.  This can be overridden using the @code{LOCPATH} environment variable (@pxref{locales-and-locpath, @code{LOCPATH} and locale packages})."
+#: guix-git/doc/guix.texi:14746
+msgid "The compiled locale definitions are available at @file{/run/current-system/locale/X.Y}, where @code{X.Y} is the libc version, which is the default location where the GNU@tie{}libc provided by Guix looks for locale data.  This can be overridden using the @env{LOCPATH} environment variable (@pxref{locales-and-locpath, @env{LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11307
+#: guix-git/doc/guix.texi:14749
 msgid "The @code{locale-definition} form is provided by the @code{(gnu system locale)} module.  Details are given below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11308
+#: guix-git/doc/guix.texi:14750
 #, no-wrap
 msgid "{Data Type} locale-definition"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11310
+#: guix-git/doc/guix.texi:14752
 msgid "This is the data type of a locale definition."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11316
+#: guix-git/doc/guix.texi:14758
 msgid "The name of the locale.  @xref{Locale Names,,, libc, The GNU C Library Reference Manual}, for more information on locale names."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11320
+#: guix-git/doc/guix.texi:14762
 msgid "The name of the source for that locale.  This is typically the @code{@var{language}_@var{territory}} part of the locale name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11321
+#: guix-git/doc/guix.texi:14763
 #, no-wrap
 msgid "@code{charset} (default: @code{\"UTF-8\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11325
+#: guix-git/doc/guix.texi:14767
 msgid "The ``character set'' or ``code set'' for that locale, @uref{https://www.iana.org/assignments/character-sets, as defined by IANA}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11329
+#: guix-git/doc/guix.texi:14771
 #, no-wrap
 msgid "{Scheme Variable} %default-locale-definitions"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11333
+#: guix-git/doc/guix.texi:14775
 msgid "A list of commonly used UTF-8 locales, used as the default value of the @code{locale-definitions} field of @code{operating-system} declarations."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11334
+#: guix-git/doc/guix.texi:14776
 #, no-wrap
 msgid "locale name"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11335
+#: guix-git/doc/guix.texi:14777
 #, no-wrap
 msgid "normalized codeset in locale names"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11341
+#: guix-git/doc/guix.texi:14783
 msgid "These locale definitions use the @dfn{normalized codeset} for the part that follows the dot in the name (@pxref{Using gettextized software, normalized codeset,, libc, The GNU C Library Reference Manual}).  So for instance it has @code{uk_UA.utf8} but @emph{not}, say, @code{uk_UA.UTF-8}."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:11343
+#: guix-git/doc/guix.texi:14785
 #, no-wrap
 msgid "Locale Data Compatibility Considerations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11345
+#: guix-git/doc/guix.texi:14787
 #, no-wrap
 msgid "incompatibility, of locale data"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11352
+#: guix-git/doc/guix.texi:14794
 msgid "@code{operating-system} declarations provide a @code{locale-libcs} field to specify the GNU@tie{}libc packages that are used to compile locale declarations (@pxref{operating-system Reference}).  ``Why would I care?'', you may ask.  Well, it turns out that the binary format of locale data is occasionally incompatible from one libc version to another."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11364
-msgid "For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program @emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}.  Similarly, a program linked against libc 2.22 can read most, but not all, of the locale data from libc 2.21 (specifically, @code{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort."
+#: guix-git/doc/guix.texi:14806
+msgid "For instance, a program linked against libc version 2.21 is unable to read locale data produced with libc 2.22; worse, that program @emph{aborts} instead of simply ignoring the incompatible locale data@footnote{Versions 2.23 and later of GNU@tie{}libc will simply skip the incompatible locale data, which is already an improvement.}.  Similarly, a program linked against libc 2.22 can read most, but not all, of the locale data from libc 2.21 (specifically, @env{LC_COLLATE} data is incompatible); thus calls to @code{setlocale} may fail, but programs will not abort."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11369
+#: guix-git/doc/guix.texi:14811
 msgid "The ``problem'' with Guix is that users have a lot of freedom: They can choose whether and when to upgrade software in their profiles, and might be using a libc version different from the one the system administrator used to build the system-wide locale data."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11373
-msgid "Fortunately, unprivileged users can also install their own locale data and define @var{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, @code{GUIX_LOCPATH} and locale packages})."
+#: guix-git/doc/guix.texi:14815
+msgid "Fortunately, unprivileged users can also install their own locale data and define @env{GUIX_LOCPATH} accordingly (@pxref{locales-and-locpath, @env{GUIX_LOCPATH} and locale packages})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11380
+#: guix-git/doc/guix.texi:14822
 msgid "Still, it is best if the system-wide locale data at @file{/run/current-system/locale} is built for all the libc versions actually in use on the system, so that all the programs can access it---this is especially crucial on a multi-user system.  To do that, the administrator can specify several libc packages in the @code{locale-libcs} field of @code{operating-system}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11383
+#. type: lisp
+#: guix-git/doc/guix.texi:14825
 #, no-wrap
 msgid ""
 "(use-package-modules base)\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11387
+#. type: lisp
+#: guix-git/doc/guix.texi:14829
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -19637,39 +25847,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11392
+#: guix-git/doc/guix.texi:14834
 msgid "This example would lead to a system containing locale definitions for both libc 2.21 and the current version of libc in @file{/run/current-system/locale}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11397
+#: guix-git/doc/guix.texi:14839
 #, no-wrap
 msgid "system services"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11403
+#: guix-git/doc/guix.texi:14845
 msgid "An important part of preparing an @code{operating-system} declaration is listing @dfn{system services} and their configuration (@pxref{Using the Configuration System}).  System services are typically daemons launched when the system boots, or other actions needed at that time---e.g., configuring network access."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11410
+#: guix-git/doc/guix.texi:14852
 msgid "Guix has a broad definition of ``service'' (@pxref{Service Composition}), but many services are managed by the GNU@tie{}Shepherd (@pxref{Shepherd Services}).  On a running system, the @command{herd} command allows you to list the available services, show their status, start and stop them, or do other specific operations (@pxref{Jump Start,,, shepherd, The GNU Shepherd Manual}).  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11413
+#: guix-git/doc/guix.texi:14855
 #, no-wrap
 msgid "# herd status\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11418
+#: guix-git/doc/guix.texi:14860
 msgid "The above command, run as @code{root}, lists the currently defined services.  The @command{herd doc} command shows a synopsis of the given service and its associated actions:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11422
+#: guix-git/doc/guix.texi:14864
 #, no-wrap
 msgid ""
 "# herd doc nscd\n"
@@ -19678,7 +25888,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11425
+#: guix-git/doc/guix.texi:14867
 #, no-wrap
 msgid ""
 "# herd doc nscd action invalidate\n"
@@ -19686,12 +25896,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11430
+#: guix-git/doc/guix.texi:14872
 msgid "The @command{start}, @command{stop}, and @command{restart} sub-commands have the effect you would expect.  For instance, the commands below stop the nscd service and restart the Xorg display server:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11437
+#: guix-git/doc/guix.texi:14879
 #, no-wrap
 msgid ""
 "# herd stop nscd\n"
@@ -19702,44 +25912,48 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:11442
+#: guix-git/doc/guix.texi:14884
 msgid "The following sections document the available services, starting with the core services, that may be used in an @code{operating-system} declaration."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:11471 doc/guix.texi:18084 doc/guix.texi:18085
-#, no-wrap
-msgid "LDAP Services"
-msgstr ""
+#: guix-git/doc/guix.texi:14919 guix-git/doc/guix.texi:22543
+#: guix-git/doc/guix.texi:22544
+#, fuzzy, no-wrap
+#| msgid "Messaging Services"
+msgid "File-Sharing Services"
+msgstr "消息服务"
 
 #. type: menuentry
-#: doc/guix.texi:11471
-msgid "LDAP services."
-msgstr ""
+#: guix-git/doc/guix.texi:14919
+#, fuzzy
+#| msgid "Messaging services."
+msgid "File-sharing services."
+msgstr "消息服务。"
 
 #. type: Plain text
-#: doc/guix.texi:11479
+#: guix-git/doc/guix.texi:14927
 msgid "The @code{(gnu services base)} module provides definitions for the basic services that one expects from the system.  The services exported by this module are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11480
+#: guix-git/doc/guix.texi:14928
 #, no-wrap
 msgid "{Scheme Variable} %base-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11486
+#: guix-git/doc/guix.texi:14934
 msgid "This variable contains a list of basic services (@pxref{Service Types and Services}, for more information on service objects) one would expect from the system: a login service (mingetty) on each tty, syslogd, the libc name service cache daemon (nscd), the udev device manager, and more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11491
-msgid "This is the default value of the @code{services} field of @code{operating-system} declarations.  Usually, when customizing a system, you will want to append services to @var{%base-services}, like this:"
+#: guix-git/doc/guix.texi:14939
+msgid "This is the default value of the @code{services} field of @code{operating-system} declarations.  Usually, when customizing a system, you will want to append services to @code{%base-services}, like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11496
+#. type: lisp
+#: guix-git/doc/guix.texi:14944
 #, no-wrap
 msgid ""
 "(append (list (service avahi-service-type)\n"
@@ -19748,87 +25962,87 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11499
+#: guix-git/doc/guix.texi:14947
 #, no-wrap
 msgid "{Scheme Variable} special-files-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11502
+#: guix-git/doc/guix.texi:14950
 msgid "This is the service that sets up ``special files'' such as @file{/bin/sh}; an instance of it is part of @code{%base-services}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11506
+#: guix-git/doc/guix.texi:14954
 msgid "The value associated with @code{special-files-service-type} services must be a list of tuples where the first element is the ``special file'' and the second element is its target.  By default it is:"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:11507
+#: guix-git/doc/guix.texi:14955
 #, no-wrap
 msgid "/bin/sh"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11508
+#: guix-git/doc/guix.texi:14956
 #, no-wrap
 msgid "@file{sh}, in @file{/bin}"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11511
+#. type: lisp
+#: guix-git/doc/guix.texi:14959
 #, no-wrap
-msgid "`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\")))\n"
+msgid "`((\"/bin/sh\" ,(file-append bash \"/bin/sh\")))\n"
 msgstr ""
 
 #. type: file{#1}
-#: doc/guix.texi:11513
+#: guix-git/doc/guix.texi:14961
 #, no-wrap
 msgid "/usr/bin/env"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11514
+#: guix-git/doc/guix.texi:14962
 #, no-wrap
 msgid "@file{env}, in @file{/usr/bin}"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11517
+#: guix-git/doc/guix.texi:14965
 msgid "If you want to add, say, @code{/usr/bin/env} to your system, you can change it to:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11521
+#. type: lisp
+#: guix-git/doc/guix.texi:14969
 #, no-wrap
 msgid ""
-"`((\"/bin/sh\" ,(file-append @var{bash} \"/bin/sh\"))\n"
-"  (\"/usr/bin/env\" ,(file-append @var{coreutils} \"/bin/env\")))\n"
+"`((\"/bin/sh\" ,(file-append bash \"/bin/sh\"))\n"
+"  (\"/usr/bin/env\" ,(file-append coreutils \"/bin/env\")))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11528
-msgid "Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}).  But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure (see below.)"
+#: guix-git/doc/guix.texi:14976
+msgid "Since this is part of @code{%base-services}, you can use @code{modify-services} to customize the set of special files (@pxref{Service Reference, @code{modify-services}}).  But the simple way to add a special file is @i{via} the @code{extra-special-file} procedure (see below)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11530
+#: guix-git/doc/guix.texi:14978
 #, no-wrap
 msgid "{Scheme Procedure} extra-special-file @var{file} @var{target}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11532
+#: guix-git/doc/guix.texi:14980
 msgid "Use @var{target} as the ``special file'' @var{file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11536
+#: guix-git/doc/guix.texi:14984
 msgid "For example, adding the following lines to the @code{services} field of your operating system declaration leads to a @file{/usr/bin/env} symlink:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:11540
+#. type: lisp
+#: guix-git/doc/guix.texi:14988
 #, no-wrap
 msgid ""
 "(extra-special-file \"/usr/bin/env\"\n"
@@ -19836,1150 +26050,1298 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11543
+#: guix-git/doc/guix.texi:14991
 #, no-wrap
 msgid "{Scheme Procedure} host-name-service @var{name}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11545
+#: guix-git/doc/guix.texi:14993
 msgid "Return a service that sets the host name to @var{name}."
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:14995
+#, no-wrap
+msgid "{Scheme Variable} console-font-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:15000
+msgid "Install the given fonts on the specified ttys (fonts are per virtual console on the kernel Linux).  The value of this service is a list of tty/font pairs.  The font can be the name of a font provided by the @code{kbd} package or any valid argument to @command{setfont}, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15009
+#, no-wrap
+msgid ""
+"`((\"tty1\" . \"LatGrkCyr-8x16\")\n"
+"  (\"tty2\" . ,(file-append\n"
+"                font-tamzen\n"
+"                \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))\n"
+"  (\"tty3\" . ,(file-append\n"
+"                font-terminus\n"
+"                \"/share/consolefonts/ter-132n\"))) ; for HDPI\n"
+msgstr ""
+
 #. type: deffn
-#: doc/guix.texi:11547
+#: guix-git/doc/guix.texi:15012
 #, no-wrap
 msgid "{Scheme Procedure} login-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11551
+#: guix-git/doc/guix.texi:15016
 msgid "Return a service to run login according to @var{config}, a @code{<login-configuration>} object, which specifies the message of the day, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11553
+#: guix-git/doc/guix.texi:15018
 #, no-wrap
 msgid "{Data Type} login-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11555
+#: guix-git/doc/guix.texi:15020
 msgid "This is the data type representing the configuration of login."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11558
+#: guix-git/doc/guix.texi:15023
 #, no-wrap
 msgid "motd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11559
+#: guix-git/doc/guix.texi:15024
 #, no-wrap
 msgid "message of the day"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11561
+#: guix-git/doc/guix.texi:15026
 msgid "A file-like object containing the ``message of the day''."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11562 doc/guix.texi:13522
+#: guix-git/doc/guix.texi:15027 guix-git/doc/guix.texi:17908
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11565
+#: guix-git/doc/guix.texi:15030
 msgid "Allow empty passwords by default so that first-time users can log in when the 'root' account has just been created."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11569
+#: guix-git/doc/guix.texi:15034
 #, no-wrap
 msgid "{Scheme Procedure} mingetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11573
+#: guix-git/doc/guix.texi:15038
 msgid "Return a service to run mingetty according to @var{config}, a @code{<mingetty-configuration>} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11575
+#: guix-git/doc/guix.texi:15040
 #, no-wrap
 msgid "{Data Type} mingetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11578
+#: guix-git/doc/guix.texi:15043
 msgid "This is the data type representing the configuration of Mingetty, which provides the default implementation of virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11581 doc/guix.texi:11617
+#: guix-git/doc/guix.texi:15046 guix-git/doc/guix.texi:15085
+#: guix-git/doc/guix.texi:31537
 #, no-wrap
 msgid "tty"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11583
+#: guix-git/doc/guix.texi:15048
 msgid "The name of the console this Mingetty runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11584 doc/guix.texi:11646 doc/guix.texi:11805
+#: guix-git/doc/guix.texi:15049 guix-git/doc/guix.texi:15114
+#: guix-git/doc/guix.texi:15273
 #, no-wrap
 msgid "@code{auto-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11588
+#: guix-git/doc/guix.texi:15053
 msgid "When true, this field must be a string denoting the user name under which the system automatically logs in.  When it is @code{#f}, a user name and password must be entered to log in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11589
+#: guix-git/doc/guix.texi:15054
 #, no-wrap
 msgid "@code{login-program} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11593
+#: guix-git/doc/guix.texi:15058
 msgid "This must be either @code{#f}, in which case the default log-in program is used (@command{login} from the Shadow tool suite), or a gexp denoting the name of the log-in program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11594
+#: guix-git/doc/guix.texi:15059
 #, no-wrap
 msgid "@code{login-pause?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11597
+#: guix-git/doc/guix.texi:15062
 msgid "When set to @code{#t} in conjunction with @var{auto-login}, the user will have to press a key before the log-in shell is launched."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11598
+#: guix-git/doc/guix.texi:15063
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{clear-on-logout?} (default: @code{#t})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15065
+msgid "When set to @code{#t}, the screen will be cleared after logout."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:15066
 #, no-wrap
 msgid "@code{mingetty} (default: @var{mingetty})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11600
+#: guix-git/doc/guix.texi:15068
 msgid "The Mingetty package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11604
+#: guix-git/doc/guix.texi:15072
 #, no-wrap
 msgid "{Scheme Procedure} agetty-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11608
+#: guix-git/doc/guix.texi:15076
 msgid "Return a service to run agetty according to @var{config}, an @code{<agetty-configuration>} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11610
+#: guix-git/doc/guix.texi:15078
 #, no-wrap
 msgid "{Data Type} agetty-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11614
+#: guix-git/doc/guix.texi:15082
 msgid "This is the data type representing the configuration of agetty, which implements virtual and serial console log-in.  See the @code{agetty(8)} man page for more information."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11621
-msgid "The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}. This argument is optional, it will default to a reasonable default serial port used by the kernel Linux."
+#: guix-git/doc/guix.texi:15089
+msgid "The name of the console this agetty runs on, as a string---e.g., @code{\"ttyS0\"}.  This argument is optional, it will default to a reasonable default serial port used by the kernel Linux."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11625
+#: guix-git/doc/guix.texi:15093
 msgid "For this, if there is a value for an option @code{agetty.tty} in the kernel command line, agetty will extract the device name of the serial port from it and use that."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11629
+#: guix-git/doc/guix.texi:15097
 msgid "If not and if there is a value for an option @code{console} with a tty in the Linux command line, agetty will extract the device name of the serial port from it and use that."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11633
+#: guix-git/doc/guix.texi:15101
 msgid "In both cases, agetty will leave the other serial device settings (baud rate etc.)@: alone---in the hope that Linux pinned them to the correct values."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11634
+#: guix-git/doc/guix.texi:15102 guix-git/doc/guix.texi:31698
 #, no-wrap
 msgid "@code{baud-rate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11637
+#: guix-git/doc/guix.texi:15105
 msgid "A string containing a comma-separated list of one or more baud rates, in descending order."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11638
+#: guix-git/doc/guix.texi:15106
 #, no-wrap
 msgid "@code{term} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11641
-msgid "A string containing the value used for the @code{TERM} environment variable."
+#: guix-git/doc/guix.texi:15109
+msgid "A string containing the value used for the @env{TERM} environment variable."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11642
+#: guix-git/doc/guix.texi:15110
 #, no-wrap
 msgid "@code{eight-bits?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11645
+#: guix-git/doc/guix.texi:15113
 msgid "When @code{#t}, the tty is assumed to be 8-bit clean, and parity detection is disabled."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11649 doc/guix.texi:11808
+#: guix-git/doc/guix.texi:15117 guix-git/doc/guix.texi:15276
 msgid "When passed a login name, as a string, the specified user will be logged in automatically without prompting for their login name or password."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11650
+#: guix-git/doc/guix.texi:15118
 #, no-wrap
 msgid "@code{no-reset?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11652
+#: guix-git/doc/guix.texi:15120
 msgid "When @code{#t}, don't reset terminal cflags (control modes)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11653
+#: guix-git/doc/guix.texi:15121
 #, no-wrap
 msgid "@code{host} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11656
-msgid "This accepts a string containing the \"login_host\", which will be written into the @file{/var/run/utmpx} file."
+#: guix-git/doc/guix.texi:15124
+msgid "This accepts a string containing the ``login_host'', which will be written into the @file{/var/run/utmpx} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11657
+#: guix-git/doc/guix.texi:15125
 #, no-wrap
 msgid "@code{remote?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11661
+#: guix-git/doc/guix.texi:15129
 msgid "When set to @code{#t} in conjunction with @var{host}, this will add an @code{-r} fakehost option to the command line of the login program specified in @var{login-program}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11662
+#: guix-git/doc/guix.texi:15130
 #, no-wrap
 msgid "@code{flow-control?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11664
+#: guix-git/doc/guix.texi:15132
 msgid "When set to @code{#t}, enable hardware (RTS/CTS) flow control."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11665
+#: guix-git/doc/guix.texi:15133
 #, no-wrap
 msgid "@code{no-issue?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11668
+#: guix-git/doc/guix.texi:15136
 msgid "When set to @code{#t}, the contents of the @file{/etc/issue} file will not be displayed before presenting the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11669
+#: guix-git/doc/guix.texi:15137
 #, no-wrap
 msgid "@code{init-string} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11672
+#: guix-git/doc/guix.texi:15140
 msgid "This accepts a string that will be sent to the tty or modem before sending anything else.  It can be used to initialize a modem."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11673
+#: guix-git/doc/guix.texi:15141
 #, no-wrap
 msgid "@code{no-clear?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11676
+#: guix-git/doc/guix.texi:15144
 msgid "When set to @code{#t}, agetty will not clear the screen before showing the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11677
+#: guix-git/doc/guix.texi:15145
 #, no-wrap
 msgid "@code{login-program} (default: (file-append shadow \"/bin/login\"))"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11681
+#: guix-git/doc/guix.texi:15149
 msgid "This must be either a gexp denoting the name of a log-in program, or unset, in which case the default value is the @command{login} from the Shadow tool suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11682
+#: guix-git/doc/guix.texi:15150
 #, no-wrap
 msgid "@code{local-line} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11686
-msgid "Control the CLOCAL line flag.  This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}. If @code{#f}, the default value chosen by agetty is @code{'auto}."
+#: guix-git/doc/guix.texi:15154
+msgid "Control the CLOCAL line flag.  This accepts one of three symbols as arguments, @code{'auto}, @code{'always}, or @code{'never}.  If @code{#f}, the default value chosen by agetty is @code{'auto}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11687
+#: guix-git/doc/guix.texi:15155
 #, no-wrap
 msgid "@code{extract-baud?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11690
+#: guix-git/doc/guix.texi:15158
 msgid "When set to @code{#t}, instruct agetty to try to extract the baud rate from the status messages produced by certain types of modems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11691
+#: guix-git/doc/guix.texi:15159
 #, no-wrap
 msgid "@code{skip-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11695
+#: guix-git/doc/guix.texi:15163
 msgid "When set to @code{#t}, do not prompt the user for a login name.  This can be used with @var{login-program} field to use non-standard login systems."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11696
+#: guix-git/doc/guix.texi:15164
 #, no-wrap
 msgid "@code{no-newline?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11699
+#: guix-git/doc/guix.texi:15167
 msgid "When set to @code{#t}, do not print a newline before printing the @file{/etc/issue} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11701
+#: guix-git/doc/guix.texi:15169
 #, no-wrap
 msgid "@code{login-options} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11706
+#: guix-git/doc/guix.texi:15174
 msgid "This option accepts a string containing options that are passed to the login program.  When used with the @var{login-program}, be aware that a malicious user could try to enter a login name containing embedded options that could be parsed by the login program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11707
+#: guix-git/doc/guix.texi:15175
 #, no-wrap
 msgid "@code{login-pause} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11711
+#: guix-git/doc/guix.texi:15179
 msgid "When set to @code{#t}, wait for any key before showing the login prompt.  This can be used in conjunction with @var{auto-login} to save memory by lazily spawning shells."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11712
+#: guix-git/doc/guix.texi:15180
 #, no-wrap
 msgid "@code{chroot} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11715
+#: guix-git/doc/guix.texi:15183
 msgid "Change root to the specified directory.  This option accepts a directory path as a string."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11716
+#: guix-git/doc/guix.texi:15184
 #, no-wrap
 msgid "@code{hangup?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11719
+#: guix-git/doc/guix.texi:15187
 msgid "Use the Linux system call @code{vhangup} to do a virtual hangup of the specified terminal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11720
+#: guix-git/doc/guix.texi:15188
 #, no-wrap
 msgid "@code{keep-baud?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11724
+#: guix-git/doc/guix.texi:15192
 msgid "When set to @code{#t}, try to keep the existing baud rate.  The baud rates from @var{baud-rate} are used when agetty receives a @key{BREAK} character."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11725
+#: guix-git/doc/guix.texi:15193
 #, no-wrap
 msgid "@code{timeout} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11728
+#: guix-git/doc/guix.texi:15196
 msgid "When set to an integer value, terminate if no user name could be read within @var{timeout} seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11729
+#: guix-git/doc/guix.texi:15197
 #, no-wrap
 msgid "@code{detect-case?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11735
+#: guix-git/doc/guix.texi:15203
 msgid "When set to @code{#t}, turn on support for detecting an uppercase-only terminal.  This setting will detect a login name containing only uppercase letters as indicating an uppercase-only terminal and turn on some upper-to-lower case conversions.  Note that this will not support Unicode characters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11736
+#: guix-git/doc/guix.texi:15204
 #, no-wrap
 msgid "@code{wait-cr?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11741
+#: guix-git/doc/guix.texi:15209
 msgid "When set to @code{#t}, wait for the user or modem to send a carriage-return or linefeed character before displaying @file{/etc/issue} or login prompt.  This is typically used with the @var{init-string} option."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11742
+#: guix-git/doc/guix.texi:15210
 #, no-wrap
 msgid "@code{no-hints?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11745
+#: guix-git/doc/guix.texi:15213
 msgid "When set to @code{#t}, do not print hints about Num, Caps, and Scroll locks."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11746
+#: guix-git/doc/guix.texi:15214
 #, no-wrap
 msgid "@code{no-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11749
+#: guix-git/doc/guix.texi:15217
 msgid "By default, the hostname is printed.  When this option is set to @code{#t}, no hostname will be shown at all."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11750
+#: guix-git/doc/guix.texi:15218
 #, no-wrap
 msgid "@code{long-hostname?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11754
+#: guix-git/doc/guix.texi:15222
 msgid "By default, the hostname is only printed until the first dot.  When this option is set to @code{#t}, the fully qualified hostname by @code{gethostname} or @code{getaddrinfo} is shown."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11755
+#: guix-git/doc/guix.texi:15223
 #, no-wrap
 msgid "@code{erase-characters} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11758
+#: guix-git/doc/guix.texi:15226
 msgid "This option accepts a string of additional characters that should be interpreted as backspace when the user types their login name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11759
+#: guix-git/doc/guix.texi:15227
 #, no-wrap
 msgid "@code{kill-characters} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11763
-msgid "This option accepts a string that should be interpreted to mean \"ignore all previous characters\" (also called a \"kill\" character) when the user types their login name."
+#: guix-git/doc/guix.texi:15231
+msgid "This option accepts a string that should be interpreted to mean ``ignore all previous characters'' (also called a ``kill'' character) when the user types their login name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11764
+#: guix-git/doc/guix.texi:15232
 #, no-wrap
 msgid "@code{chdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11767
+#: guix-git/doc/guix.texi:15235
 msgid "This option accepts, as a string, a directory path that will be changed to before login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11768
+#: guix-git/doc/guix.texi:15236
 #, no-wrap
 msgid "@code{delay} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11771
+#: guix-git/doc/guix.texi:15239
 msgid "This options accepts, as an integer, the number of seconds to sleep before opening the tty and displaying the login prompt."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11772
+#: guix-git/doc/guix.texi:15240
 #, no-wrap
 msgid "@code{nice} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11775
+#: guix-git/doc/guix.texi:15243
 msgid "This option accepts, as an integer, the nice value with which to run the @command{login} program."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11776 doc/guix.texi:12007 doc/guix.texi:12694
-#: doc/guix.texi:19064
+#: guix-git/doc/guix.texi:15244 guix-git/doc/guix.texi:15521
+#: guix-git/doc/guix.texi:16383 guix-git/doc/guix.texi:23526
+#: guix-git/doc/guix.texi:25002 guix-git/doc/guix.texi:27350
+#: guix-git/doc/guix.texi:28137 guix-git/doc/guix.texi:29836
+#: guix-git/doc/guix.texi:32028
 #, no-wrap
 msgid "@code{extra-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11779
-msgid "This option provides an \"escape hatch\" for the user to provide arbitrary command-line arguments to @command{agetty} as a list of strings."
+#: guix-git/doc/guix.texi:15247
+msgid "This option provides an ``escape hatch'' for the user to provide arbitrary command-line arguments to @command{agetty} as a list of strings."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11783
+#: guix-git/doc/guix.texi:15251
 #, no-wrap
 msgid "{Scheme Procedure} kmscon-service-type @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11787
+#: guix-git/doc/guix.texi:15255
 msgid "Return a service to run @uref{https://www.freedesktop.org/wiki/Software/kmscon,kmscon} according to @var{config}, a @code{<kmscon-configuration>} object, which specifies the tty to run, among other things."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11789
+#: guix-git/doc/guix.texi:15257
 #, no-wrap
 msgid "{Data Type} kmscon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11792
+#: guix-git/doc/guix.texi:15260
 msgid "This is the data type representing the configuration of Kmscon, which implements virtual console log-in."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11795
+#: guix-git/doc/guix.texi:15263
 #, no-wrap
 msgid "virtual-terminal"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11797
+#: guix-git/doc/guix.texi:15265
 msgid "The name of the console this Kmscon runs on---e.g., @code{\"tty1\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11798
+#: guix-git/doc/guix.texi:15266
 #, no-wrap
 msgid "@code{login-program} (default: @code{#~(string-append #$shadow \"/bin/login\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11801
-msgid "A gexp denoting the name of the log-in program. The default log-in program is @command{login} from the Shadow tool suite."
+#: guix-git/doc/guix.texi:15269
+msgid "A gexp denoting the name of the log-in program.  The default log-in program is @command{login} from the Shadow tool suite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11802
+#: guix-git/doc/guix.texi:15270
 #, no-wrap
 msgid "@code{login-arguments} (default: @code{'(\"-p\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11804
+#: guix-git/doc/guix.texi:15272
 msgid "A list of arguments to pass to @command{login}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11809
+#: guix-git/doc/guix.texi:15277
 #, no-wrap
 msgid "@code{hardware-acceleration?} (default: #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11811
+#: guix-git/doc/guix.texi:15279
 msgid "Whether to use hardware acceleration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11812
+#: guix-git/doc/guix.texi:15280
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{font-engine} (default: @code{\"pango\"})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15282
+msgid "Font engine used in Kmscon."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:15283
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{font-size} (default: @code{12})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15285
+msgid "Font size used in Kmscon."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:15286
 #, no-wrap
 msgid "@code{kmscon} (default: @var{kmscon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11814
+#: guix-git/doc/guix.texi:15288
 msgid "The Kmscon package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11818
+#: guix-git/doc/guix.texi:15292
 #, no-wrap
 msgid "name service cache daemon"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11819
+#: guix-git/doc/guix.texi:15293
 #, no-wrap
 msgid "nscd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11820
+#: guix-git/doc/guix.texi:15294
 #, no-wrap
 msgid "{Scheme Procedure} nscd-service [@var{config}] [#:glibc glibc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11825
+#: guix-git/doc/guix.texi:15299
 msgid "[#:name-services '()] Return a service that runs the libc name service cache daemon (nscd) with the given @var{config}---an @code{<nscd-configuration>} object.  @xref{Name Service Switch}, for an example."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11827
+#: guix-git/doc/guix.texi:15301
 msgid "For convenience, the Shepherd service for nscd provides the following actions:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11829
+#: guix-git/doc/guix.texi:15303
 #, no-wrap
 msgid "invalidate"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11830
+#: guix-git/doc/guix.texi:15304
 #, no-wrap
 msgid "cache invalidation, nscd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11831
+#: guix-git/doc/guix.texi:15305
 #, no-wrap
 msgid "nscd, cache invalidation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11833
+#: guix-git/doc/guix.texi:15307
 msgid "This invalidate the given cache.  For instance, running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:11836
+#: guix-git/doc/guix.texi:15310
 #, no-wrap
 msgid "herd invalidate nscd hosts\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11840
+#: guix-git/doc/guix.texi:15314
 msgid "invalidates the host name lookup cache of nscd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11841
+#: guix-git/doc/guix.texi:15315
 #, no-wrap
 msgid "statistics"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11844
+#: guix-git/doc/guix.texi:15318
 msgid "Running @command{herd statistics nscd} displays information about nscd usage and caches."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11848
+#: guix-git/doc/guix.texi:15322
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-configuration"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11852
-msgid "This is the default @code{<nscd-configuration>} value (see below) used by @code{nscd-service}.  It uses the caches defined by @var{%nscd-default-caches}; see below."
+#: guix-git/doc/guix.texi:15326
+msgid "This is the default @code{<nscd-configuration>} value (see below) used by @code{nscd-service}.  It uses the caches defined by @code{%nscd-default-caches}; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11854
+#: guix-git/doc/guix.texi:15328
 #, no-wrap
 msgid "{Data Type} nscd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11857
+#: guix-git/doc/guix.texi:15331
 msgid "This is the data type representing the name service cache daemon (nscd)  configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11860
+#: guix-git/doc/guix.texi:15334
 #, no-wrap
 msgid "@code{name-services} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11863
+#: guix-git/doc/guix.texi:15337
 msgid "List of packages denoting @dfn{name services} that must be visible to the nscd---e.g., @code{(list @var{nss-mdns})}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11864
+#: guix-git/doc/guix.texi:15338
 #, no-wrap
 msgid "@code{glibc} (default: @var{glibc})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11867
+#: guix-git/doc/guix.texi:15341
 msgid "Package object denoting the GNU C Library providing the @command{nscd} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11868
+#: guix-git/doc/guix.texi:15342
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/nscd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11871
+#: guix-git/doc/guix.texi:15345
 msgid "Name of the nscd log file.  This is where debugging output goes when @code{debug-level} is strictly positive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11872
+#: guix-git/doc/guix.texi:15346
 #, no-wrap
 msgid "@code{debug-level} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11875
+#: guix-git/doc/guix.texi:15349
 msgid "Integer denoting the debugging levels.  Higher numbers mean that more debugging output is logged."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11876
-#, no-wrap
-msgid "@code{caches} (default: @var{%nscd-default-caches})"
-msgstr ""
+#: guix-git/doc/guix.texi:15350
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{caches} (default: @code{%nscd-default-caches})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
 
 #. type: table
-#: doc/guix.texi:11879
+#: guix-git/doc/guix.texi:15353
 msgid "List of @code{<nscd-cache>} objects denoting things to be cached; see below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11883
+#: guix-git/doc/guix.texi:15357
 #, no-wrap
 msgid "{Data Type} nscd-cache"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11885
+#: guix-git/doc/guix.texi:15359
 msgid "Data type representing a cache database of nscd and its parameters."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11888 doc/guix.texi:15088
+#: guix-git/doc/guix.texi:15362 guix-git/doc/guix.texi:19690
 #, no-wrap
 msgid "database"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11893
+#: guix-git/doc/guix.texi:15367
 msgid "This is a symbol representing the name of the database to be cached.  Valid values are @code{passwd}, @code{group}, @code{hosts}, and @code{services}, which designate the corresponding NSS database (@pxref{NSS Basics,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:11894
+#: guix-git/doc/guix.texi:15368
 #, no-wrap
 msgid "positive-time-to-live"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11895
+#: guix-git/doc/guix.texi:15369
 #, no-wrap
 msgid "@code{negative-time-to-live} (default: @code{20})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11898
+#: guix-git/doc/guix.texi:15372
 msgid "A number representing the number of seconds during which a positive or negative lookup result remains in cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11899
+#: guix-git/doc/guix.texi:15373
 #, no-wrap
 msgid "@code{check-files?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11902
+#: guix-git/doc/guix.texi:15376
 msgid "Whether to check for updates of the files corresponding to @var{database}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11906
+#: guix-git/doc/guix.texi:15380
 msgid "For instance, when @var{database} is @code{hosts}, setting this flag instructs nscd to check for updates in @file{/etc/hosts} and to take them into account."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11907
+#: guix-git/doc/guix.texi:15381
 #, no-wrap
 msgid "@code{persistent?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11909
+#: guix-git/doc/guix.texi:15383
 msgid "Whether the cache should be stored persistently on disk."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11910
+#: guix-git/doc/guix.texi:15384
 #, no-wrap
 msgid "@code{shared?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11912
+#: guix-git/doc/guix.texi:15386
 msgid "Whether the cache should be shared among users."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11913
+#: guix-git/doc/guix.texi:15387
 #, no-wrap
 msgid "@code{max-database-size} (default: 32@tie{}MiB)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11915
+#: guix-git/doc/guix.texi:15389
 msgid "Maximum size in bytes of the database cache."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11922
+#: guix-git/doc/guix.texi:15396
 #, no-wrap
 msgid "{Scheme Variable} %nscd-default-caches"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11925
+#: guix-git/doc/guix.texi:15399
 msgid "List of @code{<nscd-cache>} objects used by default by @code{nscd-configuration} (see above)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11931
+#: guix-git/doc/guix.texi:15405
 msgid "It enables persistent and aggressive caching of service and host name lookups.  The latter provides better host name lookup performance, resilience in the face of unreliable name servers, and also better privacy---often the result of host name lookups is in local cache, so external name servers do not even need to be queried."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:11934
+#: guix-git/doc/guix.texi:15408
 msgid "syslog-configuration-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11934 doc/guix.texi:11950
+#: guix-git/doc/guix.texi:15408 guix-git/doc/guix.texi:15424
 #, no-wrap
 msgid "syslog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:11935 doc/guix.texi:12372
+#: guix-git/doc/guix.texi:15409 guix-git/doc/guix.texi:15983
 #, no-wrap
 msgid "logging"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11936
+#: guix-git/doc/guix.texi:15410
 #, no-wrap
 msgid "{Data Type} syslog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11938
+#: guix-git/doc/guix.texi:15412
 msgid "This data type represents the configuration of the syslog daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11940
+#: guix-git/doc/guix.texi:15414
 #, no-wrap
 msgid "@code{syslogd} (default: @code{#~(string-append #$inetutils \"/libexec/syslogd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11942
+#: guix-git/doc/guix.texi:15416
 msgid "The syslog daemon to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11943
+#: guix-git/doc/guix.texi:15417
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-syslog.conf})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11945
+#: guix-git/doc/guix.texi:15419
 msgid "The syslog configuration file to use."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:11950
+#: guix-git/doc/guix.texi:15424
 msgid "syslog-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11951
+#: guix-git/doc/guix.texi:15425
 #, no-wrap
 msgid "{Scheme Procedure} syslog-service @var{config}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11953
+#: guix-git/doc/guix.texi:15427
 msgid "Return a service that runs a syslog daemon according to @var{config}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:11956
+#: guix-git/doc/guix.texi:15430
 msgid "@xref{syslogd invocation,,, inetutils, GNU Inetutils}, for more information on the configuration file syntax."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11958
+#: guix-git/doc/guix.texi:15432
 #, no-wrap
 msgid "{Scheme Variable} guix-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:11962
+#: guix-git/doc/guix.texi:15436
 msgid "This is the type of the service that runs the build daemon, @command{guix-daemon} (@pxref{Invoking guix-daemon}).  Its value must be a @code{guix-configuration} record as described below."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:11965
+#: guix-git/doc/guix.texi:15439
 msgid "guix-configuration-type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11965
+#: guix-git/doc/guix.texi:15439
 #, no-wrap
 msgid "{Data Type} guix-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:11968
+#: guix-git/doc/guix.texi:15442
 msgid "This data type represents the configuration of the Guix build daemon.  @xref{Invoking guix-daemon}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11970
+#: guix-git/doc/guix.texi:15444
 #, no-wrap
 msgid "@code{guix} (default: @var{guix})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11972 doc/guix.texi:12192
+#: guix-git/doc/guix.texi:15446 guix-git/doc/guix.texi:15720
 msgid "The Guix package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11973
+#: guix-git/doc/guix.texi:15447
 #, no-wrap
 msgid "@code{build-group} (default: @code{\"guixbuild\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11975
+#: guix-git/doc/guix.texi:15449
 msgid "Name of the group for build user accounts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11976
+#: guix-git/doc/guix.texi:15450
 #, no-wrap
 msgid "@code{build-accounts} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11978
+#: guix-git/doc/guix.texi:15452
 msgid "Number of build user accounts to create."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11979
+#: guix-git/doc/guix.texi:15453
 #, no-wrap
 msgid "@code{authorize-key?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11984
+#: guix-git/doc/guix.texi:15458
 msgid "Whether to authorize the substitute keys listed in @code{authorized-keys}---by default that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:15464
+msgid "When @code{authorize-key?} is true, @file{/etc/guix/acl} cannot be changed by invoking @command{guix archive --authorize}.  You must instead adjust @code{guix-configuration} as you wish and reconfigure the system.  This ensures that your operating system configuration file is self-contained."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:15471
+msgid "When booting or reconfiguring to a system where @code{authorize-key?} is true, the existing @file{/etc/guix/acl} file is backed up as @file{/etc/guix/acl.bak} if it was determined to be a manually modified file.  This is to facilitate migration from earlier versions, which allowed for in-place modifications to @file{/etc/guix/acl}."
+msgstr ""
+
 #. type: vindex
-#: doc/guix.texi:11985
+#: guix-git/doc/guix.texi:15473
 #, no-wrap
 msgid "%default-authorized-guix-keys"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11986
-#, no-wrap
-msgid "@code{authorized-keys} (default: @var{%default-authorized-guix-keys})"
-msgstr ""
+#: guix-git/doc/guix.texi:15474
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{authorized-keys} (default: @code{%default-authorized-guix-keys})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:11990
-msgid "The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}).  By default, it contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes})."
+#: guix-git/doc/guix.texi:15479
+msgid "The list of authorized key files for archive imports, as a list of string-valued gexps (@pxref{Invoking guix archive}).  By default, it contains that of @code{@value{SUBSTITUTE-SERVER}} (@pxref{Substitutes}).  See @code{substitute-urls} below for an example on how to change it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11991
+#: guix-git/doc/guix.texi:15480
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11993
+#: guix-git/doc/guix.texi:15482
 msgid "Whether to use substitutes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11994
+#: guix-git/doc/guix.texi:15483
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{substitute-urls} (default: @code{%default-substitute-urls})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15485
+msgid "The list of URLs where to look for substitutes by default."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:15492
+msgid "Suppose you would like to fetch substitutes from @code{guix.example.org} in addition to @code{@value{SUBSTITUTE-SERVER}}.  You will need to do two things: (1) add @code{guix.example.org} to @code{substitute-urls}, and (2) authorize its signing key, having done appropriate checks (@pxref{Substitute Server Authorization}).  The configuration below does exactly that:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15501
 #, no-wrap
-msgid "@code{substitute-urls} (default: @var{%default-substitute-urls})"
+msgid ""
+"(guix-configuration\n"
+"  (substitute-urls\n"
+"   (append (list \"https://guix.example.org\")\n"
+"           %default-substitute-urls))\n"
+"  (authorized-keys\n"
+"   (append (list (local-file \"./guix.example.org-key.pub\"))\n"
+"           %default-authorized-guix-keys)))\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:11996
-msgid "The list of URLs where to look for substitutes by default."
+#: guix-git/doc/guix.texi:15506
+msgid "This example assumes that the file @file{./guix.example.org-key.pub} contains the public key that @code{guix.example.org} uses to sign substitutes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:11997
+#: guix-git/doc/guix.texi:15507
 #, no-wrap
 msgid "@code{max-silent-time} (default: @code{0})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:11998
+#: guix-git/doc/guix.texi:15508
 #, no-wrap
 msgid "@code{timeout} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12002
+#: guix-git/doc/guix.texi:15512
 msgid "The number of seconds of silence and the number of seconds of activity, respectively, after which a build process times out.  A value of zero disables the timeout."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12003
+#: guix-git/doc/guix.texi:15513
 #, no-wrap
 msgid "@code{log-compression} (default: @code{'bzip2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12006
+#: guix-git/doc/guix.texi:15516
 msgid "The type of compression used for build logs---one of @code{gzip}, @code{bzip2}, or @code{none}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:15517
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{discover?} (default: @code{#f})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
 #. type: table
-#: doc/guix.texi:12009
+#: guix-git/doc/guix.texi:15523
 msgid "List of extra command-line options for @command{guix-daemon}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12010
+#: guix-git/doc/guix.texi:15524
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/guix-daemon.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12013
+#: guix-git/doc/guix.texi:15527
 msgid "File where @command{guix-daemon}'s standard output and standard error are written."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:15528
+#, no-wrap
+msgid "HTTP proxy, for @code{guix-daemon}"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:15529
+#, no-wrap
+msgid "proxy, for @code{guix-daemon} HTTP access"
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:12014
+#: guix-git/doc/guix.texi:15530
 #, no-wrap
 msgid "@code{http-proxy} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12017
-msgid "The HTTP proxy used for downloading fixed-output derivations and substitutes."
+#: guix-git/doc/guix.texi:15533
+msgid "The URL of the HTTP and HTTPS proxy used for downloading fixed-output derivations and substitutes."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:15536
+msgid "It is also possible to change the daemon's proxy at run time through the @code{set-http-proxy} action, which restarts it:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:15539
+#, no-wrap
+msgid "herd set-http-proxy guix-daemon http://localhost:8118\n"
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:15542
+msgid "To clear the proxy settings, run:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:15545
+#, fuzzy, no-wrap
+#| msgid "security, guix-daemon"
+msgid "herd set-http-proxy guix-daemon\n"
+msgstr "安全，guix-daemon"
+
 #. type: item
-#: doc/guix.texi:12018
+#: guix-git/doc/guix.texi:15547
 #, no-wrap
 msgid "@code{tmpdir} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12020
+#: guix-git/doc/guix.texi:15549
 msgid "A directory path where the @command{guix-daemon} will perform builds."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12024
+#: guix-git/doc/guix.texi:15553
 #, no-wrap
 msgid "{Scheme Procedure} udev-service [#:udev @var{eudev} #:rules @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12029
-msgid "Run @var{udev}, which populates the @file{/dev} directory dynamically.  udev rules can be provided as a list of files through the @var{rules} variable.  The procedures @code{udev-rule} and @code{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files."
+#: guix-git/doc/guix.texi:15559
+msgid "Run @var{udev}, which populates the @file{/dev} directory dynamically.  udev rules can be provided as a list of files through the @var{rules} variable.  The procedures @code{udev-rule}, @code{udev-rules-service} and @code{file->udev-rule} from @code{(gnu services base)} simplify the creation of such rule files."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:15562
+msgid "The @command{herd rules udev} command, as root, returns the name of the directory containing all the active udev rules."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12031
+#: guix-git/doc/guix.texi:15564
 #, no-wrap
 msgid "{Scheme Procedure} udev-rule [@var{file-name} @var{contents}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12034
+#: guix-git/doc/guix.texi:15567
 msgid "Return a udev-rule file named @var{file-name} containing the rules defined by the @var{contents} literal."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12038
+#: guix-git/doc/guix.texi:15571
 msgid "In the following example, a rule for a USB device is defined to be stored in the file @file{90-usb-thing.rules}.  The rule runs a script upon detecting a USB device with a given product identifier."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12046
+#. type: lisp
+#: guix-git/doc/guix.texi:15579
 #, no-wrap
 msgid ""
 "(define %example-udev-rule\n"
@@ -20991,57 +27353,60 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12050
-msgid "The @command{herd rules udev} command, as root, returns the name of the directory containing all the active udev rules."
+#: guix-git/doc/guix.texi:15582
+#, no-wrap
+msgid "{Scheme Procedure} udev-rules-service [@var{name} @var{rules}] @"
 msgstr ""
 
-#. type: Plain text
-#: doc/guix.texi:12053
-msgid "Here we show how the default @var{udev-service} can be extended with it."
+#. type: deffn
+#: guix-git/doc/guix.texi:15589
+msgid "[#:groups @var{groups}] Return a service that extends @code{udev-service-type } with @var{rules} and @code{account-service-type} with @var{groups} as system groups.  This works by creating a singleton service type @code{@var{name}-udev-rules}, of which the returned service is an instance."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12063
+#. type: deffn
+#: guix-git/doc/guix.texi:15592
+msgid "Here we show how it can be used to extend @code{udev-service-type} with the previously defined rule @code{%example-udev-rule}."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15599
 #, no-wrap
 msgid ""
 "(operating-system\n"
 " ;; @dots{}\n"
 " (services\n"
-" (modify-services %desktop-services\n"
-"   (udev-service-type config =>\n"
-"     (udev-configuration (inherit config)\n"
-"      (rules (append (udev-configuration-rules config)\n"
-"                     (list %example-udev-rule))))))))\n"
+"   (cons (udev-rules-service 'usb-thing %example-udev-rule)\n"
+"         %desktop-services)))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12065
+#: guix-git/doc/guix.texi:15602
 #, no-wrap
 msgid "{Scheme Procedure} file->udev-rule [@var{file-name} @var{file}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12068
+#: guix-git/doc/guix.texi:15605
 msgid "Return a udev file named @var{file-name} containing the rules defined within @var{file}, a file-like object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12070
+#: guix-git/doc/guix.texi:15607
 msgid "The following example showcases how we can use an existing rule file."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12075
+#. type: lisp
+#: guix-git/doc/guix.texi:15612
 #, no-wrap
 msgid ""
 "(use-modules (guix download)     ;for url-fetch\n"
 "             (guix packages)     ;for origin\n"
-"             ;; @dots{})\n"
+"             @dots{})\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12086
+#. type: lisp
+#: guix-git/doc/guix.texi:15623
 #, no-wrap
 msgid ""
 "(define %android-udev-rules\n"
@@ -21057,331 +27422,368 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12095
+#: guix-git/doc/guix.texi:15632
 msgid "Additionally, Guix package definitions can be included in @var{rules} in order to extend the udev rules with the definitions found under their @file{lib/udev/rules.d} sub-directory.  In lieu of the previous @var{file->udev-rule} example, we could have used the @var{android-udev-rules} package which exists in Guix in the @code{(gnu packages android)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12104
-msgid "The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices without root privileges.  It also details how to create the @code{adbusers} group, which is required for the proper functioning of the rules defined within the @var{android-udev-rules} package.  To create such a group, we must define it both as part of the @var{supplementary-groups} of our @var{user-account} declaration, as well as in the @var{groups} field of the @var{operating-system} record."
+#: guix-git/doc/guix.texi:15641
+msgid "The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices without root privileges.  It also details how to create the @code{adbusers} group, which is required for the proper functioning of the rules defined within the @code{android-udev-rules} package.  To create such a group, we must define it both as part of the @code{supplementary-groups} of our @code{user-account} declaration, as well as in the @var{groups} of the @code{udev-rules-service} procedure."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12109
+#. type: lisp
+#: guix-git/doc/guix.texi:15646
 #, no-wrap
 msgid ""
 "(use-modules (gnu packages android)  ;for android-udev-rules\n"
 "             (gnu system shadow)     ;for user-group\n"
-"             ;; @dots{})\n"
+"             @dots{})\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12118
+#. type: lisp
+#: guix-git/doc/guix.texi:15659
 #, no-wrap
 msgid ""
 "(operating-system\n"
 "  ;; @dots{}\n"
-"  (users (cons (user-acount\n"
+"  (users (cons (user-account\n"
 "                ;; @dots{}\n"
 "                (supplementary-groups\n"
 "                 '(\"adbusers\"   ;for adb\n"
-"                   \"wheel\" \"netdev\" \"audio\" \"video\"))\n"
-"                ;; @dots{})))\n"
-"\n"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:12121
-#, no-wrap
-msgid ""
-"  (groups (cons (user-group (system? #t) (name \"adbusers\"))\n"
-"                %base-groups))\n"
-"\n"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:12123
-#, no-wrap
-msgid ""
+"                   \"wheel\" \"netdev\" \"audio\" \"video\")))))\n"
 "  ;; @dots{}\n"
-"\n"
-msgstr ""
-
-#. type: example
-#: doc/guix.texi:12131
-#, no-wrap
-msgid ""
 "  (services\n"
-"   (modify-services %desktop-services\n"
-"     (udev-service-type\n"
-"      config =>\n"
-"      (udev-configuration (inherit config)\n"
-"                          (rules (cons android-udev-rules\n"
-"                                       (udev-configuration-rules config))))))))\n"
+"    (cons (udev-rules-service 'android android-udev-rules\n"
+"                              #:groups '(\"adbusers\"))\n"
+"          %desktop-services)))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12133
+#: guix-git/doc/guix.texi:15661
 #, no-wrap
 msgid "{Scheme Variable} urandom-seed-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12138
-msgid "Save some entropy in @var{%random-seed-file} to seed @file{/dev/urandom} when rebooting.  It also tries to seed @file{/dev/urandom} from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
+#: guix-git/doc/guix.texi:15666
+msgid "Save some entropy in @code{%random-seed-file} to seed @file{/dev/urandom} when rebooting.  It also tries to seed @file{/dev/urandom} from @file{/dev/hwrng} while booting, if @file{/dev/hwrng} exists and is readable."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12140
+#: guix-git/doc/guix.texi:15668
 #, no-wrap
 msgid "{Scheme Variable} %random-seed-file"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12144
+#: guix-git/doc/guix.texi:15672
 msgid "This is the name of the file where some random bytes are saved by @var{urandom-seed-service} to seed @file{/dev/urandom} when rebooting.  It defaults to @file{/var/lib/random-seed}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12146
+#: guix-git/doc/guix.texi:15674
 #, no-wrap
 msgid "mouse"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12147
+#: guix-git/doc/guix.texi:15675
 #, no-wrap
 msgid "gpm"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12148
+#: guix-git/doc/guix.texi:15676
 #, no-wrap
 msgid "{Scheme Variable} gpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12153
+#: guix-git/doc/guix.texi:15681
 msgid "This is the type of the service that runs GPM, the @dfn{general-purpose mouse daemon}, which provides mouse support to the Linux console.  GPM allows users to use the mouse in the console, notably to select, copy, and paste text."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12156
-msgid "The value for services of this type must be a @code{gpm-configuration} (see below).  This service is not part of @var{%base-services}."
+#: guix-git/doc/guix.texi:15684
+msgid "The value for services of this type must be a @code{gpm-configuration} (see below).  This service is not part of @code{%base-services}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12158
+#: guix-git/doc/guix.texi:15686
 #, no-wrap
 msgid "{Data Type} gpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12160
+#: guix-git/doc/guix.texi:15688
 msgid "Data type representing the configuration of GPM."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12162
+#: guix-git/doc/guix.texi:15690
 #, no-wrap
 msgid "@code{options} (default: @code{%default-gpm-options})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12167
+#: guix-git/doc/guix.texi:15695
 msgid "Command-line options passed to @command{gpm}.  The default set of options instruct @command{gpm} to listen to mouse events on @file{/dev/input/mice}.  @xref{Command Line,,, gpm, gpm manual}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12168
+#: guix-git/doc/guix.texi:15696
 #, no-wrap
 msgid "@code{gpm} (default: @code{gpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12170
+#: guix-git/doc/guix.texi:15698
 msgid "The GPM package to use."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12175
+#: guix-git/doc/guix.texi:15703
 msgid "guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12175
+#: guix-git/doc/guix.texi:15703
 #, no-wrap
 msgid "{Scheme Variable} guix-publish-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12179
-msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}).  Its value must be a @code{guix-configuration} object, as described below."
+#: guix-git/doc/guix.texi:15707
+msgid "This is the service type for @command{guix publish} (@pxref{Invoking guix publish}).  Its value must be a @code{guix-publish-configuration} object, as described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12183
+#: guix-git/doc/guix.texi:15711
 msgid "This assumes that @file{/etc/guix} already contains a signing key pair as created by @command{guix archive --generate-key} (@pxref{Invoking guix archive}).  If that is not the case, the service will fail to start."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12185
+#: guix-git/doc/guix.texi:15713
 #, no-wrap
 msgid "{Data Type} guix-publish-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12188
+#: guix-git/doc/guix.texi:15716
 msgid "Data type representing the configuration of the @code{guix publish} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12190
+#: guix-git/doc/guix.texi:15718
 #, no-wrap
 msgid "@code{guix} (default: @code{guix})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12193
+#: guix-git/doc/guix.texi:15721 guix-git/doc/guix.texi:29691
 #, no-wrap
 msgid "@code{port} (default: @code{80})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12195
+#: guix-git/doc/guix.texi:15723
 msgid "The TCP port to listen for connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12196
+#: guix-git/doc/guix.texi:15724 guix-git/doc/guix.texi:27330
 #, no-wrap
 msgid "@code{host} (default: @code{\"localhost\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12199
+#: guix-git/doc/guix.texi:15727
 msgid "The host (and thus, network interface) to listen to.  Use @code{\"0.0.0.0\"} to listen on all the network interfaces."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:15728
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{advertise?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15731
+msgid "When true, advertise the service on the local network @i{via} the DNS-SD protocol, using Avahi."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:15735
+msgid "This allows neighboring Guix devices with discovery on (see @code{guix-configuration} above) to discover this @command{guix publish} instance and to automatically download substitutes from it."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:15736
+#, fuzzy, no-wrap
+#| msgid "@code{compression-level} (default: @code{3})"
+msgid "@code{compression} (default: @code{'((\"gzip\" 3) (\"zstd\" 3))})"
+msgstr "@code{compression-level}（默认值：@code{3}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:15740
+msgid "This is a list of compression method/level tuple used when compressing substitutes.  For example, to compress all substitutes with @emph{both} lzip at level 7 and gzip at level 9, write:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15743
+#, no-wrap
+msgid "'((\"lzip\" 7) (\"gzip\" 9))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:15749
+msgid "Level 9 achieves the best compression ratio at the expense of increased CPU usage, whereas level 1 achieves fast compression.  @xref{Invoking guix publish}, for more information on the available compression methods and the tradeoffs involved."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:12204
-msgid "The gzip compression level at which substitutes are compressed.  Use @code{0} to disable compression altogether, and @code{9} to get the best compression ratio at the expense of increased CPU usage."
+#: guix-git/doc/guix.texi:15751
+msgid "An empty list disables compression altogether."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12205
+#: guix-git/doc/guix.texi:15752
 #, no-wrap
 msgid "@code{nar-path} (default: @code{\"nar\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12208
-msgid "The URL path at which ``nars'' can be fetched.  @xref{Invoking guix publish, @code{--nar-path}}, for details."
+#: guix-git/doc/guix.texi:15755
+msgid "The URL path at which ``nars'' can be fetched.  @xref{Invoking guix publish, @option{--nar-path}}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12209
+#: guix-git/doc/guix.texi:15756
 #, no-wrap
 msgid "@code{cache} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12215
+#: guix-git/doc/guix.texi:15762
 msgid "When it is @code{#f}, disable caching and instead generate archives on demand.  Otherwise, this should be the name of a directory---e.g., @code{\"/var/cache/guix/publish\"}---where @command{guix publish} caches archives and meta-data ready to be sent.  @xref{Invoking guix publish, @option{--cache}}, for more information on the tradeoffs involved."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12216
+#: guix-git/doc/guix.texi:15763
 #, no-wrap
 msgid "@code{workers} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12220
+#: guix-git/doc/guix.texi:15767
 msgid "When it is an integer, this is the number of worker threads used for caching; when @code{#f}, the number of processors is used.  @xref{Invoking guix publish, @option{--workers}}, for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12221
+#: guix-git/doc/guix.texi:15768
+#, no-wrap
+msgid "@code{cache-bypass-threshold} (default: 10 MiB)"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:15773
+msgid "When @code{cache} is true, this is the maximum size in bytes of a store item for which @command{guix publish} may bypass its cache in case of a cache miss.  @xref{Invoking guix publish, @option{--cache-bypass-threshold}}, for more information."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:15774
 #, no-wrap
 msgid "@code{ttl} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12225
+#: guix-git/doc/guix.texi:15778
 msgid "When it is an integer, this denotes the @dfn{time-to-live} in seconds of the published archives.  @xref{Invoking guix publish, @option{--ttl}}, for more information."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12229
+#: guix-git/doc/guix.texi:15782
 msgid "rngd-service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12229
+#: guix-git/doc/guix.texi:15782
 #, no-wrap
 msgid "{Scheme Procedure} rngd-service [#:rng-tools @var{rng-tools}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12234
+#: guix-git/doc/guix.texi:15787
 msgid "[#:device \"/dev/hwrng\"] Return a service that runs the @command{rngd} program from @var{rng-tools} to add @var{device} to the kernel's entropy pool.  The service will fail if @var{device} does not exist."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:12237
+#: guix-git/doc/guix.texi:15790
 msgid "pam-limits-service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12237
+#: guix-git/doc/guix.texi:15790
 #, no-wrap
 msgid "session limits"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12238
+#: guix-git/doc/guix.texi:15791
 #, no-wrap
 msgid "ulimit"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12239
+#: guix-git/doc/guix.texi:15792
 #, no-wrap
 msgid "priority"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12240
+#: guix-git/doc/guix.texi:15793
 #, no-wrap
 msgid "realtime"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12241
+#: guix-git/doc/guix.texi:15794
 #, no-wrap
 msgid "jackd"
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:15795
+#, no-wrap
+msgid "nofile"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:15796
+#, fuzzy, no-wrap
+#| msgid "Synopses and Descriptions"
+msgid "open file descriptors"
+msgstr "简介和描述"
+
 #. type: deffn
-#: doc/guix.texi:12242
+#: guix-git/doc/guix.texi:15797
 #, no-wrap
 msgid "{Scheme Procedure} pam-limits-service [#:limits @code{'()}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12249
-msgid "Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} module}.  The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify @code{ulimit} limits and nice priority limits to user sessions."
+#: guix-git/doc/guix.texi:15804
+msgid "Return a service that installs a configuration file for the @uref{http://linux-pam.org/Linux-PAM-html/sag-pam_limits.html, @code{pam_limits} module}.  The procedure optionally takes a list of @code{pam-limits-entry} values, which can be used to specify @code{ulimit} limits and @code{nice} priority limits to user sessions."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12252
+#: guix-git/doc/guix.texi:15807
 msgid "The following limits definition sets two hard and soft limits for all login sessions of users in the @code{realtime} group:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12258
+#. type: lisp
+#: guix-git/doc/guix.texi:15813
 #, no-wrap
 msgid ""
 "(pam-limits-service\n"
@@ -21391,40 +27793,59 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12264
+#: guix-git/doc/guix.texi:15819
 msgid "The first entry increases the maximum realtime priority for non-privileged processes; the second entry lifts any restriction of the maximum address space that can be locked in memory.  These settings are commonly used for real-time audio systems."
 msgstr ""
 
+#. type: deffn
+#: guix-git/doc/guix.texi:15822
+msgid "Another useful example is raising the maximum number of open file descriptors that can be used:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15827
+#, no-wrap
+msgid ""
+"(pam-limits-service\n"
+" (list\n"
+"  (pam-limits-entry \"*\" 'both 'nofile 100000)))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:15835
+msgid "In the above example, the asterisk means the limit should apply to any user.  It is important to ensure the chosen value doesn't exceed the maximum system value visible in the @file{/proc/sys/fs/file-max} file, else the users would be prevented from login in.  For more information about the Pluggable Authentication Module (PAM) limits, refer to the @samp{pam_limits} man page from the @code{linux-pam} package."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:12269
+#: guix-git/doc/guix.texi:15840
 #, no-wrap
 msgid "cron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12270
+#: guix-git/doc/guix.texi:15841
 #, no-wrap
 msgid "mcron"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12271
+#: guix-git/doc/guix.texi:15842
 #, no-wrap
 msgid "scheduling jobs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12278
+#: guix-git/doc/guix.texi:15849
 msgid "The @code{(gnu services mcron)} module provides an interface to GNU@tie{}mcron, a daemon to run jobs at scheduled times (@pxref{Top,,, mcron, GNU@tie{}mcron}).  GNU@tie{}mcron is similar to the traditional Unix @command{cron} daemon; the main difference is that it is implemented in Guile Scheme, which provides a lot of flexibility when specifying the scheduling of jobs and their actions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12286
+#: guix-git/doc/guix.texi:15857
 msgid "The example below defines an operating system that runs the @command{updatedb} (@pxref{Invoking updatedb,,, find, Finding Files})  and the @command{guix gc} commands (@pxref{Invoking guix gc}) daily, as well as the @command{mkid} command on behalf of an unprivileged user (@pxref{mkid invocation,,, idutils, ID Database Utilities}).  It uses gexps to introduce job definitions that are passed to mcron (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12290
+#: guix-git/doc/guix.texi:15861
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu) (gnu services mcron))\n"
@@ -21433,7 +27854,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12299
+#: guix-git/doc/guix.texi:15870
 #, no-wrap
 msgid ""
 "(define updatedb-job\n"
@@ -21448,7 +27869,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12305
+#: guix-git/doc/guix.texi:15876
 #, no-wrap
 msgid ""
 "(define garbage-collector-job\n"
@@ -21460,7 +27881,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12312
+#: guix-git/doc/guix.texi:15883
 #, no-wrap
 msgid ""
 "(define idutils-job\n"
@@ -21473,225 +27894,298 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12321
+#: guix-git/doc/guix.texi:15886
 #, no-wrap
 msgid ""
 "(operating-system\n"
 "  ;; @dots{}\n"
-"  (services (cons (service mcron-service-type\n"
-"                           (mcron-configuration\n"
-"                            (jobs (list garbage-collector-job\n"
-"                                        updatedb-job\n"
-"                                        idutils-job))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15896
+#, no-wrap
+msgid ""
+"  ;; %BASE-SERVICES already includes an instance of\n"
+"  ;; 'mcron-service-type', which we extend with additional\n"
+"  ;; jobs using 'simple-service'.\n"
+"  (services (cons (simple-service 'my-cron-jobs\n"
+"                                   mcron-service-type\n"
+"                                   (list garbage-collector-job\n"
+"                                         updatedb-job\n"
+"                                         idutils-job))\n"
 "                  %base-services)))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12326
+#: guix-git/doc/guix.texi:15903
+msgid "For more complex jobs defined in Scheme where you need control over the top level, for instance to introduce a @code{use-modules} form, you can move your code to a separate program using the @code{program-file} procedure of the @code{(guix gexp)} module (@pxref{G-Expressions}).  The example below illustrates that."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15919
+#, no-wrap
+msgid ""
+"(define %battery-alert-job\n"
+"  ;; Beep when the battery percentage falls below %MIN-LEVEL.\n"
+"  #~(job\n"
+"     '(next-minute (range 0 60 1))\n"
+"     #$(program-file\n"
+"        \"battery-alert.scm\"\n"
+"        (with-imported-modules (source-module-closure\n"
+"                                '((guix build utils)))\n"
+"          #~(begin\n"
+"              (use-modules (guix build utils)\n"
+"                           (ice-9 popen)\n"
+"                           (ice-9 regex)\n"
+"                           (ice-9 textual-ports)\n"
+"                           (srfi srfi-2))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15921
+#, no-wrap
+msgid ""
+"              (define %min-level 20)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:15932
+#, no-wrap
+msgid ""
+"              (setenv \"LC_ALL\" \"C\")     ;ensure English output\n"
+"              (and-let* ((input-pipe (open-pipe*\n"
+"                                      OPEN_READ\n"
+"                                      #$(file-append acpi \"/bin/acpi\")))\n"
+"                         (output (get-string-all input-pipe))\n"
+"                         (m (string-match \"Discharging, ([0-9]+)%\" output))\n"
+"                         (level (string->number (match:substring m 1)))\n"
+"                         ((< level %min-level)))\n"
+"                (format #t \"warning: Battery level is low (~a%)~%\" level)\n"
+"                (invoke #$(file-append beep \"/bin/beep\") \"-r5\")))))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:15937
 msgid "@xref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron}, for more information on mcron job specifications.  Below is the reference of the mcron service."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12329
+#: guix-git/doc/guix.texi:15940
 msgid "On a running system, you can use the @code{schedule} action of the service to visualize the mcron jobs that will be executed next:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12332
+#: guix-git/doc/guix.texi:15943
 #, no-wrap
 msgid "# herd schedule mcron\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12337
+#: guix-git/doc/guix.texi:15948
 msgid "The example above lists the next five tasks that will be executed, but you can also specify the number of tasks to display:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12340
+#: guix-git/doc/guix.texi:15951
 #, no-wrap
 msgid "# herd schedule mcron 10\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12342
+#: guix-git/doc/guix.texi:15953
 #, no-wrap
 msgid "{Scheme Variable} mcron-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12345
+#: guix-git/doc/guix.texi:15956
 msgid "This is the type of the @code{mcron} service, whose value is an @code{mcron-configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12350
+#: guix-git/doc/guix.texi:15961
 msgid "This service type can be the target of a service extension that provides it additional job specifications (@pxref{Service Composition}).  In other words, it is possible to define services that provide additional mcron jobs to run."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12352
+#: guix-git/doc/guix.texi:15963
 #, no-wrap
 msgid "{Data Type} mcron-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12354
+#: guix-git/doc/guix.texi:15965
 msgid "Data type representing the configuration of mcron."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12356
+#: guix-git/doc/guix.texi:15967
 #, no-wrap
 msgid "@code{mcron} (default: @var{mcron})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12358
+#: guix-git/doc/guix.texi:15969
 msgid "The mcron package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12359 doc/guix.texi:12418
+#: guix-git/doc/guix.texi:15970 guix-git/doc/guix.texi:16039
 #, no-wrap
 msgid "jobs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12363
+#: guix-git/doc/guix.texi:15974
 msgid "This is a list of gexps (@pxref{G-Expressions}), where each gexp corresponds to an mcron job specification (@pxref{Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12370
+#: guix-git/doc/guix.texi:15981
 #, no-wrap
 msgid "rottlog"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12371
+#: guix-git/doc/guix.texi:15982
 #, no-wrap
 msgid "log rotation"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12378
+#: guix-git/doc/guix.texi:15989
 msgid "Log files such as those found in @file{/var/log} tend to grow endlessly, so it's a good idea to @dfn{rotate} them once in a while---i.e., archive their contents in separate files, possibly compressed.  The @code{(gnu services admin)} module provides an interface to GNU@tie{}Rot[t]log, a log rotation tool (@pxref{Top,,, rottlog, GNU Rot[t]log Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12381
-msgid "The example below defines an operating system that provides log rotation with the default settings, for commonly encountered log files."
+#: guix-git/doc/guix.texi:15995
+msgid "This service is part of @code{%base-services}, and thus enabled by default, with the default settings, for commonly encountered log files.  The example below shows how to extend it with an additional @dfn{rotation}, should you need to do that (usually, services that produce log files already take care of that):"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12386
+#: guix-git/doc/guix.texi:15999
 #, no-wrap
 msgid ""
 "(use-modules (guix) (gnu))\n"
-"(use-service-modules admin mcron)\n"
-"(use-package-modules base idutils)\n"
+"(use-service-modules admin)\n"
 "\n"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12391
+#: guix-git/doc/guix.texi:16003
+#, no-wrap
+msgid ""
+"(define my-log-files\n"
+"  ;; Log files that I want to rotate.\n"
+"  '(\"/var/log/something.log\" \"/var/log/another.log\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:16012
 #, no-wrap
 msgid ""
 "(operating-system\n"
 "  ;; @dots{}\n"
-"  (services (cons (service rottlog-service-type)\n"
+"  (services (cons (simple-service 'rotate-my-stuff\n"
+"                                  rottlog-service-type\n"
+"                                  (list (log-rotation\n"
+"                                         (frequency 'daily)\n"
+"                                         (files my-log-files))))\n"
 "                  %base-services)))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12393
+#: guix-git/doc/guix.texi:16014
 #, no-wrap
 msgid "{Scheme Variable} rottlog-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12396
+#: guix-git/doc/guix.texi:16017
 msgid "This is the type of the Rottlog service, whose value is a @code{rottlog-configuration} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12399
+#: guix-git/doc/guix.texi:16020
 msgid "Other services can extend this one with new @code{log-rotation} objects (see below), thereby augmenting the set of files to be rotated."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12402
+#: guix-git/doc/guix.texi:16023
 msgid "This service type can define mcron jobs (@pxref{Scheduled Job Execution}) to run the rottlog service."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12404
+#: guix-git/doc/guix.texi:16025
 #, no-wrap
 msgid "{Data Type} rottlog-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12406
+#: guix-git/doc/guix.texi:16027
 msgid "Data type representing the configuration of rottlog."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12408
+#: guix-git/doc/guix.texi:16029
 #, no-wrap
 msgid "@code{rottlog} (default: @code{rottlog})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12410
+#: guix-git/doc/guix.texi:16031
 msgid "The Rottlog package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12411
+#: guix-git/doc/guix.texi:16032
 #, no-wrap
 msgid "@code{rc-file} (default: @code{(file-append rottlog \"/etc/rc\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12414
+#: guix-git/doc/guix.texi:16035
 msgid "The Rottlog configuration file to use (@pxref{Mandatory RC Variables,,, rottlog, GNU Rot[t]log Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12415
+#: guix-git/doc/guix.texi:16036
 #, no-wrap
 msgid "@code{rotations} (default: @code{%default-rotations})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12417
+#: guix-git/doc/guix.texi:16038
 msgid "A list of @code{log-rotation} objects as defined below."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12421
+#: guix-git/doc/guix.texi:16042
 msgid "This is a list of gexps where each gexp corresponds to an mcron job specification (@pxref{Scheduled Job Execution})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12424
+#: guix-git/doc/guix.texi:16045
 #, no-wrap
 msgid "{Data Type} log-rotation"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12426
+#: guix-git/doc/guix.texi:16047
 msgid "Data type representing the rotation of a group of log files."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12430
+#: guix-git/doc/guix.texi:16051
 msgid "Taking an example from the Rottlog manual (@pxref{Period Related File Examples,,, rottlog, GNU Rot[t]log Manual}), a log rotation might be defined like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12439
+#. type: lisp
+#: guix-git/doc/guix.texi:16060
 #, no-wrap
 msgid ""
 "(log-rotation\n"
@@ -21704,111 +28198,111 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12442
+#: guix-git/doc/guix.texi:16063
 msgid "The list of fields is as follows:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12444
+#: guix-git/doc/guix.texi:16065
 #, no-wrap
 msgid "@code{frequency} (default: @code{'weekly})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12446
+#: guix-git/doc/guix.texi:16067
 msgid "The log rotation frequency, a symbol."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12447
+#: guix-git/doc/guix.texi:16068
 #, no-wrap
 msgid "files"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12449
+#: guix-git/doc/guix.texi:16070
 msgid "The list of files or file glob patterns to rotate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12450
+#: guix-git/doc/guix.texi:16071
 #, no-wrap
 msgid "@code{options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12453
+#: guix-git/doc/guix.texi:16074
 msgid "The list of rottlog options for this rotation (@pxref{Configuration parameters,,, rottlog, GNU Rot[t]lg Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12454
+#: guix-git/doc/guix.texi:16075
 #, no-wrap
 msgid "@code{post-rotate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12456
+#: guix-git/doc/guix.texi:16077
 msgid "Either @code{#f} or a gexp to execute once the rotation has completed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12459
+#: guix-git/doc/guix.texi:16080
 #, no-wrap
 msgid "{Scheme Variable} %default-rotations"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12462
-msgid "Specifies weekly rotation of @var{%rotated-files} and a couple of other files."
+#: guix-git/doc/guix.texi:16083
+msgid "Specifies weekly rotation of @code{%rotated-files} and of @file{/var/log/guix-daemon.log}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12464
+#: guix-git/doc/guix.texi:16085
 #, no-wrap
 msgid "{Scheme Variable} %rotated-files"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12467
-msgid "The list of syslog-controlled files to be rotated.  By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\")}."
+#: guix-git/doc/guix.texi:16089
+msgid "The list of syslog-controlled files to be rotated.  By default it is: @code{'(\"/var/log/messages\" \"/var/log/secure\" \"/var/log/debug\" \\ \"/var/log/maillog\")}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12474
+#: guix-git/doc/guix.texi:16096
 msgid "The @code{(gnu services networking)} module provides services to configure the network interface."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12475
+#: guix-git/doc/guix.texi:16097
 #, no-wrap
 msgid "DHCP, networking service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12476
+#: guix-git/doc/guix.texi:16098
 #, no-wrap
 msgid "{Scheme Variable} dhcp-client-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12480
+#: guix-git/doc/guix.texi:16102
 msgid "This is the type of services that run @var{dhcp}, a Dynamic Host Configuration Protocol (DHCP) client, on all the non-loopback network interfaces.  Its value is the DHCP client package to use, @code{isc-dhcp} by default."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12482
+#: guix-git/doc/guix.texi:16104
 #, no-wrap
 msgid "{Scheme Procedure} dhcpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12486
+#: guix-git/doc/guix.texi:16108
 msgid "This type defines a service that runs a DHCP daemon.  To create a service of this type, you must supply a @code{<dhcpd-configuration>}.  For example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12492
+#. type: lisp
+#: guix-git/doc/guix.texi:16114
 #, no-wrap
 msgid ""
 "(service dhcpd-service-type\n"
@@ -21818,111 +28312,112 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12495
+#: guix-git/doc/guix.texi:16117
 #, no-wrap
 msgid "{Data Type} dhcpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12497
+#: guix-git/doc/guix.texi:16119
 #, no-wrap
 msgid "@code{package} (default: @code{isc-dhcp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12502
+#: guix-git/doc/guix.texi:16124
 msgid "The package that provides the DHCP daemon.  This package is expected to provide the daemon at @file{sbin/dhcpd} relative to its output directory.  The default package is the @uref{https://www.isc.org/products/DHCP, ISC's DHCP server}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12502 doc/guix.texi:12691 doc/guix.texi:16678
+#: guix-git/doc/guix.texi:16124 guix-git/doc/guix.texi:16380
+#: guix-git/doc/guix.texi:21452
 #, no-wrap
 msgid "@code{config-file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12507
+#: guix-git/doc/guix.texi:16129
 msgid "The configuration file to use.  This is required.  It will be passed to @code{dhcpd} via its @code{-cf} option.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).  See @code{man dhcpd.conf} for details on the configuration file syntax."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12507
+#: guix-git/doc/guix.texi:16129
 #, no-wrap
 msgid "@code{version} (default: @code{\"4\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12512
+#: guix-git/doc/guix.texi:16134
 msgid "The DHCP version to use.  The ISC DHCP server supports the values ``4'', ``6'', and ``4o6''.  These correspond to the @code{dhcpd} program options @code{-4}, @code{-6}, and @code{-4o6}.  See @code{man dhcpd} for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12512
+#: guix-git/doc/guix.texi:16134
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/run/dhcpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12515
+#: guix-git/doc/guix.texi:16137
 msgid "The run directory to use.  At service activation time, this directory will be created if it does not exist."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12515
+#: guix-git/doc/guix.texi:16137
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/run/dhcpd/dhcpd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12518
+#: guix-git/doc/guix.texi:16140
 msgid "The PID file to use.  This corresponds to the @code{-pf} option of @code{dhcpd}.  See @code{man dhcpd} for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12518
+#: guix-git/doc/guix.texi:16140
 #, no-wrap
 msgid "@code{interfaces} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12524
+#: guix-git/doc/guix.texi:16146
 msgid "The names of the network interfaces on which dhcpd should listen for broadcasts.  If this list is not empty, then its elements (which must be strings) will be appended to the @code{dhcpd} invocation when starting the daemon.  It may not be necessary to explicitly specify any interfaces here; see @code{man dhcpd} for details."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12527
+#: guix-git/doc/guix.texi:16149
 #, no-wrap
 msgid "{Scheme Variable} static-networking-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12530
+#: guix-git/doc/guix.texi:16152
 msgid "This is the type for statically-configured network interfaces."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12532
+#: guix-git/doc/guix.texi:16154
 #, no-wrap
 msgid "{Scheme Procedure} static-networking-service @var{interface} @var{ip} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12540
+#: guix-git/doc/guix.texi:16162
 msgid "[#:netmask #f] [#:gateway #f] [#:name-servers @code{'()}] @ [#:requirement @code{'(udev)}] Return a service that starts @var{interface} with address @var{ip}.  If @var{netmask} is true, use it as the network mask.  If @var{gateway} is true, it must be a string specifying the default network gateway.  @var{requirement} can be used to declare a dependency on another service before configuring the interface."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12545
+#: guix-git/doc/guix.texi:16167
 msgid "This procedure can be called several times, one for each network interface of interest.  Behind the scenes what it does is extend @code{static-networking-service-type} with additional network interfaces to handle."
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:12547
+#. type: defvr
+#: guix-git/doc/guix.texi:16169 guix-git/doc/guix.texi:29003
 msgid "For example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12552
+#. type: lisp
+#: guix-git/doc/guix.texi:16174
 #, no-wrap
 msgid ""
 "(static-networking-service \"eno1\" \"192.168.1.82\"\n"
@@ -21931,195 +28426,284 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12555
+#: guix-git/doc/guix.texi:16177
 #, no-wrap
 msgid "wicd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12558
+#: guix-git/doc/guix.texi:16180
 #, no-wrap
 msgid "network management"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12559
+#: guix-git/doc/guix.texi:16181
 #, no-wrap
 msgid "{Scheme Procedure} wicd-service [#:wicd @var{wicd}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12562
+#: guix-git/doc/guix.texi:16184
 msgid "Return a service that runs @url{https://launchpad.net/wicd,Wicd}, a network management daemon that aims to simplify wired and wireless networking."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12567
+#: guix-git/doc/guix.texi:16189
 msgid "This service adds the @var{wicd} package to the global profile, providing several commands to interact with the daemon and configure networking: @command{wicd-client}, a graphical user interface, and the @command{wicd-cli} and @command{wicd-curses} user interfaces."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12569
+#: guix-git/doc/guix.texi:16191
 #, no-wrap
 msgid "ModemManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12571
+#: guix-git/doc/guix.texi:16193
 #, no-wrap
 msgid "{Scheme Variable} modem-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12576
-msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager} service. The value for this service type is a @code{modem-manager-configuration} record."
+#: guix-git/doc/guix.texi:16198
+msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/ModemManager, ModemManager} service.  The value for this service type is a @code{modem-manager-configuration} record."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12579 doc/guix.texi:12601
+#: guix-git/doc/guix.texi:16201 guix-git/doc/guix.texi:16230
+#: guix-git/doc/guix.texi:16262
 msgid "This service is part of @code{%desktop-services} (@pxref{Desktop Services})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12581
+#: guix-git/doc/guix.texi:16203
 #, no-wrap
 msgid "{Data Type} modem-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12583
+#: guix-git/doc/guix.texi:16205
 msgid "Data type representing the configuration of ModemManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12585
+#: guix-git/doc/guix.texi:16207
 #, no-wrap
 msgid "@code{modem-manager} (default: @code{modem-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12587
+#: guix-git/doc/guix.texi:16209
 msgid "The ModemManager package to use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12591
+#: guix-git/doc/guix.texi:16213
+#, no-wrap
+msgid "USB_ModeSwitch"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16214
+#, no-wrap
+msgid "Modeswitching"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16216
+#, no-wrap
+msgid "{Scheme Variable} usb-modeswitch-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16221
+msgid "This is the service type for the @uref{https://www.draisberghof.de/usb_modeswitch/, USB_ModeSwitch} service.  The value for this service type is a @code{usb-modeswitch-configuration} record."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16227
+msgid "When plugged in, some USB modems (and other USB devices) initially present themselves as a read-only storage medium and not as a modem.  They need to be @dfn{modeswitched} before they are usable.  The USB_ModeSwitch service type installs udev rules to automatically modeswitch these devices when they are plugged in."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16232
+#, no-wrap
+msgid "{Data Type} usb-modeswitch-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16234
+msgid "Data type representing the configuration of USB_ModeSwitch."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16236
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{usb-modeswitch} (default: @code{usb-modeswitch})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16238
+msgid "The USB_ModeSwitch package providing the binaries for modeswitching."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16239
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{usb-modeswitch-data} (default: @code{usb-modeswitch-data})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16242
+msgid "The package providing the device data and udev rules file used by USB_ModeSwitch."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16243
+#, no-wrap
+msgid "@code{config-file} (default: @code{#~(string-append #$usb-modeswitch:dispatcher \"/etc/usb_modeswitch.conf\")})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16248
+msgid "Which config file to use for the USB_ModeSwitch dispatcher.  By default the config file shipped with USB_ModeSwitch is used which disables logging to @file{/var/log} among other default settings.  If set to @code{#f}, no config file is used."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16252
 #, no-wrap
 msgid "NetworkManager"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12593
+#: guix-git/doc/guix.texi:16254
 #, no-wrap
 msgid "{Scheme Variable} network-manager-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12598
+#: guix-git/doc/guix.texi:16259
 msgid "This is the service type for the @uref{https://wiki.gnome.org/Projects/NetworkManager, NetworkManager} service. The value for this service type is a @code{network-manager-configuration} record."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12603
+#: guix-git/doc/guix.texi:16264
 #, no-wrap
 msgid "{Data Type} network-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12605
+#: guix-git/doc/guix.texi:16266
 msgid "Data type representing the configuration of NetworkManager."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12607
+#: guix-git/doc/guix.texi:16268
 #, no-wrap
 msgid "@code{network-manager} (default: @code{network-manager})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12609
+#: guix-git/doc/guix.texi:16270
 msgid "The NetworkManager package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12610
+#: guix-git/doc/guix.texi:16271
 #, no-wrap
 msgid "@code{dns} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12613
+#: guix-git/doc/guix.texi:16274
 msgid "Processing mode for DNS, which affects how NetworkManager uses the @code{resolv.conf} configuration file."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:12615
-#, no-wrap
-msgid "default"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:12618
+#: guix-git/doc/guix.texi:16279
 msgid "NetworkManager will update @code{resolv.conf} to reflect the nameservers provided by currently active connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12619
+#: guix-git/doc/guix.texi:16280
 #, no-wrap
 msgid "dnsmasq"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12623
-msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a \"split DNS\" configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver."
+#: guix-git/doc/guix.texi:16284
+msgid "NetworkManager will run @code{dnsmasq} as a local caching nameserver, using a @dfn{conditional forwarding} configuration if you are connected to a VPN, and then update @code{resolv.conf} to point to the local nameserver."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:12624 doc/guix.texi:13884
+#. type: table
+#: guix-git/doc/guix.texi:16290
+msgid "With this setting, you can share your network connection.  For example when you want to share your network connection to another laptop @i{via} an Ethernet cable, you can open @command{nm-connection-editor} and configure the Wired connection's method for IPv4 and IPv6 to be ``Shared to other computers'' and reestablish the connection (or reboot)."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16297
+msgid "You can also set up a @dfn{host-to-guest connection} to QEMU VMs (@pxref{Installing Guix in a VM}).  With a host-to-guest connection, you can e.g.@: access a Web server running on the VM (@pxref{Web Services}) from a Web browser on your host system, or connect to the VM @i{via} SSH (@pxref{Networking Services, @code{openssh-service-type}}).  To set up a host-to-guest connection, run this command once:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:16304
 #, no-wrap
-msgid "none"
+msgid ""
+"nmcli connection add type tun \\\n"
+" connection.interface-name tap0 \\\n"
+" tun.mode tap tun.owner $(id -u) \\\n"
+" ipv4.method shared \\\n"
+" ipv4.addresses 172.28.112.1/24\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16309
+msgid "Then each time you launch your QEMU VM (@pxref{Running Guix in a VM}), pass @option{-nic tap,ifname=tap0,script=no,downscript=no} to @command{qemu-system-...}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12626
+#: guix-git/doc/guix.texi:16312
 msgid "NetworkManager will not modify @code{resolv.conf}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12628
+#: guix-git/doc/guix.texi:16314
 #, no-wrap
 msgid "@code{vpn-plugins} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12632
+#: guix-git/doc/guix.texi:16318
 msgid "This is the list of available plugins for virtual private networks (VPNs).  An example of this is the @code{network-manager-openvpn} package, which allows NetworkManager to manage VPNs @i{via} OpenVPN."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12636
+#: guix-git/doc/guix.texi:16322
 #, no-wrap
 msgid "Connman"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12637
+#: guix-git/doc/guix.texi:16323
 #, no-wrap
 msgid "{Scheme Variable} connman-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12640
+#: guix-git/doc/guix.texi:16326
 msgid "This is the service type to run @url{https://01.org/connman,Connman}, a network connection manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12643
+#: guix-git/doc/guix.texi:16329
 msgid "Its value must be an @code{connman-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12648
+#. type: lisp
+#: guix-git/doc/guix.texi:16334
 #, no-wrap
 msgid ""
 "(service connman-service-type\n"
@@ -22128,149 +28712,308 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12651
+#: guix-git/doc/guix.texi:16337
 msgid "See below for details about @code{connman-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12653
+#: guix-git/doc/guix.texi:16339
 #, no-wrap
 msgid "{Data Type} connman-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12655
+#: guix-git/doc/guix.texi:16341
 msgid "Data Type representing the configuration of connman."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12657
+#: guix-git/doc/guix.texi:16343
 #, no-wrap
 msgid "@code{connman} (default: @var{connman})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12659
+#: guix-git/doc/guix.texi:16345
 msgid "The connman package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12660
+#: guix-git/doc/guix.texi:16346
 #, no-wrap
 msgid "@code{disable-vpn?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12662
+#: guix-git/doc/guix.texi:16348
 msgid "When true, disable connman's vpn plugin."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12665
+#: guix-git/doc/guix.texi:16351
 #, no-wrap
 msgid "WPA Supplicant"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12666
+#: guix-git/doc/guix.texi:16352
 #, no-wrap
 msgid "{Scheme Variable} wpa-supplicant-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12670
+#: guix-git/doc/guix.texi:16356
 msgid "This is the service type to run @url{https://w1.fi/wpa_supplicant/,WPA supplicant}, an authentication daemon required to authenticate against encrypted WiFi or ethernet networks."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12672
+#: guix-git/doc/guix.texi:16358
 #, no-wrap
 msgid "{Data Type} wpa-supplicant-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12674
+#: guix-git/doc/guix.texi:16360
 msgid "Data type representing the configuration of WPA Supplicant."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12676
+#: guix-git/doc/guix.texi:16362 guix-git/doc/guix.texi:31015
 msgid "It takes the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12678
+#: guix-git/doc/guix.texi:16364
 #, no-wrap
 msgid "@code{wpa-supplicant} (default: @code{wpa-supplicant})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12680
+#: guix-git/doc/guix.texi:16366
 msgid "The WPA Supplicant package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12681
+#: guix-git/doc/guix.texi:16367
+#, no-wrap
+msgid "@code{requirement} (default: @code{'(user-processes loopback syslogd)}"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16369
+msgid "List of services that should be started before WPA Supplicant starts."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16370
 #, no-wrap
 msgid "@code{dbus?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12683
+#: guix-git/doc/guix.texi:16372
 msgid "Whether to listen for requests on D-Bus."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12684
+#: guix-git/doc/guix.texi:16373
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/wpa_supplicant.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12686
+#: guix-git/doc/guix.texi:16375
 msgid "Where to store the PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12687
+#: guix-git/doc/guix.texi:16376 guix-git/doc/guix.texi:29460
+#: guix-git/doc/guix.texi:29602
 #, no-wrap
 msgid "@code{interface} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12690
+#: guix-git/doc/guix.texi:16379
 msgid "If this is set, it must specify the name of a network interface that WPA supplicant will control."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12693
+#: guix-git/doc/guix.texi:16382
 msgid "Optional configuration file to use."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12696
+#: guix-git/doc/guix.texi:16385
 msgid "List of additional command-line arguments to pass to the daemon."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12699
+#: guix-git/doc/guix.texi:16388
+#, no-wrap
+msgid "hostapd service, for Wi-Fi access points"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16389
+#, no-wrap
+msgid "Wi-Fi access points, hostapd service"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16390
+#, no-wrap
+msgid "{Scheme Variable} hostapd-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16395
+msgid "This is the service type to run the @uref{https://w1.fi/hostapd/, hostapd} daemon to set up WiFi (IEEE 802.11) access points and authentication servers.  Its associated value must be a @code{hostapd-configuration} as shown below:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:16403
+#, no-wrap
+msgid ""
+";; Use wlan1 to run the access point for \"My Network\".\n"
+"(service hostapd-service-type\n"
+"         (hostapd-configuration\n"
+"          (interface \"wlan1\")\n"
+"          (ssid \"My Network\")\n"
+"          (channel 12)))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16406
+#, no-wrap
+msgid "{Data Type} hostapd-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16409
+msgid "This data type represents the configuration of the hostapd service, with the following fields:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16411
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{hostapd})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16413
+#, fuzzy
+#| msgid "The package data type."
+msgid "The hostapd package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:16414
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{interface} (default: @code{\"wlan0\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16416
+msgid "The network interface to run the WiFi access point."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:16417
+#, no-wrap
+msgid "ssid"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16420
+msgid "The SSID (@dfn{service set identifier}), a string that identifies this network."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16421
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{broadcast-ssid?} (default: @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16423
+msgid "Whether to broadcast this SSID."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16424
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{channel} (default: @code{1})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16426
+msgid "The WiFi channel to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16427
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{driver} (default: @code{\"nl80211\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16431
+msgid "The driver interface type.  @code{\"nl80211\"} is used with all Linux mac80211 drivers.  Use @code{\"none\"} if building hostapd as a standalone RADIUS server that does # not control any wireless/wired driver."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16432 guix-git/doc/guix.texi:22301
+#: guix-git/doc/guix.texi:25151
+#, no-wrap
+msgid "@code{extra-settings} (default: @code{\"\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16436
+msgid "Extra settings to append as-is to the hostapd configuration file.  See @uref{https://w1.fi/cgit/hostap/plain/hostapd/hostapd.conf} for the configuration file reference."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16439
+#, no-wrap
+msgid "{Scheme Variable} simulated-wifi-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16446
+msgid "This is the type of a service to simulate WiFi networking, which can be useful in virtual machines for testing purposes.  The service loads the Linux kernel @uref{https://www.kernel.org/doc/html/latest/networking/mac80211_hwsim/mac80211_hwsim.html, @code{mac80211_hwsim} module} and starts hostapd to create a pseudo WiFi network that can be seen on @code{wlan0}, by default."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16448
+msgid "The service's value is a @code{hostapd-configuration} record."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16450
 #, no-wrap
 msgid "iptables"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12700
+#: guix-git/doc/guix.texi:16451
 #, no-wrap
 msgid "{Scheme Variable} iptables-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12706
+#: guix-git/doc/guix.texi:16457
 msgid "This is the service type to set up an iptables configuration.  iptables is a packet filtering framework supported by the Linux kernel.  This service supports configuring iptables for both IPv4 and IPv6.  A simple example configuration rejecting all incoming connections except those to the ssh port 22 is shown below."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:12726
+#: guix-git/doc/guix.texi:16477
 #, no-wrap
 msgid ""
 "(service iptables-service-type\n"
@@ -22294,151 +29037,275 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12729
+#: guix-git/doc/guix.texi:16480
 #, no-wrap
 msgid "{Data Type} iptables-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12731
+#: guix-git/doc/guix.texi:16482
 msgid "The data type representing the configuration of iptables."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12733
+#: guix-git/doc/guix.texi:16484
 #, no-wrap
 msgid "@code{iptables} (default: @code{iptables})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12736
+#: guix-git/doc/guix.texi:16487
 msgid "The iptables package that provides @code{iptables-restore} and @code{ip6tables-restore}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12736
+#: guix-git/doc/guix.texi:16487
 #, no-wrap
 msgid "@code{ipv4-rules} (default: @code{%iptables-accept-all-rules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12740
+#: guix-git/doc/guix.texi:16491
 msgid "The iptables rules to use.  It will be passed to @code{iptables-restore}.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12740
+#: guix-git/doc/guix.texi:16491
 #, no-wrap
 msgid "@code{ipv6-rules} (default: @code{%iptables-accept-all-rules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12744
+#: guix-git/doc/guix.texi:16495
 msgid "The ip6tables rules to use.  It will be passed to @code{ip6tables-restore}.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12747
+#: guix-git/doc/guix.texi:16498
+#, no-wrap
+msgid "nftables"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16499
+#, no-wrap
+msgid "{Scheme Variable} nftables-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16507
+msgid "This is the service type to set up a nftables configuration.  nftables is a netfilter project that aims to replace the existing iptables, ip6tables, arptables and ebtables framework.  It provides a new packet filtering framework, a new user-space utility @command{nft}, and a compatibility layer for iptables.  This service comes with a default ruleset @code{%default-nftables-ruleset} that rejecting all incoming connections except those to the ssh port 22.  To use it, simply write:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:16510
+#, no-wrap
+msgid "(service nftables-service-type)\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16513
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} nftables-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16515
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "The data type representing the configuration of nftables."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:16517
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{package} (default: @code{nftables})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16519
+msgid "The nftables package that provides @command{nft}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16519
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{ruleset} (default: @code{%default-nftables-ruleset})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16522
+msgid "The nftables ruleset to use.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects})."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16525
 #, no-wrap
 msgid "NTP (Network Time Protocol), service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12748
+#: guix-git/doc/guix.texi:16526
+#, no-wrap
+msgid "ntpd, service for the Network Time Protocol daemon"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16527
 #, no-wrap
 msgid "real time clock"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12749
+#: guix-git/doc/guix.texi:16528
 #, no-wrap
 msgid "{Scheme Variable} ntp-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12753
-msgid "This is the type of the service running the @uref{http://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}.  The daemon will keep the system clock synchronized with that of the specified NTP servers."
+#: guix-git/doc/guix.texi:16532
+msgid "This is the type of the service running the @uref{https://www.ntp.org, Network Time Protocol (NTP)} daemon, @command{ntpd}.  The daemon will keep the system clock synchronized with that of the specified NTP servers."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12756
+#: guix-git/doc/guix.texi:16535
 msgid "The value of this service is an @code{ntpd-configuration} object, as described below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12758
+#: guix-git/doc/guix.texi:16537
 #, no-wrap
 msgid "{Data Type} ntp-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12760
+#: guix-git/doc/guix.texi:16539
 msgid "This is the data type for the NTP service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12762
+#: guix-git/doc/guix.texi:16541
 #, no-wrap
 msgid "@code{servers} (default: @code{%ntp-servers})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12765
-msgid "This is the list of servers (host names) with which @command{ntpd} will be synchronized."
+#: guix-git/doc/guix.texi:16545
+msgid "This is the list of servers (@code{<ntp-server>} records) with which @command{ntpd} will be synchronized.  See the @code{ntp-server} data type definition below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12766 doc/guix.texi:12827
-#, no-wrap
-msgid "@code{allow-large-adjustment?} (default: @code{#f})"
-msgstr ""
+#: guix-git/doc/guix.texi:16546
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{allow-large-adjustment?} (default: @code{#t})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:12769
+#: guix-git/doc/guix.texi:16549
 msgid "This determines whether @command{ntpd} is allowed to make an initial adjustment of more than 1,000 seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12770
+#: guix-git/doc/guix.texi:16550
 #, no-wrap
 msgid "@code{ntp} (default: @code{ntp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12772
+#: guix-git/doc/guix.texi:16552
 msgid "The NTP package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12775
+#: guix-git/doc/guix.texi:16555
 #, no-wrap
 msgid "{Scheme Variable} %ntp-servers"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12778
+#: guix-git/doc/guix.texi:16558
 msgid "List of host names used as the default NTP servers.  These are servers of the @uref{https://www.ntppool.org/en/, NTP Pool Project}."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:16560
+#, no-wrap
+msgid "{Data Type} ntp-server"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16562
+msgid "The data type representing the configuration of a NTP server."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16564
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{type} (default: @code{'server})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16567
+msgid "The type of the NTP server, given as a symbol.  One of @code{'pool}, @code{'server}, @code{'peer}, @code{'broadcast} or @code{'manycastclient}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:16568
+#, no-wrap
+msgid "address"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16570
+msgid "The address of the server, as a string."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:16571 guix-git/doc/guix.texi:31761
+#: guix-git/doc/guix.texi:31781
+#, no-wrap
+msgid "options"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:16576
+msgid "NTPD options to use with that specific server, given as a list of option names and/or of option names and values tuples.  The following example define a server to use with the options @option{iburst} and @option{prefer}, as well as @option{version} 3 and a @option{maxpoll} time of 16 seconds."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:16582
+#, no-wrap
+msgid ""
+"(ntp-server\n"
+" (type 'server)\n"
+" (address \"some.ntp.server.org\")\n"
+" (options `(iburst (version 3) (maxpoll 16) prefer))))\n"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:12780
+#: guix-git/doc/guix.texi:16586
 #, no-wrap
 msgid "OpenNTPD"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12781
+#: guix-git/doc/guix.texi:16587
 #, no-wrap
 msgid "{Scheme Procedure} openntpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12785
+#: guix-git/doc/guix.texi:16591
 msgid "Run the @command{ntpd}, the Network Time Protocol (NTP) daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The daemon will keep the system clock synchronized with that of the given servers."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12795
+#. type: lisp
+#: guix-git/doc/guix.texi:16600
 #, no-wrap
 msgid ""
 "(service\n"
@@ -22447,134 +29314,141 @@ msgid ""
 "  (listen-on '(\"127.0.0.1\" \"::1\"))\n"
 "  (sensor '(\"udcf0 correction 70000\"))\n"
 "  (constraint-from '(\"www.gnu.org\"))\n"
-"  (constraints-from '(\"https://www.google.com/\"))\n"
-"  (allow-large-adjustment? #t)))\n"
+"  (constraints-from '(\"https://www.google.com/\"))))\n"
 "\n"
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:16604
+#, no-wrap
+msgid "{Scheme Variable} %openntpd-servers"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:16607
+msgid "This variable is a list of the server addresses defined in @code{%ntp-servers}."
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:12799
+#: guix-git/doc/guix.texi:16609
 #, no-wrap
 msgid "{Data Type} openntpd-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12801
+#: guix-git/doc/guix.texi:16611
 #, no-wrap
 msgid "@code{openntpd} (default: @code{(file-append openntpd \"/sbin/ntpd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12803
+#: guix-git/doc/guix.texi:16613
 msgid "The openntpd executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12803
+#: guix-git/doc/guix.texi:16613
 #, no-wrap
 msgid "@code{listen-on} (default: @code{'(\"127.0.0.1\" \"::1\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12805
+#: guix-git/doc/guix.texi:16615
 msgid "A list of local IP addresses or hostnames the ntpd daemon should listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12805
+#: guix-git/doc/guix.texi:16615
 #, no-wrap
 msgid "@code{query-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12807
+#: guix-git/doc/guix.texi:16617
 msgid "A list of local IP address the ntpd daemon should use for outgoing queries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12807
+#: guix-git/doc/guix.texi:16617
 #, no-wrap
 msgid "@code{sensor} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12812
+#: guix-git/doc/guix.texi:16622
 msgid "Specify a list of timedelta sensor devices ntpd should use.  @code{ntpd} will listen to each sensor that actually exists and ignore non-existent ones.  See @uref{https://man.openbsd.org/ntpd.conf, upstream documentation} for more information."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12812
-#, no-wrap
-msgid "@code{server} (default: @var{%ntp-servers})"
-msgstr ""
+#: guix-git/doc/guix.texi:16622
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{server} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:12814
+#: guix-git/doc/guix.texi:16624
 msgid "Specify a list of IP addresses or hostnames of NTP servers to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12814 doc/guix.texi:20029
-#, no-wrap
-msgid "@code{servers} (default: @code{'()})"
-msgstr ""
+#: guix-git/doc/guix.texi:16624
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{servers} (default: @code{%openntp-servers})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
 
 #. type: table
-#: doc/guix.texi:12816
+#: guix-git/doc/guix.texi:16626
 msgid "Specify a list of IP addresses or hostnames of NTP pools to synchronize to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12816
+#: guix-git/doc/guix.texi:16626
 #, no-wrap
 msgid "@code{constraint-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12823
+#: guix-git/doc/guix.texi:16633
 msgid "@code{ntpd} can be configured to query the ‘Date’ from trusted HTTPS servers via TLS.  This time information is not used for precision but acts as an authenticated constraint, thereby reducing the impact of unauthenticated NTP man-in-the-middle attacks.  Specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12823
+#: guix-git/doc/guix.texi:16633
 #, no-wrap
 msgid "@code{constraints-from} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12827
+#: guix-git/doc/guix.texi:16637
 msgid "As with constraint from, specify a list of URLs, IP addresses or hostnames of HTTPS servers to provide a constraint.  Should the hostname resolve to multiple IP addresses, @code{ntpd} will calculate a median constraint from all of them."
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:12830
-msgid "Determines if @code{ntpd} is allowed to make an initial adjustment of more than 180 seconds."
-msgstr ""
-
 #. type: cindex
-#: doc/guix.texi:12833
+#: guix-git/doc/guix.texi:16640
 #, no-wrap
 msgid "inetd"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12834
+#: guix-git/doc/guix.texi:16641
 #, no-wrap
 msgid "{Scheme variable} inetd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12839
+#: guix-git/doc/guix.texi:16646
 msgid "This service runs the @command{inetd} (@pxref{inetd invocation,,, inetutils, GNU Inetutils}) daemon.  @command{inetd} listens for connections on internet sockets, and lazily starts the specified server program when a connection is made on one of these sockets."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12845
+#: guix-git/doc/guix.texi:16652
 msgid "The value of this service is an @code{inetd-configuration} object.  The following example configures the @command{inetd} daemon to provide the built-in @command{echo} service, as well as an smtp service which forwards smtp traffic over ssh to a server @code{smtp-server} behind a gateway @code{hostname}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:12868
+#. type: lisp
+#: guix-git/doc/guix.texi:16675
 #, no-wrap
 msgid ""
 "(service\n"
@@ -22597,224 +29471,236 @@ msgid ""
 "             (program (file-append openssh \"/bin/ssh\"))\n"
 "             (arguments\n"
 "              '(\"ssh\" \"-qT\" \"-i\" \"/path/to/ssh_key\"\n"
-"                \"-W\" \"smtp-server:25\" \"user@@hostname\")))))\n"
+"                \"-W\" \"smtp-server:25\" \"user@@hostname\")))))))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12871
+#: guix-git/doc/guix.texi:16678
 msgid "See below for more details about @code{inetd-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12873
+#: guix-git/doc/guix.texi:16680
 #, no-wrap
 msgid "{Data Type} inetd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12875
+#: guix-git/doc/guix.texi:16682
 msgid "Data type representing the configuration of @command{inetd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12877
+#: guix-git/doc/guix.texi:16684
 #, no-wrap
 msgid "@code{program} (default: @code{(file-append inetutils \"/libexec/inetd\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12879
+#: guix-git/doc/guix.texi:16686
 msgid "The @command{inetd} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12880 doc/guix.texi:19683
+#: guix-git/doc/guix.texi:16687 guix-git/doc/guix.texi:25985
 #, no-wrap
 msgid "@code{entries} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12883
+#: guix-git/doc/guix.texi:16690
 msgid "A list of @command{inetd} service entries.  Each entry should be created by the @code{inetd-entry} constructor."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12886
+#: guix-git/doc/guix.texi:16693
 #, no-wrap
 msgid "{Data Type} inetd-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12890
+#: guix-git/doc/guix.texi:16697
 msgid "Data type representing an entry in the @command{inetd} configuration.  Each entry corresponds to a socket where @command{inetd} will listen for requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12892
+#: guix-git/doc/guix.texi:16699
 #, no-wrap
 msgid "@code{node} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12897
+#: guix-git/doc/guix.texi:16704
 msgid "Optional string, a comma-separated list of local addresses @command{inetd} should use when listening for this service.  @xref{Configuration file,,, inetutils, GNU Inetutils} for a complete description of all options."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12899
+#: guix-git/doc/guix.texi:16706
 msgid "A string, the name must correspond to an entry in @code{/etc/services}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12899
+#: guix-git/doc/guix.texi:16706
 #, no-wrap
 msgid "socket-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12902
+#: guix-git/doc/guix.texi:16709
 msgid "One of @code{'stream}, @code{'dgram}, @code{'raw}, @code{'rdm} or @code{'seqpacket}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:12902
+#: guix-git/doc/guix.texi:16709
 #, no-wrap
 msgid "protocol"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12904
+#: guix-git/doc/guix.texi:16711
 msgid "A string, must correspond to an entry in @code{/etc/protocols}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12904
+#: guix-git/doc/guix.texi:16711
 #, no-wrap
 msgid "@code{wait?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12907
+#: guix-git/doc/guix.texi:16714
 msgid "Whether @command{inetd} should wait for the server to exit before listening to new service requests."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12912
+#: guix-git/doc/guix.texi:16719
 msgid "A string containing the user (and, optionally, group) name of the user as whom the server should run.  The group name can be specified in a suffix, separated by a colon or period, i.e.@: @code{\"user\"}, @code{\"user:group\"} or @code{\"user.group\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12912
+#: guix-git/doc/guix.texi:16719
 #, no-wrap
 msgid "@code{program} (default: @code{\"internal\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12915
+#: guix-git/doc/guix.texi:16722
 msgid "The server program which will serve the requests, or @code{\"internal\"} if @command{inetd} should use a built-in service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12920
+#: guix-git/doc/guix.texi:16727
 msgid "A list strings or file-like objects, which are the server program's arguments, starting with the zeroth argument, i.e.@: the name of the program itself.  For @command{inetd}'s internal services, this entry must be @code{'()} or @code{'(\"internal\")}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12924
+#: guix-git/doc/guix.texi:16731
 msgid "@xref{Configuration file,,, inetutils, GNU Inetutils} for a more detailed discussion of each configuration field."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:12926
+#: guix-git/doc/guix.texi:16733
 #, no-wrap
 msgid "Tor"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12927
+#: guix-git/doc/guix.texi:16734
 #, no-wrap
 msgid "{Scheme Variable} tor-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:12932
+#: guix-git/doc/guix.texi:16739
 msgid "This is the type for a service that runs the @uref{https://torproject.org, Tor} anonymous networking daemon.  The service is configured using a @code{<tor-configuration>} record.  By default, the Tor daemon runs as the @code{tor} unprivileged user, which is a member of the @code{tor} group."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:12935
+#: guix-git/doc/guix.texi:16742
 #, no-wrap
 msgid "{Data Type} tor-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12937
+#: guix-git/doc/guix.texi:16744
 #, no-wrap
 msgid "@code{tor} (default: @code{tor})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12942
+#: guix-git/doc/guix.texi:16749
 msgid "The package that provides the Tor daemon.  This package is expected to provide the daemon at @file{bin/tor} relative to its output directory.  The default package is the @uref{https://www.torproject.org, Tor Project's} implementation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12943
+#: guix-git/doc/guix.texi:16750
 #, no-wrap
 msgid "@code{config-file} (default: @code{(plain-file \"empty\" \"\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12949
+#: guix-git/doc/guix.texi:16756
 msgid "The configuration file to use.  It will be appended to a default configuration file, and the final configuration file will be passed to @code{tor} via its @code{-f} option.  This may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).  See @code{man tor} for details on the configuration file syntax."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12950
+#: guix-git/doc/guix.texi:16757
 #, no-wrap
 msgid "@code{hidden-services} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12956
+#: guix-git/doc/guix.texi:16763
 msgid "The list of @code{<hidden-service>} records to use.  For any hidden service you include in this list, appropriate configuration to enable the hidden service will be automatically added to the default configuration file.  You may conveniently create @code{<hidden-service>} records using the @code{tor-hidden-service} procedure described below."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:12957
+#: guix-git/doc/guix.texi:16764
 #, no-wrap
 msgid "@code{socks-socket-type} (default: @code{'tcp})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12964
+#: guix-git/doc/guix.texi:16771
 msgid "The default socket type that Tor should use for its SOCKS socket.  This must be either @code{'tcp} or @code{'unix}.  If it is @code{'tcp}, then by default Tor will listen on TCP port 9050 on the loopback interface (i.e., localhost).  If it is @code{'unix}, then Tor will listen on the UNIX domain socket @file{/var/run/tor/socks-sock}, which will be made writable by members of the @code{tor} group."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:12969
+#: guix-git/doc/guix.texi:16776
 msgid "If you want to customize the SOCKS socket in more detail, leave @code{socks-socket-type} at its default value of @code{'tcp} and use @code{config-file} to override the default by providing your own @code{SocksPort} option."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:16777
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{control-socket?} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16783
+msgid "Whether or not to provide a ``control socket'' by which Tor can be controlled to, for instance, dynamically instantiate tor onion services.  If @code{#t}, Tor will listen for control commands on the UNIX domain socket @file{/var/run/tor/control-sock}, which will be made writable by members of the @code{tor} group."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:12972
+#: guix-git/doc/guix.texi:16787
 #, no-wrap
 msgid "hidden service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12973
+#: guix-git/doc/guix.texi:16788
 #, no-wrap
 msgid "{Scheme Procedure} tor-hidden-service @var{name} @var{mapping}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12976
+#: guix-git/doc/guix.texi:16791
 msgid "Define a new Tor @dfn{hidden service} called @var{name} and implementing @var{mapping}.  @var{mapping} is a list of port/host tuples, such as:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:12980
+#: guix-git/doc/guix.texi:16795
 #, no-wrap
 msgid ""
 " '((22 \"127.0.0.1:22\")\n"
@@ -22822,288 +29708,418 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12984
+#: guix-git/doc/guix.texi:16799
 msgid "In this example, port 22 of the hidden service is mapped to local port 22, and port 80 is mapped to local port 8080."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12988
+#: guix-git/doc/guix.texi:16803
 msgid "This creates a @file{/var/lib/tor/hidden-services/@var{name}} directory, where the @file{hostname} file contains the @code{.onion} host name for the hidden service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12991
+#: guix-git/doc/guix.texi:16806
 msgid "See @uref{https://www.torproject.org/docs/tor-hidden-service.html.en, the Tor project's documentation} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12994
+#: guix-git/doc/guix.texi:16809
 msgid "The @code{(gnu services rsync)} module provides the following services:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:12998
+#: guix-git/doc/guix.texi:16813
 msgid "You might want an rsync daemon if you have files that you want available so anyone (or just yourself) can download existing files or upload new files."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:12999
+#: guix-git/doc/guix.texi:16814
 #, no-wrap
 msgid "{Scheme Variable} rsync-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13003
+#: guix-git/doc/guix.texi:16818
 msgid "This is the service type for the @uref{https://rsync.samba.org, rsync} daemon, The value for this service type is a @command{rsync-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13006
+#. type: lisp
+#: guix-git/doc/guix.texi:16821
 #, no-wrap
 msgid "(service rsync-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13009
+#: guix-git/doc/guix.texi:16824
 msgid "See below for details about @code{rsync-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13011
+#: guix-git/doc/guix.texi:16826
 #, no-wrap
 msgid "{Data Type} rsync-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13013
+#: guix-git/doc/guix.texi:16828
 msgid "Data type representing the configuration for @code{rsync-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13015
+#: guix-git/doc/guix.texi:16830
 #, no-wrap
 msgid "@code{package} (default: @var{rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13017
+#: guix-git/doc/guix.texi:16832
 msgid "@code{rsync} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13018
+#: guix-git/doc/guix.texi:16833
 #, no-wrap
 msgid "@code{port-number} (default: @code{873})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13022
+#: guix-git/doc/guix.texi:16837
 msgid "TCP port on which @command{rsync} listens for incoming connections.  If port is less than @code{1024} @command{rsync} needs to be started as the @code{root} user and group."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13023
+#: guix-git/doc/guix.texi:16838
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/rsyncd/rsyncd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13025
+#: guix-git/doc/guix.texi:16840
 msgid "Name of the file where @command{rsync} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13026
+#: guix-git/doc/guix.texi:16841
 #, no-wrap
 msgid "@code{lock-file} (default: @code{\"/var/run/rsyncd/rsyncd.lock\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13028
+#: guix-git/doc/guix.texi:16843
 msgid "Name of the file where @command{rsync} writes its lock file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13029
+#: guix-git/doc/guix.texi:16844
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/rsyncd.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13031
+#: guix-git/doc/guix.texi:16846
 msgid "Name of the file where @command{rsync} writes its log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13032
+#: guix-git/doc/guix.texi:16847
 #, no-wrap
 msgid "@code{use-chroot?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13034
+#: guix-git/doc/guix.texi:16849
 msgid "Whether to use chroot for @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13035
+#: guix-git/doc/guix.texi:16850
 #, no-wrap
 msgid "@code{share-path} (default: @file{/srv/rsync})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13037
+#: guix-git/doc/guix.texi:16852
 msgid "Location of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13038
+#: guix-git/doc/guix.texi:16853
 #, no-wrap
 msgid "@code{share-comment} (default: @code{\"Rsync share\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13040
+#: guix-git/doc/guix.texi:16855
 msgid "Comment of the @command{rsync} shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13041
+#: guix-git/doc/guix.texi:16856
 #, no-wrap
 msgid "@code{read-only?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13043
+#: guix-git/doc/guix.texi:16858
 msgid "Read-write permissions to shared directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13044
+#: guix-git/doc/guix.texi:16859
 #, no-wrap
 msgid "@code{timeout} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13046
+#: guix-git/doc/guix.texi:16861
 msgid "I/O timeout in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13047
+#: guix-git/doc/guix.texi:16862
 #, no-wrap
 msgid "@code{user} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13049
+#: guix-git/doc/guix.texi:16864
 msgid "Owner of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13050
+#: guix-git/doc/guix.texi:16865
 #, no-wrap
 msgid "@code{group} (default: @var{\"root\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13052
+#: guix-git/doc/guix.texi:16867
 msgid "Group of the @code{rsync} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13053
+#: guix-git/doc/guix.texi:16868
 #, no-wrap
 msgid "@code{uid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13056
+#: guix-git/doc/guix.texi:16871
 msgid "User name or user ID that file transfers to and from that module should take place as when the daemon was run as @code{root}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13057
+#: guix-git/doc/guix.texi:16872
 #, no-wrap
 msgid "@code{gid} (default: @var{\"rsyncd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13059
+#: guix-git/doc/guix.texi:16874 guix-git/doc/guix.texi:17317
 msgid "Group name or group ID that will be used when accessing the module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13064
+#: guix-git/doc/guix.texi:16879
+msgid "The @code{(gnu services syncthing)} module provides the following services:"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:16879
+#, no-wrap
+msgid "syncthing"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:16884
+msgid "You might want a syncthing daemon if you have files between two or more computers and want to sync them in real time, safely protected from prying eyes."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:16885
+#, no-wrap
+msgid "{Scheme Variable} syncthing-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:16889
+msgid "This is the service type for the @uref{https://syncthing.net/, syncthing} daemon, The value for this service type is a @command{syncthing-configuration} record as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:16893
+#, no-wrap
+msgid ""
+"(service syncthing-service-type\n"
+"         (syncthing-configuration (user \"alice\")))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:16896
+msgid "See below for details about @code{syncthing-configuration}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16897
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} syncthing-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:16899
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration for @code{syncthing-service-type}."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:16901
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{syncthing} (default: @var{syncthing})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16903
+#, fuzzy
+#| msgid "The package data type."
+msgid "@code{syncthing} package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:16904
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{arguments} (default: @var{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16906
+msgid "List of command-line arguments passing to @code{syncthing} binary."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16907
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{logflags} (default: @var{0})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16910
+msgid "Sum of logging flags, see @uref{https://docs.syncthing.net/users/syncthing.html#cmdoption-logflags, Syncthing documentation logflags}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16911
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{user} (default: @var{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16914
+msgid "The user as which the Syncthing service is to be run.  This assumes that the specified user exists."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16915
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{group} (default: @var{\"users\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16918
+msgid "The group as which the Syncthing service is to be run.  This assumes that the specified group exists."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:16919
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{home} (default: @var{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:16922
+msgid "Common configuration and data directory.  The default configuration directory is @file{$HOME} of the specified Syncthing @code{user}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:16928
 msgid "Furthermore, @code{(gnu services ssh)} provides the following services."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13064 doc/guix.texi:13103 doc/guix.texi:24768
+#: guix-git/doc/guix.texi:16928 guix-git/doc/guix.texi:16967
+#: guix-git/doc/guix.texi:33628
 #, no-wrap
 msgid "SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13065 doc/guix.texi:13104 doc/guix.texi:24769
+#: guix-git/doc/guix.texi:16929 guix-git/doc/guix.texi:16968
+#: guix-git/doc/guix.texi:33629
 #, no-wrap
 msgid "SSH server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13067
+#: guix-git/doc/guix.texi:16931
 #, no-wrap
 msgid "{Scheme Procedure} lsh-service [#:host-key \"/etc/lsh/host-key\"] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13076
+#: guix-git/doc/guix.texi:16940
 msgid "[#:daemonic? #t] [#:interfaces '()] [#:port-number 22] @ [#:allow-empty-passwords? #f] [#:root-login? #f] @ [#:syslog-output? #t] [#:x11-forwarding? #t] @ [#:tcp/ip-forwarding? #t] [#:password-authentication? #t] @ [#:public-key-authentication? #t] [#:initialize? #t] Run the @command{lshd} program from @var{lsh} to listen on port @var{port-number}.  @var{host-key} must designate a file containing the host key, and readable only by root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13082
+#: guix-git/doc/guix.texi:16946
 msgid "When @var{daemonic?} is true, @command{lshd} will detach from the controlling terminal and log its output to syslogd, unless one sets @var{syslog-output?} to false.  Obviously, it also makes lsh-service depend on existence of syslogd service.  When @var{pid-file?} is true, @command{lshd} writes its PID to the file called @var{pid-file}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13086
+#: guix-git/doc/guix.texi:16950
 msgid "When @var{initialize?} is true, automatically create the seed and host key upon service activation if they do not exist yet.  This may take long and require interaction."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13091
+#: guix-git/doc/guix.texi:16955
 msgid "When @var{initialize?} is false, it is up to the user to initialize the randomness generator (@pxref{lsh-make-seed,,, lsh, LSH Manual}), and to create a key pair with the private key stored in file @var{host-key} (@pxref{lshd basics,,, lsh, LSH Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13095
+#: guix-git/doc/guix.texi:16959
 msgid "When @var{interfaces} is empty, lshd listens for connections on all the network interfaces; otherwise, @var{interfaces} must be a list of host names or addresses."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13099
+#: guix-git/doc/guix.texi:16963
 msgid "@var{allow-empty-passwords?} specifies whether to accept log-ins with empty passwords, and @var{root-login?} specifies whether to accept log-ins as root."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13101
+#: guix-git/doc/guix.texi:16965
 msgid "The other options should be self-descriptive."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13105
+#: guix-git/doc/guix.texi:16969
 #, no-wrap
 msgid "{Scheme Variable} openssh-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13109
+#: guix-git/doc/guix.texi:16973
 msgid "This is the type for the @uref{http://www.openssh.org, OpenSSH} secure shell daemon, @command{sshd}.  Its value must be an @code{openssh-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13118
+#. type: lisp
+#: guix-git/doc/guix.texi:16982
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -23116,17 +30132,17 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13121
+#: guix-git/doc/guix.texi:16985
 msgid "See below for details about @code{openssh-configuration}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13124
+#: guix-git/doc/guix.texi:16988
 msgid "This service can be extended with extra authorized keys, as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13129
+#. type: lisp
+#: guix-git/doc/guix.texi:16993
 #, no-wrap
 msgid ""
 "(service-extension openssh-service-type\n"
@@ -23135,192 +30151,206 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13132
+#: guix-git/doc/guix.texi:16996
 #, no-wrap
 msgid "{Data Type} openssh-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13134
+#: guix-git/doc/guix.texi:16998
 msgid "This is the configuration record for OpenSSH's @command{sshd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13136
+#: guix-git/doc/guix.texi:17000
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{openssh} (default @var{openssh})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17002
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Openssh package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:17003
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/sshd.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13138
+#: guix-git/doc/guix.texi:17005
 msgid "Name of the file where @command{sshd} writes its PID."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13139
+#: guix-git/doc/guix.texi:17006
 #, no-wrap
 msgid "@code{port-number} (default: @code{22})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13141
+#: guix-git/doc/guix.texi:17008
 msgid "TCP port on which @command{sshd} listens for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13142
+#: guix-git/doc/guix.texi:17009
 #, no-wrap
 msgid "@code{permit-root-login} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13147
+#: guix-git/doc/guix.texi:17014
 msgid "This field determines whether and when to allow logins as root.  If @code{#f}, root logins are disallowed; if @code{#t}, they are allowed.  If it's the symbol @code{'without-password}, then root logins are permitted but not with password-based authentication."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13148 doc/guix.texi:13309
+#: guix-git/doc/guix.texi:17015 guix-git/doc/guix.texi:17176
 #, no-wrap
 msgid "@code{allow-empty-passwords?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13151
+#: guix-git/doc/guix.texi:17018
 msgid "When true, users with empty passwords may log in.  When false, they may not."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13152 doc/guix.texi:13312
+#: guix-git/doc/guix.texi:17019 guix-git/doc/guix.texi:17179
 #, no-wrap
 msgid "@code{password-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13155
+#: guix-git/doc/guix.texi:17022
 msgid "When true, users may log in with their password.  When false, they have other authentication methods."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13156
+#: guix-git/doc/guix.texi:17023
 #, no-wrap
 msgid "@code{public-key-authentication?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13159
+#: guix-git/doc/guix.texi:17026
 msgid "When true, users may log in using public key authentication.  When false, users have to use other authentication method."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13162
+#: guix-git/doc/guix.texi:17029
 msgid "Authorized public keys are stored in @file{~/.ssh/authorized_keys}.  This is used only by protocol version 2."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13163
+#: guix-git/doc/guix.texi:17030
 #, no-wrap
 msgid "@code{x11-forwarding?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13167
+#: guix-git/doc/guix.texi:17034
 msgid "When true, forwarding of X11 graphical client connections is enabled---in other words, @command{ssh} options @option{-X} and @option{-Y} will work."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13168
+#: guix-git/doc/guix.texi:17035
 #, no-wrap
 msgid "@code{allow-agent-forwarding?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13170
+#: guix-git/doc/guix.texi:17037
 msgid "Whether to allow agent forwarding."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13171
+#: guix-git/doc/guix.texi:17038
 #, no-wrap
 msgid "@code{allow-tcp-forwarding?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13173
+#: guix-git/doc/guix.texi:17040
 msgid "Whether to allow TCP forwarding."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13174
+#: guix-git/doc/guix.texi:17041
 #, no-wrap
 msgid "@code{gateway-ports?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13176
+#: guix-git/doc/guix.texi:17043
 msgid "Whether to allow gateway ports."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13177
+#: guix-git/doc/guix.texi:17044
 #, no-wrap
 msgid "@code{challenge-response-authentication?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13180
+#: guix-git/doc/guix.texi:17047
 msgid "Specifies whether challenge response authentication is allowed (e.g.@: via PAM)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13181
+#: guix-git/doc/guix.texi:17048
 #, no-wrap
 msgid "@code{use-pam?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13187
+#: guix-git/doc/guix.texi:17054
 msgid "Enables the Pluggable Authentication Module interface.  If set to @code{#t}, this will enable PAM authentication using @code{challenge-response-authentication?} and @code{password-authentication?}, in addition to PAM account and session module processing for all authentication types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13192
+#: guix-git/doc/guix.texi:17059
 msgid "Because PAM challenge response authentication usually serves an equivalent role to password authentication, you should disable either @code{challenge-response-authentication?} or @code{password-authentication?}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13193
+#: guix-git/doc/guix.texi:17060
 #, no-wrap
 msgid "@code{print-last-log?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13196
+#: guix-git/doc/guix.texi:17063
 msgid "Specifies whether @command{sshd} should print the date and time of the last user login when a user logs in interactively."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13197
+#: guix-git/doc/guix.texi:17064
 #, no-wrap
 msgid "@code{subsystems} (default: @code{'((\"sftp\" \"internal-sftp\"))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13199
+#: guix-git/doc/guix.texi:17066
 msgid "Configures external subsystems (e.g.@: file transfer daemon)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13203
+#: guix-git/doc/guix.texi:17070
 msgid "This is a list of two-element lists, each of which containing the subsystem name and a command (with optional arguments) to execute upon subsystem request."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13206
-msgid "The command @command{internal-sftp} implements an in-process SFTP server.  Alternately, one can specify the @command{sftp-server} command:"
+#: guix-git/doc/guix.texi:17073
+msgid "The command @command{internal-sftp} implements an in-process SFTP server.  Alternatively, one can specify the @command{sftp-server} command:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13211
+#. type: lisp
+#: guix-git/doc/guix.texi:17078
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -23330,28 +30360,28 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13213
+#: guix-git/doc/guix.texi:17080
 #, no-wrap
 msgid "@code{accepted-environment} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13215
+#: guix-git/doc/guix.texi:17082
 msgid "List of strings describing which environment variables may be exported."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13218
+#: guix-git/doc/guix.texi:17085
 msgid "Each string gets on its own line.  See the @code{AcceptEnv} option in @code{man sshd_config}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13223
-msgid "This example allows ssh-clients to export the @code{COLORTERM} variable.  It is set by terminal emulators, which support colors.  You can use it in your shell's ressource file to enable colors for the prompt and commands if this variable is set."
+#: guix-git/doc/guix.texi:17090
+msgid "This example allows ssh-clients to export the @env{COLORTERM} variable.  It is set by terminal emulators, which support colors.  You can use it in your shell's resource file to enable colors for the prompt and commands if this variable is set."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13228
+#. type: lisp
+#: guix-git/doc/guix.texi:17095
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -23360,30 +30390,30 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13230
+#: guix-git/doc/guix.texi:17097
 #, no-wrap
 msgid "@code{authorized-keys} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13231
+#: guix-git/doc/guix.texi:17098
 #, no-wrap
 msgid "authorized keys, SSH"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13232
+#: guix-git/doc/guix.texi:17099
 #, no-wrap
 msgid "SSH authorized keys"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13236
+#: guix-git/doc/guix.texi:17103
 msgid "This is the list of authorized keys.  Each element of the list is a user name followed by one or more file-like objects that represent SSH public keys.  For example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13243
+#. type: lisp
+#: guix-git/doc/guix.texi:17110
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
@@ -23394,44 +30424,45 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13248
+#: guix-git/doc/guix.texi:17115
 msgid "registers the specified public keys for user accounts @code{rekado}, @code{chris}, and @code{root}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13251
+#: guix-git/doc/guix.texi:17118
 msgid "Additional authorized keys can be specified @i{via} @code{service-extension}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13254
+#: guix-git/doc/guix.texi:17121
 msgid "Note that this does @emph{not} interfere with the use of @file{~/.ssh/authorized_keys}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13255
+#: guix-git/doc/guix.texi:17122 guix-git/doc/guix.texi:17553
 #, no-wrap
 msgid "@code{log-level} (default: @code{'info})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13259
+#: guix-git/doc/guix.texi:17126
 msgid "This is a symbol specifying the logging level: @code{quiet}, @code{fatal}, @code{error}, @code{info}, @code{verbose}, @code{debug}, etc.  See the man page for @file{sshd_config} for the full list of level names."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13260 doc/guix.texi:18874
+#: guix-git/doc/guix.texi:17127 guix-git/doc/guix.texi:19947
+#: guix-git/doc/guix.texi:24813
 #, no-wrap
 msgid "@code{extra-content} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13265
+#: guix-git/doc/guix.texi:17132
 msgid "This field can be used to append arbitrary text to the configuration file.  It is especially useful for elaborate configurations that cannot be expressed otherwise.  This configuration, for example, would generally disable root logins, but permit them from one specific IP address:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13271
+#. type: lisp
+#: guix-git/doc/guix.texi:17138
 #, no-wrap
 msgid ""
 "(openssh-configuration\n"
@@ -23441,23 +30472,23 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13276
+#: guix-git/doc/guix.texi:17143
 #, no-wrap
 msgid "{Scheme Procedure} dropbear-service [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13280
+#: guix-git/doc/guix.texi:17147
 msgid "Run the @uref{https://matt.ucc.asn.au/dropbear/dropbear.html,Dropbear SSH daemon} with the given @var{config}, a @code{<dropbear-configuration>} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13283
+#: guix-git/doc/guix.texi:17150
 msgid "For example, to specify a Dropbear service listening on port 1234, add this call to the operating system's @code{services} field:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13287
+#. type: lisp
+#: guix-git/doc/guix.texi:17154
 #, no-wrap
 msgid ""
 "(dropbear-service (dropbear-configuration\n"
@@ -23465,99 +30496,425 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13290
+#: guix-git/doc/guix.texi:17157
 #, no-wrap
 msgid "{Data Type} dropbear-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13292
+#: guix-git/doc/guix.texi:17159
 msgid "This data type represents the configuration of a Dropbear SSH daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13294
+#: guix-git/doc/guix.texi:17161
 #, no-wrap
 msgid "@code{dropbear} (default: @var{dropbear})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13296
+#: guix-git/doc/guix.texi:17163
 msgid "The Dropbear package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13297
+#: guix-git/doc/guix.texi:17164
 #, no-wrap
 msgid "@code{port-number} (default: 22)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13299
+#: guix-git/doc/guix.texi:17166
 msgid "The TCP port where the daemon waits for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13300
+#: guix-git/doc/guix.texi:17167
 #, no-wrap
 msgid "@code{syslog-output?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13302
+#: guix-git/doc/guix.texi:17169
 msgid "Whether to enable syslog output."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13303
+#: guix-git/doc/guix.texi:17170
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/dropbear.pid\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13305
+#: guix-git/doc/guix.texi:17172
 msgid "File name of the daemon's PID file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13306
+#: guix-git/doc/guix.texi:17173
 #, no-wrap
 msgid "@code{root-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13308
+#: guix-git/doc/guix.texi:17175
 msgid "Whether to allow @code{root} logins."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13311
+#: guix-git/doc/guix.texi:17178
 msgid "Whether to allow empty passwords."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13314
+#: guix-git/doc/guix.texi:17181
 msgid "Whether to enable password-based authentication."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:17184
+#, no-wrap
+msgid "AutoSSH"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17185
+#, no-wrap
+msgid "{Scheme Variable} autossh-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17193
+msgid "This is the type for the @uref{https://www.harding.motd.ca/autossh, AutoSSH} program that runs a copy of @command{ssh} and monitors it, restarting it as necessary should it die or stop passing traffic.  AutoSSH can be run manually from the command-line by passing arguments to the binary @command{autossh} from the package @code{autossh}, but it can also be run as a Guix service.  This latter use case is documented here."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17197
+msgid "AutoSSH can be used to forward local traffic to a remote machine using an SSH tunnel, and it respects the @file{~/.ssh/config} of the user it is run as."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17202
+msgid "For example, to specify a service running autossh as the user @code{pino} and forwarding all local connections to port @code{8081} to @code{remote:8081} using an SSH tunnel, add this call to the operating system's @code{services} field:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17208
+#, no-wrap
+msgid ""
+"(service autossh-service-type\n"
+"         (autossh-configuration\n"
+"          (user \"pino\")\n"
+"          (ssh-options (list \"-T\" \"-N\" \"-L\" \"8081:localhost:8081\" \"remote.net\"))))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17211
+#, no-wrap
+msgid "{Data Type} autossh-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17213
+msgid "This data type represents the configuration of an AutoSSH service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17216
+#, fuzzy, no-wrap
+#| msgid "@code{vt} (default @code{\"vt7\"})"
+msgid "@code{user} (default @code{\"autossh\"})"
+msgstr "@code{vt}（默认值：@code{\"vt7\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17219
+msgid "The user as which the AutoSSH service is to be run.  This assumes that the specified user exists."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17220
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{poll} (default @code{600})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17222
+msgid "Specifies the connection poll time in seconds."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17223
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{first-poll} (default @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17229
+msgid "Specifies how many seconds AutoSSH waits before the first connection test.  After this first test, polling is resumed at the pace defined in @code{poll}.  When set to @code{#f}, the first poll is not treated specially and will also use the connection poll specified in @code{poll}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17230
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{gate-time} (default @code{30})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17233
+msgid "Specifies how many seconds an SSH connection must be active before it is considered successful."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17234
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{log-level} (default @code{1})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17237
+msgid "The log level, corresponding to the levels used by syslog---so @code{0} is the most silent while @code{7} is the chattiest."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17238
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{max-start} (default @code{#f})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17241
+msgid "The maximum number of times SSH may be (re)started before AutoSSH exits.  When set to @code{#f}, no maximum is configured and AutoSSH may restart indefinitely."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17242
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{message} (default @code{\"\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17244
+msgid "The message to append to the echo message sent when testing connections."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17245
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default @code{\"0\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17255
+msgid "The ports used for monitoring the connection.  When set to @code{\"0\"}, monitoring is disabled.  When set to @code{\"@var{n}\"} where @var{n} is a positive integer, ports @var{n} and @var{n}+1 are used for monitoring the connection, such that port @var{n} is the base monitoring port and @code{n+1} is the echo port.  When set to @code{\"@var{n}:@var{m}\"} where @var{n} and @var{m} are positive integers, the ports @var{n} and @var{m} are used for monitoring the connection, such that port @var{n} is the base monitoring port and @var{m} is the echo port."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17256
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{ssh-options} (default @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17260
+msgid "The list of command-line arguments to pass to @command{ssh} when it is run.  Options @option{-f} and @option{-M} are reserved for AutoSSH and may cause undefined behaviour."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:17264
+#, no-wrap
+msgid "WebSSH"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17265
+#, no-wrap
+msgid "{Scheme Variable} webssh-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17271
+msgid "This is the type for the @uref{https://webssh.huashengdun.org/, WebSSH} program that runs a web SSH client.  WebSSH can be run manually from the command-line by passing arguments to the binary @command{wssh} from the package @code{webssh}, but it can also be run as a Guix service.  This latter use case is documented here."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17277
+msgid "For example, to specify a service running WebSSH on loopback interface on port @code{8888} with reject policy with a list of allowed to connection hosts, and NGINX as a reverse-proxy to this service listening for HTTPS connection, add this call to the operating system's @code{services} field:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17285
+#, no-wrap
+msgid ""
+"(service webssh-service-type\n"
+"  (webssh-configuration (address \"127.0.0.1\")\n"
+"                        (port 8888)\n"
+"                        (policy 'reject)\n"
+"                        (known-hosts '(\"localhost ecdsa-sha2-nistp256 AAAA…\"\n"
+"                                       \"127.0.0.1 ecdsa-sha2-nistp256 AAAA…\"))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17301
+#, no-wrap
+msgid ""
+"(service nginx-service-type\n"
+"         (nginx-configuration\n"
+"          (server-blocks\n"
+"           (list\n"
+"            (nginx-server-configuration\n"
+"             (inherit %webssh-configuration-nginx)\n"
+"             (server-name '(\"webssh.example.com\"))\n"
+"             (listen '(\"443 ssl\"))\n"
+"             (ssl-certificate (letsencrypt-certificate \"webssh.example.com\"))\n"
+"             (ssl-certificate-key (letsencrypt-key \"webssh.example.com\"))\n"
+"             (locations\n"
+"              (cons (nginx-location-configuration\n"
+"                     (uri \"/.well-known\")\n"
+"                     (body '(\"root /var/www;\")))\n"
+"                    (nginx-server-configuration-locations %webssh-configuration-nginx))))))))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17304
+#, no-wrap
+msgid "{Data Type} webssh-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17306
+msgid "Data type representing the configuration for @code{webssh-service}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17308
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{package} (default: @var{webssh})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17310
+msgid "@code{webssh} package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17311
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{user-name} (default: @var{\"webssh\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17314
+msgid "User name or user ID that file transfers to and from that module should take place."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17315
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{group-name} (default: @var{\"webssh\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:17318
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{address} (default: @var{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17320
+msgid "IP address on which @command{webssh} listens for incoming connections."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17321
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @var{8888})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17323
+msgid "TCP port on which @command{webssh} listens for incoming connections."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17324
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{policy} (default: @var{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17326
+msgid "Connection policy.  @var{reject} policy requires to specify @var{known-hosts}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17327
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{known-hosts} (default: @var{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17329
+msgid "List of hosts which allowed for SSH connection from @command{webssh}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17330
+#, fuzzy, no-wrap
+#| msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
+msgid "@code{log-file} (default: @file{\"/var/log/webssh.log\"})"
+msgstr "@code{private-key}（默认值：@file{~root/.ssh/id_rsa}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17332
+msgid "Name of the file where @command{webssh} writes its log file."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17333
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{log-level} (default: @var{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17335
+msgid "Logging level."
+msgstr ""
+
 #. type: defvr
-#: doc/guix.texi:13317
+#: guix-git/doc/guix.texi:17339
 #, no-wrap
 msgid "{Scheme Variable} %facebook-host-aliases"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13323
+#: guix-git/doc/guix.texi:17345
 msgid "This variable contains a string for use in @file{/etc/hosts} (@pxref{Host Names,,, libc, The GNU C Library Reference Manual}).  Each line contains a entry that maps a known server name of the Facebook on-line service---e.g., @code{www.facebook.com}---to the local host---@code{127.0.0.1} or its IPv6 equivalent, @code{::1}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13327
+#: guix-git/doc/guix.texi:17349
 msgid "This variable is typically used in the @code{hosts-file} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @file{/etc/hosts}}):"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13340
+#. type: lisp
+#: guix-git/doc/guix.texi:17362
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -23572,348 +30929,1062 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13344
+#: guix-git/doc/guix.texi:17366
 msgid "This mechanism can prevent programs running locally, such as Web browsers, from accessing Facebook."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13347
+#: guix-git/doc/guix.texi:17369
 msgid "The @code{(gnu services avahi)} provides the following definition."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13348
+#: guix-git/doc/guix.texi:17370
 #, no-wrap
 msgid "{Scheme Variable} avahi-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13353
-msgid "This is the service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and ``zero-configuration'' host name lookups (see @uref{https://avahi.org/}).  Its value must be a @code{zero-configuration} record---see below."
+#: guix-git/doc/guix.texi:17375
+msgid "This is the service that runs @command{avahi-daemon}, a system-wide mDNS/DNS-SD responder that allows for service discovery and ``zero-configuration'' host name lookups (see @uref{https://avahi.org/}).  Its value must be an @code{avahi-configuration} record---see below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13358
-msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{http://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  @xref{Name Service Switch}, for information on host name resolution."
+#: guix-git/doc/guix.texi:17380
+msgid "This service extends the name service cache daemon (nscd) so that it can resolve @code{.local} host names using @uref{https://0pointer.de/lennart/projects/nss-mdns/, nss-mdns}.  @xref{Name Service Switch}, for information on host name resolution."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13361
+#: guix-git/doc/guix.texi:17383
 msgid "Additionally, add the @var{avahi} package to the system profile so that commands such as @command{avahi-browse} are directly usable."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13363
+#: guix-git/doc/guix.texi:17385
 #, no-wrap
 msgid "{Data Type} avahi-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13365
+#: guix-git/doc/guix.texi:17387
 msgid "Data type representation the configuration for Avahi."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13368
+#: guix-git/doc/guix.texi:17390
 #, no-wrap
 msgid "@code{host-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13371
+#: guix-git/doc/guix.texi:17393
 msgid "If different from @code{#f}, use that as the host name to publish for this machine; otherwise, use the machine's actual host name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13372
+#: guix-git/doc/guix.texi:17394
 #, no-wrap
 msgid "@code{publish?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13375
+#: guix-git/doc/guix.texi:17397
 msgid "When true, allow host names and services to be published (broadcast) over the network."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13376
+#: guix-git/doc/guix.texi:17398
 #, no-wrap
 msgid "@code{publish-workstation?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13380
+#: guix-git/doc/guix.texi:17402
 msgid "When true, @command{avahi-daemon} publishes the machine's host name and IP address via mDNS on the local network.  To view the host names published on your local network, you can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:13383
+#: guix-git/doc/guix.texi:17405
 #, no-wrap
 msgid "avahi-browse _workstation._tcp\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13385
+#: guix-git/doc/guix.texi:17407
 #, no-wrap
 msgid "@code{wide-area?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13387
+#: guix-git/doc/guix.texi:17409
 msgid "When true, DNS-SD over unicast DNS is enabled."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13388
+#: guix-git/doc/guix.texi:17410
 #, no-wrap
 msgid "@code{ipv4?} (default: @code{#t})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:13389
+#: guix-git/doc/guix.texi:17411
 #, no-wrap
 msgid "@code{ipv6?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13391
+#: guix-git/doc/guix.texi:17413
 msgid "These fields determine whether to use IPv4/IPv6 sockets."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13392
+#: guix-git/doc/guix.texi:17414
 #, no-wrap
 msgid "@code{domains-to-browse} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13394
+#: guix-git/doc/guix.texi:17416
 msgid "This is a list of domains to browse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13397
+#: guix-git/doc/guix.texi:17419
 #, no-wrap
 msgid "{Scheme Variable} openvswitch-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13401
+#: guix-git/doc/guix.texi:17423
 msgid "This is the type of the @uref{https://www.openvswitch.org, Open vSwitch} service, whose value should be an @code{openvswitch-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13403
+#: guix-git/doc/guix.texi:17425
 #, no-wrap
 msgid "{Data Type} openvswitch-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13407
+#: guix-git/doc/guix.texi:17429
 msgid "Data type representing the configuration of Open vSwitch, a multilayer virtual switch which is designed to enable massive network automation through programmatic extension."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13409
+#: guix-git/doc/guix.texi:17431
 #, no-wrap
 msgid "@code{package} (default: @var{openvswitch})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13411
+#: guix-git/doc/guix.texi:17433
 msgid "Package object of the Open vSwitch."
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:17437
+#, no-wrap
+msgid "{Scheme Variable} pagekite-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17442
+msgid "This is the service type for the @uref{https://pagekite.net, PageKite} service, a tunneling solution for making localhost servers publicly visible, even from behind restrictive firewalls or NAT without forwarded ports.  The value for this service type is a @code{pagekite-configuration} record."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17444
+msgid "Here's an example exposing the local HTTP and SSH daemons:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17451
+#, no-wrap
+msgid ""
+"(service pagekite-service-type\n"
+"         (pagekite-configuration\n"
+"           (kites '(\"http:@@kitename:localhost:80:@@kitesecret\"\n"
+"                    \"raw/22:@@kitename:localhost:22:@@kitesecret\"))\n"
+"           (extra-file \"/etc/pagekite.rc\")))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17454
+#, fuzzy, no-wrap
+#| msgid "Manage the operating system configuration."
+msgid "{Data Type} pagekite-configuration"
+msgstr "管理操作系统配置。"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17456
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of PageKite."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:17458
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @var{pagekite})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17460
+msgid "Package object of PageKite."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17461
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{kitename} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17463
+msgid "PageKite name for authenticating to the frontend server."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17464
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{kitesecret} (default: @code{#f})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17467
+msgid "Shared secret for authenticating to the frontend server.  You should probably put this inside @code{extra-file} instead."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17468
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{frontend} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17471
+msgid "Connect to the named PageKite frontend server instead of the @uref{https://pagekite.net,,pagekite.net} service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17472
+#, no-wrap
+msgid "@code{kites} (default: @code{'(\"http:@@kitename:localhost:80:@@kitesecret\")})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17475
+msgid "List of service kites to use.  Exposes HTTP on port 80 by default.  The format is @code{proto:kitename:host:port:secret}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17476
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{extra-file} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17479
+msgid "Extra configuration file to read, which you are expected to create manually.  Use this to add additional options and manage shared secrets out-of-band."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17483
+#, no-wrap
+msgid "{Scheme Variable} yggdrasil-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17487
+msgid "The service type for connecting to the @uref{https://yggdrasil-network.github.io/, Yggdrasil network}, an early-stage implementation of a fully end-to-end encrypted IPv6 network."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:17494
+msgid "Yggdrasil provides name-independent routing with cryptographically generated addresses.  Static addressing means you can keep the same address as long as you want, even if you move to a new location, or generate a new address (by generating new keys) whenever you want.  @uref{https://yggdrasil-network.github.io/2018/07/28/addressing.html}"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17498
+msgid "Pass it a value of @code{yggdrasil-configuration} to connect it to public peers and/or local peers."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17502
+msgid "Here is an example using public peers and a static address.  The static signing and encryption keys are defined in @file{/etc/yggdrasil-private.conf} (the default value for @code{config-file})."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17514
+#, no-wrap
+msgid ""
+";; part of the operating-system declaration\n"
+"(service yggdrasil-service-type\n"
+"              (yggdrasil-configuration\n"
+"               (autoconf? #f) ;; use only the public peers\n"
+"               (json-config\n"
+"               ;; choose one from\n"
+"               ;; https://github.com/yggdrasil-network/public-peers\n"
+"                '((peers . #(\"tcp://1.2.3.4:1337\"))))\n"
+"               ;; /etc/yggdrasil-private.conf is the default value for config-file\n"
+"               ))\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17521
+#, no-wrap
+msgid ""
+"# sample content for /etc/yggdrasil-private.conf\n"
+"@{\n"
+"  # Your public encryption key. Your peers may ask you for this to put\n"
+"  # into their AllowedEncryptionPublicKeys configuration.\n"
+"  EncryptionPublicKey: 378dc5...\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17524
+#, no-wrap
+msgid ""
+"  # Your private encryption key. DO NOT share this with anyone!\n"
+"  EncryptionPrivateKey: 0777...\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17528
+#, no-wrap
+msgid ""
+"  # Your public signing key. You should not ordinarily need to share\n"
+"  # this with anyone.\n"
+"  SigningPublicKey: e1664...\n"
+"\n"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17532
+#, no-wrap
+msgid ""
+"  # Your private signing key. DO NOT share this with anyone!\n"
+"  SigningPrivateKey: 0589d...\n"
+"@}\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17535
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} yggdrasil-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17537
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of Yggdrasil."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:17539
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{yggdrasil})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17541
+msgid "Package object of Yggdrasil."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17542
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{json-config} (default: @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17548
+msgid "Contents of @file{/etc/yggdrasil.conf}.  Will be merged with @file{/etc/yggdrasil-private.conf}.  Note that these settings are stored in the Guix store, which is readable to all users. @strong{Do not store your private keys in it}.  See the output of @code{yggdrasil -genconf} for a quick overview of valid keys and their default values."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17549
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{autoconf?} (default: @code{#f})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17552
+msgid "Whether to use automatic mode.  Enabling it makes Yggdrasil use adynamic IP and peer with IPv6 neighbors."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17555
+msgid "How much detail to include in logs.  Use @code{'debug} for more detail."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17556
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{log-to} (default: @code{'stdout})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17560
+msgid "Where to send logs.  By default, the service logs standard output to @file{/var/log/yggdrasil.log}.  The alternative is @code{'syslog}, which sends output to the running syslog service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17561
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{config-file} (default: @code{\"/etc/yggdrasil-private.conf\"})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17568
+msgid "What HJSON file to load sensitive data from.  This is where private keys should be stored, which are necessary to specify if you don't want a randomized address after each restart.  Use @code{#f} to disable.  Options defined in this file take precedence over @code{json-config}.  Use the output of @code{yggdrasil -genconf} as a starting point.  To configure a static address, delete everything except these options:"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:17570
+#, no-wrap
+msgid "EncryptionPublicKey"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:17571
+#, no-wrap
+msgid "EncryptionPrivateKey"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:17572
+#, no-wrap
+msgid "SigningPublicKey"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:17573
+#, no-wrap
+msgid "SigningPrivateKey"
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:13418
+#: guix-git/doc/guix.texi:17578
+#, no-wrap
+msgid "IPFS"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17579
+#, no-wrap
+msgid "{Scheme Variable} ipfs-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17583
+msgid "The service type for connecting to the @uref{https://ipfs.io,IPFS network}, a global, versioned, peer-to-peer file system. Pass it a @code{ipfs-configuration} to change the ports used for the gateway and API."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17585
+msgid "Here's an example configuration, using some non-standard ports:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17591
+#, no-wrap
+msgid ""
+"(service ipfs-service-type\n"
+"         (ipfs-configuration\n"
+"          (gateway \"/ip4/127.0.0.1/tcp/8880\")\n"
+"          (api \"/ip4/127.0.0.1/tcp/8881\")))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17594
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "{Data Type} ipfs-configuration"
+msgstr "系统配置"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17596
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of IPFS."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:17598
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{go-ipfs})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17600
+msgid "Package object of IPFS."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17601
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{gateway} (default: @code{\"/ip4/127.0.0.1/tcp/8082\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17603
+msgid "Address of the gateway, in ‘multiaddress’ format."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17604
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{api} (default: @code{\"/ip4/127.0.0.1/tcp/5001\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17606
+msgid "Address of the API endpoint, in ‘multiaddress’ format."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:17609
+#, no-wrap
+msgid "keepalived"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17610
+#, no-wrap
+msgid "{Scheme Variable} keepalived-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17615
+msgid "This is the type for the @uref{https://www.keepalived.org/, Keepalived} routing software, @command{keepalived}.  Its value must be an @code{keepalived-configuration} record as in this example for master machine:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17620
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(service qemu-binfmt-service-type\n"
+#| " (qemu-binfmt-configuration\n"
+#| "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+#| "   (guix-support? #t)))\n"
+msgid ""
+"(service keepalived-service-type\n"
+"         (keepalived-configuration\n"
+"           (config-file (local-file \"keepalived-master.conf\"))))\n"
+msgstr ""
+"(service qemu-binfmt-service-type\n"
+" (qemu-binfmt-configuration\n"
+"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+"   (guix-support? #t)))\n"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17623
+msgid "where @file{keepalived-master.conf}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17635
+#, no-wrap
+msgid ""
+"vrrp_instance my-group @{\n"
+"  state MASTER\n"
+"  interface enp9s0\n"
+"  virtual_router_id 100\n"
+"  priority 100\n"
+"  unicast_peer @{ 10.0.0.2 @}\n"
+"  virtual_ipaddress @{\n"
+"    10.0.0.4/24\n"
+"  @}\n"
+"@}\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17638
+msgid "and for backup machine:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17643
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(service qemu-binfmt-service-type\n"
+#| " (qemu-binfmt-configuration\n"
+#| "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+#| "   (guix-support? #t)))\n"
+msgid ""
+"(service keepalived-service-type\n"
+"         (keepalived-configuration\n"
+"          (config-file (local-file \"keepalived-backup.conf\"))))\n"
+msgstr ""
+"(service qemu-binfmt-service-type\n"
+" (qemu-binfmt-configuration\n"
+"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+"   (guix-support? #t)))\n"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:17646
+msgid "where @file{keepalived-backup.conf}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:17658
+#, no-wrap
+msgid ""
+"vrrp_instance my-group @{\n"
+"  state BACKUP\n"
+"  interface enp9s0\n"
+"  virtual_router_id 100\n"
+"  priority 99\n"
+"  unicast_peer @{ 10.0.0.3 @}\n"
+"  virtual_ipaddress @{\n"
+"    10.0.0.4/24\n"
+"  @}\n"
+"@}\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:17664
+#, no-wrap
+msgid "unattended upgrades"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:17665
+#, no-wrap
+msgid "upgrades, unattended"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:17670
+msgid "Guix provides a service to perform @emph{unattended upgrades}: periodically, the system automatically reconfigures itself from the latest Guix.  Guix System has several properties that make unattended upgrades safe:"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:17675
+msgid "upgrades are transactional (either the upgrade succeeds or it fails, but you cannot end up with an ``in-between'' system state);"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:17679
+msgid "the upgrade log is kept---you can view it with @command{guix system list-generations}---and you can roll back to any previous generation, should the upgraded system fail to behave as intended;"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:17682
+msgid "channel code is authenticated so you know you can only run genuine code (@pxref{Channels});"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:17685
+msgid "@command{guix system reconfigure} prevents downgrades, which makes it immune to @dfn{downgrade attacks}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:17690
+msgid "To set up unattended upgrades, add an instance of @code{unattended-upgrade-service-type} like the one below to the list of your operating system services:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17693
+#, no-wrap
+msgid "(service unattended-upgrade-service-type)\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:17700
+msgid "The defaults above set up weekly upgrades: every Sunday at midnight.  You do not need to provide the operating system configuration file: it uses @file{/run/current-system/configuration.scm}, which ensures it always uses your latest configuration---@pxref{provenance-service-type}, for more information about this file."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:17706
+msgid "There are several things that can be configured, in particular the periodicity and services (daemons) to be restarted upon completion.  When the upgrade is successful, the service takes care of deleting system generations older that some threshold, as per @command{guix system delete-generations}.  See the reference below for details."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:17710
+msgid "To ensure that upgrades are actually happening, you can run @command{guix system describe}.  To investigate upgrade failures, visit the unattended upgrade log file (see below)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17711
+#, no-wrap
+msgid "{Scheme Variable} unattended-upgrade-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17715
+msgid "This is the service type for unattended upgrades.  It sets up an mcron job (@pxref{Scheduled Job Execution}) that runs @command{guix system reconfigure} from the latest version of the specified channels."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:17718
+msgid "Its value must be a @code{unattended-upgrade-configuration} record (see below)."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17720
+#, no-wrap
+msgid "{Data Type} unattended-upgrade-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:17723
+msgid "This data type represents the configuration of the unattended upgrade service.  The following fields are available:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17725
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{schedule} (default: @code{\"30 01 * * 0\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17729
+msgid "This is the schedule of upgrades, expressed as a gexp containing an mcron job schedule (@pxref{Guile Syntax, mcron job specifications,, mcron, GNU@tie{}mcron})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17730
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{channels} (default: @code{#~%default-channels})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17734
+msgid "This gexp specifies the channels to use for the upgrade (@pxref{Channels}).  By default, the tip of the official @code{guix} channel is used."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17735
+#, no-wrap
+msgid "@code{operating-system-file} (default: @code{\"/run/current-system/configuration.scm\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17738
+msgid "This field specifies the operating system configuration file to use.  The default is to reuse the config file of the current configuration."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17744
+msgid "There are cases, though, where referring to @file{/run/current-system/configuration.scm} is not enough, for instance because that file refers to extra files (SSH public keys, extra configuration files, etc.) @i{via} @code{local-file} and similar constructs.  For those cases, we recommend something along these lines:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:17750
+#, no-wrap
+msgid ""
+"(unattended-upgrade-configuration\n"
+"  (operating-system-file\n"
+"    (file-append (local-file \".\" \"config-dir\" #:recursive? #t)\n"
+"                 \"/config.scm\")))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17757
+msgid "The effect here is to import all of the current directory into the store, and to refer to @file{config.scm} within that directory.  Therefore, uses of @code{local-file} within @file{config.scm} will work as expected.  @xref{G-Expressions}, for information about @code{local-file} and @code{file-append}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17758
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{services-to-restart} (default: @code{'(mcron)})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17761
+msgid "This field specifies the Shepherd services to restart when the upgrade completes."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17768
+msgid "Those services are restarted right away upon completion, as with @command{herd restart}, which ensures that the latest version is running---remember that by default @command{guix system reconfigure} only restarts services that are not currently running, which is conservative: it minimizes disruption but leaves outdated services running."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17772
+msgid "Use @command{herd status} to find out candidates for restarting.  @xref{Services}, for general information about services.  Common services to restart would include @code{ntpd} and @code{ssh-daemon}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17775
+msgid "By default, the @code{mcron} service is restarted.  This ensures that the latest version of the unattended upgrade job will be used next time."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17776
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{system-expiration} (default: @code{(* 3 30 24 3600)})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17780
+msgid "This is the expiration time in seconds for system generations.  System generations older that this amount of time are deleted with @command{guix system delete-generations} when an upgrade completes."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:17785
+msgid "The unattended upgrade service does not run the garbage collector.  You will probably want to set up your own mcron job to run @command{guix gc} periodically."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17787
+#, fuzzy, no-wrap
+#| msgid "@code{max-journal-depth} (default: @code{#f})"
+msgid "@code{maximum-duration} (default: @code{3600})"
+msgstr "@code{max-journal-depth}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17790
+msgid "Maximum duration in seconds for the upgrade; past that time, the upgrade aborts."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17793
+msgid "This is primarily useful to ensure the upgrade does not end up rebuilding or re-downloading ``the world''."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17794
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{log-file} (default: @code{\"/var/log/unattended-upgrade.log\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:17796
+msgid "File where unattended upgrades are logged."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:17802
 #, no-wrap
 msgid "X11"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13419
+#: guix-git/doc/guix.texi:17803
 #, no-wrap
 msgid "X Window System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13420 doc/guix.texi:13669
+#: guix-git/doc/guix.texi:17804 guix-git/doc/guix.texi:18056
 #, no-wrap
 msgid "login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13425
+#: guix-git/doc/guix.texi:17809
 msgid "Support for the X Window graphical display system---specifically Xorg---is provided by the @code{(gnu services xorg)} module.  Note that there is no @code{xorg-service} procedure.  Instead, the X server is started by the @dfn{login manager}, by default the GNOME Display Manager (GDM)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13426
+#: guix-git/doc/guix.texi:17810
 #, no-wrap
 msgid "GDM"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13427
+#: guix-git/doc/guix.texi:17811
 #, no-wrap
 msgid "GNOME, login manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13431
+#: guix-git/doc/guix.texi:17815
 msgid "GDM of course allows users to log in into window managers and desktop environments other than GNOME; for those using GNOME, GDM is required for features such as automatic screen locking."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13432
+#: guix-git/doc/guix.texi:17816
 #, no-wrap
 msgid "window manager"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13437
+#: guix-git/doc/guix.texi:17821
 msgid "To use X11, you must install at least one @dfn{window manager}---for example the @code{windowmaker} or @code{openbox} packages---preferably by adding it to the @code{packages} field of your operating system definition (@pxref{operating-system Reference, system-wide packages})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13438
+#: guix-git/doc/guix.texi:17822
 #, no-wrap
 msgid "{Scheme Variable} gdm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13443
-msgid "This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins.  Its value must be a @code{gdm-configuration} (see below.)"
+#: guix-git/doc/guix.texi:17827
+msgid "This is the type for the @uref{https://wiki.gnome.org/Projects/GDM/, GNOME Desktop Manager} (GDM), a program that manages graphical display servers and handles graphical user logins.  Its value must be a @code{gdm-configuration} (see below)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13444
+#: guix-git/doc/guix.texi:17828
 #, no-wrap
 msgid "session types (X11)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13445
+#: guix-git/doc/guix.texi:17829
 #, no-wrap
 msgid "X11 session types"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13451
+#: guix-git/doc/guix.texi:17835
 msgid "GDM looks for @dfn{session types} described by the @file{.desktop} files in @file{/run/current-system/profile/share/xsessions} and allows users to choose a session from the log-in screen.  Packages such as @code{gnome}, @code{xfce}, and @code{i3} provide @file{.desktop} files; adding them to the system-wide set of packages automatically makes them available at the log-in screen."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13455
+#: guix-git/doc/guix.texi:17839
 msgid "In addition, @file{~/.xsession} files are honored.  When available, @file{~/.xsession} must be an executable that starts a window manager and/or other X clients."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13457
+#: guix-git/doc/guix.texi:17841
 #, no-wrap
 msgid "{Data Type} gdm-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13459 doc/guix.texi:13525
+#: guix-git/doc/guix.texi:17843 guix-git/doc/guix.texi:17911
 #, no-wrap
 msgid "@code{auto-login?} (default: @code{#f})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:13460
+#: guix-git/doc/guix.texi:17844
 #, no-wrap
 msgid "@code{default-user} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13462
+#: guix-git/doc/guix.texi:17846
 msgid "When @code{auto-login?} is false, GDM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13465
+#: guix-git/doc/guix.texi:17849
 msgid "When @code{auto-login?} is true, GDM logs in directly as @code{default-user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13466
+#: guix-git/doc/guix.texi:17850 guix-git/doc/guix.texi:23422
+#: guix-git/doc/guix.texi:25130 guix-git/doc/guix.texi:29480
+#: guix-git/doc/guix.texi:29509 guix-git/doc/guix.texi:29538
+#: guix-git/doc/guix.texi:29565 guix-git/doc/guix.texi:29620
+#: guix-git/doc/guix.texi:29645 guix-git/doc/guix.texi:29672
+#: guix-git/doc/guix.texi:29698 guix-git/doc/guix.texi:29740
+#, no-wrap
+msgid "@code{debug?} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:17852
+msgid "When true, GDM writes debug messages to its log."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:17853
 #, no-wrap
 msgid "@code{gnome-shell-assets} (default: ...)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13468
+#: guix-git/doc/guix.texi:17855
 msgid "List of GNOME Shell assets needed by GDM: icon theme, fonts, etc."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13469
+#: guix-git/doc/guix.texi:17856
 #, no-wrap
 msgid "@code{xorg-configuration} (default: @code{(xorg-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13471 doc/guix.texi:13552 doc/guix.texi:13635
+#: guix-git/doc/guix.texi:17858 guix-git/doc/guix.texi:17938
+#: guix-git/doc/guix.texi:18022
 msgid "Configuration of the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13472
+#: guix-git/doc/guix.texi:17859
 #, no-wrap
 msgid "@code{xsession} (default: @code{(xinitrc)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13474 doc/guix.texi:13650
+#: guix-git/doc/guix.texi:17861 guix-git/doc/guix.texi:18037
 msgid "Script to run before starting a X session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13475
+#: guix-git/doc/guix.texi:17862
 #, no-wrap
 msgid "@code{dbus-daemon} (default: @code{dbus-daemon-wrapper})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13477
+#: guix-git/doc/guix.texi:17864
 msgid "File name of the @code{dbus-daemon} executable."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13478
+#: guix-git/doc/guix.texi:17865
 #, no-wrap
 msgid "@code{gdm} (default: @code{gdm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13480
+#: guix-git/doc/guix.texi:17867
 msgid "The GDM package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13483
+#: guix-git/doc/guix.texi:17870
 #, no-wrap
 msgid "{Scheme Variable} slim-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13485
+#: guix-git/doc/guix.texi:17872
 msgid "This is the type for the SLiM graphical login manager for X11."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13489
+#: guix-git/doc/guix.texi:17876
 msgid "Like GDM, SLiM looks for session types described by @file{.desktop} files and allows users to choose a session from the log-in screen using @kbd{F1}.  It also honors @file{~/.xsession} files."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13496
+#: guix-git/doc/guix.texi:17883
 msgid "Unlike GDM, SLiM does not spawn the user session on a different VT after logging in, which means that you can only start one graphical session.  If you want to be able to run multiple graphical sessions at the same time you have to add multiple SLiM services to your system services.  The following example shows how to replace the default GDM service with two SLiM services on tty7 and tty8."
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13502
+#: guix-git/doc/guix.texi:17889
 #, no-wrap
 msgid ""
 "(use-modules (gnu services)\n"
@@ -23924,7 +31995,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13514
+#: guix-git/doc/guix.texi:17900
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -23935,2237 +32006,2386 @@ msgid ""
 "                   (service slim-service-type (slim-configuration\n"
 "                                               (display \":1\")\n"
 "                                               (vt \"vt8\")))\n"
-"                   (remove (lambda (service)\n"
-"                             (eq? (service-kind service) gdm-service-type))\n"
-"                           %desktop-services))))\n"
+"                   (modify-services %desktop-services\n"
+"                     (delete gdm-service-type)))))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13518
+#: guix-git/doc/guix.texi:17904
 #, no-wrap
 msgid "{Data Type} slim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13520
+#: guix-git/doc/guix.texi:17906
 msgid "Data type representing the configuration of @code{slim-service-type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13524
+#: guix-git/doc/guix.texi:17910
 msgid "Whether to allow logins with empty passwords."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:13526
+#: guix-git/doc/guix.texi:17912
 #, no-wrap
 msgid "@code{default-user} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13528
+#: guix-git/doc/guix.texi:17914
 msgid "When @code{auto-login?} is false, SLiM presents a log-in screen."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13531
+#: guix-git/doc/guix.texi:17917
 msgid "When @code{auto-login?} is true, SLiM logs in directly as @code{default-user}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13532
+#: guix-git/doc/guix.texi:17918
 #, no-wrap
 msgid "@code{theme} (default: @code{%default-slim-theme})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:13533
+#: guix-git/doc/guix.texi:17919
 #, no-wrap
 msgid "@code{theme-name} (default: @code{%default-slim-theme-name})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13535
+#: guix-git/doc/guix.texi:17921
 msgid "The graphical theme to use and its name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13536
+#: guix-git/doc/guix.texi:17922
 #, no-wrap
 msgid "@code{auto-login-session} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13539
+#: guix-git/doc/guix.texi:17925
 msgid "If true, this must be the name of the executable to start as the default session---e.g., @code{(file-append windowmaker \"/bin/windowmaker\")}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13543
+#: guix-git/doc/guix.texi:17929
 msgid "If false, a session described by one of the available @file{.desktop} files in @code{/run/current-system/profile} and @code{~/.guix-profile} will be used."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:13548
+#: guix-git/doc/guix.texi:17934
 msgid "You must install at least one window manager in the system profile or in your user profile.  Failing to do that, if @code{auto-login-session} is false, you will be unable to log in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13550 doc/guix.texi:13633
+#: guix-git/doc/guix.texi:17936 guix-git/doc/guix.texi:18020
 #, no-wrap
 msgid "@code{xorg-configuration} (default @code{(xorg-configuration)})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13553
+#: guix-git/doc/guix.texi:17939
 #, no-wrap
 msgid "@code{display} (default @code{\":0\"})"
 msgstr "@code{display}（默认值：@code{\":0\"}）"
 
 #. type: table
-#: doc/guix.texi:13555
+#: guix-git/doc/guix.texi:17941
 msgid "The display on which to start the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13556
+#: guix-git/doc/guix.texi:17942
 #, no-wrap
 msgid "@code{vt} (default @code{\"vt7\"})"
 msgstr "@code{vt}（默认值：@code{\"vt7\"}）"
 
 #. type: table
-#: doc/guix.texi:13558
+#: guix-git/doc/guix.texi:17944
 msgid "The VT on which to start the Xorg graphical server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13559
+#: guix-git/doc/guix.texi:17945
 #, no-wrap
 msgid "@code{xauth} (default: @code{xauth})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13561
+#: guix-git/doc/guix.texi:17947
 msgid "The XAuth package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13562
+#: guix-git/doc/guix.texi:17948
 #, no-wrap
 msgid "@code{shepherd} (default: @code{shepherd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13565
+#: guix-git/doc/guix.texi:17951
 msgid "The Shepherd package used when invoking @command{halt} and @command{reboot}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13566
+#: guix-git/doc/guix.texi:17952
 #, no-wrap
 msgid "@code{sessreg} (default: @code{sessreg})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13568
+#: guix-git/doc/guix.texi:17954
 msgid "The sessreg package used in order to register the session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13569
+#: guix-git/doc/guix.texi:17955
 #, no-wrap
 msgid "@code{slim} (default: @code{slim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13571
+#: guix-git/doc/guix.texi:17957
 msgid "The SLiM package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13574 doc/guix.texi:24215
+#: guix-git/doc/guix.texi:17960
 #, no-wrap
 msgid "{Scheme Variable} %default-theme"
 msgstr ""
 
 #. type: defvrx
-#: doc/guix.texi:13575
+#: guix-git/doc/guix.texi:17961
 #, no-wrap
 msgid "{Scheme Variable} %default-theme-name"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:13577
+#: guix-git/doc/guix.texi:17963
 msgid "The default SLiM theme and its name."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13580
+#: guix-git/doc/guix.texi:17966 guix-git/doc/guix.texi:18073
 #, no-wrap
 msgid "{Data Type} sddm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13582
-msgid "This is the data type representing the sddm service configuration."
+#: guix-git/doc/guix.texi:17968
+msgid "This is the data type representing the SDDM service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13584
+#: guix-git/doc/guix.texi:17970
 #, no-wrap
 msgid "@code{display-server} (default: \"x11\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13587
-msgid "Select display server to use for the greeter. Valid values are \"x11\" or \"wayland\"."
+#: guix-git/doc/guix.texi:17973
+msgid "Select display server to use for the greeter.  Valid values are @samp{\"x11\"} or @samp{\"wayland\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13588
+#: guix-git/doc/guix.texi:17974
 #, no-wrap
 msgid "@code{numlock} (default: \"on\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13590
-msgid "Valid values are \"on\", \"off\" or \"none\"."
+#: guix-git/doc/guix.texi:17976
+msgid "Valid values are @samp{\"on\"}, @samp{\"off\"} or @samp{\"none\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13591
+#: guix-git/doc/guix.texi:17977
 #, no-wrap
 msgid "@code{halt-command} (default @code{#~(string-apppend #$shepherd \"/sbin/halt\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13593
+#: guix-git/doc/guix.texi:17979
 msgid "Command to run when halting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13594
+#: guix-git/doc/guix.texi:17980
 #, no-wrap
 msgid "@code{reboot-command} (default @code{#~(string-append #$shepherd \"/sbin/reboot\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13596
+#: guix-git/doc/guix.texi:17982
 msgid "Command to run when rebooting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13597
+#: guix-git/doc/guix.texi:17983
 #, no-wrap
 msgid "@code{theme} (default \"maldives\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13599
-msgid "Theme to use. Default themes provided by SDDM are \"elarun\" or \"maldives\"."
+#: guix-git/doc/guix.texi:17986
+msgid "Theme to use.  Default themes provided by SDDM are @samp{\"elarun\"}, @samp{\"maldives\"} or @samp{\"maya\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13600
+#: guix-git/doc/guix.texi:17987
 #, no-wrap
 msgid "@code{themes-directory} (default \"/run/current-system/profile/share/sddm/themes\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13602
+#: guix-git/doc/guix.texi:17989
 msgid "Directory to look for themes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13603
+#: guix-git/doc/guix.texi:17990
 #, no-wrap
 msgid "@code{faces-directory} (default \"/run/current-system/profile/share/sddm/faces\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13605
+#: guix-git/doc/guix.texi:17992
 msgid "Directory to look for faces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13606
+#: guix-git/doc/guix.texi:17993
 #, no-wrap
 msgid "@code{default-path} (default \"/run/current-system/profile/bin\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13608
+#: guix-git/doc/guix.texi:17995
 msgid "Default PATH to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13609
-#, no-wrap
-msgid "@code{minimum-uid} (default 1000)"
-msgstr ""
+#: guix-git/doc/guix.texi:17996
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{minimum-uid} (default: 1000)"
+msgstr "@code{includes}（默认值：@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:13611
-msgid "Minimum UID to display in SDDM."
+#: guix-git/doc/guix.texi:17998
+msgid "Minimum UID displayed in SDDM and allowed for log-in."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13612
-#, no-wrap
-msgid "@code{maximum-uid} (default 2000)"
-msgstr ""
+#: guix-git/doc/guix.texi:17999
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{maximum-uid} (default: 2000)"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:13614
-msgid "Maximum UID to display in SDDM"
+#: guix-git/doc/guix.texi:18001
+msgid "Maximum UID to display in SDDM."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13615
+#: guix-git/doc/guix.texi:18002
 #, no-wrap
 msgid "@code{remember-last-user?} (default #t)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13617
+#: guix-git/doc/guix.texi:18004
 msgid "Remember last user."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13618
+#: guix-git/doc/guix.texi:18005
 #, no-wrap
 msgid "@code{remember-last-session?} (default #t)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13620
+#: guix-git/doc/guix.texi:18007
 msgid "Remember last session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13621
+#: guix-git/doc/guix.texi:18008
 #, no-wrap
 msgid "@code{hide-users} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13623
+#: guix-git/doc/guix.texi:18010
 msgid "Usernames to hide from SDDM greeter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13624
+#: guix-git/doc/guix.texi:18011
 #, no-wrap
 msgid "@code{hide-shells} (default @code{#~(string-append #$shadow \"/sbin/nologin\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13626
+#: guix-git/doc/guix.texi:18013
 msgid "Users with shells listed will be hidden from the SDDM greeter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13627
+#: guix-git/doc/guix.texi:18014
 #, no-wrap
 msgid "@code{session-command} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/wayland-session\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13629
+#: guix-git/doc/guix.texi:18016
 msgid "Script to run before starting a wayland session."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13630
+#: guix-git/doc/guix.texi:18017
 #, no-wrap
 msgid "@code{sessions-directory} (default \"/run/current-system/profile/share/wayland-sessions\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13632
+#: guix-git/doc/guix.texi:18019
 msgid "Directory to look for desktop files starting wayland sessions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13636
+#: guix-git/doc/guix.texi:18023
 #, no-wrap
 msgid "@code{xauth-path} (default @code{#~(string-append #$xauth \"/bin/xauth\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13638
+#: guix-git/doc/guix.texi:18025
 msgid "Path to xauth."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13639
+#: guix-git/doc/guix.texi:18026
 #, no-wrap
 msgid "@code{xephyr-path} (default @code{#~(string-append #$xorg-server \"/bin/Xephyr\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13641
+#: guix-git/doc/guix.texi:18028
 msgid "Path to Xephyr."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13642
+#: guix-git/doc/guix.texi:18029
 #, no-wrap
 msgid "@code{xdisplay-start} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xsetup\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13644
+#: guix-git/doc/guix.texi:18031
 msgid "Script to run after starting xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13645
+#: guix-git/doc/guix.texi:18032
 #, no-wrap
 msgid "@code{xdisplay-stop} (default @code{#~(string-append #$sddm \"/share/sddm/scripts/Xstop\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13647
+#: guix-git/doc/guix.texi:18034
 msgid "Script to run before stopping xorg-server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13648
+#: guix-git/doc/guix.texi:18035
 #, no-wrap
 msgid "@code{xsession-command} (default: @code{xinitrc})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13651
+#: guix-git/doc/guix.texi:18038
 #, no-wrap
 msgid "@code{xsessions-directory} (default: \"/run/current-system/profile/share/xsessions\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13653
+#: guix-git/doc/guix.texi:18040
 msgid "Directory to look for desktop files starting X sessions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13654
+#: guix-git/doc/guix.texi:18041
 #, no-wrap
 msgid "@code{minimum-vt} (default: 7)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13656
+#: guix-git/doc/guix.texi:18043
 msgid "Minimum VT to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13657
+#: guix-git/doc/guix.texi:18044
 #, no-wrap
 msgid "@code{auto-login-user} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13659
+#: guix-git/doc/guix.texi:18046
 msgid "User to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13660
+#: guix-git/doc/guix.texi:18047
 #, no-wrap
 msgid "@code{auto-login-session} (default \"\")"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13662
+#: guix-git/doc/guix.texi:18049
 msgid "Desktop file to use for auto-login."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13663
+#: guix-git/doc/guix.texi:18050
 #, no-wrap
 msgid "@code{relogin?} (default #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13665
+#: guix-git/doc/guix.texi:18052
 msgid "Relogin after logout."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13670
+#: guix-git/doc/guix.texi:18057
 #, no-wrap
 msgid "X11 login"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:13671
+#. type: defvr
+#: guix-git/doc/guix.texi:18058
 #, no-wrap
-msgid "{Scheme Procedure} sddm-service config"
+msgid "{Scheme Variable} sddm-service-type"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:13674
-msgid "Return a service that spawns the SDDM graphical login manager for config of type @code{<sddm-configuration>}."
+#. type: defvr
+#: guix-git/doc/guix.texi:18062
+msgid "This is the type of the service to run the @uref{https://github.com/sddm/sddm,SDDM display manager}.  Its value must be a @code{sddm-configuration} record (see below)."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13679
+#. type: defvr
+#: guix-git/doc/guix.texi:18064
+msgid "Here's an example use:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:18070
 #, no-wrap
 msgid ""
-"  (sddm-service (sddm-configuration\n"
-"                 (auto-login-user \"Alice\")\n"
-"                 (auto-login-session \"xfce.desktop\")))\n"
+"(service sddm-service-type\n"
+"         (sddm-configuration\n"
+"           (auto-login-user \"alice\")\n"
+"           (auto-login-session \"xfce.desktop\")))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:18076
+#, fuzzy
+#| msgid "This data type represents build machines to which the daemon may offload builds.  The important fields are:"
+msgid "This data type represents the configuration of the SDDM login manager.  The available fields are:"
+msgstr "这个数据类型表示后台进程可以下发构建任务的构建机器。重要的项有："
+
+#. type: item
+#: guix-git/doc/guix.texi:18078
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{sddm} (default: @code{sddm})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:18080
+#, fuzzy
+#| msgid "The package data type."
+msgid "The SDDM package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:18081
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{display-server} (default: @code{\"x11\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:18083
+msgid "This must be either @code{\"x11\"} or @code{\"wayland\"}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:18086
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{auto-login-user} (default: @code{\"\"})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:18089
+msgid "If non-empty, this is the user account under which to log in automatically."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:18090
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{auto-login-session} (default: @code{\"\"})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:18093
+msgid "If non-empty, this is the @file{.desktop} file name to use as the auto-login session."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13682
+#: guix-git/doc/guix.texi:18096
 #, no-wrap
 msgid "Xorg, configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13683
+#: guix-git/doc/guix.texi:18097
 #, no-wrap
 msgid "{Data Type} xorg-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:13688
-msgid "This data type represents the configuration of the Xorg graphical display server.  Note that there is not Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM.  Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record."
+#: guix-git/doc/guix.texi:18102
+msgid "This data type represents the configuration of the Xorg graphical display server.  Note that there is no Xorg service; instead, the X server is started by a ``display manager'' such as GDM, SDDM, and SLiM@.  Thus, the configuration of these display managers aggregates an @code{xorg-configuration} record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13690
+#: guix-git/doc/guix.texi:18104
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-xorg-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13693
+#: guix-git/doc/guix.texi:18107
 msgid "This is a list of @dfn{module packages} loaded by the Xorg server---e.g., @code{xf86-video-vesa}, @code{xf86-input-keyboard}, and so on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13694
+#: guix-git/doc/guix.texi:18108
 #, no-wrap
 msgid "@code{fonts} (default: @code{%default-xorg-fonts})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13696
+#: guix-git/doc/guix.texi:18110
 msgid "This is a list of font directories to add to the server's @dfn{font path}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13697
+#: guix-git/doc/guix.texi:18111
 #, no-wrap
 msgid "@code{drivers} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13701
+#: guix-git/doc/guix.texi:18115
 msgid "This must be either the empty list, in which case Xorg chooses a graphics driver automatically, or a list of driver names that will be tried in this order---e.g., @code{(\"modesetting\" \"vesa\")}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13702
+#: guix-git/doc/guix.texi:18116
 #, no-wrap
 msgid "@code{resolutions} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13706
+#: guix-git/doc/guix.texi:18120
 msgid "When @code{resolutions} is the empty list, Xorg chooses an appropriate screen resolution.  Otherwise, it must be a list of resolutions---e.g., @code{((1024 768) (640 480))}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13707
+#: guix-git/doc/guix.texi:18121
 #, no-wrap
 msgid "keyboard layout, for Xorg"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13708
+#: guix-git/doc/guix.texi:18122
 #, no-wrap
 msgid "keymap, for Xorg"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13712
+#: guix-git/doc/guix.texi:18126
 msgid "If this is @code{#f}, Xorg uses the default keyboard layout---usually US English (``qwerty'') for a 105-key PC keyboard."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13716
+#: guix-git/doc/guix.texi:18130
 msgid "Otherwise this must be a @code{keyboard-layout} object specifying the keyboard layout in use when Xorg is running.  @xref{Keyboard Layout}, for more information on how to specify the keyboard layout."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13717
+#: guix-git/doc/guix.texi:18131 guix-git/doc/guix.texi:19842
+#: guix-git/doc/guix.texi:32023
 #, no-wrap
 msgid "@code{extra-config} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13720
+#: guix-git/doc/guix.texi:18134 guix-git/doc/guix.texi:32027
 msgid "This is a list of strings or objects appended to the configuration file.  It is used to pass extra text to be added verbatim to the configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13721
+#: guix-git/doc/guix.texi:18135
 #, no-wrap
 msgid "@code{server} (default: @code{xorg-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13723
+#: guix-git/doc/guix.texi:18137
 msgid "This is the package providing the Xorg server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13724
+#: guix-git/doc/guix.texi:18138
 #, no-wrap
 msgid "@code{server-arguments} (default: @code{%default-xorg-server-arguments})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13727
+#: guix-git/doc/guix.texi:18141
 msgid "This is the list of command-line arguments to pass to the X server.  The default is @code{-nolisten tcp}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13730
+#: guix-git/doc/guix.texi:18144
 #, no-wrap
 msgid "{Scheme Procedure} set-xorg-configuration @var{config} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13734
+#: guix-git/doc/guix.texi:18148
 msgid "[@var{login-manager-service-type}] Tell the log-in manager (of type @var{login-manager-service-type}) to use @var{config}, an @code{<xorg-configuration>} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13738
+#: guix-git/doc/guix.texi:18152
 msgid "Since the Xorg configuration is embedded in the log-in manager's configuration---e.g., @code{gdm-configuration}---this procedure provides a shorthand to set the Xorg configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13740
+#: guix-git/doc/guix.texi:18154
 #, no-wrap
 msgid "{Scheme Procedure} xorg-start-command [@var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13744
+#: guix-git/doc/guix.texi:18158
 msgid "Return a @code{startx} script in which the modules, fonts, etc. specified in @var{config}, are available.  The result should be used in place of @code{startx}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13746
+#: guix-git/doc/guix.texi:18160
 msgid "Usually the X server is started by a login manager."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13749
+#: guix-git/doc/guix.texi:18163
 #, no-wrap
 msgid "{Scheme Procedure} screen-locker-service @var{package} [@var{program}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13753
+#: guix-git/doc/guix.texi:18167
 msgid "Add @var{package}, a package for a screen locker or screen saver whose command is @var{program}, to the set of setuid programs and add a PAM entry for it.  For example:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:13756
+#: guix-git/doc/guix.texi:18170
 #, no-wrap
 msgid "(screen-locker-service xlockmore \"xlock\")\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13759
+#: guix-git/doc/guix.texi:18173
 msgid "makes the good ol' XlockMore usable."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:13765
+#: guix-git/doc/guix.texi:18179
 #, no-wrap
 msgid "printer support with CUPS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13769
+#: guix-git/doc/guix.texi:18183
 msgid "The @code{(gnu services cups)} module provides a Guix service definition for the CUPS printing service.  To add printer support to a Guix system, add a @code{cups-service} to the operating system definition:"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13770
+#: guix-git/doc/guix.texi:18184
 #, no-wrap
 msgid "{Scheme Variable} cups-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:13774
+#: guix-git/doc/guix.texi:18188
 msgid "The service type for the CUPS print server.  Its value should be a valid CUPS configuration (see below).  To use the default settings, simply write:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13776
+#. type: lisp
+#: guix-git/doc/guix.texi:18190
 #, no-wrap
 msgid "(service cups-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13786
+#: guix-git/doc/guix.texi:18200
 msgid "The CUPS configuration controls the basic things about your CUPS installation: what interfaces it listens on, what to do if a print job fails, how much logging to do, and so on.  To actually add a printer, you have to visit the @url{http://localhost:631} URL, or use a tool such as GNOME's printer configuration services.  By default, configuring a CUPS service will generate a self-signed certificate if needed, for secure connections to the print server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13791
-msgid "Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{escpr} package and for HP printers @i{via} the @code{hplip-minimal} package.  You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):"
+#: guix-git/doc/guix.texi:18206
+msgid "Suppose you want to enable the Web interface of CUPS and also add support for Epson printers @i{via} the @code{epson-inkjet-printer-escpr} package and for HP printers @i{via} the @code{hplip-minimal} package.  You can do that directly, like this (you need to use the @code{(gnu packages cups)} module):"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:13798
+#. type: lisp
+#: guix-git/doc/guix.texi:18213
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
 "         (cups-configuration\n"
 "           (web-interface? #t)\n"
 "           (extensions\n"
-"             (list cups-filters escpr hplip-minimal))))\n"
+"             (list cups-filters epson-inkjet-printer-escpr hplip-minimal))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13803
+#: guix-git/doc/guix.texi:18218
 msgid "Note: If you wish to use the Qt5 based GUI which comes with the hplip package then it is suggested that you install the @code{hplip} package, either in your OS configuration file or as your user."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13810
+#: guix-git/doc/guix.texi:18225
 msgid "The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the configuration as a string, if you have an old @code{cupsd.conf} file that you want to port over from some other system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:13821
+#: guix-git/doc/guix.texi:18236
 msgid "Available @code{cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13822
+#: guix-git/doc/guix.texi:18237
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13824 doc/guix.texi:14581
+#: guix-git/doc/guix.texi:18239 guix-git/doc/guix.texi:19007
 msgid "The CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13826
+#: guix-git/doc/guix.texi:18241
 #, no-wrap
-msgid "{@code{cups-configuration} parameter} package-list extensions"
+msgid "{@code{cups-configuration} parameter} package-list extensions (default: @code{(list brlaser cups-filters epson-inkjet-printer-escpr foomatic-filters hplip-minimal splix)})"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13828
+#: guix-git/doc/guix.texi:18243
 msgid "Drivers and other extensions to the CUPS package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13830
+#: guix-git/doc/guix.texi:18245
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} files-configuration files-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13833
+#: guix-git/doc/guix.texi:18248
 msgid "Configuration of where to write logs, what directories to use for print spools, and related privileged configuration parameters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13835
+#: guix-git/doc/guix.texi:18250
 msgid "Available @code{files-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13836
+#: guix-git/doc/guix.texi:18251
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location access-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13844
+#: guix-git/doc/guix.texi:18259
 msgid "Defines the access log filename.  Specifying a blank filename disables access log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-access_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13846
+#: guix-git/doc/guix.texi:18261
 msgid "Defaults to @samp{\"/var/log/cups/access_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13848
+#: guix-git/doc/guix.texi:18263
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name cache-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13850
+#: guix-git/doc/guix.texi:18265
 msgid "Where CUPS should cache data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13852
+#: guix-git/doc/guix.texi:18267
 msgid "Defaults to @samp{\"/var/cache/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13854
+#: guix-git/doc/guix.texi:18269
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string config-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13857
+#: guix-git/doc/guix.texi:18272
 msgid "Specifies the permissions for all configuration files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13863
+#: guix-git/doc/guix.texi:18278
 msgid "Note that the permissions for the printers.conf file are currently masked to only allow access from the scheduler user (typically root).  This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system.  There is no way to disable this security feature."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13865
+#: guix-git/doc/guix.texi:18280
 msgid "Defaults to @samp{\"0640\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13867
+#: guix-git/doc/guix.texi:18282
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location error-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13875
+#: guix-git/doc/guix.texi:18290
 msgid "Defines the error log filename.  Specifying a blank filename disables error log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-error_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13877
+#: guix-git/doc/guix.texi:18292
 msgid "Defaults to @samp{\"/var/log/cups/error_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13879
+#: guix-git/doc/guix.texi:18294
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string fatal-errors"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13882
+#: guix-git/doc/guix.texi:18297
 msgid "Specifies which errors are fatal, causing the scheduler to exit.  The kind strings are:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13886
+#: guix-git/doc/guix.texi:18301
 msgid "No errors are fatal."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13889
+#: guix-git/doc/guix.texi:18304
 msgid "All of the errors below are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13890
+#: guix-git/doc/guix.texi:18305
 #, no-wrap
 msgid "browse"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13893
+#: guix-git/doc/guix.texi:18308
 msgid "Browsing initialization errors are fatal, for example failed connections to the DNS-SD daemon."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13894
+#: guix-git/doc/guix.texi:18309
 #, no-wrap
 msgid "config"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13896
+#: guix-git/doc/guix.texi:18311
 msgid "Configuration file syntax errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13897
+#: guix-git/doc/guix.texi:18312
 #, no-wrap
 msgid "listen"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13900
+#: guix-git/doc/guix.texi:18315
 msgid "Listen or Port errors are fatal, except for IPv6 failures on the loopback or @code{any} addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13901
+#: guix-git/doc/guix.texi:18316
 #, no-wrap
 msgid "log"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13903
+#: guix-git/doc/guix.texi:18318
 msgid "Log file creation or write errors are fatal."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:13904
+#: guix-git/doc/guix.texi:18319
 #, no-wrap
 msgid "permissions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:13907
+#: guix-git/doc/guix.texi:18322
 msgid "Bad startup file permissions are fatal, for example shared TLS certificate and key files with world-read permissions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13910
+#: guix-git/doc/guix.texi:18325
 msgid "Defaults to @samp{\"all -browse\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13912
+#: guix-git/doc/guix.texi:18327
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean file-device?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13915
+#: guix-git/doc/guix.texi:18330
 msgid "Specifies whether the file pseudo-device can be used for new printer queues.  The URI @uref{file:///dev/null} is always allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13917 doc/guix.texi:13987 doc/guix.texi:14023
-#: doc/guix.texi:14035 doc/guix.texi:14041 doc/guix.texi:14057
-#: doc/guix.texi:14145 doc/guix.texi:14239 doc/guix.texi:14555
-#: doc/guix.texi:14568 doc/guix.texi:20262 doc/guix.texi:20276
-#: doc/guix.texi:20398 doc/guix.texi:20419 doc/guix.texi:20440
-#: doc/guix.texi:20447 doc/guix.texi:20492 doc/guix.texi:20499
-#: doc/guix.texi:20926 doc/guix.texi:20940 doc/guix.texi:21112
-#: doc/guix.texi:21157 doc/guix.texi:21244 doc/guix.texi:21385
-#: doc/guix.texi:21418 doc/guix.texi:21558 doc/guix.texi:21569
-#: doc/guix.texi:21819 doc/guix.texi:22461 doc/guix.texi:22470
-#: doc/guix.texi:22478 doc/guix.texi:22486 doc/guix.texi:22502
-#: doc/guix.texi:22518 doc/guix.texi:22526 doc/guix.texi:22534
-#: doc/guix.texi:22543 doc/guix.texi:22552 doc/guix.texi:22568
-#: doc/guix.texi:22632 doc/guix.texi:22738 doc/guix.texi:22746
-#: doc/guix.texi:22754 doc/guix.texi:22779 doc/guix.texi:22833
-#: doc/guix.texi:22881 doc/guix.texi:23082 doc/guix.texi:23089
+#: guix-git/doc/guix.texi:18332 guix-git/doc/guix.texi:18402
+#: guix-git/doc/guix.texi:18444 guix-git/doc/guix.texi:18464
+#: guix-git/doc/guix.texi:18470 guix-git/doc/guix.texi:18486
+#: guix-git/doc/guix.texi:18574 guix-git/doc/guix.texi:18668
+#: guix-git/doc/guix.texi:18981 guix-git/doc/guix.texi:18994
+#: guix-git/doc/guix.texi:21543 guix-git/doc/guix.texi:21649
+#: guix-git/doc/guix.texi:21714 guix-git/doc/guix.texi:21723
+#: guix-git/doc/guix.texi:22728 guix-git/doc/guix.texi:22772
+#: guix-git/doc/guix.texi:22789 guix-git/doc/guix.texi:22797
+#: guix-git/doc/guix.texi:22812 guix-git/doc/guix.texi:22830
+#: guix-git/doc/guix.texi:22854 guix-git/doc/guix.texi:22907
+#: guix-git/doc/guix.texi:23040 guix-git/doc/guix.texi:23074
+#: guix-git/doc/guix.texi:23110 guix-git/doc/guix.texi:23126
+#: guix-git/doc/guix.texi:23154 guix-git/doc/guix.texi:23215
+#: guix-git/doc/guix.texi:23298 guix-git/doc/guix.texi:26691
+#: guix-git/doc/guix.texi:26705 guix-git/doc/guix.texi:26727
+#: guix-git/doc/guix.texi:26846 guix-git/doc/guix.texi:26860
+#: guix-git/doc/guix.texi:26881 guix-git/doc/guix.texi:26902
+#: guix-git/doc/guix.texi:26909 guix-git/doc/guix.texi:26954
+#: guix-git/doc/guix.texi:26961 guix-git/doc/guix.texi:27694
+#: guix-git/doc/guix.texi:27708 guix-git/doc/guix.texi:27880
+#: guix-git/doc/guix.texi:27925 guix-git/doc/guix.texi:28012
+#: guix-git/doc/guix.texi:28214 guix-git/doc/guix.texi:28247
+#: guix-git/doc/guix.texi:28387 guix-git/doc/guix.texi:28398
+#: guix-git/doc/guix.texi:28649 guix-git/doc/guix.texi:30114
+#: guix-git/doc/guix.texi:30123 guix-git/doc/guix.texi:30131
+#: guix-git/doc/guix.texi:30139 guix-git/doc/guix.texi:30155
+#: guix-git/doc/guix.texi:30171 guix-git/doc/guix.texi:30179
+#: guix-git/doc/guix.texi:30187 guix-git/doc/guix.texi:30196
+#: guix-git/doc/guix.texi:30205 guix-git/doc/guix.texi:30221
+#: guix-git/doc/guix.texi:30285 guix-git/doc/guix.texi:30391
+#: guix-git/doc/guix.texi:30399 guix-git/doc/guix.texi:30407
+#: guix-git/doc/guix.texi:30432 guix-git/doc/guix.texi:30486
+#: guix-git/doc/guix.texi:30534 guix-git/doc/guix.texi:30735
+#: guix-git/doc/guix.texi:30742
 msgid "Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13919
+#: guix-git/doc/guix.texi:18334
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13922
+#: guix-git/doc/guix.texi:18337
 msgid "Specifies the group name or ID that will be used when executing external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13924 doc/guix.texi:14004
+#: guix-git/doc/guix.texi:18339 guix-git/doc/guix.texi:18419
 msgid "Defaults to @samp{\"lp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13926
+#: guix-git/doc/guix.texi:18341
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string log-file-perm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13928
+#: guix-git/doc/guix.texi:18343
 msgid "Specifies the permissions for all log files that the scheduler writes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13930
+#: guix-git/doc/guix.texi:18345
 msgid "Defaults to @samp{\"0644\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13932
+#: guix-git/doc/guix.texi:18347
 #, no-wrap
 msgid "{@code{files-configuration} parameter} log-location page-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13940
+#: guix-git/doc/guix.texi:18355
 msgid "Defines the page log filename.  Specifying a blank filename disables page log generation.  The value @code{stderr} causes log entries to be sent to the standard error file when the scheduler is running in the foreground, or to the system log daemon when run in the background.  The value @code{syslog} causes log entries to be sent to the system log daemon.  The server name may be included in filenames using the string @code{%s}, as in @code{/var/log/cups/%s-page_log}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13942
+#: guix-git/doc/guix.texi:18357
 msgid "Defaults to @samp{\"/var/log/cups/page_log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13944
+#: guix-git/doc/guix.texi:18359
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string remote-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13947
+#: guix-git/doc/guix.texi:18362
 msgid "Specifies the username that is associated with unauthenticated accesses by clients claiming to be the root user.  The default is @code{remroot}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13949
+#: guix-git/doc/guix.texi:18364
 msgid "Defaults to @samp{\"remroot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13951
+#: guix-git/doc/guix.texi:18366
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name request-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13954
+#: guix-git/doc/guix.texi:18369
 msgid "Specifies the directory that contains print jobs and other HTTP request data."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13956
+#: guix-git/doc/guix.texi:18371
 msgid "Defaults to @samp{\"/var/spool/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13958
+#: guix-git/doc/guix.texi:18373
 #, no-wrap
 msgid "{@code{files-configuration} parameter} sandboxing sandboxing"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13963
+#: guix-git/doc/guix.texi:18378
 msgid "Specifies the level of security sandboxing that is applied to print filters, backends, and other child processes of the scheduler; either @code{relaxed} or @code{strict}.  This directive is currently only used/supported on macOS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13965
+#: guix-git/doc/guix.texi:18380
 msgid "Defaults to @samp{strict}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13967
+#: guix-git/doc/guix.texi:18382
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-keychain"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13972
-msgid "Specifies the location of TLS certificates and private keys.  CUPS will look for public and private keys in this directory: a @code{.crt} files for PEM-encoded certificates and corresponding @code{.key} files for PEM-encoded private keys."
+#: guix-git/doc/guix.texi:18387
+msgid "Specifies the location of TLS certificates and private keys.  CUPS will look for public and private keys in this directory: @file{.crt} files for PEM-encoded certificates and corresponding @file{.key} files for PEM-encoded private keys."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13974
+#: guix-git/doc/guix.texi:18389
 msgid "Defaults to @samp{\"/etc/cups/ssl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13976
+#: guix-git/doc/guix.texi:18391
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name server-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13978
+#: guix-git/doc/guix.texi:18393
 msgid "Specifies the directory containing the server configuration files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13980
+#: guix-git/doc/guix.texi:18395
 msgid "Defaults to @samp{\"/etc/cups\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13982
+#: guix-git/doc/guix.texi:18397
 #, no-wrap
 msgid "{@code{files-configuration} parameter} boolean sync-on-close?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13985
+#: guix-git/doc/guix.texi:18400
 msgid "Specifies whether the scheduler calls fsync(2) after writing configuration or state files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13989
+#: guix-git/doc/guix.texi:18404
 #, no-wrap
 msgid "{@code{files-configuration} parameter} space-separated-string-list system-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13991
+#: guix-git/doc/guix.texi:18406
 msgid "Specifies the group(s) to use for @code{@@SYSTEM} group authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13993
+#: guix-git/doc/guix.texi:18408
 #, no-wrap
 msgid "{@code{files-configuration} parameter} file-name temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13995
+#: guix-git/doc/guix.texi:18410
 msgid "Specifies the directory where temporary files are stored."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13997
+#: guix-git/doc/guix.texi:18412
 msgid "Defaults to @samp{\"/var/spool/cups/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:13999
+#: guix-git/doc/guix.texi:18414
 #, no-wrap
 msgid "{@code{files-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14002
+#: guix-git/doc/guix.texi:18417
 msgid "Specifies the user name or ID that is used when running external programs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14007
+#: guix-git/doc/guix.texi:18421
+#, no-wrap
+msgid "{@code{files-configuration} parameter} string set-env"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18423
+msgid "Set the specified environment variable to be passed to child processes."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18425
+msgid "Defaults to @samp{\"variable value\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18428
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} access-log-level access-log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14014
+#: guix-git/doc/guix.texi:18435
 msgid "Specifies the logging level for the AccessLog file.  The @code{config} level logs when printers and classes are added, deleted, or modified and when configuration files are accessed or updated.  The @code{actions} level logs when print jobs are submitted, held, released, modified, or canceled, and any of the conditions for @code{config}.  The @code{all} level logs all requests."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14016
+#: guix-git/doc/guix.texi:18437
 msgid "Defaults to @samp{actions}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14018
+#: guix-git/doc/guix.texi:18439
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean auto-purge-jobs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14021
+#: guix-git/doc/guix.texi:18442
 msgid "Specifies whether to purge job history data automatically when it is no longer required for quotas."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14025
+#: guix-git/doc/guix.texi:18446
+#, no-wrap
+msgid "{@code{cups-configuration} parameter} comma-separated-string-list browse-dns-sd-sub-types"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18450
+msgid "Specifies a list of DNS-SD sub-types to advertise for each shared printer.  For example, @samp{\"_cups\" \"_print\"} will tell network clients that both CUPS sharing and IPP Everywhere are supported."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18452
+msgid "Defaults to @samp{\"_cups\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18454
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} browse-local-protocols browse-local-protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14027
+#: guix-git/doc/guix.texi:18456
 msgid "Specifies which protocols to use for local printer sharing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14029
+#: guix-git/doc/guix.texi:18458
 msgid "Defaults to @samp{dnssd}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14031
+#: guix-git/doc/guix.texi:18460
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browse-web-if?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14033
+#: guix-git/doc/guix.texi:18462
 msgid "Specifies whether the CUPS web interface is advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14037
+#: guix-git/doc/guix.texi:18466
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean browsing?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14039
+#: guix-git/doc/guix.texi:18468
 msgid "Specifies whether shared printers are advertised."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14043
+#: guix-git/doc/guix.texi:18472
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string classification"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14048
-msgid "Specifies the security classification of the server.  Any valid banner name can be used, including \"classified\", \"confidential\", \"secret\", \"topsecret\", and \"unclassified\", or the banner can be omitted to disable secure printing functions."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14050 doc/guix.texi:14387 doc/guix.texi:15990
-#: doc/guix.texi:16002 doc/guix.texi:17704 doc/guix.texi:17730
-#: doc/guix.texi:17766 doc/guix.texi:17831 doc/guix.texi:17870
-#: doc/guix.texi:17929 doc/guix.texi:17938 doc/guix.texi:21524
-#: doc/guix.texi:21532 doc/guix.texi:21540 doc/guix.texi:21548
-#: doc/guix.texi:21826 doc/guix.texi:22304 doc/guix.texi:22312
-#: doc/guix.texi:22320 doc/guix.texi:22428 doc/guix.texi:22453
-#: doc/guix.texi:22584 doc/guix.texi:22592 doc/guix.texi:22600
-#: doc/guix.texi:22608 doc/guix.texi:22616 doc/guix.texi:22624
-#: doc/guix.texi:22647 doc/guix.texi:22655 doc/guix.texi:22707
-#: doc/guix.texi:22723 doc/guix.texi:22731 doc/guix.texi:22770
-#: doc/guix.texi:22793 doc/guix.texi:22815 doc/guix.texi:22822
-#: doc/guix.texi:22857 doc/guix.texi:22865 doc/guix.texi:22889
-#: doc/guix.texi:22921 doc/guix.texi:22950 doc/guix.texi:22957
-#: doc/guix.texi:22964 doc/guix.texi:22972 doc/guix.texi:22986
-#: doc/guix.texi:22995 doc/guix.texi:23005 doc/guix.texi:23012
-#: doc/guix.texi:23019 doc/guix.texi:23026 doc/guix.texi:23097
-#: doc/guix.texi:23104 doc/guix.texi:23111 doc/guix.texi:23120
-#: doc/guix.texi:23136 doc/guix.texi:23143 doc/guix.texi:23150
-#: doc/guix.texi:23157 doc/guix.texi:23165 doc/guix.texi:23173
+#: guix-git/doc/guix.texi:18477
+msgid "Specifies the security classification of the server.  Any valid banner name can be used, including @samp{\"classified\"}, @samp{\"confidential\"}, @samp{\"secret\"}, @samp{\"topsecret\"}, and @samp{\"unclassified\"}, or the banner can be omitted to disable secure printing functions."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:18479 guix-git/doc/guix.texi:18816
+#: guix-git/doc/guix.texi:20764 guix-git/doc/guix.texi:20776
+#: guix-git/doc/guix.texi:21550 guix-git/doc/guix.texi:21564
+#: guix-git/doc/guix.texi:21571 guix-git/doc/guix.texi:21578
+#: guix-git/doc/guix.texi:21608 guix-git/doc/guix.texi:21706
+#: guix-git/doc/guix.texi:23597 guix-git/doc/guix.texi:23623
+#: guix-git/doc/guix.texi:23659 guix-git/doc/guix.texi:23705
+#: guix-git/doc/guix.texi:23724 guix-git/doc/guix.texi:23763
+#: guix-git/doc/guix.texi:23822 guix-git/doc/guix.texi:23832
+#: guix-git/doc/guix.texi:28353 guix-git/doc/guix.texi:28361
+#: guix-git/doc/guix.texi:28369 guix-git/doc/guix.texi:28377
+#: guix-git/doc/guix.texi:28656 guix-git/doc/guix.texi:29957
+#: guix-git/doc/guix.texi:29965 guix-git/doc/guix.texi:29973
+#: guix-git/doc/guix.texi:30081 guix-git/doc/guix.texi:30106
+#: guix-git/doc/guix.texi:30237 guix-git/doc/guix.texi:30245
+#: guix-git/doc/guix.texi:30253 guix-git/doc/guix.texi:30261
+#: guix-git/doc/guix.texi:30269 guix-git/doc/guix.texi:30277
+#: guix-git/doc/guix.texi:30300 guix-git/doc/guix.texi:30308
+#: guix-git/doc/guix.texi:30360 guix-git/doc/guix.texi:30376
+#: guix-git/doc/guix.texi:30384 guix-git/doc/guix.texi:30423
+#: guix-git/doc/guix.texi:30446 guix-git/doc/guix.texi:30468
+#: guix-git/doc/guix.texi:30475 guix-git/doc/guix.texi:30510
+#: guix-git/doc/guix.texi:30518 guix-git/doc/guix.texi:30542
+#: guix-git/doc/guix.texi:30574 guix-git/doc/guix.texi:30603
+#: guix-git/doc/guix.texi:30610 guix-git/doc/guix.texi:30617
+#: guix-git/doc/guix.texi:30625 guix-git/doc/guix.texi:30639
+#: guix-git/doc/guix.texi:30648 guix-git/doc/guix.texi:30658
+#: guix-git/doc/guix.texi:30665 guix-git/doc/guix.texi:30672
+#: guix-git/doc/guix.texi:30679 guix-git/doc/guix.texi:30750
+#: guix-git/doc/guix.texi:30757 guix-git/doc/guix.texi:30764
+#: guix-git/doc/guix.texi:30773 guix-git/doc/guix.texi:30789
+#: guix-git/doc/guix.texi:30796 guix-git/doc/guix.texi:30803
+#: guix-git/doc/guix.texi:30810 guix-git/doc/guix.texi:30818
+#: guix-git/doc/guix.texi:30826
 msgid "Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14052
+#: guix-git/doc/guix.texi:18481
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean classify-override?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14055
+#: guix-git/doc/guix.texi:18484
 msgid "Specifies whether users may override the classification (cover page) of individual print jobs using the @code{job-sheets} option."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14059
+#: guix-git/doc/guix.texi:18488
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-auth-type default-auth-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14061
+#: guix-git/doc/guix.texi:18490
 msgid "Specifies the default type of authentication to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14063
+#: guix-git/doc/guix.texi:18492
 msgid "Defaults to @samp{Basic}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14065
+#: guix-git/doc/guix.texi:18494
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} default-encryption default-encryption"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14067
+#: guix-git/doc/guix.texi:18496
 msgid "Specifies whether encryption will be used for authenticated requests."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14069
+#: guix-git/doc/guix.texi:18498
 msgid "Defaults to @samp{Required}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14071
+#: guix-git/doc/guix.texi:18500
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-language"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14073
+#: guix-git/doc/guix.texi:18502
 msgid "Specifies the default language to use for text and web content."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14075
+#: guix-git/doc/guix.texi:18504
 msgid "Defaults to @samp{\"en\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14077
+#: guix-git/doc/guix.texi:18506
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-paper-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14082
+#: guix-git/doc/guix.texi:18511
 msgid "Specifies the default paper size for new print queues.  @samp{\"Auto\"} uses a locale-specific default, while @samp{\"None\"} specifies there is no default paper size.  Specific size names are typically @samp{\"Letter\"} or @samp{\"A4\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14084
+#: guix-git/doc/guix.texi:18513
 msgid "Defaults to @samp{\"Auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14086
+#: guix-git/doc/guix.texi:18515
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string default-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14088
+#: guix-git/doc/guix.texi:18517
 msgid "Specifies the default access policy to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14090
+#: guix-git/doc/guix.texi:18519
 msgid "Defaults to @samp{\"default\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14092
+#: guix-git/doc/guix.texi:18521
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean default-shared?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14094
+#: guix-git/doc/guix.texi:18523
 msgid "Specifies whether local printers are shared by default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14096 doc/guix.texi:14176 doc/guix.texi:14472
-#: doc/guix.texi:20084 doc/guix.texi:20112 doc/guix.texi:20232
-#: doc/guix.texi:20239 doc/guix.texi:20247 doc/guix.texi:20269
-#: doc/guix.texi:20283 doc/guix.texi:20368 doc/guix.texi:20375
-#: doc/guix.texi:20383 doc/guix.texi:20793 doc/guix.texi:20933
-#: doc/guix.texi:21119 doc/guix.texi:21126 doc/guix.texi:21148
-#: doc/guix.texi:21187 doc/guix.texi:21207 doc/guix.texi:21221
-#: doc/guix.texi:21373 doc/guix.texi:22406 doc/guix.texi:22494
-#: doc/guix.texi:22510 doc/guix.texi:22560
+#: guix-git/doc/guix.texi:18525 guix-git/doc/guix.texi:18605
+#: guix-git/doc/guix.texi:18901 guix-git/doc/guix.texi:21640
+#: guix-git/doc/guix.texi:21691 guix-git/doc/guix.texi:21698
+#: guix-git/doc/guix.texi:22752 guix-git/doc/guix.texi:22940
+#: guix-git/doc/guix.texi:23057 guix-git/doc/guix.texi:23093
+#: guix-git/doc/guix.texi:23144 guix-git/doc/guix.texi:23163
+#: guix-git/doc/guix.texi:23173 guix-git/doc/guix.texi:23183
+#: guix-git/doc/guix.texi:23242 guix-git/doc/guix.texi:23264
+#: guix-git/doc/guix.texi:23289 guix-git/doc/guix.texi:23315
+#: guix-git/doc/guix.texi:23333 guix-git/doc/guix.texi:26513
+#: guix-git/doc/guix.texi:26541 guix-git/doc/guix.texi:26668
+#: guix-git/doc/guix.texi:26675 guix-git/doc/guix.texi:26683
+#: guix-git/doc/guix.texi:26720 guix-git/doc/guix.texi:26734
+#: guix-git/doc/guix.texi:26823 guix-git/doc/guix.texi:26830
+#: guix-git/doc/guix.texi:26838 guix-git/doc/guix.texi:27561
+#: guix-git/doc/guix.texi:27701 guix-git/doc/guix.texi:27887
+#: guix-git/doc/guix.texi:27894 guix-git/doc/guix.texi:27916
+#: guix-git/doc/guix.texi:27955 guix-git/doc/guix.texi:27975
+#: guix-git/doc/guix.texi:27989 guix-git/doc/guix.texi:28202
+#: guix-git/doc/guix.texi:30059 guix-git/doc/guix.texi:30147
+#: guix-git/doc/guix.texi:30163 guix-git/doc/guix.texi:30213
 msgid "Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14098
+#: guix-git/doc/guix.texi:18527
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer dirty-clean-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14102
+#: guix-git/doc/guix.texi:18531
 msgid "Specifies the delay for updating of configuration and state files, in seconds.  A value of 0 causes the update to happen as soon as possible, typically within a few milliseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14104 doc/guix.texi:14152 doc/guix.texi:14161
-#: doc/guix.texi:14182 doc/guix.texi:14479
+#: guix-git/doc/guix.texi:18533 guix-git/doc/guix.texi:18581
+#: guix-git/doc/guix.texi:18590 guix-git/doc/guix.texi:18611
+#: guix-git/doc/guix.texi:18908 guix-git/doc/guix.texi:23102
+#: guix-git/doc/guix.texi:23135
 msgid "Defaults to @samp{30}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14106
+#: guix-git/doc/guix.texi:18535
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} error-policy error-policy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14112
-msgid "Specifies what to do when an error occurs.  Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; @code{retry-this-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer."
+#: guix-git/doc/guix.texi:18541
+msgid "Specifies what to do when an error occurs.  Possible values are @code{abort-job}, which will discard the failed print job; @code{retry-job}, which will retry the job at a later time; @code{retry-current-job}, which retries the failed job immediately; and @code{stop-printer}, which stops the printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14114
+#: guix-git/doc/guix.texi:18543
 msgid "Defaults to @samp{stop-printer}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14116
+#: guix-git/doc/guix.texi:18545
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14124
+#: guix-git/doc/guix.texi:18553
 msgid "Specifies the maximum cost of filters that are run concurrently, which can be used to minimize disk, memory, and CPU resource problems.  A limit of 0 disables filter limiting.  An average print to a non-PostScript printer needs a filter limit of about 200.  A PostScript printer needs about half that (100).  Setting the limit below these thresholds will effectively limit the scheduler to printing a single job at any time."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14126 doc/guix.texi:14134 doc/guix.texi:14189
-#: doc/guix.texi:14305 doc/guix.texi:14319 doc/guix.texi:14326
-#: doc/guix.texi:15432 doc/guix.texi:15448 doc/guix.texi:16094
-#: doc/guix.texi:16106 doc/guix.texi:20809 doc/guix.texi:21134
-#: doc/guix.texi:22399 doc/guix.texi:22699 doc/guix.texi:22873
+#: guix-git/doc/guix.texi:18555 guix-git/doc/guix.texi:18563
+#: guix-git/doc/guix.texi:18618 guix-git/doc/guix.texi:18734
+#: guix-git/doc/guix.texi:18748 guix-git/doc/guix.texi:18755
+#: guix-git/doc/guix.texi:20206 guix-git/doc/guix.texi:20222
+#: guix-git/doc/guix.texi:20868 guix-git/doc/guix.texi:20880
+#: guix-git/doc/guix.texi:21659 guix-git/doc/guix.texi:21668
+#: guix-git/doc/guix.texi:21676 guix-git/doc/guix.texi:21684
+#: guix-git/doc/guix.texi:27577 guix-git/doc/guix.texi:27902
+#: guix-git/doc/guix.texi:30052 guix-git/doc/guix.texi:30352
+#: guix-git/doc/guix.texi:30526
 msgid "Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14128
+#: guix-git/doc/guix.texi:18557
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer filter-nice"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14132
+#: guix-git/doc/guix.texi:18561
 msgid "Specifies the scheduling priority of filters that are run to print a job.  The nice value ranges from 0, the highest priority, to 19, the lowest priority."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14136
+#: guix-git/doc/guix.texi:18565
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-lookups host-name-lookups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14143
+#: guix-git/doc/guix.texi:18572
 msgid "Specifies whether to do reverse lookups on connecting clients.  The @code{double} setting causes @code{cupsd} to verify that the hostname resolved from the address matches one of the addresses returned for that hostname.  Double lookups also prevent clients with unregistered addresses from connecting to your server.  Only set this option to @code{#t} or @code{double} if absolutely required."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14147
+#: guix-git/doc/guix.texi:18576
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-kill-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14150
+#: guix-git/doc/guix.texi:18579
 msgid "Specifies the number of seconds to wait before killing the filters and backend associated with a canceled or held job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14154
+#: guix-git/doc/guix.texi:18583
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14159
+#: guix-git/doc/guix.texi:18588
 msgid "Specifies the interval between retries of jobs in seconds.  This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14163
+#: guix-git/doc/guix.texi:18592
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer job-retry-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14168
+#: guix-git/doc/guix.texi:18597
 msgid "Specifies the number of retries that are done for jobs.  This is typically used for fax queues but can also be used with normal print queues whose error policy is @code{retry-job} or @code{retry-current-job}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14170 doc/guix.texi:21625 doc/guix.texi:21645
-#: doc/guix.texi:21661 doc/guix.texi:21675 doc/guix.texi:21682
-#: doc/guix.texi:21689 doc/guix.texi:21696 doc/guix.texi:21855
-#: doc/guix.texi:21871 doc/guix.texi:21878 doc/guix.texi:21885
-#: doc/guix.texi:21896 doc/guix.texi:22351 doc/guix.texi:22359
-#: doc/guix.texi:22367 doc/guix.texi:22391
+#: guix-git/doc/guix.texi:18599 guix-git/doc/guix.texi:23066
+#: guix-git/doc/guix.texi:28454 guix-git/doc/guix.texi:28474
+#: guix-git/doc/guix.texi:28490 guix-git/doc/guix.texi:28504
+#: guix-git/doc/guix.texi:28511 guix-git/doc/guix.texi:28518
+#: guix-git/doc/guix.texi:28525 guix-git/doc/guix.texi:28685
+#: guix-git/doc/guix.texi:28701 guix-git/doc/guix.texi:28708
+#: guix-git/doc/guix.texi:28715 guix-git/doc/guix.texi:28726
+#: guix-git/doc/guix.texi:30004 guix-git/doc/guix.texi:30012
+#: guix-git/doc/guix.texi:30020 guix-git/doc/guix.texi:30044
 msgid "Defaults to @samp{5}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14172
+#: guix-git/doc/guix.texi:18601
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean keep-alive?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14174
+#: guix-git/doc/guix.texi:18603
 msgid "Specifies whether to support HTTP keep-alive connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14178
+#: guix-git/doc/guix.texi:18607
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer keep-alive-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14180
+#: guix-git/doc/guix.texi:18609
 msgid "Specifies how long an idle client connection remains open, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14184
+#: guix-git/doc/guix.texi:18613
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer limit-request-body"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14187
+#: guix-git/doc/guix.texi:18616
 msgid "Specifies the maximum size of print files, IPP requests, and HTML form data.  A limit of 0 disables the limit check."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14191
+#: guix-git/doc/guix.texi:18620
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14198
+#: guix-git/doc/guix.texi:18627
 msgid "Listens on the specified interfaces for connections.  Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses.  Values can also be file names of local UNIX domain sockets.  The Listen directive is similar to the Port directive but allows you to restrict access to specific interfaces or networks."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14200
+#: guix-git/doc/guix.texi:18629
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer listen-back-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14207
+#: guix-git/doc/guix.texi:18636
 msgid "Specifies the number of pending connections that will be allowed.  This normally only affects very busy servers that have reached the MaxClients limit, but can also be triggered by large numbers of simultaneous connections.  When the limit is reached, the operating system will refuse additional connections until the scheduler can accept the pending ones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14209
+#: guix-git/doc/guix.texi:18638
 msgid "Defaults to @samp{128}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14211
+#: guix-git/doc/guix.texi:18640
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} location-access-control-list location-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14213
+#: guix-git/doc/guix.texi:18642
 msgid "Specifies a set of additional access controls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14215
+#: guix-git/doc/guix.texi:18644
 msgid "Available @code{location-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14216
+#: guix-git/doc/guix.texi:18645
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} file-name path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14218
+#: guix-git/doc/guix.texi:18647
 msgid "Specifies the URI path to which the access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14220
+#: guix-git/doc/guix.texi:18649
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14223
+#: guix-git/doc/guix.texi:18652
 msgid "Access controls for all access to this path, in the same format as the @code{access-controls} of @code{operation-access-control}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14225 doc/guix.texi:14231 doc/guix.texi:14245
-#: doc/guix.texi:14252 doc/guix.texi:14394 doc/guix.texi:14453
-#: doc/guix.texi:14537 doc/guix.texi:14548 doc/guix.texi:16580
-#: doc/guix.texi:17774 doc/guix.texi:17878 doc/guix.texi:18303
-#: doc/guix.texi:18311 doc/guix.texi:18556 doc/guix.texi:20143
-#: doc/guix.texi:20290 doc/guix.texi:20478 doc/guix.texi:21516
-#: doc/guix.texi:21576 doc/guix.texi:21584 doc/guix.texi:22414
-#: doc/guix.texi:22421 doc/guix.texi:22763 doc/guix.texi:22841
-#: doc/guix.texi:22935 doc/guix.texi:22943 doc/guix.texi:22979
-#: doc/guix.texi:23129 doc/guix.texi:23180 doc/guix.texi:23189
+#: guix-git/doc/guix.texi:18654 guix-git/doc/guix.texi:18660
+#: guix-git/doc/guix.texi:18674 guix-git/doc/guix.texi:18681
+#: guix-git/doc/guix.texi:18823 guix-git/doc/guix.texi:18882
+#: guix-git/doc/guix.texi:18960 guix-git/doc/guix.texi:18974
+#: guix-git/doc/guix.texi:21354 guix-git/doc/guix.texi:21557
+#: guix-git/doc/guix.texi:21585 guix-git/doc/guix.texi:21615
+#: guix-git/doc/guix.texi:21730 guix-git/doc/guix.texi:21743
+#: guix-git/doc/guix.texi:21750 guix-git/doc/guix.texi:23272
+#: guix-git/doc/guix.texi:23667 guix-git/doc/guix.texi:23771
+#: guix-git/doc/guix.texi:24198 guix-git/doc/guix.texi:24206
+#: guix-git/doc/guix.texi:24451 guix-git/doc/guix.texi:26572
+#: guix-git/doc/guix.texi:26741 guix-git/doc/guix.texi:26940
+#: guix-git/doc/guix.texi:28345 guix-git/doc/guix.texi:28405
+#: guix-git/doc/guix.texi:28413 guix-git/doc/guix.texi:30067
+#: guix-git/doc/guix.texi:30074 guix-git/doc/guix.texi:30416
+#: guix-git/doc/guix.texi:30494 guix-git/doc/guix.texi:30588
+#: guix-git/doc/guix.texi:30596 guix-git/doc/guix.texi:30632
+#: guix-git/doc/guix.texi:30782 guix-git/doc/guix.texi:30833
+#: guix-git/doc/guix.texi:30842
 msgid "Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14227
+#: guix-git/doc/guix.texi:18656
 #, no-wrap
 msgid "{@code{location-access-controls} parameter} method-access-control-list method-access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14229
+#: guix-git/doc/guix.texi:18658
 msgid "Access controls for method-specific access to this path."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14233
+#: guix-git/doc/guix.texi:18662
 msgid "Available @code{method-access-controls} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14234
+#: guix-git/doc/guix.texi:18663
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} boolean reverse?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14237
+#: guix-git/doc/guix.texi:18666
 msgid "If @code{#t}, apply access controls to all methods except the listed methods.  Otherwise apply to only the listed methods."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14241
+#: guix-git/doc/guix.texi:18670
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} method-list methods"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14243
+#: guix-git/doc/guix.texi:18672
 msgid "Methods to which this access control applies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14247
+#: guix-git/doc/guix.texi:18676
 #, no-wrap
 msgid "{@code{method-access-controls} parameter} access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14250
-msgid "Access control directives, as a list of strings.  Each string should be one directive, such as \"Order allow,deny\"."
+#: guix-git/doc/guix.texi:18679
+msgid "Access control directives, as a list of strings.  Each string should be one directive, such as @samp{\"Order allow,deny\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14256
+#: guix-git/doc/guix.texi:18685
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer log-debug-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14260
+#: guix-git/doc/guix.texi:18689
 msgid "Specifies the number of debugging messages that are retained for logging if an error occurs in a print job.  Debug messages are logged regardless of the LogLevel setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14262 doc/guix.texi:14283 doc/guix.texi:14290
-#: doc/guix.texi:16340 doc/guix.texi:20463
+#: guix-git/doc/guix.texi:18691 guix-git/doc/guix.texi:18712
+#: guix-git/doc/guix.texi:18719 guix-git/doc/guix.texi:21114
+#: guix-git/doc/guix.texi:22804 guix-git/doc/guix.texi:22819
+#: guix-git/doc/guix.texi:26925
 msgid "Defaults to @samp{100}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14264
+#: guix-git/doc/guix.texi:18693
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-level log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14267
+#: guix-git/doc/guix.texi:18696
 msgid "Specifies the level of logging for the ErrorLog file.  The value @code{none} stops all logging while @code{debug2} logs everything."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14269
+#: guix-git/doc/guix.texi:18698 guix-git/doc/guix.texi:23281
 msgid "Defaults to @samp{info}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14271
+#: guix-git/doc/guix.texi:18700
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} log-time-format log-time-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14274
+#: guix-git/doc/guix.texi:18703
 msgid "Specifies the format of the date and time in the log files.  The value @code{standard} logs whole seconds while @code{usecs} logs microseconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14276
+#: guix-git/doc/guix.texi:18705
 msgid "Defaults to @samp{standard}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14278
+#: guix-git/doc/guix.texi:18707
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14281
+#: guix-git/doc/guix.texi:18710
 msgid "Specifies the maximum number of simultaneous clients that are allowed by the scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14285
+#: guix-git/doc/guix.texi:18714
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-clients-per-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14288
+#: guix-git/doc/guix.texi:18717
 msgid "Specifies the maximum number of simultaneous clients that are allowed from a single address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14292
+#: guix-git/doc/guix.texi:18721
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-copies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14295
+#: guix-git/doc/guix.texi:18724
 msgid "Specifies the maximum number of copies that a user can print of each job."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14297
+#: guix-git/doc/guix.texi:18726
 msgid "Defaults to @samp{9999}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14299
+#: guix-git/doc/guix.texi:18728
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-hold-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14303
+#: guix-git/doc/guix.texi:18732
 msgid "Specifies the maximum time a job may remain in the @code{indefinite} hold state before it is canceled.  A value of 0 disables cancellation of held jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14307
+#: guix-git/doc/guix.texi:18736
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14310
+#: guix-git/doc/guix.texi:18739
 msgid "Specifies the maximum number of simultaneous jobs that are allowed.  Set to 0 to allow an unlimited number of jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14312
+#: guix-git/doc/guix.texi:18741
 msgid "Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14314
+#: guix-git/doc/guix.texi:18743
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-printer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14317
+#: guix-git/doc/guix.texi:18746
 msgid "Specifies the maximum number of simultaneous jobs that are allowed per printer.  A value of 0 allows up to MaxJobs jobs per printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14321
+#: guix-git/doc/guix.texi:18750
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-jobs-per-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14324
+#: guix-git/doc/guix.texi:18753
 msgid "Specifies the maximum number of simultaneous jobs that are allowed per user.  A value of 0 allows up to MaxJobs jobs per user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14328
+#: guix-git/doc/guix.texi:18757
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-job-time"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14331
-msgid "Specifies the maximum time a job may take to print before it is canceled, in seconds.  Set to 0 to disable cancellation of \"stuck\" jobs."
+#: guix-git/doc/guix.texi:18760
+msgid "Specifies the maximum time a job may take to print before it is canceled, in seconds.  Set to 0 to disable cancellation of ``stuck'' jobs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14333
+#: guix-git/doc/guix.texi:18762
 msgid "Defaults to @samp{10800}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14335
+#: guix-git/doc/guix.texi:18764
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer max-log-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14338
+#: guix-git/doc/guix.texi:18767
 msgid "Specifies the maximum size of the log files before they are rotated, in bytes.  The value 0 disables log rotation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14340
+#: guix-git/doc/guix.texi:18769
 msgid "Defaults to @samp{1048576}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14342
+#: guix-git/doc/guix.texi:18771
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer multiple-operation-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14345
+#: guix-git/doc/guix.texi:18774
 msgid "Specifies the maximum amount of time to allow between files in a multiple file print job, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14347 doc/guix.texi:14561 doc/guix.texi:20077
+#: guix-git/doc/guix.texi:18776 guix-git/doc/guix.texi:18987
+#: guix-git/doc/guix.texi:26506
 msgid "Defaults to @samp{300}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14349
+#: guix-git/doc/guix.texi:18778
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string page-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14354
+#: guix-git/doc/guix.texi:18783
 msgid "Specifies the format of PageLog lines.  Sequences beginning with percent (@samp{%}) characters are replaced with the corresponding information, while all other characters are copied literally.  The following percent sequences are recognized:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14356
+#: guix-git/doc/guix.texi:18785
 #, no-wrap
 msgid "%%"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14358
+#: guix-git/doc/guix.texi:18787
 msgid "insert a single percent character"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14359
+#: guix-git/doc/guix.texi:18788
 #, no-wrap
 msgid "%@{name@}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14361
+#: guix-git/doc/guix.texi:18790
 msgid "insert the value of the specified IPP attribute"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14362
+#: guix-git/doc/guix.texi:18791
 #, no-wrap
 msgid "%C"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14364
+#: guix-git/doc/guix.texi:18793
 msgid "insert the number of copies for the current page"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14365
+#: guix-git/doc/guix.texi:18794
 #, no-wrap
 msgid "%P"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14367
+#: guix-git/doc/guix.texi:18796
 msgid "insert the current page number"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14368
+#: guix-git/doc/guix.texi:18797
 #, no-wrap
 msgid "%T"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14370
+#: guix-git/doc/guix.texi:18799
 msgid "insert the current date and time in common log format"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14371
+#: guix-git/doc/guix.texi:18800
 #, no-wrap
 msgid "%j"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14373
+#: guix-git/doc/guix.texi:18802
 msgid "insert the job ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14374 doc/guix.texi:15950
+#: guix-git/doc/guix.texi:18803 guix-git/doc/guix.texi:20724
 #, no-wrap
 msgid "%p"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14376
+#: guix-git/doc/guix.texi:18805
 msgid "insert the printer name"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14377 doc/guix.texi:15973
+#: guix-git/doc/guix.texi:18806 guix-git/doc/guix.texi:20747
 #, no-wrap
 msgid "%u"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14379
+#: guix-git/doc/guix.texi:18808
 msgid "insert the username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14385
+#: guix-git/doc/guix.texi:18814
 msgid "A value of the empty string disables page logging.  The string @code{%p %u %j %T %P %C %@{job-billing@} %@{job-originating-host-name@} %@{job-name@} %@{media@} %@{sides@}} creates a page log with the standard items."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14389
+#: guix-git/doc/guix.texi:18818
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} environment-variables environment-variables"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14392
+#: guix-git/doc/guix.texi:18821
 msgid "Passes the specified environment variable(s) to child processes; a list of strings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14396
+#: guix-git/doc/guix.texi:18825
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} policy-configuration-list policies"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14398
+#: guix-git/doc/guix.texi:18827
 msgid "Specifies named access control policies."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14400
+#: guix-git/doc/guix.texi:18829
 msgid "Available @code{policy-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14401
+#: guix-git/doc/guix.texi:18830
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14403
+#: guix-git/doc/guix.texi:18832
 msgid "Name of the policy."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14405
+#: guix-git/doc/guix.texi:18834
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14415
+#: guix-git/doc/guix.texi:18844
 msgid "Specifies an access list for a job's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14417 doc/guix.texi:14439
+#: guix-git/doc/guix.texi:18846 guix-git/doc/guix.texi:18868
 msgid "Defaults to @samp{\"@@OWNER @@SYSTEM\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14419
+#: guix-git/doc/guix.texi:18848
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string job-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14422 doc/guix.texi:14444
+#: guix-git/doc/guix.texi:18851 guix-git/doc/guix.texi:18873
 msgid "Specifies the list of job values to make private, or @code{all}, @code{default}, or @code{none}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14425
+#: guix-git/doc/guix.texi:18854
 msgid "Defaults to @samp{\"job-name job-originating-host-name job-originating-user-name phone\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14427
+#: guix-git/doc/guix.texi:18856
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-access"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14437
+#: guix-git/doc/guix.texi:18866
 msgid "Specifies an access list for a subscription's private values.  @code{@@ACL} maps to the printer's requesting-user-name-allowed or requesting-user-name-denied values.  @code{@@OWNER} maps to the job's owner.  @code{@@SYSTEM} maps to the groups listed for the @code{system-group} field of the @code{files-config} configuration, which is reified into the @code{cups-files.conf(5)} file.  Other possible elements of the access list include specific user names, and @code{@@@var{group}} to indicate members of a specific group.  The access list may also be simply @code{all} or @code{default}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14441
+#: guix-git/doc/guix.texi:18870
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} string subscription-private-values"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14447
+#: guix-git/doc/guix.texi:18876
 msgid "Defaults to @samp{\"notify-events notify-pull-method notify-recipient-uri notify-subscriber-user-name notify-user-data\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14449
+#: guix-git/doc/guix.texi:18878
 #, no-wrap
 msgid "{@code{policy-configuration} parameter} operation-access-control-list access-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14451
+#: guix-git/doc/guix.texi:18880
 msgid "Access control by IPP operation."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14456
+#: guix-git/doc/guix.texi:18885
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14461
+#: guix-git/doc/guix.texi:18890
 msgid "Specifies whether job files (documents) are preserved after a job is printed.  If a numeric value is specified, job files are preserved for the indicated number of seconds after printing.  Otherwise a boolean value applies indefinitely."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14463
+#: guix-git/doc/guix.texi:18892
 msgid "Defaults to @samp{86400}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14465
+#: guix-git/doc/guix.texi:18894
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean-or-non-negative-integer preserve-job-history"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14470
+#: guix-git/doc/guix.texi:18899
 msgid "Specifies whether the job history is preserved after a job is printed.  If a numeric value is specified, the job history is preserved for the indicated number of seconds after printing.  If @code{#t}, the job history is preserved until the MaxJobs limit is reached."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14474
+#: guix-git/doc/guix.texi:18903
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer reload-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14477
+#: guix-git/doc/guix.texi:18906
 msgid "Specifies the amount of time to wait for job completion before restarting the scheduler."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14481
+#: guix-git/doc/guix.texi:18910
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string rip-cache"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14484
+#: guix-git/doc/guix.texi:18913
 msgid "Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14486
+#: guix-git/doc/guix.texi:18915
 msgid "Defaults to @samp{\"128m\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14488
+#: guix-git/doc/guix.texi:18917
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-admin"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14490
+#: guix-git/doc/guix.texi:18919
 msgid "Specifies the email address of the server administrator."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14492
+#: guix-git/doc/guix.texi:18921
 msgid "Defaults to @samp{\"root@@localhost.localdomain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14494
+#: guix-git/doc/guix.texi:18923
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} host-name-list-or-* server-alias"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14502
+#: guix-git/doc/guix.texi:18931
 msgid "The ServerAlias directive is used for HTTP Host header validation when clients connect to the scheduler from external interfaces.  Using the special name @code{*} can expose your system to known browser-based DNS rebinding attacks, even when accessing sites through a firewall.  If the auto-discovery of alternate names does not work, we recommend listing each alternate name with a ServerAlias directive instead of using @code{*}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14504
+#: guix-git/doc/guix.texi:18933
 msgid "Defaults to @samp{*}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14506
+#: guix-git/doc/guix.texi:18935
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} string server-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14508
+#: guix-git/doc/guix.texi:18937
 msgid "Specifies the fully-qualified host name of the server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14510 doc/guix.texi:17901 doc/guix.texi:17945
+#: guix-git/doc/guix.texi:18939 guix-git/doc/guix.texi:23794
+#: guix-git/doc/guix.texi:23839
 msgid "Defaults to @samp{\"localhost\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14512
+#: guix-git/doc/guix.texi:18941
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} server-tokens server-tokens"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14520
+#: guix-git/doc/guix.texi:18949
 msgid "Specifies what information is included in the Server header of HTTP responses.  @code{None} disables the Server header.  @code{ProductOnly} reports @code{CUPS}.  @code{Major} reports @code{CUPS 2}.  @code{Minor} reports @code{CUPS 2.0}.  @code{Minimal} reports @code{CUPS 2.0.0}.  @code{OS} reports @code{CUPS 2.0.0 (@var{uname})} where @var{uname} is the output of the @code{uname} command.  @code{Full} reports @code{CUPS 2.0.0 (@var{uname}) IPP/2.0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14522
+#: guix-git/doc/guix.texi:18951
 msgid "Defaults to @samp{Minimal}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14524
-#, no-wrap
-msgid "{@code{cups-configuration} parameter} string set-env"
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14526
-msgid "Set the specified environment variable to be passed to child processes."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14528
-msgid "Defaults to @samp{\"variable value\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:14530
+#: guix-git/doc/guix.texi:18953
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} multiline-string-list ssl-listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14535
+#: guix-git/doc/guix.texi:18958
 msgid "Listens on the specified interfaces for encrypted connections.  Valid values are of the form @var{address}:@var{port}, where @var{address} is either an IPv6 address enclosed in brackets, an IPv4 address, or @code{*} to indicate all addresses."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14539
+#: guix-git/doc/guix.texi:18962
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} ssl-options ssl-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14546
-msgid "Sets encryption options.  By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.  The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients that do not implement newer ones.  The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0."
+#: guix-git/doc/guix.texi:18972
+msgid "Sets encryption options.  By default, CUPS only supports encryption using TLS v1.0 or higher using known secure cipher suites.  Security is reduced when @code{Allow} options are used, and enhanced when @code{Deny} options are used.  The @code{AllowRC4} option enables the 128-bit RC4 cipher suites, which are required for some older clients.  The @code{AllowSSL3} option enables SSL v3.0, which is required for some older clients that do not support TLS v1.0.  The @code{DenyCBC} option disables all CBC cipher suites.  The @code{DenyTLS1.0} option disables TLS v1.0 support - this sets the minimum protocol version to TLS v1.1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14550
+#: guix-git/doc/guix.texi:18976
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean strict-conformance?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14553
+#: guix-git/doc/guix.texi:18979
 msgid "Specifies whether the scheduler requires clients to strictly adhere to the IPP specifications."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14557
+#: guix-git/doc/guix.texi:18983
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} non-negative-integer timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14559
+#: guix-git/doc/guix.texi:18985
 msgid "Specifies the HTTP request timeout, in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14564
+#: guix-git/doc/guix.texi:18990
 #, no-wrap
 msgid "{@code{cups-configuration} parameter} boolean web-interface?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14566
+#: guix-git/doc/guix.texi:18992
 msgid "Specifies whether the web interface is enabled."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14576
+#: guix-git/doc/guix.texi:19002
 msgid "At this point you're probably thinking ``oh dear, Guix manual, I like you but you can stop already with the configuration options''.  Indeed.  However, one more point: it could be that you have an existing @code{cupsd.conf} that you want to use.  In that case, you can pass an @code{opaque-cups-configuration} as the configuration of a @code{cups-service-type}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14578
+#: guix-git/doc/guix.texi:19004
 msgid "Available @code{opaque-cups-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14579
+#: guix-git/doc/guix.texi:19005
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} package cups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14583
+#: guix-git/doc/guix.texi:19009
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cupsd.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14585
+#: guix-git/doc/guix.texi:19011
 msgid "The contents of the @code{cupsd.conf}, as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14587
+#: guix-git/doc/guix.texi:19013
 #, no-wrap
 msgid "{@code{opaque-cups-configuration} parameter} string cups-files.conf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:14589
+#: guix-git/doc/guix.texi:19015
 msgid "The contents of the @code{cups-files.conf} file, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14594
+#: guix-git/doc/guix.texi:19020
 msgid "For example, if your @code{cupsd.conf} and @code{cups-files.conf} are in strings of the same name, you could instantiate a CUPS service like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:14600
+#. type: lisp
+#: guix-git/doc/guix.texi:19026
 #, no-wrap
 msgid ""
 "(service cups-service-type\n"
@@ -26175,195 +34395,241 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14611
+#: guix-git/doc/guix.texi:19037
 msgid "The @code{(gnu services desktop)} module provides services that are usually useful in the context of a ``desktop'' setup---that is, on a machine running a graphical display server, possibly with graphical user interfaces, etc.  It also defines services that provide specific desktop environments like GNOME, Xfce or MATE."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14615
+#: guix-git/doc/guix.texi:19041
 msgid "To simplify things, the module defines a variable containing the set of services that users typically expect on a machine with a graphical environment and networking:"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14616
+#: guix-git/doc/guix.texi:19042
 #, no-wrap
 msgid "{Scheme Variable} %desktop-services"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14619
-msgid "This is a list of services that builds upon @var{%base-services} and adds or adjusts services for a typical ``desktop'' setup."
+#: guix-git/doc/guix.texi:19045
+msgid "This is a list of services that builds upon @code{%base-services} and adds or adjusts services for a typical ``desktop'' setup."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14629
-msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})."
+#: guix-git/doc/guix.texi:19056
+msgid "In particular, it adds a graphical login manager (@pxref{X Window, @code{gdm-service-type}}), screen lockers, a network management tool (@pxref{Networking Services, @code{network-manager-service-type}}) with modem support (@pxref{Networking Services, @code{modem-manager-service-type}}), energy and color management services, the @code{elogind} login and seat manager, the Polkit privilege service, the GeoClue location service, the AccountsService daemon that allows authorized users change system passwords, an NTP client (@pxref{Networking Services}), the Avahi daemon, and has the name service switch service configured to be able to use @code{nss-mdns} (@pxref{Name Service Switch, mDNS})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14634
-msgid "The @var{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})."
+#: guix-git/doc/guix.texi:19061
+msgid "The @code{%desktop-services} variable can be used as the @code{services} field of an @code{operating-system} declaration (@pxref{operating-system Reference, @code{services}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14657
-msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system.  To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile.  Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface.  To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile.  ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expetected."
+#: guix-git/doc/guix.texi:19084
+msgid "Additionally, the @code{gnome-desktop-service-type}, @code{xfce-desktop-service}, @code{mate-desktop-service-type}, @code{lxqt-desktop-service-type} and @code{enlightenment-desktop-service-type} procedures can add GNOME, Xfce, MATE and/or Enlightenment to a system.  To ``add GNOME'' means that system-level services like the backlight adjustment helpers and the power management utilities are added to the system, extending @code{polkit} and @code{dbus} appropriately, allowing GNOME to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service made by @code{gnome-desktop-service-type} adds the GNOME metapackage to the system profile.  Likewise, adding the Xfce service not only adds the @code{xfce} metapackage to the system profile, but it also gives the Thunar file manager the ability to open a ``root-mode'' file management window, if the user authenticates using the administrator's password via the standard polkit graphical interface.  To ``add MATE'' means that @code{polkit} and @code{dbus} are extended appropriately, allowing MATE to operate with elevated privileges on a limited number of special-purpose system interfaces.  Additionally, adding a service of type @code{mate-desktop-service-type} adds the MATE metapackage to the system profile.  ``Adding Enlightenment'' means that @code{dbus} is extended appropriately, and several of Enlightenment's binaries are set as setuid, allowing Enlightenment's screen locker and other functionality to work as expected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14666
-msgid "The desktop environments in Guix use the Xorg display server by default.  If you'd like to use the newer display server protocol called Wayland, you need to use the @code{sddm-service} instead of GDM as the graphical login manager.  You should then select the ``GNOME (Wayland)'' session in SDDM.  Alternatively you can also try starting GNOME on Wayland manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``.  Currently only GNOME has support for Wayland."
+#: guix-git/doc/guix.texi:19093
+msgid "The desktop environments in Guix use the Xorg display server by default.  If you'd like to use the newer display server protocol called Wayland, you need to use the @code{sddm-service} instead of GDM as the graphical login manager.  You should then select the ``GNOME (Wayland)'' session in SDDM@.  Alternatively you can also try starting GNOME on Wayland manually from a TTY with the command ``XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session``.  Currently only GNOME has support for Wayland."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14667
+#: guix-git/doc/guix.texi:19094
 #, no-wrap
 msgid "{Scheme Variable} gnome-desktop-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14671
-msgid "This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment.  Its value is a @code{gnome-desktop-configuration} object (see below.)"
+#: guix-git/doc/guix.texi:19098
+msgid "This is the type of the service that adds the @uref{https://www.gnome.org, GNOME} desktop environment.  Its value is a @code{gnome-desktop-configuration} object (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14674
+#: guix-git/doc/guix.texi:19101
 msgid "This service adds the @code{gnome} package to the system profile, and extends polkit with the actions from @code{gnome-settings-daemon}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14676
+#: guix-git/doc/guix.texi:19103
 #, no-wrap
 msgid "{Data Type} gnome-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14678
+#: guix-git/doc/guix.texi:19105
 msgid "Configuration record for the GNOME desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14680
+#: guix-git/doc/guix.texi:19107
 #, no-wrap
 msgid "@code{gnome} (default: @code{gnome})"
 msgstr "@code{gnome}（默认值：@code{gnome}）"
 
 #. type: table
-#: doc/guix.texi:14682
+#: guix-git/doc/guix.texi:19109
 msgid "The GNOME package to use."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14685
+#: guix-git/doc/guix.texi:19112
 #, no-wrap
 msgid "{Scheme Variable} xfce-desktop-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14689
-msgid "This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment.  Its value is an @code{xfce-desktop-configuration} object (see below.)"
+#: guix-git/doc/guix.texi:19116
+msgid "This is the type of a service to run the @uref{Xfce, https://xfce.org/} desktop environment.  Its value is an @code{xfce-desktop-configuration} object (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14694
+#: guix-git/doc/guix.texi:19121
 msgid "This service adds the @code{xfce} package to the system profile, and extends polkit with the ability for @code{thunar} to manipulate the file system as root from within a user session, after the user has authenticated with the administrator's password."
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:19127
+msgid "Note that @code{xfce4-panel} and its plugin packages should be installed in the same profile to ensure compatibility.  When using this service, you should add extra plugins (@code{xfce4-whiskermenu-plugin}, @code{xfce4-weather-plugin}, etc.) to the @code{packages} field of your @code{operating-system}."
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:14696
+#: guix-git/doc/guix.texi:19129
 #, no-wrap
 msgid "{Data Type} xfce-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14698
+#: guix-git/doc/guix.texi:19131
 msgid "Configuration record for the Xfce desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14700
+#: guix-git/doc/guix.texi:19133
 #, no-wrap
 msgid "@code{xfce} (default: @code{xfce})"
 msgstr "@code{xfce}（默认值：@code{xfce}）"
 
 #. type: table
-#: doc/guix.texi:14702
+#: guix-git/doc/guix.texi:19135
 msgid "The Xfce package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14705
+#: guix-git/doc/guix.texi:19138
 #, no-wrap
 msgid "{Scheme Variable} mate-desktop-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14709
-msgid "This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}.  Its value is a @code{mate-desktop-configuration} object (see below.)"
+#: guix-git/doc/guix.texi:19142
+msgid "This is the type of the service that runs the @uref{https://mate-desktop.org/, MATE desktop environment}.  Its value is a @code{mate-desktop-configuration} object (see below)."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14713
+#: guix-git/doc/guix.texi:19146
 msgid "This service adds the @code{mate} package to the system profile, and extends polkit with the actions from @code{mate-settings-daemon}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14715
+#: guix-git/doc/guix.texi:19148
 #, no-wrap
 msgid "{Data Type} mate-desktop-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14717
+#: guix-git/doc/guix.texi:19150
 msgid "Configuration record for the MATE desktop environment."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14719
+#: guix-git/doc/guix.texi:19152
 #, no-wrap
 msgid "@code{mate} (default: @code{mate})"
 msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:14721
+#: guix-git/doc/guix.texi:19154
 msgid "The MATE package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14724
+#: guix-git/doc/guix.texi:19157
+#, no-wrap
+msgid "{Scheme Variable} lxqt-desktop-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19161
+msgid "This is the type of the service that runs the @uref{https://lxqt.github.io, LXQt desktop environment}.  Its value is a @code{lxqt-desktop-configuration} object (see below)."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19164
+msgid "This service adds the @code{lxqt} package to the system profile."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19166
+#, no-wrap
+msgid "{Data Type} lxqt-desktop-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19168
+msgid "Configuration record for the LXQt desktop environment."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19170
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{lxqt} (default: @code{lxqt})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19172
+#, fuzzy
+#| msgid "The package data type."
+msgid "The LXQT package to use."
+msgstr "软件包数据类型。"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19175
 #, no-wrap
 msgid "{Scheme Variable} enlightenment-desktop-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14727
+#: guix-git/doc/guix.texi:19178
 msgid "Return a service that adds the @code{enlightenment} package to the system profile, and extends dbus with actions from @code{efl}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14729
+#: guix-git/doc/guix.texi:19180
 #, no-wrap
 msgid "{Data Type} enlightenment-desktop-service-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14731
+#: guix-git/doc/guix.texi:19182
 #, no-wrap
 msgid "@code{enlightenment} (default: @code{enlightenment})"
 msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
 
 #. type: table
-#: doc/guix.texi:14733
+#: guix-git/doc/guix.texi:19184
 msgid "The enlightenment package to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14741
+#: guix-git/doc/guix.texi:19192
 msgid "Because the GNOME, Xfce and MATE desktop services pull in so many packages, the default @code{%desktop-services} variable doesn't include any of them by default.  To add GNOME, Xfce or MATE, just @code{cons} them onto @code{%desktop-services} in the @code{services} field of your @code{operating-system}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:14752
+#. type: lisp
+#: guix-git/doc/guix.texi:19203
 #, no-wrap
 msgid ""
 "(use-modules (gnu))\n"
@@ -26378,666 +34644,819 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14756
+#: guix-git/doc/guix.texi:19207
 msgid "These desktop environments will then be available as options in the graphical login window."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:14760
+#: guix-git/doc/guix.texi:19211
 msgid "The actual service definitions included in @code{%desktop-services} and provided by @code{(gnu services dbus)} and @code{(gnu services desktop)} are described below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14761
+#: guix-git/doc/guix.texi:19212
 #, no-wrap
 msgid "{Scheme Procedure} dbus-service [#:dbus @var{dbus}] [#:services '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14764
+#: guix-git/doc/guix.texi:19215
 msgid "Return a service that runs the ``system bus'', using @var{dbus}, with support for @var{services}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14768
+#: guix-git/doc/guix.texi:19219
 msgid "@uref{https://dbus.freedesktop.org/, D-Bus} is an inter-process communication facility.  Its system bus is used to allow system services to communicate and to be notified of system-wide events."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14773
+#: guix-git/doc/guix.texi:19224
 msgid "@var{services} must be a list of packages that provide an @file{etc/dbus-1/system.d} directory containing additional D-Bus configuration and policy files.  For example, to allow avahi-daemon to use the system bus, @var{services} must be equal to @code{(list avahi)}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14775
+#: guix-git/doc/guix.texi:19226
 #, no-wrap
 msgid "{Scheme Procedure} elogind-service [#:config @var{config}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14781
+#: guix-git/doc/guix.texi:19232
 msgid "Return a service that runs the @code{elogind} login and seat management daemon.  @uref{https://github.com/elogind/elogind, Elogind} exposes a D-Bus interface that can be used to know which users are logged in, know what kind of sessions they have open, suspend the system, inhibit system suspend, reboot the system, and other tasks."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14785
+#: guix-git/doc/guix.texi:19236
 msgid "Elogind handles most system-level power events for a computer, for example suspending the system when a lid is closed, or shutting it down when the power button is pressed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14790
+#: guix-git/doc/guix.texi:19241
 msgid "The @var{config} keyword argument specifies the configuration for elogind, and should be the result of an @code{(elogind-configuration (@var{parameter} @var{value})...)} invocation.  Available parameters and their default values are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14792
+#: guix-git/doc/guix.texi:19243
 #, no-wrap
 msgid "kill-user-processes?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14794 doc/guix.texi:14812 doc/guix.texi:14814
-#: doc/guix.texi:14816 doc/guix.texi:14828
+#: guix-git/doc/guix.texi:19245 guix-git/doc/guix.texi:19265
+#: guix-git/doc/guix.texi:19267 guix-git/doc/guix.texi:19269
+#: guix-git/doc/guix.texi:19281
 msgid "#f"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14794
+#: guix-git/doc/guix.texi:19245
 #, no-wrap
 msgid "kill-only-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14796 doc/guix.texi:14834
+#: guix-git/doc/guix.texi:19247 guix-git/doc/guix.texi:19287
 msgid "()"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14796
+#: guix-git/doc/guix.texi:19247
 #, no-wrap
 msgid "kill-exclude-users"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14798
+#: guix-git/doc/guix.texi:19249
 msgid "(\"root\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14798
+#: guix-git/doc/guix.texi:19249
 #, no-wrap
 msgid "inhibit-delay-max-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14800
+#: guix-git/doc/guix.texi:19251
 msgid "5"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14800
+#: guix-git/doc/guix.texi:19251
 #, no-wrap
 msgid "handle-power-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14802
+#: guix-git/doc/guix.texi:19253
 msgid "poweroff"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14802
+#: guix-git/doc/guix.texi:19253
 #, no-wrap
 msgid "handle-suspend-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14804 doc/guix.texi:14808
+#: guix-git/doc/guix.texi:19255 guix-git/doc/guix.texi:19259
 msgid "suspend"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14804
+#: guix-git/doc/guix.texi:19255
 #, no-wrap
 msgid "handle-hibernate-key"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14806
+#: guix-git/doc/guix.texi:19257
 msgid "hibernate"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14806
+#: guix-git/doc/guix.texi:19257
 #, no-wrap
 msgid "handle-lid-switch"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14808
+#: guix-git/doc/guix.texi:19259
 #, no-wrap
 msgid "handle-lid-switch-docked"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14810 doc/guix.texi:14822
+#: guix-git/doc/guix.texi:19261 guix-git/doc/guix.texi:19263
+#: guix-git/doc/guix.texi:19275
 msgid "ignore"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14810
+#: guix-git/doc/guix.texi:19261
+#, no-wrap
+msgid "handle-lid-switch-external-power"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19263
 #, no-wrap
 msgid "power-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14812
+#: guix-git/doc/guix.texi:19265
 #, no-wrap
 msgid "suspend-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14814
+#: guix-git/doc/guix.texi:19267
 #, no-wrap
 msgid "hibernate-key-ignore-inhibited?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14816
+#: guix-git/doc/guix.texi:19269
 #, no-wrap
 msgid "lid-switch-ignore-inhibited?"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14818 doc/guix.texi:14830
+#: guix-git/doc/guix.texi:19271 guix-git/doc/guix.texi:19283
 msgid "#t"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14818
+#: guix-git/doc/guix.texi:19271
 #, no-wrap
 msgid "holdoff-timeout-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14820
+#: guix-git/doc/guix.texi:19273
 msgid "30"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14820
+#: guix-git/doc/guix.texi:19273
 #, no-wrap
 msgid "idle-action"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14822
+#: guix-git/doc/guix.texi:19275
 #, no-wrap
 msgid "idle-action-seconds"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14824
+#: guix-git/doc/guix.texi:19277
 msgid "(* 30 60)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14824
+#: guix-git/doc/guix.texi:19277
 #, no-wrap
 msgid "runtime-directory-size-percent"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14826
+#: guix-git/doc/guix.texi:19279
 msgid "10"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14826
+#: guix-git/doc/guix.texi:19279
 #, no-wrap
 msgid "runtime-directory-size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14828
+#: guix-git/doc/guix.texi:19281
 #, no-wrap
 msgid "remove-ipc?"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14830
+#: guix-git/doc/guix.texi:19283
 #, no-wrap
 msgid "suspend-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14832
+#: guix-git/doc/guix.texi:19285
 msgid "(\"mem\" \"standby\" \"freeze\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14832
+#: guix-git/doc/guix.texi:19285
 #, no-wrap
 msgid "suspend-mode"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14834
+#: guix-git/doc/guix.texi:19287
 #, no-wrap
 msgid "hibernate-state"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14836 doc/guix.texi:14840
+#: guix-git/doc/guix.texi:19289 guix-git/doc/guix.texi:19293
 msgid "(\"disk\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14836
+#: guix-git/doc/guix.texi:19289
 #, no-wrap
 msgid "hibernate-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14838
+#: guix-git/doc/guix.texi:19291
 msgid "(\"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14838
+#: guix-git/doc/guix.texi:19291
 #, no-wrap
 msgid "hybrid-sleep-state"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14840
+#: guix-git/doc/guix.texi:19293
 #, no-wrap
 msgid "hybrid-sleep-mode"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14842
+#: guix-git/doc/guix.texi:19295
 msgid "(\"suspend\" \"platform\" \"shutdown\")"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14845
+#: guix-git/doc/guix.texi:19298
 #, no-wrap
 msgid "{Scheme Procedure} accountsservice-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14853
+#: guix-git/doc/guix.texi:19306
 msgid "[#:accountsservice @var{accountsservice}] Return a service that runs AccountsService, a system service that can list available accounts, change their passwords, and so on.  AccountsService integrates with PolicyKit to enable unprivileged users to acquire the capability to modify their system configuration.  @uref{https://www.freedesktop.org/wiki/Software/AccountsService/, the accountsservice web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14856
+#: guix-git/doc/guix.texi:19309
 msgid "The @var{accountsservice} keyword argument is the @code{accountsservice} package to expose as a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14858
+#: guix-git/doc/guix.texi:19311
 #, no-wrap
 msgid "{Scheme Procedure} polkit-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14867
+#: guix-git/doc/guix.texi:19320
 msgid "[#:polkit @var{polkit}] Return a service that runs the @uref{https://www.freedesktop.org/wiki/Software/polkit/, Polkit privilege management service}, which allows system administrators to grant access to privileged operations in a structured way.  By querying the Polkit service, a privileged system component can know when it should grant additional capabilities to ordinary users.  For example, an ordinary user can be granted the capability to suspend the system if the user is logged in locally."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14869
+#: guix-git/doc/guix.texi:19322
+#, no-wrap
+msgid "{Scheme Variable} polkit-wheel-service"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19327
+msgid "Service that adds the @code{wheel} group as admins to the Polkit service.  This makes it so that users in the @code{wheel} group are queried for their own passwords when performing administrative actions instead of @code{root}'s, similar to the behaviour used by @code{sudo}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19329
 #, no-wrap
 msgid "{Scheme Variable} upower-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14873
+#: guix-git/doc/guix.texi:19333
 msgid "Service that runs @uref{https://upower.freedesktop.org/, @command{upowerd}}, a system-wide monitor for power consumption and battery levels, with the given configuration settings."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14876
+#: guix-git/doc/guix.texi:19336
 msgid "It implements the @code{org.freedesktop.UPower} D-Bus interface, and is notably used by GNOME."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14878
+#: guix-git/doc/guix.texi:19338
 #, no-wrap
 msgid "{Data Type} upower-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:14880
+#: guix-git/doc/guix.texi:19340
 msgid "Data type representation the configuration for UPower."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14883
+#: guix-git/doc/guix.texi:19343
 #, no-wrap
 msgid "@code{upower} (default: @var{upower})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14885
+#: guix-git/doc/guix.texi:19345
 msgid "Package to use for @code{upower}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14886
+#: guix-git/doc/guix.texi:19346
 #, no-wrap
 msgid "@code{watts-up-pro?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14888
+#: guix-git/doc/guix.texi:19348
 msgid "Enable the Watts Up Pro device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14889
+#: guix-git/doc/guix.texi:19349
 #, no-wrap
 msgid "@code{poll-batteries?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14891
+#: guix-git/doc/guix.texi:19351
 msgid "Enable polling the kernel for battery level changes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14892
+#: guix-git/doc/guix.texi:19352
 #, no-wrap
 msgid "@code{ignore-lid?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14894
+#: guix-git/doc/guix.texi:19354
 msgid "Ignore the lid state, this can be useful if it's incorrect on a device."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14895
+#: guix-git/doc/guix.texi:19355
 #, no-wrap
 msgid "@code{use-percentage-for-policy?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14898
+#: guix-git/doc/guix.texi:19358
 msgid "Whether battery percentage based policy should be used.  The default is to use the time left, change to @code{#t} to use the percentage."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14899
+#: guix-git/doc/guix.texi:19359
 #, no-wrap
 msgid "@code{percentage-low} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14902
+#: guix-git/doc/guix.texi:19362
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered low."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14903
+#: guix-git/doc/guix.texi:19363
 #, no-wrap
 msgid "@code{percentage-critical} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14906
+#: guix-git/doc/guix.texi:19366
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which the battery is considered critical."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14907
+#: guix-git/doc/guix.texi:19367
 #, no-wrap
 msgid "@code{percentage-action} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14910
+#: guix-git/doc/guix.texi:19370
 msgid "When @code{use-percentage-for-policy?} is @code{#t}, this sets the percentage at which action will be taken."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14911
+#: guix-git/doc/guix.texi:19371
 #, no-wrap
 msgid "@code{time-low} (default: @code{1200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14914
+#: guix-git/doc/guix.texi:19374
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered low."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14915
+#: guix-git/doc/guix.texi:19375
 #, no-wrap
 msgid "@code{time-critical} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14918
+#: guix-git/doc/guix.texi:19378
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which the battery is considered critical."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14919
+#: guix-git/doc/guix.texi:19379
 #, no-wrap
 msgid "@code{time-action} (default: @code{120})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14922
+#: guix-git/doc/guix.texi:19382
 msgid "When @code{use-time-for-policy?} is @code{#f}, this sets the time remaining in seconds at which action will be taken."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:14923
+#: guix-git/doc/guix.texi:19383
 #, no-wrap
 msgid "@code{critical-power-action} (default: @code{'hybrid-sleep})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14926
+#: guix-git/doc/guix.texi:19386
 msgid "The action taken when @code{percentage-action} or @code{time-action} is reached (depending on the configuration of @code{use-percentage-for-policy?})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:14928
+#: guix-git/doc/guix.texi:19388
 msgid "Possible values are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14932
+#: guix-git/doc/guix.texi:19392
 msgid "'power-off"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:14935
+#: guix-git/doc/guix.texi:19395
 msgid "'hibernate"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:14938
+#: guix-git/doc/guix.texi:19398
 msgid "@code{'hybrid-sleep}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14943
+#: guix-git/doc/guix.texi:19403
 #, no-wrap
 msgid "{Scheme Procedure} udisks-service [#:udisks @var{udisks}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14948
-msgid "Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks.  Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks."
+#: guix-git/doc/guix.texi:19413
+msgid "Return a service for @uref{https://udisks.freedesktop.org/docs/latest/, UDisks}, a @dfn{disk management} daemon that provides user interfaces with notifications and ways to mount/unmount disks.  Programs that talk to UDisks include the @command{udisksctl} command, part of UDisks, and GNOME Disks.  Note that Udisks relies on the @command{mount} command, so it will only be able to use the file-system utilities installed in the system profile.  For example if you want to be able to mount NTFS file-systems in read and write fashion, you'll need to have @code{ntfs-3g} installed system-wide."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14950
+#: guix-git/doc/guix.texi:19415
 #, no-wrap
-msgid "{Scheme Procedure} colord-service [#:colord @var{colord}]"
+msgid "{Scheme Variable} colord-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14956
-msgid "Return a service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners.  It is notably used by the GNOME Color Manager graphical tool.  See @uref{https://www.freedesktop.org/software/colord/, the colord web site} for more information."
+#: guix-git/doc/guix.texi:19422
+msgid "This is the type of the service that runs @command{colord}, a system service with a D-Bus interface to manage the color profiles of input and output devices such as screens and scanners.  It is notably used by the GNOME Color Manager graphical tool.  See @uref{https://www.freedesktop.org/software/colord/, the colord web site} for more information."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:19424
+#, no-wrap
+msgid "scanner access"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19425
+#, no-wrap
+msgid "{Scheme Variable} sane-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19431
+msgid "This service provides access to scanners @i{via} @uref{http://www.sane-project.org, SANE} by installing the necessary udev rules.  It is included in @code{%desktop-services} (@pxref{Desktop Services}) and relies by default on @code{sane-backends-minimal} package (see below) for hardware support."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19433
+#, no-wrap
+msgid "{Scheme Variable} sane-backends-minimal"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19436
+msgid "The default package which the @code{sane-service-type} installs.  It supports many recent scanners."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19438
+#, no-wrap
+msgid "{Scheme Variable} sane-backends"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19445
+msgid "This package includes support for all scanners that @code{sane-backends-minimal} supports, plus older Hewlett-Packard scanners supported by @code{hplip} package.  In order to use this on a system which relies on @code{%desktop-services}, you may use @code{modify-services} (@pxref{Service Reference, @code{modify-services}}) as illustrated below:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19454
+#, no-wrap
+msgid ""
+"(use-modules (gnu))\n"
+"(use-service-modules\n"
+"  @dots{}\n"
+"  desktop)\n"
+"(use-package-modules\n"
+"  @dots{}\n"
+"  scanner)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19459
+#, no-wrap
+msgid ""
+"(define %my-desktop-services\n"
+"  ;; List of desktop services that supports a broader range of scanners.\n"
+"  (modify-services %desktop-services\n"
+"    (sane-service-type _ => sane-backends)))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19463
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  @dots{}\n"
+"  (services %my-desktop-services)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14958
+#: guix-git/doc/guix.texi:19466
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-application name [#:allowed? #t] [#:system? #f] [#:users '()]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14967
+#: guix-git/doc/guix.texi:19475
 msgid "Return a configuration allowing an application to access GeoClue location data.  @var{name} is the Desktop ID of the application, without the @code{.desktop} part.  If @var{allowed?} is true, the application will have access to location information by default.  The boolean @var{system?} value indicates whether an application is a system component or not.  Finally @var{users} is a list of UIDs of all users for which this application is allowed location info access.  An empty users list means that all users are allowed."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14969
+#: guix-git/doc/guix.texi:19477
 #, no-wrap
 msgid "{Scheme Variable} %standard-geoclue-applications"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:14976
+#: guix-git/doc/guix.texi:19484
 msgid "The standard list of well-known GeoClue application configurations, granting authority to the GNOME date-and-time utility to ask for the current location in order to set the time zone, and allowing the IceCat and Epiphany web browsers to request location information.  IceCat and Epiphany both query the user before allowing a web page to know the user's location."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14978
+#: guix-git/doc/guix.texi:19486
 #, no-wrap
 msgid "{Scheme Procedure} geoclue-service [#:colord @var{colord}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14991
+#: guix-git/doc/guix.texi:19499
 msgid "[#:whitelist '()] @ [#:wifi-geolocation-url \"https://location.services.mozilla.com/v1/geolocate?key=geoclue\"] @ [#:submit-data? #f] [#:wifi-submission-url \"https://location.services.mozilla.com/v1/submit?key=geoclue\"] @ [#:submission-nick \"geoclue\"] @ [#:applications %standard-geoclue-applications] Return a service that runs the GeoClue location service.  This service provides a D-Bus interface to allow applications to request access to a user's physical location, and optionally to add information to online location databases.  See @uref{https://wiki.freedesktop.org/www/Software/GeoClue/, the GeoClue web site} for more information."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:14993
+#: guix-git/doc/guix.texi:19501
 #, no-wrap
 msgid "{Scheme Procedure} bluetooth-service [#:bluez @var{bluez}] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15000
+#: guix-git/doc/guix.texi:19508
 msgid "[@w{#:auto-enable? #f}] Return a service that runs the @command{bluetoothd} daemon, which manages all the Bluetooth devices and provides a number of D-Bus interfaces.  When AUTO-ENABLE? is true, the bluetooth controller is powered automatically at boot, which can be useful when using a bluetooth keyboard or mouse."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15002
+#: guix-git/doc/guix.texi:19510
 msgid "Users need to be in the @code{lp} group to access the D-Bus service."
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:19512
+#, no-wrap
+msgid "{Scheme Variable} gnome-keyring-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19516
+msgid "This is the type of the service that adds the @uref{https://wiki.gnome.org/Projects/GnomeKeyring, GNOME Keyring}.  Its value is a @code{gnome-keyring-configuration} object (see below)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:19520
+msgid "This service adds the @code{gnome-keyring} package to the system profile and extends PAM with entries using @code{pam_gnome_keyring.so}, unlocking a user's login keyring when they log in or setting its password with passwd."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19522
+#, no-wrap
+msgid "{Data Type} gnome-keyring-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19524
+msgid "Configuration record for the GNOME Keyring service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19526
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{keyring} (default: @code{gnome-keyring})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19528
+msgid "The GNOME keyring package to use."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:19529
+#, fuzzy, no-wrap
+#| msgid "Base Services"
+msgid "pam-services"
+msgstr "基础服务"
+
+#. type: table
+#: guix-git/doc/guix.texi:19534
+msgid "A list of @code{(@var{service} . @var{kind})} pairs denoting PAM services to extend, where @var{service} is the name of an existing service to extend and @var{kind} is one of @code{login} or @code{passwd}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19540
+msgid "If @code{login} is given, it adds an optional @code{pam_gnome_keyring.so} to the auth block without arguments and to the session block with @code{auto_start}.  If @code{passwd} is given, it adds an optional @code{pam_gnome_keyring.so} to the password block without arguments."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19543
+msgid "By default, this field contains ``gdm-password'' with the value @code{login} and ``passwd'' is with the value @code{passwd}."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:15007
+#: guix-git/doc/guix.texi:19550
 #, no-wrap
 msgid "sound support"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15008
+#: guix-git/doc/guix.texi:19551
 #, no-wrap
 msgid "ALSA"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15009
+#: guix-git/doc/guix.texi:19552
 #, no-wrap
 msgid "PulseAudio, sound support"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15014
+#: guix-git/doc/guix.texi:19557
 msgid "The @code{(gnu services sound)} module provides a service to configure the Advanced Linux Sound Architecture (ALSA) system, which makes PulseAudio the preferred ALSA output driver."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15015
+#: guix-git/doc/guix.texi:19558
 #, no-wrap
 msgid "{Scheme Variable} alsa-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15020
+#: guix-git/doc/guix.texi:19563
 msgid "This is the type for the @uref{https://alsa-project.org/, Advanced Linux Sound Architecture} (ALSA) system, which generates the @file{/etc/asound.conf} configuration file.  The value for this type is a @command{alsa-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15023
+#. type: lisp
+#: guix-git/doc/guix.texi:19566
 #, no-wrap
 msgid "(service alsa-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15026
+#: guix-git/doc/guix.texi:19569
 msgid "See below for details about @code{alsa-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15028
+#: guix-git/doc/guix.texi:19571
 #, no-wrap
 msgid "{Data Type} alsa-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15030
+#: guix-git/doc/guix.texi:19573
 msgid "Data type representing the configuration for @code{alsa-service}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15032
+#: guix-git/doc/guix.texi:19575
 #, no-wrap
 msgid "@code{alsa-plugins} (default: @var{alsa-plugins})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15034
+#: guix-git/doc/guix.texi:19577
 msgid "@code{alsa-plugins} package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15035
+#: guix-git/doc/guix.texi:19578
 #, no-wrap
 msgid "@code{pulseaudio?} (default: @var{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15038
-msgid "Whether ALSA applications should transparently be made to use the @uref{http://www.pulseaudio.org/, PulseAudio} sound server."
+#: guix-git/doc/guix.texi:19581
+msgid "Whether ALSA applications should transparently be made to use the @uref{https://www.pulseaudio.org/, PulseAudio} sound server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15042
+#: guix-git/doc/guix.texi:19585
 msgid "Using PulseAudio allows you to run several sound-producing applications at the same time and to individual control them @i{via} @command{pavucontrol}, among other things."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15043
+#: guix-git/doc/guix.texi:19586
 #, no-wrap
 msgid "@code{extra-options} (default: @var{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15045
+#: guix-git/doc/guix.texi:19588
 msgid "String to append to the @file{/etc/asound.conf} file."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15051
+#: guix-git/doc/guix.texi:19594
 msgid "Individual users who want to override the system configuration of ALSA can do it with the @file{~/.asoundrc} file:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15057
+#: guix-git/doc/guix.texi:19600
 #, no-wrap
 msgid ""
 "# In guix, we have to specify the absolute path for plugins.\n"
@@ -27048,7 +35467,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15066
+#: guix-git/doc/guix.texi:19609
 #, no-wrap
 msgid ""
 "# Routing ALSA to jack:\n"
@@ -27063,7 +35482,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15072
+#: guix-git/doc/guix.texi:19615
 #, no-wrap
 msgid ""
 "  capture_ports @{\n"
@@ -27075,7 +35494,7 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15079
+#: guix-git/doc/guix.texi:19622
 #, no-wrap
 msgid ""
 "pcm.!default @{\n"
@@ -27087,64 +35506,277 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15083
+#: guix-git/doc/guix.texi:19626
 msgid "See @uref{https://www.alsa-project.org/main/index.php/Asoundrc} for the details."
 msgstr ""
 
+#. type: deffn
+#: guix-git/doc/guix.texi:19627
+#, no-wrap
+msgid "{Scheme Variable} pulseaudio-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19631
+msgid "This is the type for the @uref{https://www.pulseaudio.org/, PulseAudio} sound server.  It exists to allow system overrides of the default settings via @code{pulseaudio-configuration}, see below."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:19637
+msgid "This service overrides per-user configuration files.  If you want PulseAudio to honor configuration files in @file{~/.config/pulse} you have to unset the environment variables @env{PULSE_CONFIG} and @env{PULSE_CLIENTCONFIG} in your @file{~/.bash_profile}."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:19645
+msgid "This service on its own does not ensure, that the @code{pulseaudio} package exists on your machine.  It merely adds configuration files for it, as detailed below.  In the (admittedly unlikely) case, that you find yourself without a @code{pulseaudio} package, consider enabling it through the @code{alsa-service-type} above."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19648
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} pulseaudio-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19650
+msgid "Data type representing the configuration for @code{pulseaudio-service}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19652
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{client-conf} (default: @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19657
+msgid "List of settings to set in @file{client.conf}.  Accepts a list of strings or a symbol-value pairs.  A string will be inserted as-is with a newline added.  A pair will be formatted as ``key = value'', again with a newline added."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19658
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{daemon-conf} (default: @code{'((flat-volumes . no))})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19661
+msgid "List of settings to set in @file{daemon.conf}, formatted just like @var{client-conf}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19662
+#, no-wrap
+msgid "@code{script-file} (default: @code{(file-append pulseaudio \"/etc/pulse/default.pa\")})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19664
+msgid "Script file to use as @file{default.pa}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19665
+#, no-wrap
+msgid "@code{system-script-file} (default: @code{(file-append pulseaudio \"/etc/pulse/system.pa\")})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19667
+msgid "Script file to use as @file{system.pa}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19670
+#, no-wrap
+msgid "{Scheme Variable} ladspa-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19673
+msgid "This service sets the @var{LADSPA_PATH} variable, so that programs, which respect it, e.g. PulseAudio, can load LADSPA plugins."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19676
+msgid "The following example will setup the service to enable modules from the @code{swh-plugins} package:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19680
+#, no-wrap
+msgid ""
+"(service ladspa-service-type\n"
+"         (ladspa-configuration (plugins (list swh-plugins))))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:19684
+msgid "See @uref{http://plugin.org.uk/ladspa-swh/docs/ladspa-swh.html} for the details."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:15089
+#: guix-git/doc/guix.texi:19691
 #, no-wrap
 msgid "SQL"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15091
+#: guix-git/doc/guix.texi:19693
 msgid "The @code{(gnu services databases)} module provides the following services."
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15092
+#. type: subsubheading
+#: guix-git/doc/guix.texi:19694
 #, no-wrap
-msgid "{Scheme Procedure} postgresql-service [#:postgresql postgresql] @"
+msgid "PostgreSQL"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15097
-msgid "[#:config-file] [#:data-directory ``/var/lib/postgresql/data''] @ [#:port 5432] [#:locale ``en_US.utf8''] [#:extension-packages '()] Return a service that runs @var{postgresql}, the PostgreSQL database server."
+#. type: Plain text
+#: guix-git/doc/guix.texi:19698
+msgid "The following example describes a PostgreSQL service with the default configuration."
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15101
-msgid "The PostgreSQL daemon loads its runtime configuration from @var{config-file}, creates a database cluster with @var{locale} as the default locale, stored in @var{data-directory}.  It then listens on @var{port}."
+#. type: lisp
+#: guix-git/doc/guix.texi:19703
+#, no-wrap
+msgid ""
+"(service postgresql-service-type\n"
+"         (postgresql-configuration\n"
+"          (postgresql postgresql-10)))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:19709
+msgid "If the services fails to start, it may be due to an incompatible cluster already present in @var{data-directory}.  Adjust it (or, if you don't need the cluster anymore, delete @var{data-directory}), then restart the service."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:19716
+msgid "Peer authentication is used by default and the @code{postgres} user account has no shell, which prevents the direct execution of @code{psql} commands as this user.  To use @code{psql}, you can temporarily log in as @code{postgres} using a shell, create a PostgreSQL superuser with the same name as one of the system users and then create the associated database."
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:19721
+#, no-wrap
+msgid ""
+"sudo -u postgres -s /bin/sh\n"
+"createuser --interactive\n"
+"createdb $MY_USER_LOGIN      # Replace appropriately.\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19723
+#, no-wrap
+msgid "{Data Type} postgresql-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19726
+msgid "Data type representing the configuration for the @code{postgresql-service-type}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:19728
+#, no-wrap
+msgid "postgresql"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19730
+msgid "PostgreSQL package to use for the service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19731
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{5432})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19733
+msgid "Port on which PostgreSQL should listen."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19736
+msgid "Locale to use as the default when creating the database cluster."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19737
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{config-file} (default: @code{(postgresql-config-file)})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19741
+msgid "The configuration file to use when running PostgreSQL@.  The default behaviour uses the postgresql-config-file record with the default values for the fields."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19742
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{log-directory} (default: @code{\"/var/log/postgresql\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19746
+msgid "The directory where @command{pg_ctl} output will be written in a file named @code{\"pg_ctl.log\"}.  This file can be useful to debug PostgreSQL configuration errors for instance."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19747
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{data-directory} (default: @code{\"/var/lib/postgresql/data\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19749
+msgid "Directory in which to store the data."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19750
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{extension-packages} (default: @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
 #. type: cindex
-#: doc/guix.texi:15102
+#: guix-git/doc/guix.texi:19751
 #, no-wrap
 msgid "postgresql extension-packages"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15107
+#. type: table
+#: guix-git/doc/guix.texi:19756
 msgid "Additional extensions are loaded from packages listed in @var{extension-packages}.  Extensions are available at runtime.  For instance, to create a geographic database using the @code{postgis} extension, a user can configure the postgresql-service as in this example:"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15108
+#: guix-git/doc/guix.texi:19757
 #, no-wrap
 msgid "postgis"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15111
+#. type: lisp
+#: guix-git/doc/guix.texi:19760
 #, no-wrap
 msgid ""
 "(use-package-modules databases geo)\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15121
+#. type: lisp
+#: guix-git/doc/guix.texi:19773
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -27154,17 +35786,20 @@ msgid ""
 "  (packages (cons* postgresql %base-packages))\n"
 "  (services\n"
 "    (cons*\n"
-"      (postgresql-service #:extension-packages (list postgis))\n"
+"      (service postgresql-service-type\n"
+"               (postgresql-configuration\n"
+"                (postgresql postgresql-10)\n"
+"                (extension-packages (list postgis))))\n"
 "      %base-services)))\n"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15125
+#. type: table
+#: guix-git/doc/guix.texi:19777
 msgid "Then the extension becomes visible and you can initialise an empty geographic database in this way:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:15132
+#: guix-git/doc/guix.texi:19784
 #, no-wrap
 msgid ""
 "psql -U postgres\n"
@@ -27174,321 +35809,546 @@ msgid ""
 "> create extension postgis_topology;\n"
 msgstr ""
 
-#. type: deffn
-#: doc/guix.texi:15137
+#. type: table
+#: guix-git/doc/guix.texi:19789
 msgid "There is no need to add this field for contrib extensions such as hstore or dblink as they are already loadable by postgresql.  This field is only required to add extensions provided by other packages."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:19793
+#, no-wrap
+msgid "{Data Type} postgresql-config-file"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19799
+msgid "Data type representing the PostgreSQL configuration file.  As shown in the following example, this can be used to customize the configuration of PostgreSQL@.  Note that you can use any G-expression or filename in place of this record, if you already have a configuration file you'd like to use for example."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19819
+#, no-wrap
+msgid ""
+"(service postgresql-service-type\n"
+"         (postgresql-configuration\n"
+"          (config-file\n"
+"           (postgresql-config-file\n"
+"            (log-destination \"stderr\")\n"
+"            (hba-file\n"
+"             (plain-file \"pg_hba.conf\"\n"
+"                         \"\n"
+"local\tall\tall\t\t\ttrust\n"
+"host\tall\tall\t127.0.0.1/32 \tmd5\n"
+"host\tall\tall\t::1/128 \tmd5\"))\n"
+"            (extra-config\n"
+"             '((\"session_preload_libraries\"     \"auto_explain\")\n"
+"               (\"random_page_cost\"              2)\n"
+"               (\"auto_explain.log_min_duration\" \"100 ms\")\n"
+"               (\"work_mem\"                      \"500 MB\")\n"
+"               (\"logging_collector\"             #t)\n"
+"               (\"log_directory\"                 \"/var/log/postgresql\")))))))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19822
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{log-destination} (default: @code{\"syslog\"})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19825
+msgid "The logging method to use for PostgreSQL@.  Multiple values are accepted, separated by commas."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19826
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{hba-file} (default: @code{%default-postgres-hba})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19829
+msgid "Filename or G-expression for the host-based authentication configuration."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19830
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{ident-file} (default: @code{%default-postgres-ident})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19832
+msgid "Filename or G-expression for the user name mapping configuration."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19833
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{socket-directory} (default: @code{#false})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19838
+msgid "Specifies the directory of the Unix-domain socket(s) on which PostgreSQL is to listen for connections from client applications. If set to @code{\"\"} PostgreSQL does not listen on any Unix-domain sockets, in which case only TCP/IP sockets can be used to connect to the server."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19841
+msgid "By default, the @code{#false} value means the PostgreSQL default value will be used, which is currently @samp{/tmp}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19846
+msgid "List of additional keys and values to include in the PostgreSQL config file.  Each entry in the list should be a list where the first element is the key, and the remaining elements are the values."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19852
+msgid "The values can be numbers, booleans or strings and will be mapped to PostgreSQL parameters types @code{Boolean}, @code{String}, @code{Numeric}, @code{Numeric with Unit} and @code{Enumerated} described @uref{https://www.postgresql.org/docs/current/config-setting.html, here}."
+msgstr ""
+
 #. type: deffn
-#: doc/guix.texi:15139
+#: guix-git/doc/guix.texi:19856
 #, no-wrap
-msgid "{Scheme Procedure} mysql-service [#:config (mysql-configuration)]"
+msgid "{Scheme Variable} postgresql-role-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15142
-msgid "Return a service that runs @command{mysqld}, the MySQL or MariaDB database server."
+#: guix-git/doc/guix.texi:19859
+msgid "This service allows to create PostgreSQL roles and databases after PostgreSQL service start.  Here is an example of its use."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:19867
+#, no-wrap
+msgid ""
+"(service postgresql-role-service-type\n"
+"            (postgresql-role-configuration\n"
+"             (roles\n"
+"              (list (postgresql-role\n"
+"                     (name \"test\")\n"
+"                     (create-database? #t))))))\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15145
-msgid "The optional @var{config} argument specifies the configuration for @command{mysqld}, which should be a @code{<mysql-configuration>} object."
+#: guix-git/doc/guix.texi:19871
+msgid "This service can be extended with extra roles, as in this example:"
 msgstr ""
 
-#. type: deftp
-#: doc/guix.texi:15147
+#. type: lisp
+#: guix-git/doc/guix.texi:19877
 #, no-wrap
-msgid "{Data Type} mysql-configuration"
+msgid ""
+"(service-extension postgresql-role-service-type\n"
+"                   (const (postgresql-role\n"
+"                           (name \"alice\")\n"
+"                           (create-database? #t))))\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15149
-msgid "Data type representing the configuration of @var{mysql-service}."
+#: guix-git/doc/guix.texi:19880
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} postgresql-role"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19886
+msgid "PostgreSQL manages database access permissions using the concept of roles.  A role can be thought of as either a database user, or a group of database users, depending on how the role is set up.  Roles can own database objects (for example, tables) and can assign privileges on those objects to other roles to control who has access to which objects."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:19890
+#, fuzzy
+#| msgid "The Store Monad"
+msgid "The role name."
+msgstr "仓库monad"
+
 #. type: item
-#: doc/guix.texi:15151
-#, no-wrap
-msgid "@code{mysql} (default: @var{mariadb})"
-msgstr ""
+#: guix-git/doc/guix.texi:19891
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{permissions} (default: @code{'(createdb login)})"
+msgstr "@code{includes}（默认值：@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:15154
-msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}."
+#: guix-git/doc/guix.texi:19895
+msgid "The role permissions list.  Supported permissions are @code{bypassrls}, @code{createdb}, @code{createrole}, @code{login}, @code{replication} and @code{superuser}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:19896
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{create-database?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
 #. type: table
-#: doc/guix.texi:15157
-msgid "For MySQL, a temporary root password will be displayed at activation time.  For MariaDB, the root password is empty."
+#: guix-git/doc/guix.texi:19898
+msgid "Whether to create a database with the same name as the role."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:19902
+#, fuzzy, no-wrap
+#| msgid "Manage the operating system configuration."
+msgid "{Data Type} postgresql-role-configuration"
+msgstr "管理操作系统配置。"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:19905
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of @var{postgresql-role-service-type}."
+msgstr "管理操作系统配置。"
+
 #. type: item
-#: doc/guix.texi:15158
-#, no-wrap
-msgid "@code{port} (default: @code{3306})"
+#: guix-git/doc/guix.texi:19907
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{host} (default: @code{\"/var/run/postgresql\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19909
+msgid "The PostgreSQL host to connect to."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:19910
+#, fuzzy, no-wrap
+#| msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
+msgid "@code{log} (default: @code{\"/var/log/postgresql_roles.log\"})"
+msgstr "@code{private-key}（默认值：@file{~root/.ssh/id_rsa}）"
+
 #. type: table
-#: doc/guix.texi:15160
-msgid "TCP port on which the database server listens for incoming connections."
+#: guix-git/doc/guix.texi:19912
+#, fuzzy
+#| msgid "The host name of the remote machine."
+msgid "File name of the log file."
+msgstr "远程机器的主机名。"
+
+#. type: item
+#: guix-git/doc/guix.texi:19913
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{roles} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19915
+msgid "The initial PostgreSQL roles to create."
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:15163
+#. type: subsubheading
+#: guix-git/doc/guix.texi:19918
 #, no-wrap
-msgid "{Scheme Variable} memcached-service-type"
+msgid "MariaDB/MySQL"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15167
-msgid "This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache.  The value for the service type is a @code{memcached-configuration} object."
+#: guix-git/doc/guix.texi:19920
+#, no-wrap
+msgid "{Scheme Variable} mysql-service-type"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15171
-#, no-wrap
-msgid "(service memcached-service-type)\n"
+#. type: defvr
+#: guix-git/doc/guix.texi:19924
+msgid "This is the service type for a MySQL or MariaDB database server.  Its value is a @code{mysql-configuration} object that specifies which package to use, as well as various settings for the @command{mysqld} daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15173
+#: guix-git/doc/guix.texi:19926
 #, no-wrap
-msgid "{Data Type} memcached-configuration"
+msgid "{Data Type} mysql-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15175
-msgid "Data type representing the configuration of memcached."
-msgstr ""
+#: guix-git/doc/guix.texi:19928
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of @var{mysql-service-type}."
+msgstr "管理操作系统配置。"
 
 #. type: item
-#: doc/guix.texi:15177
+#: guix-git/doc/guix.texi:19930
 #, no-wrap
-msgid "@code{memcached} (default: @code{memcached})"
+msgid "@code{mysql} (default: @var{mariadb})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15179
-msgid "The Memcached package to use."
+#: guix-git/doc/guix.texi:19933
+msgid "Package object of the MySQL database server, can be either @var{mariadb} or @var{mysql}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19936
+msgid "For MySQL, a temporary root password will be displayed at activation time.  For MariaDB, the root password is empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15180
+#: guix-git/doc/guix.texi:19937 guix-git/doc/guix.texi:23483
 #, no-wrap
-msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})"
+msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15182
-msgid "Network interfaces on which to listen."
+#: guix-git/doc/guix.texi:19940
+msgid "The IP on which to listen for network connections.  Use @code{\"0.0.0.0\"} to bind to all available network interfaces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15183
+#: guix-git/doc/guix.texi:19941
 #, no-wrap
-msgid "@code{tcp-port} (default: @code{11211})"
+msgid "@code{port} (default: @code{3306})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15185
-msgid "Port on which to accept connections on,"
+#: guix-git/doc/guix.texi:19943
+msgid "TCP port on which the database server listens for incoming connections."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15186
-#, no-wrap
-msgid "@code{udp-port} (default: @code{11211})"
+#: guix-git/doc/guix.texi:19944
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{socket} (default: @code{\"/run/mysqld/mysqld.sock\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:19946
+msgid "Socket file to use for local (non-network) connections."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15189
-msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket."
+#: guix-git/doc/guix.texi:19949
+msgid "Additional settings for the @file{my.cnf} configuration file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15190
-#, no-wrap
-msgid "@code{additional-options} (default: @code{'()})"
-msgstr ""
+#: guix-git/doc/guix.texi:19950
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{auto-upgrade?} (default: @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:15192
-msgid "Additional command line options to pass to @code{memcached}."
+#: guix-git/doc/guix.texi:19955
+msgid "Whether to automatically run @command{mysql_upgrade} after starting the service.  This is necessary to upgrade the @dfn{system schema} after ``major'' updates (such as switching from MariaDB 10.4 to 10.5), but can be disabled if you would rather do that manually."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:19959
+#, no-wrap
+msgid "Memcached"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15195
+#: guix-git/doc/guix.texi:19961
 #, no-wrap
-msgid "{Scheme Variable} mongodb-service-type"
+msgid "{Scheme Variable} memcached-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15198
-msgid "This is the service type for @uref{https://www.mongodb.com/, MongoDB}.  The value for the service type is a @code{mongodb-configuration} object."
+#: guix-git/doc/guix.texi:19965
+msgid "This is the service type for the @uref{https://memcached.org/, Memcached} service, which provides a distributed in memory cache.  The value for the service type is a @code{memcached-configuration} object."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15202
+#. type: lisp
+#: guix-git/doc/guix.texi:19969
 #, no-wrap
-msgid "(service mongodb-service-type)\n"
+msgid "(service memcached-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15204
+#: guix-git/doc/guix.texi:19971
 #, no-wrap
-msgid "{Data Type} mongodb-configuration"
+msgid "{Data Type} memcached-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15206
-msgid "Data type representing the configuration of mongodb."
+#: guix-git/doc/guix.texi:19973
+msgid "Data type representing the configuration of memcached."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15208
+#: guix-git/doc/guix.texi:19975
 #, no-wrap
-msgid "@code{mongodb} (default: @code{mongodb})"
+msgid "@code{memcached} (default: @code{memcached})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15210
-msgid "The MongoDB package to use."
+#: guix-git/doc/guix.texi:19977
+msgid "The Memcached package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15211
+#: guix-git/doc/guix.texi:19978
 #, no-wrap
-msgid "@code{config-file} (default: @code{%default-mongodb-configuration-file})"
+msgid "@code{interfaces} (default: @code{'(\"0.0.0.0\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15213
-msgid "The configuration file for MongoDB."
+#: guix-git/doc/guix.texi:19980
+msgid "Network interfaces on which to listen."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19981
+#, no-wrap
+msgid "@code{tcp-port} (default: @code{11211})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19983
+msgid "Port on which to accept connections."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:19984
+#, no-wrap
+msgid "@code{udp-port} (default: @code{11211})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:19987
+msgid "Port on which to accept UDP connections on, a value of 0 will disable listening on a UDP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15214
+#: guix-git/doc/guix.texi:19988
 #, no-wrap
-msgid "@code{data-directory} (default: @code{\"/var/lib/mongodb\"})"
+msgid "@code{additional-options} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15218
-msgid "This value is used to create the directory, so that it exists and is owned by the mongodb user.  It should match the data-directory which MongoDB is configured to use through the configuration file."
+#: guix-git/doc/guix.texi:19990
+msgid "Additional command line options to pass to @code{memcached}."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:19993
+#, no-wrap
+msgid "Redis"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15221
+#: guix-git/doc/guix.texi:19995
 #, no-wrap
 msgid "{Scheme Variable} redis-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:15224
+#: guix-git/doc/guix.texi:19998
 msgid "This is the service type for the @uref{https://redis.io/, Redis} key/value store, whose value is a @code{redis-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15226
+#: guix-git/doc/guix.texi:20000
 #, no-wrap
 msgid "{Data Type} redis-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:15228
+#: guix-git/doc/guix.texi:20002
 msgid "Data type representing the configuration of redis."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15230
+#: guix-git/doc/guix.texi:20004
 #, no-wrap
 msgid "@code{redis} (default: @code{redis})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15232
+#: guix-git/doc/guix.texi:20006
 msgid "The Redis package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15233
+#: guix-git/doc/guix.texi:20007
 #, no-wrap
 msgid "@code{bind} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15235
+#: guix-git/doc/guix.texi:20009
 msgid "Network interface on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15236
+#: guix-git/doc/guix.texi:20010
 #, no-wrap
 msgid "@code{port} (default: @code{6379})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15239
+#: guix-git/doc/guix.texi:20013
 msgid "Port on which to accept connections on, a value of 0 will disable listening on a TCP socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15240
+#: guix-git/doc/guix.texi:20014
 #, no-wrap
 msgid "@code{working-directory} (default: @code{\"/var/lib/redis\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15242
+#: guix-git/doc/guix.texi:20016
 msgid "Directory in which to store the database and related files."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:15248
+#: guix-git/doc/guix.texi:20022
 #, no-wrap
 msgid "mail"
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:15249 doc/guix.texi:19449
+#. type: cindex
+#: guix-git/doc/guix.texi:20023
 #, no-wrap
 msgid "email"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15254
+#: guix-git/doc/guix.texi:20028
 msgid "The @code{(gnu services mail)} module provides Guix service definitions for email services: IMAP, POP3, and LMTP servers, as well as mail transport agents (MTAs).  Lots of acronyms! These services are detailed in the subsections below."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:15255
+#: guix-git/doc/guix.texi:20029
 #, no-wrap
 msgid "Dovecot Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15257
+#: guix-git/doc/guix.texi:20031
 #, no-wrap
 msgid "{Scheme Procedure} dovecot-service [#:config (dovecot-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:15259
+#: guix-git/doc/guix.texi:20033
 msgid "Return a service that runs the Dovecot IMAP/POP3/LMTP mail server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15269
+#: guix-git/doc/guix.texi:20043
 msgid "By default, Dovecot does not need much configuration; the default configuration object created by @code{(dovecot-configuration)} will suffice if your mail is delivered to @code{~/Maildir}.  A self-signed certificate will be generated for TLS-protected connections, though Dovecot will also listen on cleartext ports by default.  There are a number of options, though, which mail administrators might need to change, and as is the case with other services, Guix allows the system administrator to specify these parameters via a uniform Scheme interface."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15272
+#: guix-git/doc/guix.texi:20046
 msgid "For example, to specify that mail is located at @code{maildir~/.mail}, one would instantiate the Dovecot service like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:15277
+#. type: lisp
+#: guix-git/doc/guix.texi:20051
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -27497,2379 +36357,2379 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15285
+#: guix-git/doc/guix.texi:20059
 msgid "The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings.  There is also a way to specify the configuration as a string, if you have an old @code{dovecot.conf} file that you want to port over from some other system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:15295
+#: guix-git/doc/guix.texi:20069
 msgid "Available @code{dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15296
+#: guix-git/doc/guix.texi:20070
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15298 doc/guix.texi:16604
+#: guix-git/doc/guix.texi:20072 guix-git/doc/guix.texi:21378
 msgid "The dovecot package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15300
+#: guix-git/doc/guix.texi:20074
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} comma-separated-string-list listen"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15306
+#: guix-git/doc/guix.texi:20080
 msgid "A list of IPs or hosts where to listen for connections.  @samp{*} listens on all IPv4 interfaces, @samp{::} listens on all IPv6 interfaces.  If you want to specify non-default ports or anything more complex, customize the address and port fields of the @samp{inet-listener} of the specific services you are interested in."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15308
+#: guix-git/doc/guix.texi:20082
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} protocol-configuration-list protocols"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15311
+#: guix-git/doc/guix.texi:20085
 msgid "List of protocols we want to serve.  Available protocols include @samp{imap}, @samp{pop3}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15313
+#: guix-git/doc/guix.texi:20087
 msgid "Available @code{protocol-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15314
+#: guix-git/doc/guix.texi:20088
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15316
+#: guix-git/doc/guix.texi:20090
 msgid "The name of the protocol."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15318
+#: guix-git/doc/guix.texi:20092
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} string auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15322
+#: guix-git/doc/guix.texi:20096
 msgid "UNIX socket path to the master authentication server to find users.  This is used by imap (for shared users) and lda.  It defaults to @samp{\"/var/run/dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15324
+#: guix-git/doc/guix.texi:20098
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15326
+#: guix-git/doc/guix.texi:20100
 msgid "Space separated list of plugins to load."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15328
+#: guix-git/doc/guix.texi:20102
 #, no-wrap
 msgid "{@code{protocol-configuration} parameter} non-negative-integer mail-max-userip-connections"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15332
+#: guix-git/doc/guix.texi:20106
 msgid "Maximum number of IMAP connections allowed for a user from each IP address.  NOTE: The username is compared case-sensitively.  Defaults to @samp{10}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15336
+#: guix-git/doc/guix.texi:20110
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} service-configuration-list services"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15340
+#: guix-git/doc/guix.texi:20114
 msgid "List of services to enable.  Available services include @samp{imap}, @samp{imap-login}, @samp{pop3}, @samp{pop3-login}, @samp{auth}, and @samp{lmtp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15342
+#: guix-git/doc/guix.texi:20116
 msgid "Available @code{service-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15343
+#: guix-git/doc/guix.texi:20117
 #, no-wrap
 msgid "{@code{service-configuration} parameter} string kind"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15348
+#: guix-git/doc/guix.texi:20122
 msgid "The service kind.  Valid values include @code{director}, @code{imap-login}, @code{pop3-login}, @code{lmtp}, @code{imap}, @code{pop3}, @code{auth}, @code{auth-worker}, @code{dict}, @code{tcpwrap}, @code{quota-warning}, or anything else."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15350
+#: guix-git/doc/guix.texi:20124
 #, no-wrap
 msgid "{@code{service-configuration} parameter} listener-configuration-list listeners"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15355
+#: guix-git/doc/guix.texi:20129
 msgid "Listeners for the service.  A listener is either a @code{unix-listener-configuration}, a @code{fifo-listener-configuration}, or an @code{inet-listener-configuration}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15357
+#: guix-git/doc/guix.texi:20131
 msgid "Available @code{unix-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15358
+#: guix-git/doc/guix.texi:20132
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15361 doc/guix.texi:15384
+#: guix-git/doc/guix.texi:20135 guix-git/doc/guix.texi:20158
 msgid "Path to the file, relative to @code{base-dir} field.  This is also used as the section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15363
+#: guix-git/doc/guix.texi:20137
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15366 doc/guix.texi:15389
+#: guix-git/doc/guix.texi:20140 guix-git/doc/guix.texi:20163
 msgid "The access mode for the socket.  Defaults to @samp{\"0600\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15368
+#: guix-git/doc/guix.texi:20142
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15371 doc/guix.texi:15394
+#: guix-git/doc/guix.texi:20145 guix-git/doc/guix.texi:20168
 msgid "The user to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15373
+#: guix-git/doc/guix.texi:20147
 #, no-wrap
 msgid "{@code{unix-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15376 doc/guix.texi:15399
+#: guix-git/doc/guix.texi:20150 guix-git/doc/guix.texi:20173
 msgid "The group to own the socket.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15380
+#: guix-git/doc/guix.texi:20154
 msgid "Available @code{fifo-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15381
+#: guix-git/doc/guix.texi:20155
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15386
+#: guix-git/doc/guix.texi:20160
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15391
+#: guix-git/doc/guix.texi:20165
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15396
+#: guix-git/doc/guix.texi:20170
 #, no-wrap
 msgid "{@code{fifo-listener-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15403
+#: guix-git/doc/guix.texi:20177
 msgid "Available @code{inet-listener-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15404
+#: guix-git/doc/guix.texi:20178
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15406
+#: guix-git/doc/guix.texi:20180
 msgid "The protocol to listen for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15408
+#: guix-git/doc/guix.texi:20182
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} string address"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15411
+#: guix-git/doc/guix.texi:20185
 msgid "The address on which to listen, or empty for all addresses.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15413
+#: guix-git/doc/guix.texi:20187
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} non-negative-integer port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15415
+#: guix-git/doc/guix.texi:20189
 msgid "The port on which to listen."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15417
+#: guix-git/doc/guix.texi:20191
 #, no-wrap
 msgid "{@code{inet-listener-configuration} parameter} boolean ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15421
+#: guix-git/doc/guix.texi:20195
 msgid "Whether to use SSL for this service; @samp{yes}, @samp{no}, or @samp{required}.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15425
+#: guix-git/doc/guix.texi:20199
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15430
+#: guix-git/doc/guix.texi:20204
 msgid "Maximum number of simultaneous client connections per process.  Once this number of connections is received, the next incoming connection will prompt Dovecot to spawn another process.  If set to 0, @code{default-client-limit} is used instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15435
+#: guix-git/doc/guix.texi:20209
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer service-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15440
+#: guix-git/doc/guix.texi:20214
 msgid "Number of connections to handle before starting a new process.  Typically the only useful values are 0 (unlimited) or 1.  1 is more secure, but 0 is faster.  <doc/wiki/LoginProcess.txt>.  Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15443
+#: guix-git/doc/guix.texi:20217
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer process-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15446
+#: guix-git/doc/guix.texi:20220
 msgid "Maximum number of processes that can exist for this service.  If set to 0, @code{default-process-limit} is used instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15451
+#: guix-git/doc/guix.texi:20225
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer process-min-avail"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15454
+#: guix-git/doc/guix.texi:20228
 msgid "Number of processes to always keep waiting for more connections.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15456
+#: guix-git/doc/guix.texi:20230
 #, no-wrap
 msgid "{@code{service-configuration} parameter} non-negative-integer vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15460
+#: guix-git/doc/guix.texi:20234
 msgid "If you set @samp{service-count 0}, you probably need to grow this.  Defaults to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15464
+#: guix-git/doc/guix.texi:20238
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} dict-configuration dict"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15467
+#: guix-git/doc/guix.texi:20241
 msgid "Dict configuration, as created by the @code{dict-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15469
+#: guix-git/doc/guix.texi:20243
 msgid "Available @code{dict-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15470
+#: guix-git/doc/guix.texi:20244
 #, no-wrap
 msgid "{@code{dict-configuration} parameter} free-form-fields entries"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15473
+#: guix-git/doc/guix.texi:20247
 msgid "A list of key-value pairs that this dict should hold.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15477
+#: guix-git/doc/guix.texi:20251
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} passdb-configuration-list passdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15480
+#: guix-git/doc/guix.texi:20254
 msgid "A list of passdb configurations, each one created by the @code{passdb-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15482
+#: guix-git/doc/guix.texi:20256
 msgid "Available @code{passdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15483
+#: guix-git/doc/guix.texi:20257
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15488
+#: guix-git/doc/guix.texi:20262
 msgid "The driver that the passdb should use.  Valid values include @samp{pam}, @samp{passwd}, @samp{shadow}, @samp{bsdauth}, and @samp{static}.  Defaults to @samp{\"pam\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15490
+#: guix-git/doc/guix.texi:20264
 #, no-wrap
 msgid "{@code{passdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15493
+#: guix-git/doc/guix.texi:20267
 msgid "Space separated list of arguments to the passdb driver.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15497
+#: guix-git/doc/guix.texi:20271
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} userdb-configuration-list userdbs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15500
+#: guix-git/doc/guix.texi:20274
 msgid "List of userdb configurations, each one created by the @code{userdb-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15502
+#: guix-git/doc/guix.texi:20276
 msgid "Available @code{userdb-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15503
+#: guix-git/doc/guix.texi:20277
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} string driver"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15507
+#: guix-git/doc/guix.texi:20281
 msgid "The driver that the userdb should use.  Valid values include @samp{passwd} and @samp{static}.  Defaults to @samp{\"passwd\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15509
+#: guix-git/doc/guix.texi:20283
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} space-separated-string-list args"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15512
+#: guix-git/doc/guix.texi:20286
 msgid "Space separated list of arguments to the userdb driver.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15514
+#: guix-git/doc/guix.texi:20288
 #, no-wrap
 msgid "{@code{userdb-configuration} parameter} free-form-args override-fields"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15517
+#: guix-git/doc/guix.texi:20291
 msgid "Override fields from passwd.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15521
+#: guix-git/doc/guix.texi:20295
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} plugin-configuration plugin-configuration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15524
+#: guix-git/doc/guix.texi:20298
 msgid "Plug-in configuration, created by the @code{plugin-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15526
+#: guix-git/doc/guix.texi:20300
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} list-of-namespace-configuration namespaces"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15529
+#: guix-git/doc/guix.texi:20303
 msgid "List of namespaces.  Each item in the list is created by the @code{namespace-configuration} constructor."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15531
+#: guix-git/doc/guix.texi:20305
 msgid "Available @code{namespace-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15532
+#: guix-git/doc/guix.texi:20306
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15534
+#: guix-git/doc/guix.texi:20308
 msgid "Name for this namespace."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15536
+#: guix-git/doc/guix.texi:20310
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15539
+#: guix-git/doc/guix.texi:20313
 msgid "Namespace type: @samp{private}, @samp{shared} or @samp{public}.  Defaults to @samp{\"private\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15541
+#: guix-git/doc/guix.texi:20315
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15547
-msgid "Hierarchy separator to use. You should use the same separator for all namespaces or some clients get confused.  @samp{/} is usually a good one.  The default however depends on the underlying mail storage format.  Defaults to @samp{\"\"}."
+#: guix-git/doc/guix.texi:20321
+msgid "Hierarchy separator to use.  You should use the same separator for all namespaces or some clients get confused.  @samp{/} is usually a good one.  The default however depends on the underlying mail storage format.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15549
+#: guix-git/doc/guix.texi:20323
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15553
-msgid "Prefix required to access this namespace.  This needs to be different for all namespaces. For example @samp{Public/}.  Defaults to @samp{\"\"}."
+#: guix-git/doc/guix.texi:20327
+msgid "Prefix required to access this namespace.  This needs to be different for all namespaces.  For example @samp{Public/}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15555
+#: guix-git/doc/guix.texi:20329
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} string location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15559
+#: guix-git/doc/guix.texi:20333
 msgid "Physical location of the mailbox. This is in the same format as mail_location, which is also the default for it.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15561
+#: guix-git/doc/guix.texi:20335
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean inbox?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15565
+#: guix-git/doc/guix.texi:20339
 msgid "There can be only one INBOX, and this setting defines which namespace has it.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15567
+#: guix-git/doc/guix.texi:20341
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean hidden?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15575
-msgid "If namespace is hidden, it's not advertised to clients via NAMESPACE extension. You'll most likely also want to set @samp{list? #f}.  This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep working.  For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}.  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20349
+msgid "If namespace is hidden, it's not advertised to clients via NAMESPACE extension.  You'll most likely also want to set @samp{list? #f}.  This is mostly useful when converting from another server with different namespaces which you want to deprecate but still keep working.  For example you can create hidden namespaces with prefixes @samp{~/mail/}, @samp{~%u/mail/} and @samp{mail/}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15577
+#: guix-git/doc/guix.texi:20351
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean list?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15583
-msgid "Show the mailboxes under this namespace with the LIST command. This makes the namespace visible for clients that do not support the NAMESPACE extension.  The special @code{children} value lists child mailboxes, but hides the namespace prefix.  Defaults to @samp{#t}."
+#: guix-git/doc/guix.texi:20357
+msgid "Show the mailboxes under this namespace with the LIST command.  This makes the namespace visible for clients that do not support the NAMESPACE extension.  The special @code{children} value lists child mailboxes, but hides the namespace prefix.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15585
+#: guix-git/doc/guix.texi:20359
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} boolean subscriptions?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15590
+#: guix-git/doc/guix.texi:20364
 msgid "Namespace handles its own subscriptions.  If set to @code{#f}, the parent namespace handles them.  The empty prefix should always have this as @code{#t}).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15592
+#: guix-git/doc/guix.texi:20366
 #, no-wrap
 msgid "{@code{namespace-configuration} parameter} mailbox-configuration-list mailboxes"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15595
+#: guix-git/doc/guix.texi:20369
 msgid "List of predefined mailboxes in this namespace.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15597
+#: guix-git/doc/guix.texi:20371
 msgid "Available @code{mailbox-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15598
+#: guix-git/doc/guix.texi:20372
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15600
+#: guix-git/doc/guix.texi:20374
 msgid "Name for this mailbox."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15602
+#: guix-git/doc/guix.texi:20376
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} string auto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15606
+#: guix-git/doc/guix.texi:20380
 msgid "@samp{create} will automatically create this mailbox.  @samp{subscribe} will both create and subscribe to the mailbox.  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15608
+#: guix-git/doc/guix.texi:20382
 #, no-wrap
 msgid "{@code{mailbox-configuration} parameter} space-separated-string-list special-use"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15613
+#: guix-git/doc/guix.texi:20387
 msgid "List of IMAP @code{SPECIAL-USE} attributes as specified by RFC 6154.  Valid values are @code{\\All}, @code{\\Archive}, @code{\\Drafts}, @code{\\Flagged}, @code{\\Junk}, @code{\\Sent}, and @code{\\Trash}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15619
+#: guix-git/doc/guix.texi:20393
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name base-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15622
+#: guix-git/doc/guix.texi:20396
 msgid "Base directory where to store runtime data.  Defaults to @samp{\"/var/run/dovecot/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15624
+#: guix-git/doc/guix.texi:20398
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-greeting"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15627
+#: guix-git/doc/guix.texi:20401
 msgid "Greeting message for clients.  Defaults to @samp{\"Dovecot ready.\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15629
+#: guix-git/doc/guix.texi:20403
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-trusted-networks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15636
+#: guix-git/doc/guix.texi:20410
 msgid "List of trusted network ranges.  Connections from these IPs are allowed to override their IP addresses and ports (for logging and for authentication checks).  @samp{disable-plaintext-auth} is also ignored for these networks.  Typically you would specify your IMAP proxy servers here.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15638
+#: guix-git/doc/guix.texi:20412
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-access-sockets"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15641
+#: guix-git/doc/guix.texi:20415
 msgid "List of login access check sockets (e.g.@: tcpwrap).  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15643
+#: guix-git/doc/guix.texi:20417
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-proctitle?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15649
+#: guix-git/doc/guix.texi:20423
 msgid "Show more verbose process titles (in ps).  Currently shows user name and IP address.  Useful for seeing who is actually using the IMAP processes (e.g.@: shared mailboxes or if the same uid is used for multiple accounts).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15651
+#: guix-git/doc/guix.texi:20425
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean shutdown-clients?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15657
+#: guix-git/doc/guix.texi:20431
 msgid "Should all processes be killed when Dovecot master process shuts down.  Setting this to @code{#f} means that Dovecot can be upgraded without forcing existing client connections to close (although that could also be a problem if the upgrade is e.g.@: due to a security fix).  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15659
+#: guix-git/doc/guix.texi:20433
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer doveadm-worker-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15663
+#: guix-git/doc/guix.texi:20437
 msgid "If non-zero, run mail commands via this many connections to doveadm server, instead of running them directly in the same process.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15665
+#: guix-git/doc/guix.texi:20439
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string doveadm-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15668
+#: guix-git/doc/guix.texi:20442
 msgid "UNIX socket or host:port used for connecting to doveadm server.  Defaults to @samp{\"doveadm-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15670
+#: guix-git/doc/guix.texi:20444
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list import-environment"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15674
+#: guix-git/doc/guix.texi:20448
 msgid "List of environment variables that are preserved on Dovecot startup and passed down to all of its child processes.  You can also give key=value pairs to always set specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15676
+#: guix-git/doc/guix.texi:20450
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean disable-plaintext-auth?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15683
+#: guix-git/doc/guix.texi:20457
 msgid "Disable LOGIN command and all other plaintext authentications unless SSL/TLS is used (LOGINDISABLED capability).  Note that if the remote IP matches the local IP (i.e.@: you're connecting from the same computer), the connection is considered secure and plaintext authentication is allowed.  See also ssl=required setting.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15685
+#: guix-git/doc/guix.texi:20459
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15690
+#: guix-git/doc/guix.texi:20464
 msgid "Authentication cache size (e.g.@: @samp{#e10e6}).  0 means it's disabled.  Note that bsdauth, PAM and vpopmail require @samp{cache-key} to be set for caching to be used.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15692
+#: guix-git/doc/guix.texi:20466
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15700
+#: guix-git/doc/guix.texi:20474
 msgid "Time to live for cached data.  After TTL expires the cached record is no longer used, *except* if the main database lookup returns internal failure.  We also try to handle password changes automatically: If user's previous authentication was successful, but this one wasn't, the cache isn't used.  For now this works only with plaintext authentication.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15702
+#: guix-git/doc/guix.texi:20476
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-cache-negative-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15706
+#: guix-git/doc/guix.texi:20480
 msgid "TTL for negative hits (user not found, password mismatch).  0 disables caching them completely.  Defaults to @samp{\"1 hour\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15708
+#: guix-git/doc/guix.texi:20482
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-realms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15714
+#: guix-git/doc/guix.texi:20488
 msgid "List of realms for SASL authentication mechanisms that need them.  You can leave it empty if you don't want to support multiple realms.  Many clients simply use the first one listed here, so keep the default realm first.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15716
+#: guix-git/doc/guix.texi:20490
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-default-realm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15721
+#: guix-git/doc/guix.texi:20495
 msgid "Default realm/domain to use if none was specified.  This is used for both SASL realms and appending @@domain to username in plaintext logins.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15723
+#: guix-git/doc/guix.texi:20497
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-chars"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15730
+#: guix-git/doc/guix.texi:20504
 msgid "List of allowed characters in username.  If the user-given username contains a character not listed in here, the login automatically fails.  This is just an extra check to make sure user can't exploit any potential quote escaping vulnerabilities with SQL/LDAP databases.  If you want to allow all characters, set this value to empty.  Defaults to @samp{\"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@@\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15732
+#: guix-git/doc/guix.texi:20506
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-translation"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15738
+#: guix-git/doc/guix.texi:20512
 msgid "Username character translations before it's looked up from databases.  The value contains series of from -> to characters.  For example @samp{#@@/@@} means that @samp{#} and @samp{/} characters are translated to @samp{@@}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15740
+#: guix-git/doc/guix.texi:20514
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-username-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15747
+#: guix-git/doc/guix.texi:20521
 msgid "Username formatting before it's looked up from databases.  You can use the standard variables here, e.g.@: %Lu would lowercase the username, %n would drop away the domain if it was given, or @samp{%n-AT-%d} would change the @samp{@@} into @samp{-AT-}.  This translation is done after @samp{auth-username-translation} changes.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15749
+#: guix-git/doc/guix.texi:20523
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-master-user-separator"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15757
+#: guix-git/doc/guix.texi:20531
 msgid "If you want to allow master users to log in by specifying the master username within the normal username string (i.e.@: not using SASL mechanism's support for it), you can specify the separator character here.  The format is then <username><separator><master username>.  UW-IMAP uses @samp{*} as the separator, so that could be a good choice.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15759
+#: guix-git/doc/guix.texi:20533
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-anonymous-username"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15763
+#: guix-git/doc/guix.texi:20537
 msgid "Username to use for users logging in with ANONYMOUS SASL mechanism.  Defaults to @samp{\"anonymous\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15765
+#: guix-git/doc/guix.texi:20539
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer auth-worker-max-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15770
+#: guix-git/doc/guix.texi:20544
 msgid "Maximum number of dovecot-auth worker processes.  They're used to execute blocking passdb and userdb queries (e.g.@: MySQL and PAM).  They're automatically created and destroyed as needed.  Defaults to @samp{30}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15772
+#: guix-git/doc/guix.texi:20546
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-gssapi-hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15777
+#: guix-git/doc/guix.texi:20551
 msgid "Host name to use in GSSAPI principal names.  The default is to use the name returned by gethostname().  Use @samp{$ALL} (with quotes) to allow all keytab entries.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15779
+#: guix-git/doc/guix.texi:20553
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-krb5-keytab"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15785
+#: guix-git/doc/guix.texi:20559
 msgid "Kerberos keytab to use for the GSSAPI mechanism.  Will use the system default (usually @file{/etc/krb5.keytab}) if not specified.  You may need to change the auth service to run as root to be able to read this file.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15787
+#: guix-git/doc/guix.texi:20561
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-use-winbind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15792
+#: guix-git/doc/guix.texi:20566
 msgid "Do NTLM and GSS-SPNEGO authentication using Samba's winbind daemon and @samp{ntlm-auth} helper.  <doc/wiki/Authentication/Mechanisms/Winbind.txt>.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15794
+#: guix-git/doc/guix.texi:20568
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-winbind-helper-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15797
+#: guix-git/doc/guix.texi:20571
 msgid "Path for Samba's @samp{ntlm-auth} helper binary.  Defaults to @samp{\"/usr/bin/ntlm_auth\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15799
+#: guix-git/doc/guix.texi:20573
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-failure-delay"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15802
+#: guix-git/doc/guix.texi:20576
 msgid "Time to delay before replying to failed authentications.  Defaults to @samp{\"2 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15804
+#: guix-git/doc/guix.texi:20578
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-require-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15808
+#: guix-git/doc/guix.texi:20582
 msgid "Require a valid SSL client certificate or the authentication fails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15810
+#: guix-git/doc/guix.texi:20584
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-ssl-username-from-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15815
+#: guix-git/doc/guix.texi:20589
 msgid "Take the username from client's SSL certificate, using @code{X509_NAME_get_text_by_NID()} which returns the subject's DN's CommonName.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15817
+#: guix-git/doc/guix.texi:20591
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list auth-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15823
+#: guix-git/doc/guix.texi:20597
 msgid "List of wanted authentication mechanisms.  Supported mechanisms are: @samp{plain}, @samp{login}, @samp{digest-md5}, @samp{cram-md5}, @samp{ntlm}, @samp{rpa}, @samp{apop}, @samp{anonymous}, @samp{gssapi}, @samp{otp}, @samp{skey}, and @samp{gss-spnego}.  NOTE: See also @samp{disable-plaintext-auth} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15825
+#: guix-git/doc/guix.texi:20599
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15830
+#: guix-git/doc/guix.texi:20604
 msgid "List of IPs or hostnames to all director servers, including ourself.  Ports can be specified as ip:port.  The default port is the same as what director service's @samp{inet-listener} is using.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15832
+#: guix-git/doc/guix.texi:20606
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list director-mail-servers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15836
+#: guix-git/doc/guix.texi:20610
 msgid "List of IPs or hostnames to all backend mail servers.  Ranges are allowed too, like 10.0.0.10-10.0.0.30.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15838
+#: guix-git/doc/guix.texi:20612
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-user-expire"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15842
+#: guix-git/doc/guix.texi:20616
 msgid "How long to redirect users to a specific server after it no longer has any connections.  Defaults to @samp{\"15 min\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15844
+#: guix-git/doc/guix.texi:20618
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string director-username-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15849
+#: guix-git/doc/guix.texi:20623
 msgid "How the username is translated before being hashed.  Useful values include %Ln if user can log in with or without @@domain, %Ld if mailboxes are shared within domain.  Defaults to @samp{\"%Lu\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15851
+#: guix-git/doc/guix.texi:20625
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15855
+#: guix-git/doc/guix.texi:20629
 msgid "Log file to use for error messages.  @samp{syslog} logs to syslog, @samp{/dev/stderr} logs to stderr.  Defaults to @samp{\"syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15857
+#: guix-git/doc/guix.texi:20631
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string info-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15861
+#: guix-git/doc/guix.texi:20635
 msgid "Log file to use for informational messages.  Defaults to @samp{log-path}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15863
+#: guix-git/doc/guix.texi:20637
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string debug-log-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15867
+#: guix-git/doc/guix.texi:20641
 msgid "Log file to use for debug messages.  Defaults to @samp{info-log-path}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15869
+#: guix-git/doc/guix.texi:20643
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string syslog-facility"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15874
+#: guix-git/doc/guix.texi:20648
 msgid "Syslog facility to use if you're logging to syslog.  Usually if you don't want to use @samp{mail}, you'll use local0..local7.  Also other standard facilities are supported.  Defaults to @samp{\"mail\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15876
+#: guix-git/doc/guix.texi:20650
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-verbose?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15880
+#: guix-git/doc/guix.texi:20654
 msgid "Log unsuccessful authentication attempts and the reasons why they failed.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15882
+#: guix-git/doc/guix.texi:20656
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string auth-verbose-passwords"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15889
+#: guix-git/doc/guix.texi:20663
 msgid "In case of password mismatches, log the attempted password.  Valid values are no, plain and sha1.  sha1 can be useful for detecting brute force password attempts vs.  user simply trying the same password over and over again.  You can also truncate the value to n chars by appending \":n\" (e.g.@: sha1:6).  Defaults to @samp{\"no\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15891
+#: guix-git/doc/guix.texi:20665
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15895
+#: guix-git/doc/guix.texi:20669
 msgid "Even more verbose logging for debugging purposes.  Shows for example SQL queries.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15897
+#: guix-git/doc/guix.texi:20671
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean auth-debug-passwords?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15902
+#: guix-git/doc/guix.texi:20676
 msgid "In case of password mismatches, log the passwords and used scheme so the problem can be debugged.  Enabling this also enables @samp{auth-debug}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15904
+#: guix-git/doc/guix.texi:20678
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-debug?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15908
+#: guix-git/doc/guix.texi:20682
 msgid "Enable mail process debugging.  This can help you figure out why Dovecot isn't finding your mails.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15910
+#: guix-git/doc/guix.texi:20684
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean verbose-ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15913
+#: guix-git/doc/guix.texi:20687
 msgid "Show protocol level SSL errors.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15915
+#: guix-git/doc/guix.texi:20689
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string log-timestamp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15919
+#: guix-git/doc/guix.texi:20693
 msgid "Prefix for each line written to log file.  % codes are in strftime(3) format.  Defaults to @samp{\"\\\"%b %d %H:%M:%S \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15921
+#: guix-git/doc/guix.texi:20695
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list login-log-format-elements"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15925
+#: guix-git/doc/guix.texi:20699
 msgid "List of elements we want to log.  The elements which have a non-empty variable value are joined together to form a comma-separated string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15927
+#: guix-git/doc/guix.texi:20701
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string login-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15931
+#: guix-git/doc/guix.texi:20705
 msgid "Login log format.  %s contains @samp{login-log-format-elements} string, %$ contains the data we want to log.  Defaults to @samp{\"%$: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15933
+#: guix-git/doc/guix.texi:20707
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-log-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15937
+#: guix-git/doc/guix.texi:20711
 msgid "Log prefix for mail processes.  See doc/wiki/Variables.txt for list of possible variables you can use.  Defaults to @samp{\"\\\"%s(%u)<%@{pid@}><%@{session@}>: \\\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15939
+#: guix-git/doc/guix.texi:20713
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string deliver-log-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15941
+#: guix-git/doc/guix.texi:20715
 msgid "Format to use for logging mail deliveries.  You can use variables:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15942
+#: guix-git/doc/guix.texi:20716
 #, no-wrap
 msgid "%$"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15944
+#: guix-git/doc/guix.texi:20718
 msgid "Delivery status message (e.g.@: @samp{saved to INBOX})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15944
+#: guix-git/doc/guix.texi:20718
 #, no-wrap
 msgid "%m"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15946
+#: guix-git/doc/guix.texi:20720
 msgid "Message-ID"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15946 doc/guix.texi:16478
+#: guix-git/doc/guix.texi:20720 guix-git/doc/guix.texi:21252
 #, no-wrap
 msgid "%s"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15948
+#: guix-git/doc/guix.texi:20722
 msgid "Subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15948
+#: guix-git/doc/guix.texi:20722
 #, no-wrap
 msgid "%f"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15950
+#: guix-git/doc/guix.texi:20724
 msgid "From address"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15952
+#: guix-git/doc/guix.texi:20726
 msgid "Physical size"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15952
+#: guix-git/doc/guix.texi:20726
 #, no-wrap
 msgid "%w"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15954
+#: guix-git/doc/guix.texi:20728
 msgid "Virtual size."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15956
+#: guix-git/doc/guix.texi:20730
 msgid "Defaults to @samp{\"msgid=%m: %$\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15958
+#: guix-git/doc/guix.texi:20732
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15963
+#: guix-git/doc/guix.texi:20737
 msgid "Location for users' mailboxes.  The default is empty, which means that Dovecot tries to find the mailboxes automatically.  This won't work if the user doesn't yet have any mail, so you should explicitly tell Dovecot the full location."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15969
-msgid "If you're using mbox, giving a path to the INBOX file (e.g.@: /var/mail/%u) isn't enough.  You'll also need to tell Dovecot where the other mailboxes are kept.  This is called the \"root mail directory\", and it must be the first path given in the @samp{mail-location} setting."
+#: guix-git/doc/guix.texi:20743
+msgid "If you're using mbox, giving a path to the INBOX file (e.g.@: @file{/var/mail/%u}) isn't enough.  You'll also need to tell Dovecot where the other mailboxes are kept.  This is called the @emph{root mail directory}, and it must be the first path given in the @samp{mail-location} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15971
-msgid "There are a few special variables you can use, eg.:"
+#: guix-git/doc/guix.texi:20745
+msgid "There are a few special variables you can use, e.g.:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15975
+#: guix-git/doc/guix.texi:20749
 msgid "username"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15975 doc/guix.texi:16474
+#: guix-git/doc/guix.texi:20749 guix-git/doc/guix.texi:21248
 #, no-wrap
 msgid "%n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15977
+#: guix-git/doc/guix.texi:20751
 msgid "user part in user@@domain, same as %u if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15977
+#: guix-git/doc/guix.texi:20751
 #, no-wrap
 msgid "%d"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15979
+#: guix-git/doc/guix.texi:20753
 msgid "domain part in user@@domain, empty if there's no domain"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15979
+#: guix-git/doc/guix.texi:20753
 #, no-wrap
 msgid "%h"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:15981
+#: guix-git/doc/guix.texi:20755
 msgid "home director"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15984
+#: guix-git/doc/guix.texi:20758
 msgid "See doc/wiki/Variables.txt for full list.  Some examples:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15985
+#: guix-git/doc/guix.texi:20759
 #, no-wrap
 msgid "maildir:~/Maildir"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15986
+#: guix-git/doc/guix.texi:20760
 #, no-wrap
 msgid "mbox:~/mail:INBOX=/var/mail/%u"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:15987
+#: guix-git/doc/guix.texi:20761
 #, no-wrap
 msgid "mbox:/var/mail/%d/%1n/%n:INDEX=/var/indexes/%d/%1n/%"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15992
+#: guix-git/doc/guix.texi:20766
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15997
+#: guix-git/doc/guix.texi:20771
 msgid "System user and group used to access mails.  If you use multiple, userdb can override these by returning uid or gid fields.  You can use either numbers or names.  <doc/wiki/UserIds.txt>.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:15999
+#: guix-git/doc/guix.texi:20773
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16004
+#: guix-git/doc/guix.texi:20778
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-privileged-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16010
-msgid "Group to enable temporarily for privileged operations.  Currently this is used only with INBOX when either its initial creation or dotlocking fails.  Typically this is set to \"mail\" to give access to /var/mail.  Defaults to @samp{\"\"}."
+#: guix-git/doc/guix.texi:20784
+msgid "Group to enable temporarily for privileged operations.  Currently this is used only with INBOX when either its initial creation or dotlocking fails.  Typically this is set to @samp{\"mail\"} to give access to @file{/var/mail}.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16012
+#: guix-git/doc/guix.texi:20786
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-access-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16020
-msgid "Grant access to these supplementary groups for mail processes.  Typically these are used to set up access to shared mailboxes.  Note that it may be dangerous to set these if users can create symlinks (e.g.@: if \"mail\" group is set here, ln -s /var/mail ~/mail/var could allow a user to delete others' mailboxes, or ln -s /secret/shared/box ~/mail/mybox would allow reading it).  Defaults to @samp{\"\"}."
+#: guix-git/doc/guix.texi:20794
+msgid "Grant access to these supplementary groups for mail processes.  Typically these are used to set up access to shared mailboxes.  Note that it may be dangerous to set these if users can create symlinks (e.g.@: if @samp{mail} group is set here, @code{ln -s /var/mail ~/mail/var} could allow a user to delete others' mailboxes, or @code{ln -s /secret/shared/box ~/mail/mybox} would allow reading it).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16022
+#: guix-git/doc/guix.texi:20796
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-full-filesystem-access?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16028
-msgid "Allow full file system access to clients.  There's no access checks other than what the operating system does for the active UID/GID.  It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g.@: /path/ or ~user/.  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20802
+msgid "Allow full file system access to clients.  There's no access checks other than what the operating system does for the active UID/GID@.  It works with both maildir and mboxes, allowing you to prefix mailboxes names with e.g.@: @file{/path/} or @file{~user/}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16030
+#: guix-git/doc/guix.texi:20804
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mmap-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16034
-msgid "Don't use mmap() at all.  This is required if you store indexes to shared file systems (NFS or clustered file system).  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20808
+msgid "Don't use @code{mmap()} at all.  This is required if you store indexes to shared file systems (NFS or clustered file system).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16036
+#: guix-git/doc/guix.texi:20810
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean dotlock-use-excl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16041
+#: guix-git/doc/guix.texi:20815
 msgid "Rely on @samp{O_EXCL} to work when creating dotlock files.  NFS supports @samp{O_EXCL} since version 3, so this should be safe to use nowadays by default.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16043
+#: guix-git/doc/guix.texi:20817
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-fsync"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16045
+#: guix-git/doc/guix.texi:20819
 msgid "When to use fsync() or fdatasync() calls:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16046
+#: guix-git/doc/guix.texi:20820
 #, no-wrap
 msgid "optimized"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16048
+#: guix-git/doc/guix.texi:20822
 msgid "Whenever necessary to avoid losing important data"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16050
-msgid "Useful with e.g.@: NFS when write()s are delayed"
+#: guix-git/doc/guix.texi:20824
+msgid "Useful with e.g.@: NFS when @code{write()}s are delayed"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16052
+#: guix-git/doc/guix.texi:20826
 msgid "Never use it (best performance, but crashes can lose data)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16054
+#: guix-git/doc/guix.texi:20828
 msgid "Defaults to @samp{\"optimized\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16056
+#: guix-git/doc/guix.texi:20830
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-storage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16061
-msgid "Mail storage exists in NFS.  Set this to yes to make Dovecot flush NFS caches whenever needed.  If you're using only a single mail server this isn't needed.  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20835
+msgid "Mail storage exists in NFS@.  Set this to yes to make Dovecot flush NFS caches whenever needed.  If you're using only a single mail server this isn't needed.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16063
+#: guix-git/doc/guix.texi:20837
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-nfs-index?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16067
-msgid "Mail index files also exist in NFS.  Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}.  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20841
+msgid "Mail index files also exist in NFS@.  Setting this to yes requires @samp{mmap-disable? #t} and @samp{fsync-disable? #f}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16069
+#: guix-git/doc/guix.texi:20843
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lock-method"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16075
+#: guix-git/doc/guix.texi:20849
 msgid "Locking method for index files.  Alternatives are fcntl, flock and dotlock.  Dotlocking uses some tricks which may create more disk I/O than other locking methods.  NFS users: flock doesn't work, remember to change @samp{mmap-disable}.  Defaults to @samp{\"fcntl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16077
+#: guix-git/doc/guix.texi:20851
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-temp-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16081
+#: guix-git/doc/guix.texi:20855
 msgid "Directory in which LDA/LMTP temporarily stores incoming mails >128 kB.  Defaults to @samp{\"/tmp\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16083
+#: guix-git/doc/guix.texi:20857
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16089
+#: guix-git/doc/guix.texi:20863
 msgid "Valid UID range for users.  This is mostly to make sure that users can't log in as daemons or other system users.  Note that denying root logins is hardcoded to dovecot binary and can't be done even if @samp{first-valid-uid} is set to 0.  Defaults to @samp{500}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16091
+#: guix-git/doc/guix.texi:20865
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16096
+#: guix-git/doc/guix.texi:20870
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer first-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16101
+#: guix-git/doc/guix.texi:20875
 msgid "Valid GID range for users.  Users having non-valid GID as primary group ID aren't allowed to log in.  If user belongs to supplementary groups with non-valid GIDs, those groups are not set.  Defaults to @samp{1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16103
+#: guix-git/doc/guix.texi:20877
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer last-valid-gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16108
+#: guix-git/doc/guix.texi:20882
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-max-keyword-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16112
+#: guix-git/doc/guix.texi:20886
 msgid "Maximum allowed length for mail keyword name.  It's only forced when trying to create new keywords.  Defaults to @samp{50}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16114
+#: guix-git/doc/guix.texi:20888
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} colon-separated-file-name-list valid-chroot-dirs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16124
-msgid "List of directories under which chrooting is allowed for mail processes (i.e.@: /var/mail will allow chrooting to /var/mail/foo/bar too).  This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings.  If this setting is empty, \"/./\" in home dirs are ignored.  WARNING: Never add directories here which local users can modify, that may lead to root exploit.  Usually this should be done only if you don't allow shell access for users.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{()}."
+#: guix-git/doc/guix.texi:20898
+msgid "List of directories under which chrooting is allowed for mail processes (i.e.@: @file{/var/mail} will allow chrooting to @file{/var/mail/foo/bar} too).  This setting doesn't affect @samp{login-chroot} @samp{mail-chroot} or auth chroot settings.  If this setting is empty, @samp{/./} in home dirs are ignored.  WARNING: Never add directories here which local users can modify, that may lead to root exploit.  Usually this should be done only if you don't allow shell access for users.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16126
+#: guix-git/doc/guix.texi:20900
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-chroot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16135
-msgid "Default chroot directory for mail processes.  This can be overridden for specific users in user database by giving /./ in user's home directory (e.g.@: /home/./user chroots into /home).  Note that usually there is no real need to do chrooting, Dovecot doesn't allow users to access files outside their mail directory anyway.  If your home directories are prefixed with the chroot directory, append \"/.\"@: to @samp{mail-chroot}.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{\"\"}."
+#: guix-git/doc/guix.texi:20909
+msgid "Default chroot directory for mail processes.  This can be overridden for specific users in user database by giving @samp{/./} in user's home directory (e.g.@: @samp{/home/./user} chroots into @file{/home}).  Note that usually there is no real need to do chrooting, Dovecot doesn't allow users to access files outside their mail directory anyway.  If your home directories are prefixed with the chroot directory, append @samp{/.} to @samp{mail-chroot}.  <doc/wiki/Chrooting.txt>.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16137
+#: guix-git/doc/guix.texi:20911
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name auth-socket-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16141
+#: guix-git/doc/guix.texi:20915
 msgid "UNIX socket path to master authentication server to find users.  This is used by imap (for shared users) and lda.  Defaults to @samp{\"/var/run/dovecot/auth-userdb\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16143
+#: guix-git/doc/guix.texi:20917
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name mail-plugin-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16146
+#: guix-git/doc/guix.texi:20920
 msgid "Directory where to look up mail plugins.  Defaults to @samp{\"/usr/lib/dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16148
+#: guix-git/doc/guix.texi:20922
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mail-plugins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16152
+#: guix-git/doc/guix.texi:20926
 msgid "List of plugins to load for all services.  Plugins specific to IMAP, LDA, etc.@: are added to this list in their own .conf files.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16154
+#: guix-git/doc/guix.texi:20928
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-cache-min-mail-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16159
+#: guix-git/doc/guix.texi:20933
 msgid "The minimum number of mails in a mailbox before updates are done to cache file.  This allows optimizing Dovecot's behavior to do less disk writes at the cost of more disk reads.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16161
+#: guix-git/doc/guix.texi:20935
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mailbox-idle-check-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16168
+#: guix-git/doc/guix.texi:20942
 msgid "When IDLE command is running, mailbox is checked once in a while to see if there are any new mails or other changes.  This setting defines the minimum time to wait between those checks.  Dovecot can also use dnotify, inotify and kqueue to find out immediately when changes occur.  Defaults to @samp{\"30 secs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16170
+#: guix-git/doc/guix.texi:20944
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mail-save-crlf?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16177
-msgid "Save mails with CR+LF instead of plain LF.  This makes sending those mails take less CPU, especially with sendfile() syscall with Linux and FreeBSD.  But it also creates a bit more disk I/O which may just make it slower.  Also note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems.  Defaults to @samp{#f}."
+#: guix-git/doc/guix.texi:20951
+msgid "Save mails with CR+LF instead of plain LF@.  This makes sending those mails take less CPU, especially with sendfile() syscall with Linux and FreeBSD@.  But it also creates a bit more disk I/O which may just make it slower.  Also note that if other software reads the mboxes/maildirs, they may handle the extra CRs wrong and cause problems.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16179
+#: guix-git/doc/guix.texi:20953
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-stat-dirs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16187
+#: guix-git/doc/guix.texi:20961
 msgid "By default LIST command returns all entries in maildir beginning with a dot.  Enabling this option makes Dovecot return only entries which are directories.  This is done by stat()ing each entry, so it causes more disk I/O.  (For systems setting struct @samp{dirent->d_type} this check is free and it's done always regardless of this setting).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16189
+#: guix-git/doc/guix.texi:20963
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-copy-with-hardlinks?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16194
+#: guix-git/doc/guix.texi:20968
 msgid "When copying a message, do it with hard links whenever possible.  This makes the performance much better, and it's unlikely to have any side effects.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16196
+#: guix-git/doc/guix.texi:20970
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean maildir-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16201
+#: guix-git/doc/guix.texi:20975
 msgid "Assume Dovecot is the only MUA accessing Maildir: Scan cur/ directory only when its mtime changes unexpectedly or when we can't find the mail otherwise.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16203
+#: guix-git/doc/guix.texi:20977
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-read-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16206
+#: guix-git/doc/guix.texi:20980
 msgid "Which locking methods to use for locking mbox.  There are four available:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16208
+#: guix-git/doc/guix.texi:20982
 #, no-wrap
 msgid "dotlock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16212
+#: guix-git/doc/guix.texi:20986
 msgid "Create <mailbox>.lock file.  This is the oldest and most NFS-safe solution.  If you want to use /var/mail/ like directory, the users will need write access to that directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16212
+#: guix-git/doc/guix.texi:20986
 #, no-wrap
 msgid "dotlock-try"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16215
+#: guix-git/doc/guix.texi:20989
 msgid "Same as dotlock, but if it fails because of permissions or because there isn't enough disk space, just skip it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16215
+#: guix-git/doc/guix.texi:20989
 #, no-wrap
 msgid "fcntl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16217
+#: guix-git/doc/guix.texi:20991
 msgid "Use this if possible.  Works with NFS too if lockd is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16217
+#: guix-git/doc/guix.texi:20991
 #, no-wrap
 msgid "flock"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16219 doc/guix.texi:16221
+#: guix-git/doc/guix.texi:20993 guix-git/doc/guix.texi:20995
 msgid "May not exist in all systems.  Doesn't work with NFS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16219
+#: guix-git/doc/guix.texi:20993
 #, no-wrap
 msgid "lockf"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16227
+#: guix-git/doc/guix.texi:21001
 msgid "You can use multiple locking methods; if you do the order they're declared in is important to avoid deadlocks if other MTAs/MUAs are using multiple locking methods as well.  Some operating systems don't allow using some of them simultaneously."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16229
+#: guix-git/doc/guix.texi:21003
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list mbox-write-locks"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16233
+#: guix-git/doc/guix.texi:21007
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-lock-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16236
+#: guix-git/doc/guix.texi:21010
 msgid "Maximum time to wait for lock (all of them) before aborting.  Defaults to @samp{\"5 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16238
+#: guix-git/doc/guix.texi:21012
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mbox-dotlock-change-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16242
+#: guix-git/doc/guix.texi:21016
 msgid "If dotlock exists but the mailbox isn't modified in any way, override the lock file after this much time.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16244
+#: guix-git/doc/guix.texi:21018
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16255
+#: guix-git/doc/guix.texi:21029
 msgid "When mbox changes unexpectedly we have to fully read it to find out what changed.  If the mbox is large this can take a long time.  Since the change is usually just a newly appended mail, it'd be faster to simply read the new mails.  If this setting is enabled, Dovecot does this but still safely fallbacks to re-reading the whole mbox file whenever something in mbox isn't how it's expected to be.  The only real downside to this setting is that if some other MUA changes message flags, Dovecot doesn't notice it immediately.  Note that a full sync is done with SELECT, EXAMINE, EXPUNGE and CHECK commands.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16257
+#: guix-git/doc/guix.texi:21031
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-very-dirty-syncs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16262
+#: guix-git/doc/guix.texi:21036
 msgid "Like @samp{mbox-dirty-syncs}, but don't do full syncs even with SELECT, EXAMINE, EXPUNGE or CHECK commands.  If this is set, @samp{mbox-dirty-syncs} is ignored.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16264
+#: guix-git/doc/guix.texi:21038
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mbox-lazy-writes?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16270
+#: guix-git/doc/guix.texi:21044
 msgid "Delay writing mbox headers until doing a full write sync (EXPUNGE and CHECK commands and when closing the mailbox).  This is especially useful for POP3 where clients often delete all mails.  The downside is that our changes aren't immediately visible to other MUAs.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16272
+#: guix-git/doc/guix.texi:21046
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mbox-min-index-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16277
+#: guix-git/doc/guix.texi:21051
 msgid "If mbox size is smaller than this (e.g.@: 100k), don't write index files.  If an index file already exists it's still read, just not updated.  Defaults to @samp{0}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16279
+#: guix-git/doc/guix.texi:21053
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mdbox-rotate-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16282
+#: guix-git/doc/guix.texi:21056
 msgid "Maximum dbox file size until it's rotated.  Defaults to @samp{10000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16284
+#: guix-git/doc/guix.texi:21058
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mdbox-rotate-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16289
+#: guix-git/doc/guix.texi:21063
 msgid "Maximum dbox file age until it's rotated.  Typically in days.  Day begins from midnight, so 1d = today, 2d = yesterday, etc.  0 = check disabled.  Defaults to @samp{\"1d\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16291
+#: guix-git/doc/guix.texi:21065
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean mdbox-preallocate-space?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16296
+#: guix-git/doc/guix.texi:21070
 msgid "When creating new mdbox files, immediately preallocate their size to @samp{mdbox-rotate-size}.  This setting currently works only in Linux with some file systems (ext4, xfs).  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16298
+#: guix-git/doc/guix.texi:21072
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16302
+#: guix-git/doc/guix.texi:21076
 msgid "sdbox and mdbox support saving mail attachments to external files, which also allows single instance storage for them.  Other backends don't support this for now."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16304
+#: guix-git/doc/guix.texi:21078
 msgid "WARNING: This feature hasn't been tested much yet.  Use at your own risk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16307
+#: guix-git/doc/guix.texi:21081
 msgid "Directory root where to store mail attachments.  Disabled, if empty.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16309
+#: guix-git/doc/guix.texi:21083
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer mail-attachment-min-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16314
+#: guix-git/doc/guix.texi:21088
 msgid "Attachments smaller than this aren't saved externally.  It's also possible to write a plugin to disable saving specific attachments externally.  Defaults to @samp{128000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16316
+#: guix-git/doc/guix.texi:21090
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-fs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16318
+#: guix-git/doc/guix.texi:21092
 msgid "File system backend to use for saving attachments:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16319
+#: guix-git/doc/guix.texi:21093
 #, no-wrap
 msgid "posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16321
+#: guix-git/doc/guix.texi:21095
 msgid "No SiS done by Dovecot (but this might help FS's own deduplication)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16321
+#: guix-git/doc/guix.texi:21095
 #, no-wrap
 msgid "sis posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16323
+#: guix-git/doc/guix.texi:21097
 msgid "SiS with immediate byte-by-byte comparison during saving"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16323
+#: guix-git/doc/guix.texi:21097
 #, no-wrap
 msgid "sis-queue posix"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16325
+#: guix-git/doc/guix.texi:21099
 msgid "SiS with delayed comparison and deduplication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16327
+#: guix-git/doc/guix.texi:21101
 msgid "Defaults to @samp{\"sis posix\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16329
+#: guix-git/doc/guix.texi:21103
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string mail-attachment-hash"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16335
+#: guix-git/doc/guix.texi:21109
 msgid "Hash format to use in attachment filenames.  You can add any text and variables: @code{%@{md4@}}, @code{%@{md5@}}, @code{%@{sha1@}}, @code{%@{sha256@}}, @code{%@{sha512@}}, @code{%@{size@}}.  Variables can be truncated, e.g.@: @code{%@{sha256:80@}} returns only first 80 bits.  Defaults to @samp{\"%@{sha1@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16337
+#: guix-git/doc/guix.texi:21111
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-process-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16342
+#: guix-git/doc/guix.texi:21116
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-client-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16345 doc/guix.texi:21610
+#: guix-git/doc/guix.texi:21119 guix-git/doc/guix.texi:28439
 msgid "Defaults to @samp{1000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16347
+#: guix-git/doc/guix.texi:21121
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer default-vsz-limit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16352
+#: guix-git/doc/guix.texi:21126
 msgid "Default VSZ (virtual memory size) limit for service processes.  This is mainly intended to catch and kill processes that leak memory before they eat up everything.  Defaults to @samp{256000000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16354
+#: guix-git/doc/guix.texi:21128
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-login-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16359
+#: guix-git/doc/guix.texi:21133
 msgid "Login user is internally used by login processes.  This is the most untrusted user in Dovecot system.  It shouldn't have access to anything at all.  Defaults to @samp{\"dovenull\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16361
+#: guix-git/doc/guix.texi:21135
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string default-internal-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16366
+#: guix-git/doc/guix.texi:21140
 msgid "Internal user is used by unprivileged processes.  It should be separate from login user, so that login processes can't disturb other processes.  Defaults to @samp{\"dovecot\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16368
+#: guix-git/doc/guix.texi:21142
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16371
+#: guix-git/doc/guix.texi:21145
 msgid "SSL/TLS support: yes, no, required.  <doc/wiki/SSL.txt>.  Defaults to @samp{\"required\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16373
+#: guix-git/doc/guix.texi:21147
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16376
+#: guix-git/doc/guix.texi:21150
 msgid "PEM encoded X.509 SSL/TLS certificate (public key).  Defaults to @samp{\"</etc/dovecot/default.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16378
+#: guix-git/doc/guix.texi:21152
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16383
+#: guix-git/doc/guix.texi:21157
 msgid "PEM encoded SSL/TLS private key.  The key is opened before dropping root privileges, so keep the key file unreadable by anyone but root.  Defaults to @samp{\"</etc/dovecot/private/default.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16385
+#: guix-git/doc/guix.texi:21159
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-key-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16391
+#: guix-git/doc/guix.texi:21165
 msgid "If key file is password protected, give the password here.  Alternatively give it when starting dovecot with -p parameter.  Since this file is often world-readable, you may want to place this setting instead to a different.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16393
+#: guix-git/doc/guix.texi:21167
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16399
+#: guix-git/doc/guix.texi:21173
 msgid "PEM encoded trusted certificate authority.  Set this only if you intend to use @samp{ssl-verify-client-cert? #t}.  The file should contain the CA certificate(s) followed by the matching CRL(s).  (e.g.@: @samp{ssl-ca </etc/ssl/certs/ca.pem}).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16401
+#: guix-git/doc/guix.texi:21175
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean ssl-require-crl?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16404
+#: guix-git/doc/guix.texi:21178
 msgid "Require that CRL check succeeds for client certificates.  Defaults to @samp{#t}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16406
+#: guix-git/doc/guix.texi:21180
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean ssl-verify-client-cert?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16410
+#: guix-git/doc/guix.texi:21184
 msgid "Request client to send a certificate.  If you also want to require it, set @samp{auth-ssl-require-client-cert? #t} in auth section.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16412
+#: guix-git/doc/guix.texi:21186
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cert-username-field"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16417
+#: guix-git/doc/guix.texi:21191
 msgid "Which field from certificate to use for username.  commonName and x500UniqueIdentifier are the usual choices.  You'll also need to set @samp{auth-ssl-username-from-cert? #t}.  Defaults to @samp{\"commonName\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16419
+#: guix-git/doc/guix.texi:21193
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-min-protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16422
+#: guix-git/doc/guix.texi:21196
 msgid "Minimum SSL protocol version to accept.  Defaults to @samp{\"TLSv1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16424
+#: guix-git/doc/guix.texi:21198
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-cipher-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16427
+#: guix-git/doc/guix.texi:21201
 msgid "SSL ciphers to use.  Defaults to @samp{\"ALL:!kRSA:!SRP:!kDHd:!DSS:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK:!RC4:!ADH:!LOW@@STRENGTH\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16429
+#: guix-git/doc/guix.texi:21203
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string ssl-crypto-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16432
+#: guix-git/doc/guix.texi:21206
 msgid "SSL crypto device to use, for valid values run \"openssl engine\".  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16434
+#: guix-git/doc/guix.texi:21208
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string postmaster-address"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16438
+#: guix-git/doc/guix.texi:21212
 msgid "Address to use when sending rejection mails.  %d expands to recipient domain.  Defaults to @samp{\"postmaster@@%d\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16440
+#: guix-git/doc/guix.texi:21214
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16444
+#: guix-git/doc/guix.texi:21218
 msgid "Hostname to use in various parts of sent mails (e.g.@: in Message-Id)  and in LMTP replies.  Default is the system's real hostname@@domain.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16446
+#: guix-git/doc/guix.texi:21220
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean quota-full-tempfail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16450
+#: guix-git/doc/guix.texi:21224
 msgid "If user is over quota, return with temporary failure instead of bouncing the mail.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16452
+#: guix-git/doc/guix.texi:21226
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} file-name sendmail-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16455
+#: guix-git/doc/guix.texi:21229
 msgid "Binary to use for sending mails.  Defaults to @samp{\"/usr/sbin/sendmail\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16457
+#: guix-git/doc/guix.texi:21231
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string submission-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16461
+#: guix-git/doc/guix.texi:21235
 msgid "If non-empty, send mails via this SMTP host[:port] instead of sendmail.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16463
+#: guix-git/doc/guix.texi:21237
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string rejection-subject"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16467
+#: guix-git/doc/guix.texi:21241
 msgid "Subject: header to use for rejection mails.  You can use the same variables as for @samp{rejection-reason} below.  Defaults to @samp{\"Rejected: %s\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16469
+#: guix-git/doc/guix.texi:21243
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string rejection-reason"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16472
+#: guix-git/doc/guix.texi:21246
 msgid "Human readable error message for rejection mails.  You can use variables:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16476
+#: guix-git/doc/guix.texi:21250
 msgid "CRLF"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16476
+#: guix-git/doc/guix.texi:21250
 #, no-wrap
 msgid "%r"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16478
+#: guix-git/doc/guix.texi:21252
 msgid "reason"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16480
+#: guix-git/doc/guix.texi:21254
 msgid "original subject"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16480
+#: guix-git/doc/guix.texi:21254
 #, no-wrap
 msgid "%t"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16482
+#: guix-git/doc/guix.texi:21256
 msgid "recipient"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16484
+#: guix-git/doc/guix.texi:21258
 msgid "Defaults to @samp{\"Your message to <%t> was automatically rejected:%n%r\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16486
+#: guix-git/doc/guix.texi:21260
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string recipient-delimiter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16490
+#: guix-git/doc/guix.texi:21264
 msgid "Delimiter character between local-part and detail in email address.  Defaults to @samp{\"+\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16492
+#: guix-git/doc/guix.texi:21266
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string lda-original-recipient-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16498
+#: guix-git/doc/guix.texi:21272
 msgid "Header where the original recipient address (SMTP's RCPT TO: address) is taken from if not available elsewhere.  With dovecot-lda -a parameter overrides this.  A commonly used header for this is X-Original-To.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16500
+#: guix-git/doc/guix.texi:21274
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autocreate?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16504
+#: guix-git/doc/guix.texi:21278
 msgid "Should saving a mail to a nonexistent mailbox automatically create it?.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16506
+#: guix-git/doc/guix.texi:21280
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} boolean lda-mailbox-autosubscribe?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16510
+#: guix-git/doc/guix.texi:21284
 msgid "Should automatically created mailboxes be also automatically subscribed?.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16512
+#: guix-git/doc/guix.texi:21286
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} non-negative-integer imap-max-line-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16518
+#: guix-git/doc/guix.texi:21292
 msgid "Maximum IMAP command line length.  Some clients generate very long command lines with huge mailboxes, so you may need to raise this if you get \"Too long argument\" or \"IMAP command line too large\" errors often.  Defaults to @samp{64000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16520
+#: guix-git/doc/guix.texi:21294
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-logout-format"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16522
+#: guix-git/doc/guix.texi:21296
 msgid "IMAP logout format string:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16523
+#: guix-git/doc/guix.texi:21297
 #, no-wrap
 msgid "%i"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16525
+#: guix-git/doc/guix.texi:21299
 msgid "total number of bytes read from client"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16525
+#: guix-git/doc/guix.texi:21299
 #, no-wrap
 msgid "%o"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16527
+#: guix-git/doc/guix.texi:21301
 msgid "total number of bytes sent to client."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16530
+#: guix-git/doc/guix.texi:21304
 msgid "See @file{doc/wiki/Variables.txt} for a list of all the variables you can use.  Defaults to @samp{\"in=%i out=%o deleted=%@{deleted@} expunged=%@{expunged@} trashed=%@{trashed@} hdr_count=%@{fetch_hdr_count@} hdr_bytes=%@{fetch_hdr_bytes@} body_count=%@{fetch_body_count@} body_bytes=%@{fetch_body_bytes@}\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16532
+#: guix-git/doc/guix.texi:21306
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-capability"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16536
+#: guix-git/doc/guix.texi:21310
 msgid "Override the IMAP CAPABILITY response.  If the value begins with '+', add the given capabilities on top of the defaults (e.g.@: +XFOO XBAR).  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16538
+#: guix-git/doc/guix.texi:21312
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-idle-notify-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16542
+#: guix-git/doc/guix.texi:21316
 msgid "How long to wait between \"OK Still here\" notifications when client is IDLEing.  Defaults to @samp{\"2 mins\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16544
+#: guix-git/doc/guix.texi:21318
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-send"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16550
+#: guix-git/doc/guix.texi:21324
 msgid "ID field names and values to send to clients.  Using * as the value makes Dovecot use the default value.  The following fields have default values currently: name, version, os, os-version, support-url, support-email.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16552
+#: guix-git/doc/guix.texi:21326
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-id-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16555
+#: guix-git/doc/guix.texi:21329
 msgid "ID fields sent by client to log.  * means everything.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16557
+#: guix-git/doc/guix.texi:21331
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} space-separated-string-list imap-client-workarounds"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16559
+#: guix-git/doc/guix.texi:21333
 msgid "Workarounds for various client bugs:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16561
+#: guix-git/doc/guix.texi:21335
 #, no-wrap
 msgid "delay-newmail"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16568
+#: guix-git/doc/guix.texi:21342
 msgid "Send EXISTS/RECENT new mail notifications only when replying to NOOP and CHECK commands.  Some clients ignore them otherwise, for example OSX Mail (<v2.1).  Outlook Express breaks more badly though, without this it may show user \"Message no longer in server\" errors.  Note that OE6 still breaks even with this workaround if synchronization is set to \"Headers Only\"."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16569
+#: guix-git/doc/guix.texi:21343
 #, no-wrap
 msgid "tb-extra-mailbox-sep"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16573
+#: guix-git/doc/guix.texi:21347
 msgid "Thunderbird gets somehow confused with LAYOUT=fs (mbox and dbox) and adds extra @samp{/} suffixes to mailbox names.  This option causes Dovecot to ignore the extra @samp{/} instead of treating it as invalid mailbox name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16574
+#: guix-git/doc/guix.texi:21348
 #, no-wrap
 msgid "tb-lsub-flags"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16578
+#: guix-git/doc/guix.texi:21352
 msgid "Show \\Noselect flags for LSUB replies with LAYOUT=fs (e.g.@: mbox).  This makes Thunderbird realize they aren't selectable and show them greyed out, instead of only later giving \"not selectable\" popup error."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16582
+#: guix-git/doc/guix.texi:21356
 #, no-wrap
 msgid "{@code{dovecot-configuration} parameter} string imap-urlauth-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16585
+#: guix-git/doc/guix.texi:21359
 msgid "Host allowed in URLAUTH URLs sent by client.  \"*\" allows all.  Defaults to @samp{\"\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16593
+#: guix-git/doc/guix.texi:21367
 msgid "Whew! Lots of configuration options.  The nice thing about it though is that Guix has a complete interface to Dovecot's configuration language.  This allows not only a nice way to declare configurations, but also offers reflective capabilities as well: users can write code to inspect and transform configurations from within Scheme."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16599
+#: guix-git/doc/guix.texi:21373
 msgid "However, it could be that you just want to get a @code{dovecot.conf} up and running.  In that case, you can pass an @code{opaque-dovecot-configuration} as the @code{#:config} parameter to @code{dovecot-service}.  As its name indicates, an opaque configuration does not have easy reflective capabilities."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16601
+#: guix-git/doc/guix.texi:21375
 msgid "Available @code{opaque-dovecot-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16602
+#: guix-git/doc/guix.texi:21376
 #, no-wrap
 msgid "{@code{opaque-dovecot-configuration} parameter} package dovecot"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16606
+#: guix-git/doc/guix.texi:21380
 #, no-wrap
 msgid "{@code{opaque-dovecot-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16608
+#: guix-git/doc/guix.texi:21382
 msgid "The contents of the @code{dovecot.conf}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16612
+#: guix-git/doc/guix.texi:21386
 msgid "For example, if your @code{dovecot.conf} is just the empty string, you could instantiate a dovecot service like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16617
+#. type: lisp
+#: guix-git/doc/guix.texi:21391
 #, no-wrap
 msgid ""
 "(dovecot-service #:config\n"
@@ -29878,24 +38738,24 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16619
+#: guix-git/doc/guix.texi:21393
 #, no-wrap
 msgid "OpenSMTPD Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16621
+#: guix-git/doc/guix.texi:21395
 #, no-wrap
 msgid "{Scheme Variable} opensmtpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16625
+#: guix-git/doc/guix.texi:21399
 msgid "This is the type of the @uref{https://www.opensmtpd.org, OpenSMTPD} service, whose value should be an @code{opensmtpd-configuration} object as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16630
+#. type: lisp
+#: guix-git/doc/guix.texi:21404
 #, no-wrap
 msgid ""
 "(service opensmtpd-service-type\n"
@@ -29904,75 +38764,76 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16633
+#: guix-git/doc/guix.texi:21407
 #, no-wrap
 msgid "{Data Type} opensmtpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16635
+#: guix-git/doc/guix.texi:21409
 msgid "Data type representing the configuration of opensmtpd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16637
+#: guix-git/doc/guix.texi:21411
 #, no-wrap
 msgid "@code{package} (default: @var{opensmtpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16639
+#: guix-git/doc/guix.texi:21413
 msgid "Package object of the OpenSMTPD SMTP server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16640
-#, no-wrap
-msgid "@code{config-file} (default: @var{%default-opensmtpd-file})"
-msgstr ""
+#: guix-git/doc/guix.texi:21414
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{config-file} (default: @code{%default-opensmtpd-file})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
 
 #. type: table
-#: doc/guix.texi:16645
+#: guix-git/doc/guix.texi:21419
 msgid "File-like object of the OpenSMTPD configuration file to use.  By default it listens on the loopback network interface, and allows for mail from users and daemons on the local machine, as well as permitting email to remote servers.  Run @command{man smtpd.conf} for more information."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16649
+#: guix-git/doc/guix.texi:21423
 #, no-wrap
 msgid "Exim Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16651
+#: guix-git/doc/guix.texi:21425
 #, no-wrap
 msgid "mail transfer agent (MTA)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16652
+#: guix-git/doc/guix.texi:21426
 #, no-wrap
 msgid "MTA (mail transfer agent)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16653
+#: guix-git/doc/guix.texi:21427
 #, no-wrap
 msgid "SMTP"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16655
+#: guix-git/doc/guix.texi:21429
 #, no-wrap
 msgid "{Scheme Variable} exim-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16659
+#: guix-git/doc/guix.texi:21433
 msgid "This is the type of the @uref{https://exim.org, Exim} mail transfer agent (MTA), whose value should be an @code{exim-configuration} object as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16664
+#. type: lisp
+#: guix-git/doc/guix.texi:21438
 #, no-wrap
 msgid ""
 "(service exim-service-type\n"
@@ -29981,68 +38842,556 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16670
+#: guix-git/doc/guix.texi:21444
 msgid "In order to use an @code{exim-service-type} service you must also have a @code{mail-aliases-service-type} service present in your @code{operating-system} (even if it has no aliases)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16671
+#: guix-git/doc/guix.texi:21445
 #, no-wrap
 msgid "{Data Type} exim-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16673
+#: guix-git/doc/guix.texi:21447
 msgid "Data type representing the configuration of exim."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16675
+#: guix-git/doc/guix.texi:21449
 #, no-wrap
 msgid "@code{package} (default: @var{exim})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16677
+#: guix-git/doc/guix.texi:21451
 msgid "Package object of the Exim server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16684
-msgid "File-like object of the Exim configuration file to use. If its value is @code{#f} then use the default configuration file from the package provided in @code{package}. The resulting configuration file is loaded after setting the @code{exim_user} and @code{exim_group} configuration variables."
+#: guix-git/doc/guix.texi:21458
+msgid "File-like object of the Exim configuration file to use.  If its value is @code{#f} then use the default configuration file from the package provided in @code{package}.  The resulting configuration file is loaded after setting the @code{exim_user} and @code{exim_group} configuration variables."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16688
+#: guix-git/doc/guix.texi:21462
+#, fuzzy, no-wrap
+#| msgid "Mail Services"
+msgid "Getmail service"
+msgstr "邮件服务"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:21464
+#, no-wrap
+msgid "IMAP"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:21465
+#, no-wrap
+msgid "POP"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:21467
+#, no-wrap
+msgid "{Scheme Variable} getmail-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:21470
+msgid "This is the type of the @uref{http://pyropus.ca/software/getmail/, Getmail} mail retriever, whose value should be an @code{getmail-configuration}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:21473
+msgid "Available @code{getmail-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21474
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} symbol name"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21476
+msgid "A symbol to identify the getmail service."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21478
+msgid "Defaults to @samp{\"unset\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21481
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} package package"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21483
+#, fuzzy
+#| msgid "The package data type."
+msgid "The getmail package to use."
+msgstr "软件包数据类型。"
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21486
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} string user"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21488
+msgid "The user to run getmail as."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21490 guix-git/doc/guix.texi:21497
+msgid "Defaults to @samp{\"getmail\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21493
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} string group"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21495
+msgid "The group to run getmail as."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21500
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} string directory"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21502
+msgid "The getmail directory to use."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21504
+msgid "Defaults to @samp{\"/var/lib/getmail/default\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21507
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} getmail-configuration-file rcfile"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21509
+msgid "The getmail configuration file to use."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21511
+msgid "Available @code{getmail-configuration-file} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21512
+#, no-wrap
+msgid "{@code{getmail-configuration-file} parameter} getmail-retriever-configuration retriever"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21514
+msgid "What mail account to retrieve mail from, and how to access that account."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21516
+msgid "Available @code{getmail-retriever-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21517
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string type"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21520
+msgid "The type of mail retriever to use.  Valid values include @samp{passwd} and @samp{static}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21522
+msgid "Defaults to @samp{\"SimpleIMAPSSLRetriever\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21525
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string server"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21527 guix-git/doc/guix.texi:21534
+msgid "Username to login to the mail server with."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21529 guix-git/doc/guix.texi:21536
+#: guix-git/doc/guix.texi:21600
+msgid "Defaults to @samp{unset}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21532
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string username"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21539
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} non-negative-integer port"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21541
+msgid "Port number to connect to."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21546
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string password"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21548 guix-git/doc/guix.texi:21555
+msgid "Override fields from passwd."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21553
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} list password-command"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21560
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string keyfile"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21562
+msgid "PEM-formatted key file to use for the TLS negotiation."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21567
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string certfile"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21569
+msgid "PEM-formatted certificate file to use for the TLS negotiation."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21574
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} string ca-certs"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21576
+#, fuzzy
+#| msgid "Certificate Services"
+msgid "CA certificates to use."
+msgstr "证书服务"
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21581
+#, no-wrap
+msgid "{@code{getmail-retriever-configuration} parameter} parameter-alist extra-parameters"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21583
+msgid "Extra retriever parameters."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21590
+#, no-wrap
+msgid "{@code{getmail-configuration-file} parameter} getmail-destination-configuration destination"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21592
+msgid "What to do with retrieved messages."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21594
+msgid "Available @code{getmail-destination-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21595
+#, no-wrap
+msgid "{@code{getmail-destination-configuration} parameter} string type"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21598
+msgid "The type of mail destination.  Valid values include @samp{Maildir}, @samp{Mboxrd} and @samp{MDA_external}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21603
+#, no-wrap
+msgid "{@code{getmail-destination-configuration} parameter} string-or-filelike path"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21606
+msgid "The path option for the mail destination.  The behaviour depends on the chosen type."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21611
+#, no-wrap
+msgid "{@code{getmail-destination-configuration} parameter} parameter-alist extra-parameters"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21613
+msgid "Extra destination parameters"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21620
+#, no-wrap
+msgid "{@code{getmail-configuration-file} parameter} getmail-options-configuration options"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21622
+msgid "Configure getmail."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21624
+msgid "Available @code{getmail-options-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21625
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} non-negative-integer verbose"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21630
+msgid "If set to @samp{0}, getmail will only print warnings and errors.  A value of @samp{1} means that messages will be printed about retrieving and deleting messages.  If set to @samp{2}, getmail will print messages about each of it's actions."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21632 guix-git/doc/guix.texi:27909
+#: guix-git/doc/guix.texi:28497 guix-git/doc/guix.texi:28642
+msgid "Defaults to @samp{1}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21635
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean read-all"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21638
+msgid "If true, getmail will retrieve all available messages.  Otherwise it will only retrieve messages it hasn't seen previously."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21643
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean delete"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21647
+msgid "If set to true, messages will be deleted from the server after retrieving and successfully delivering them.  Otherwise, messages will be left on the server."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21652
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} non-negative-integer delete-after"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21657
+msgid "Getmail will delete messages this number of days after seeing them, if they have been delivered.  This means messages will be left on the server this number of days after delivering them.  A value of @samp{0} disabled this feature."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21662
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} non-negative-integer delete-bigger-than"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21666
+msgid "Delete messages larger than this of bytes after retrieving them, even if the delete and delete-after options are disabled.  A value of @samp{0} disables this feature."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21671
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} non-negative-integer max-bytes-per-session"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21674
+msgid "Retrieve messages totalling up to this number of bytes before closing the session with the server.  A value of @samp{0} disables this feature."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21679
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} non-negative-integer max-message-size"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21682
+msgid "Don't retrieve messages larger than this number of bytes.  A value of @samp{0} disables this feature."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21687
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean delivered-to"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21689
+msgid "If true, getmail will add a Delivered-To header to messages."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21694
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean received"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21696
+msgid "If set, getmail adds a Received header to the messages."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21701
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} string message-log"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21704
+msgid "Getmail will record a log of its actions to the named file.  A value of @samp{\"\"} disables this feature."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21709
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean message-log-syslog"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21712
+msgid "If true, getmail will record a log of its actions using the system logger."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21717
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} boolean message-log-verbose"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21721
+msgid "If true, getmail will log information about messages not retrieved and the reason for not retrieving them, as well as starting and ending information lines."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21726
+#, no-wrap
+msgid "{@code{getmail-options-configuration} parameter} parameter-alist extra-parameters"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21728
+msgid "Extra options to include."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21737
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} list idle"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21741
+msgid "A list of mailboxes that getmail should wait on the server for new mail notifications.  This depends on the server supporting the IDLE extension."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21746
+#, no-wrap
+msgid "{@code{getmail-configuration} parameter} list environment-variables"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:21748
+msgid "Environment variables to set for getmail."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:21753
 #, no-wrap
 msgid "Mail Aliases Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16690
+#: guix-git/doc/guix.texi:21755
 #, no-wrap
 msgid "email aliases"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16691
+#: guix-git/doc/guix.texi:21756
 #, no-wrap
 msgid "aliases, for email addresses"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16693
+#: guix-git/doc/guix.texi:21758
 #, no-wrap
 msgid "{Scheme Variable} mail-aliases-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16696
+#: guix-git/doc/guix.texi:21761
 msgid "This is the type of the service which provides @code{/etc/aliases}, specifying how to deliver mail to users on this system."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16701
+#. type: lisp
+#: guix-git/doc/guix.texi:21766
 #, no-wrap
 msgid ""
 "(service mail-aliases-service-type\n"
@@ -30051,34 +39400,34 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16709
-msgid "The configuration for a @code{mail-aliases-service-type} service is an association list denoting how to deliver mail that comes to this system. Each entry is of the form @code{(alias addresses ...)}, with @code{alias} specifying the local alias and @code{addresses} specifying where to deliver this user's mail."
+#: guix-git/doc/guix.texi:21774
+msgid "The configuration for a @code{mail-aliases-service-type} service is an association list denoting how to deliver mail that comes to this system.  Each entry is of the form @code{(alias addresses ...)}, with @code{alias} specifying the local alias and @code{addresses} specifying where to deliver this user's mail."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16715
-msgid "The aliases aren't required to exist as users on the local system. In the above example, there doesn't need to be a @code{postmaster} entry in the @code{operating-system}'s @code{user-accounts} in order to deliver the @code{postmaster} mail to @code{bob} (which subsequently would deliver mail to @code{bob@@example.com} and @code{bob@@example2.com})."
+#: guix-git/doc/guix.texi:21780
+msgid "The aliases aren't required to exist as users on the local system.  In the above example, there doesn't need to be a @code{postmaster} entry in the @code{operating-system}'s @code{user-accounts} in order to deliver the @code{postmaster} mail to @code{bob} (which subsequently would deliver mail to @code{bob@@example.com} and @code{bob@@example2.com})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16716 doc/guix.texi:16717
+#: guix-git/doc/guix.texi:21781 guix-git/doc/guix.texi:21782
 #, no-wrap
 msgid "GNU Mailutils IMAP4 Daemon"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16719
+#: guix-git/doc/guix.texi:21784
 #, no-wrap
 msgid "{Scheme Variable} imap4d-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16723
+#: guix-git/doc/guix.texi:21788
 msgid "This is the type of the GNU Mailutils IMAP4 Daemon (@pxref{imap4d,,, mailutils, GNU Mailutils Manual}), whose value should be an @code{imap4d-configuration} object as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16728
+#. type: lisp
+#: guix-git/doc/guix.texi:21793
 #, no-wrap
 msgid ""
 "(service imap4d-service-type\n"
@@ -30087,85 +39436,153 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16731
+#: guix-git/doc/guix.texi:21796
 #, no-wrap
 msgid "{Data Type} imap4d-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:16733
+#: guix-git/doc/guix.texi:21798
 msgid "Data type representing the configuration of @command{imap4d}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16735
+#: guix-git/doc/guix.texi:21800
 #, no-wrap
 msgid "@code{package} (default: @code{mailutils})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16737
+#: guix-git/doc/guix.texi:21802
 msgid "The package that provides @command{imap4d}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:16738
+#: guix-git/doc/guix.texi:21803
 #, no-wrap
 msgid "@code{config-file} (default: @code{%default-imap4d-config-file})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:16742
+#: guix-git/doc/guix.texi:21807
 msgid "File-like object of the configuration file to use, by default it will listen on TCP port 143 of @code{localhost}.  @xref{Conf-imap4d,,, mailutils, GNU Mailutils Manual}, for details."
 msgstr ""
 
+#. type: subsubheading
+#: guix-git/doc/guix.texi:21811
+#, fuzzy, no-wrap
+#| msgid "Mail Services"
+msgid "Radicale Service"
+msgstr "邮件服务"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:21812
+#, no-wrap
+msgid "CalDAV"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:21813
+#, no-wrap
+msgid "CardDAV"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:21815
+#, no-wrap
+msgid "{Scheme Variable} radicale-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:21818
+msgid "This is the type of the @uref{https://radicale.org, Radicale} CalDAV/CardDAV server whose value should be a @code{radicale-configuration}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:21820
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} radicale-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:21822
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of @command{radicale}."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:21824
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{radicale})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:21826
+msgid "The package that provides @command{radicale}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:21827
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{config-file} (default: @code{%default-radicale-config-file})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:21831
+msgid "File-like object of the configuration file to use, by default it will listen on TCP port 5232 of @code{localhost} and use the @code{htpasswd} file at @file{/var/lib/radicale/users} with no (@code{plain}) encryption."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:16749
+#: guix-git/doc/guix.texi:21838
 #, no-wrap
 msgid "messaging"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16750
+#: guix-git/doc/guix.texi:21839
 #, no-wrap
 msgid "jabber"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:16751
+#: guix-git/doc/guix.texi:21840
 #, no-wrap
 msgid "XMPP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16754
-msgid "The @code{(gnu services messaging)} module provides Guix service definitions for messaging services: currently only Prosody is supported."
+#: guix-git/doc/guix.texi:21844
+msgid "The @code{(gnu services messaging)} module provides Guix service definitions for messaging services.  Currently it provides the following services:"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:16755
+#: guix-git/doc/guix.texi:21845
 #, no-wrap
 msgid "Prosody Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16757
+#: guix-git/doc/guix.texi:21847
 #, no-wrap
 msgid "{Scheme Variable} prosody-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16761
+#: guix-git/doc/guix.texi:21851
 msgid "This is the type for the @uref{https://prosody.im, Prosody XMPP communication server}.  Its value must be a @code{prosody-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:16776
+#. type: lisp
+#: guix-git/doc/guix.texi:21866
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
 "         (prosody-configuration\n"
-"          (modules-enabled (cons \"groups\" \"mam\" %default-modules-enabled))\n"
+"          (modules-enabled (cons* \"groups\" \"mam\" %default-modules-enabled))\n"
 "          (int-components\n"
 "           (list\n"
 "            (int-component-configuration\n"
@@ -30179,690 +39596,691 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:16779
+#: guix-git/doc/guix.texi:21869
 msgid "See below for details about @code{prosody-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16785
+#: guix-git/doc/guix.texi:21875
 msgid "By default, Prosody does not need much configuration.  Only one @code{virtualhosts} field is needed: it specifies the domain you wish Prosody to serve."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16788
+#: guix-git/doc/guix.texi:21878
 msgid "You can perform various sanity checks on the generated configuration with the @code{prosodyctl check} command."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16792
+#: guix-git/doc/guix.texi:21882
 msgid "Prosodyctl will also help you to import certificates from the @code{letsencrypt} directory so that the @code{prosody} user can access them.  See @url{https://prosody.im/doc/letsencrypt}."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:16795
+#: guix-git/doc/guix.texi:21885
 #, no-wrap
 msgid "prosodyctl --root cert import /etc/letsencrypt/live\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16802
+#: guix-git/doc/guix.texi:21892
 msgid "The available configuration parameters follow.  Each parameter definition is preceded by its type; for example, @samp{string-list foo} indicates that the @code{foo} parameter should be specified as a list of strings.  Types starting with @code{maybe-} denote parameters that won't show up in @code{prosody.cfg.lua} when their value is @code{'disabled}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16806
+#: guix-git/doc/guix.texi:21896
 msgid "There is also a way to specify the configuration as a string, if you have an old @code{prosody.cfg.lua} file that you want to port over from some other system; see the end for more details."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16809
+#: guix-git/doc/guix.texi:21899
 msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a file name."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:16819
+#: guix-git/doc/guix.texi:21909
 msgid "Available @code{prosody-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16820
+#: guix-git/doc/guix.texi:21910
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16822
+#: guix-git/doc/guix.texi:21912
 msgid "The Prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16824
+#: guix-git/doc/guix.texi:21914
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name data-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16828
+#: guix-git/doc/guix.texi:21918
 msgid "Location of the Prosody data storage directory.  See @url{https://prosody.im/doc/configure}.  Defaults to @samp{\"/var/lib/prosody\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16830
+#: guix-git/doc/guix.texi:21920
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-object-list plugin-paths"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16834
+#: guix-git/doc/guix.texi:21924
 msgid "Additional plugin directories.  They are searched in all the specified paths in order.  See @url{https://prosody.im/doc/plugins_directory}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16836
+#: guix-git/doc/guix.texi:21926
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name certificates"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16841
+#: guix-git/doc/guix.texi:21931
 msgid "Every virtual host and component needs a certificate so that clients and servers can securely verify its identity.  Prosody will automatically load certificates/keys from the directory specified here.  Defaults to @samp{\"/etc/prosody/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16843
+#: guix-git/doc/guix.texi:21933
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list admins"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16849
+#: guix-git/doc/guix.texi:21939
 msgid "This is a list of accounts that are admins for the server.  Note that you must create the accounts separately.  See @url{https://prosody.im/doc/admins} and @url{https://prosody.im/doc/creating_accounts}.  Example: @code{(admins '(\"user1@@example.com\" \"user2@@example.net\"))} Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16851
+#: guix-git/doc/guix.texi:21941
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean use-libevent?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16855
+#: guix-git/doc/guix.texi:21945
 msgid "Enable use of libevent for better performance under high load.  See @url{https://prosody.im/doc/libevent}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16857
+#: guix-git/doc/guix.texi:21947
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} module-list modules-enabled"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16863
+#: guix-git/doc/guix.texi:21953
 msgid "This is the list of modules Prosody will load on startup.  It looks for @code{mod_modulename.lua} in the plugins folder, so make sure that exists too.  Documentation on modules can be found at: @url{https://prosody.im/doc/modules}.  Defaults to @samp{(\"roster\" \"saslauth\" \"tls\" \"dialback\" \"disco\" \"carbons\" \"private\" \"blocklist\" \"vcard\" \"version\" \"uptime\" \"time\" \"ping\" \"pep\" \"register\" \"admin_adhoc\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16865
+#: guix-git/doc/guix.texi:21955
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list modules-disabled"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16869
+#: guix-git/doc/guix.texi:21959
 msgid "@samp{\"offline\"}, @samp{\"c2s\"} and @samp{\"s2s\"} are auto-loaded, but should you want to disable them then add them to this list.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16871
+#: guix-git/doc/guix.texi:21961
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-object groups-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16876
+#: guix-git/doc/guix.texi:21966
 msgid "Path to a text file where the shared groups are defined.  If this path is empty then @samp{mod_groups} does nothing.  See @url{https://prosody.im/doc/modules/mod_groups}.  Defaults to @samp{\"/var/lib/prosody/sharedgroups.txt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16878
+#: guix-git/doc/guix.texi:21968
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean allow-registration?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16882
+#: guix-git/doc/guix.texi:21972
 msgid "Disable account creation by default, for security.  See @url{https://prosody.im/doc/creating_accounts}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16884
+#: guix-git/doc/guix.texi:21974
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-ssl-configuration ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16889
+#: guix-git/doc/guix.texi:21979
 msgid "These are the SSL/TLS-related settings.  Most of them are disabled so to use Prosody's defaults.  If you do not completely understand these options, do not add them to your config, it is easy to lower the security of your server using them.  See @url{https://prosody.im/doc/advanced_ssl_config}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16891
+#: guix-git/doc/guix.texi:21981
 msgid "Available @code{ssl-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16892
+#: guix-git/doc/guix.texi:21982
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string protocol"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16894
+#: guix-git/doc/guix.texi:21984
 msgid "This determines what handshake to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16896
+#: guix-git/doc/guix.texi:21986
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16898
+#: guix-git/doc/guix.texi:21988
 msgid "Path to your private key file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16900
+#: guix-git/doc/guix.texi:21990
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name certificate"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16902
+#: guix-git/doc/guix.texi:21992
 msgid "Path to your certificate file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16904
+#: guix-git/doc/guix.texi:21994
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} file-object capath"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16908
+#: guix-git/doc/guix.texi:21998
 msgid "Path to directory containing root certificates that you wish Prosody to trust when verifying the certificates of remote servers.  Defaults to @samp{\"/etc/ssl/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16910
+#: guix-git/doc/guix.texi:22000
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-object cafile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16913
+#: guix-git/doc/guix.texi:22003
 msgid "Path to a file containing root certificates that you wish Prosody to trust.  Similar to @code{capath} but with all certificates concatenated together."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16915
+#: guix-git/doc/guix.texi:22005
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list verify"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16918
+#: guix-git/doc/guix.texi:22008
 msgid "A list of verification options (these mostly map to OpenSSL's @code{set_verify()} flags)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16920
+#: guix-git/doc/guix.texi:22010
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16924
-msgid "A list of general options relating to SSL/TLS.  These map to OpenSSL's @code{set_options()}.  For a full list of options available in LuaSec, see the LuaSec source."
+#: guix-git/doc/guix.texi:22014
+msgid "A list of general options relating to SSL/TLS@.  These map to OpenSSL's @code{set_options()}.  For a full list of options available in LuaSec, see the LuaSec source."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16926
+#: guix-git/doc/guix.texi:22016
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-non-negative-integer depth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16929
+#: guix-git/doc/guix.texi:22019
 msgid "How long a chain of certificate authorities to check when looking for a trusted root certificate."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16931
+#: guix-git/doc/guix.texi:22021
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string ciphers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16934
+#: guix-git/doc/guix.texi:22024
 msgid "An OpenSSL cipher string.  This selects what ciphers Prosody will offer to clients, and in what order."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16936
+#: guix-git/doc/guix.texi:22026
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-file-name dhparam"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16940
+#: guix-git/doc/guix.texi:22030
 msgid "A path to a file containing parameters for Diffie-Hellman key exchange.  You can create such a file with: @code{openssl dhparam -out /etc/prosody/certs/dh-2048.pem 2048}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16942
+#: guix-git/doc/guix.texi:22032
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string curve"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16945
-msgid "Curve for Elliptic curve Diffie-Hellman. Prosody's default is @samp{\"secp384r1\"}."
+#: guix-git/doc/guix.texi:22035
+msgid "Curve for Elliptic curve Diffie-Hellman.  Prosody's default is @samp{\"secp384r1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16947
+#: guix-git/doc/guix.texi:22037
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string-list verifyext"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16949
-msgid "A list of \"extra\" verification options."
+#: guix-git/doc/guix.texi:22039
+msgid "A list of ``extra'' verification options."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16951
+#: guix-git/doc/guix.texi:22041
 #, no-wrap
 msgid "{@code{ssl-configuration} parameter} maybe-string password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16953
+#: guix-git/doc/guix.texi:22043
 msgid "Password for encrypted private keys."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16957
+#: guix-git/doc/guix.texi:22047
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean c2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16961
+#: guix-git/doc/guix.texi:22051
 msgid "Whether to force all client-to-server connections to be encrypted or not.  See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16963
+#: guix-git/doc/guix.texi:22053
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list disable-sasl-mechanisms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16967
+#: guix-git/doc/guix.texi:22057
 msgid "Set of mechanisms that will never be offered.  See @url{https://prosody.im/doc/modules/mod_saslauth}.  Defaults to @samp{(\"DIGEST-MD5\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16969
+#: guix-git/doc/guix.texi:22059
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean s2s-require-encryption?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16973
+#: guix-git/doc/guix.texi:22063
 msgid "Whether to force all server-to-server connections to be encrypted or not.  See @url{https://prosody.im/doc/modules/mod_tls}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16975
+#: guix-git/doc/guix.texi:22065
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} boolean s2s-secure-auth?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16981
+#: guix-git/doc/guix.texi:22071
 msgid "Whether to require encryption and certificate authentication.  This provides ideal security, but requires servers you communicate with to support encryption AND present valid, trusted certificates.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16983
+#: guix-git/doc/guix.texi:22073
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list s2s-insecure-domains"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16989
-msgid "Many servers don't support encryption or have invalid or self-signed certificates.  You can list domains here that will not be required to authenticate using certificates.  They will be authenticated using DNS.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
+#: guix-git/doc/guix.texi:22079
+msgid "Many servers don't support encryption or have invalid or self-signed certificates.  You can list domains here that will not be required to authenticate using certificates.  They will be authenticated using DNS@.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16991
+#: guix-git/doc/guix.texi:22081
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string-list s2s-secure-domains"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16996
+#: guix-git/doc/guix.texi:22086
 msgid "Even if you leave @code{s2s-secure-auth?} disabled, you can still require valid certificates for some domains by specifying a list here.  See @url{https://prosody.im/doc/s2s#security}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:16998
+#: guix-git/doc/guix.texi:22088
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string authentication"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17006
+#: guix-git/doc/guix.texi:22096
 msgid "Select the authentication backend to use.  The default provider stores passwords in plaintext and uses Prosody's configured data storage to store the authentication data.  If you do not trust your server please see @url{https://prosody.im/doc/modules/mod_auth_internal_hashed} for information about using the hashed backend.  See also @url{https://prosody.im/doc/authentication} Defaults to @samp{\"internal_plain\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17008
+#: guix-git/doc/guix.texi:22098
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-string log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17012
+#: guix-git/doc/guix.texi:22102
 msgid "Set logging options.  Advanced logging configuration is not yet supported by the Prosody service.  See @url{https://prosody.im/doc/logging}.  Defaults to @samp{\"*syslog\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17014
+#: guix-git/doc/guix.texi:22104
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} file-name pidfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17017
+#: guix-git/doc/guix.texi:22107
 msgid "File to write pid in.  See @url{https://prosody.im/doc/modules/mod_posix}.  Defaults to @samp{\"/var/run/prosody/prosody.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17019
+#: guix-git/doc/guix.texi:22109
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-non-negative-integer http-max-content-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17021
+#: guix-git/doc/guix.texi:22111
 msgid "Maximum allowed size of the HTTP body (in bytes)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17023
+#: guix-git/doc/guix.texi:22113
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-string http-external-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17028
+#: guix-git/doc/guix.texi:22118
 msgid "Some modules expose their own URL in various ways.  This URL is built from the protocol, host and port used.  If Prosody sits behind a proxy, the public URL will be @code{http-external-url} instead.  See @url{https://prosody.im/doc/http#external_url}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17030
+#: guix-git/doc/guix.texi:22120
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} virtualhost-configuration-list virtualhosts"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17035
+#: guix-git/doc/guix.texi:22125
 msgid "A host in Prosody is a domain on which user accounts can be created.  For example if you want your users to have addresses like @samp{\"john.smith@@example.com\"} then you need to add a host @samp{\"example.com\"}.  All options in this list will apply only to this host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17041
-msgid "Note: the name \"virtual\" host is used in configuration to avoid confusion with the actual physical host that Prosody is installed on.  A single Prosody instance can serve many domains, each one defined as a VirtualHost entry in Prosody's configuration.  Conversely a server that hosts a single domain would have just one VirtualHost entry."
+#: guix-git/doc/guix.texi:22131
+msgid "Note: the name @emph{virtual} host is used in configuration to avoid confusion with the actual physical host that Prosody is installed on.  A single Prosody instance can serve many domains, each one defined as a VirtualHost entry in Prosody's configuration.  Conversely a server that hosts a single domain would have just one VirtualHost entry."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17043
+#: guix-git/doc/guix.texi:22133
 msgid "See @url{https://prosody.im/doc/configure#virtual_host_settings}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17045
+#: guix-git/doc/guix.texi:22135
 msgid "Available @code{virtualhost-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17047 doc/guix.texi:17069 doc/guix.texi:17122
+#: guix-git/doc/guix.texi:22137 guix-git/doc/guix.texi:22159
+#: guix-git/doc/guix.texi:22212
 msgid "all these @code{prosody-configuration} fields: @code{admins}, @code{use-libevent?}, @code{modules-enabled}, @code{modules-disabled}, @code{groups-file}, @code{allow-registration?}, @code{ssl}, @code{c2s-require-encryption?}, @code{disable-sasl-mechanisms}, @code{s2s-require-encryption?}, @code{s2s-secure-auth?}, @code{s2s-insecure-domains}, @code{s2s-secure-domains}, @code{authentication}, @code{log}, @code{http-max-content-size}, @code{http-external-url}, @code{raw-content}, plus:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17047
+#: guix-git/doc/guix.texi:22137
 #, no-wrap
 msgid "{@code{virtualhost-configuration} parameter} string domain"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17049
+#: guix-git/doc/guix.texi:22139
 msgid "Domain you wish Prosody to serve."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17053
+#: guix-git/doc/guix.texi:22143
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} int-component-configuration-list int-components"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17058
+#: guix-git/doc/guix.texi:22148
 msgid "Components are extra services on a server which are available to clients, usually on a subdomain of the main server (such as @samp{\"mycomponent.example.com\"}).  Example components might be chatroom servers, user directories, or gateways to other protocols."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17062
+#: guix-git/doc/guix.texi:22152
 msgid "Internal components are implemented with Prosody-specific plugins.  To add an internal component, you simply fill the hostname field, and the plugin you wish to use for the component."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17065
+#: guix-git/doc/guix.texi:22155
 msgid "See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17067
+#: guix-git/doc/guix.texi:22157
 msgid "Available @code{int-component-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17069
+#: guix-git/doc/guix.texi:22159
 #, no-wrap
 msgid "{@code{int-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17071 doc/guix.texi:17128
+#: guix-git/doc/guix.texi:22161 guix-git/doc/guix.texi:22218
 msgid "Hostname of the component."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17073
+#: guix-git/doc/guix.texi:22163
 #, no-wrap
 msgid "{@code{int-component-configuration} parameter} string plugin"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17075
+#: guix-git/doc/guix.texi:22165
 msgid "Plugin you wish to use for the component."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17077
+#: guix-git/doc/guix.texi:22167
 #, no-wrap
 msgid "{@code{int-component-configuration} parameter} maybe-mod-muc-configuration mod-muc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17080
+#: guix-git/doc/guix.texi:22170
 msgid "Multi-user chat (MUC) is Prosody's module for allowing you to create hosted chatrooms/conferences for XMPP users."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17084
-msgid "General information on setting up and using multi-user chatrooms can be found in the \"Chatrooms\" documentation (@url{https://prosody.im/doc/chatrooms}), which you should read if you are new to XMPP chatrooms."
+#: guix-git/doc/guix.texi:22174
+msgid "General information on setting up and using multi-user chatrooms can be found in the ``Chatrooms'' documentation (@url{https://prosody.im/doc/chatrooms}), which you should read if you are new to XMPP chatrooms."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17086
+#: guix-git/doc/guix.texi:22176
 msgid "See also @url{https://prosody.im/doc/modules/mod_muc}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17088
+#: guix-git/doc/guix.texi:22178
 msgid "Available @code{mod-muc-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17089
+#: guix-git/doc/guix.texi:22179
 #, no-wrap
 msgid "{@code{mod-muc-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17092
+#: guix-git/doc/guix.texi:22182
 msgid "The name to return in service discovery responses.  Defaults to @samp{\"Prosody Chatrooms\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17094
+#: guix-git/doc/guix.texi:22184
 #, no-wrap
 msgid "{@code{mod-muc-configuration} parameter} string-or-boolean restrict-room-creation"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17101
+#: guix-git/doc/guix.texi:22191
 msgid "If @samp{#t}, this will only allow admins to create new chatrooms.  Otherwise anyone can create a room.  The value @samp{\"local\"} restricts room creation to users on the service's parent domain.  E.g.@: @samp{user@@example.com} can create rooms on @samp{rooms.example.com}.  The value @samp{\"admin\"} restricts to service administrators only.  Defaults to @samp{#f}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17103
+#: guix-git/doc/guix.texi:22193
 #, no-wrap
 msgid "{@code{mod-muc-configuration} parameter} non-negative-integer max-history-messages"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17107
+#: guix-git/doc/guix.texi:22197
 msgid "Maximum number of history messages that will be sent to the member that has just joined the room.  Defaults to @samp{20}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17113
+#: guix-git/doc/guix.texi:22203
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} ext-component-configuration-list ext-components"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17118
+#: guix-git/doc/guix.texi:22208
 msgid "External components use XEP-0114, which most standalone components support.  To add an external component, you simply fill the hostname field.  See @url{https://prosody.im/doc/components}.  Defaults to @samp{()}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17120
+#: guix-git/doc/guix.texi:22210
 msgid "Available @code{ext-component-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17122
+#: guix-git/doc/guix.texi:22212
 #, no-wrap
 msgid "{@code{ext-component-configuration} parameter} string component-secret"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17124
+#: guix-git/doc/guix.texi:22214
 msgid "Password which the component will use to log in."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17126
+#: guix-git/doc/guix.texi:22216
 #, no-wrap
 msgid "{@code{ext-component-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17132
+#: guix-git/doc/guix.texi:22222
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} non-negative-integer-list component-ports"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17135
+#: guix-git/doc/guix.texi:22225
 msgid "Port(s) Prosody listens on for component connections.  Defaults to @samp{(5347)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17137
+#: guix-git/doc/guix.texi:22227
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} string component-interface"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17140
+#: guix-git/doc/guix.texi:22230
 msgid "Interface Prosody listens on for component connections.  Defaults to @samp{\"127.0.0.1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17142
+#: guix-git/doc/guix.texi:22232
 #, no-wrap
 msgid "{@code{prosody-configuration} parameter} maybe-raw-content raw-content"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17144
+#: guix-git/doc/guix.texi:22234
 msgid "Raw content that will be added to the configuration file."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17152
+#: guix-git/doc/guix.texi:22242
 msgid "It could be that you just want to get a @code{prosody.cfg.lua} up and running.  In that case, you can pass an @code{opaque-prosody-configuration} record as the value of @code{prosody-service-type}.  As its name indicates, an opaque configuration does not have easy reflective capabilities.  Available @code{opaque-prosody-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17153
+#: guix-git/doc/guix.texi:22243
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} package prosody"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17155
+#: guix-git/doc/guix.texi:22245
 msgid "The prosody package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17157
+#: guix-git/doc/guix.texi:22247
 #, no-wrap
 msgid "{@code{opaque-prosody-configuration} parameter} string prosody.cfg.lua"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17159
+#: guix-git/doc/guix.texi:22249
 msgid "The contents of the @code{prosody.cfg.lua} to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17163
+#: guix-git/doc/guix.texi:22253
 msgid "For example, if your @code{prosody.cfg.lua} is just the empty string, you could instantiate a prosody service like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17168
+#. type: lisp
+#: guix-git/doc/guix.texi:22258
 #, no-wrap
 msgid ""
 "(service prosody-service-type\n"
@@ -30871,218 +40289,213 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17172
+#: guix-git/doc/guix.texi:22262
 #, no-wrap
 msgid "BitlBee Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17174 doc/guix.texi:17218
+#: guix-git/doc/guix.texi:22264 guix-git/doc/guix.texi:22308
 #, no-wrap
 msgid "IRC (Internet Relay Chat)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17175
+#: guix-git/doc/guix.texi:22265
 #, no-wrap
 msgid "IRC gateway"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17178
+#: guix-git/doc/guix.texi:22268
 msgid "@url{https://bitlbee.org,BitlBee} is a gateway that provides an IRC interface to a variety of messaging protocols such as XMPP."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17179
+#: guix-git/doc/guix.texi:22269
 #, no-wrap
 msgid "{Scheme Variable} bitlbee-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17183
+#: guix-git/doc/guix.texi:22273
 msgid "This is the service type for the @url{https://bitlbee.org,BitlBee} IRC gateway daemon.  Its value is a @code{bitlbee-configuration} (see below)."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17186
+#: guix-git/doc/guix.texi:22276
 msgid "To have BitlBee listen on port 6667 on localhost, add this line to your services:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17189
+#. type: lisp
+#: guix-git/doc/guix.texi:22279
 #, no-wrap
 msgid "(service bitlbee-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17192
+#: guix-git/doc/guix.texi:22282
 #, no-wrap
 msgid "{Data Type} bitlbee-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17194
+#: guix-git/doc/guix.texi:22284
 msgid "This is the configuration for BitlBee, with the following fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17196
+#: guix-git/doc/guix.texi:22286
 #, no-wrap
 msgid "@code{interface} (default: @code{\"127.0.0.1\"})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:17197
+#: guix-git/doc/guix.texi:22287
 #, no-wrap
 msgid "@code{port} (default: @code{6667})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17200
+#: guix-git/doc/guix.texi:22290
 msgid "Listen on the network interface corresponding to the IP address specified in @var{interface}, on @var{port}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17204
+#: guix-git/doc/guix.texi:22294
 msgid "When @var{interface} is @code{127.0.0.1}, only local clients can connect; when it is @code{0.0.0.0}, connections can come from any networking interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17205
-#, no-wrap
-msgid "@code{package} (default: @code{bitlbee})"
-msgstr ""
+#: guix-git/doc/guix.texi:22295
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{bitlbee} (default: @code{bitlbee})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:17207
+#: guix-git/doc/guix.texi:22297
 msgid "The BitlBee package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17208
+#: guix-git/doc/guix.texi:22298
 #, no-wrap
 msgid "@code{plugins} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17210
+#: guix-git/doc/guix.texi:22300
 msgid "List of plugin packages to use---e.g., @code{bitlbee-discord}."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:17211
-#, no-wrap
-msgid "@code{extra-settings} (default: @code{\"\"})"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:17213
+#: guix-git/doc/guix.texi:22303
 msgid "Configuration snippet added as-is to the BitlBee configuration file."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17216
+#: guix-git/doc/guix.texi:22306
 #, no-wrap
 msgid "Quassel Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17222
+#: guix-git/doc/guix.texi:22312
 msgid "@url{https://quassel-irc.org/,Quassel} is a distributed IRC client, meaning that one or more clients can attach to and detach from the central core."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17223
+#: guix-git/doc/guix.texi:22313
 #, no-wrap
 msgid "{Scheme Variable} quassel-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17227
+#: guix-git/doc/guix.texi:22317
 msgid "This is the service type for the @url{https://quassel-irc.org/,Quassel} IRC backend daemon.  Its value is a @code{quassel-configuration} (see below)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17229
+#: guix-git/doc/guix.texi:22319
 #, no-wrap
 msgid "{Data Type} quassel-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17231
+#: guix-git/doc/guix.texi:22321
 msgid "This is the configuration for Quassel, with the following fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17233
+#: guix-git/doc/guix.texi:22323
 #, no-wrap
 msgid "@code{quassel} (default: @code{quassel})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17235
+#: guix-git/doc/guix.texi:22325
 msgid "The Quassel package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17236
+#: guix-git/doc/guix.texi:22326
 #, no-wrap
 msgid "@code{interface} (default: @code{\"::,0.0.0.0\"})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17237
+#: guix-git/doc/guix.texi:22327
 #, no-wrap
 msgid "@code{port} (default: @code{4242})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17241
+#: guix-git/doc/guix.texi:22331
 msgid "Listen on the network interface(s) corresponding to the IPv4 or IPv6 interfaces specified in the comma delimited @var{interface}, on @var{port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17242
+#: guix-git/doc/guix.texi:22332
 #, no-wrap
 msgid "@code{loglevel} (default: @code{\"Info\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17245
+#: guix-git/doc/guix.texi:22335
 msgid "The level of logging desired.  Accepted values are Debug, Info, Warning and Error."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17251
+#: guix-git/doc/guix.texi:22341
 #, no-wrap
 msgid "Murmur (VoIP server)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17252
+#: guix-git/doc/guix.texi:22342
 #, no-wrap
 msgid "VoIP server"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17256
+#: guix-git/doc/guix.texi:22346
 msgid "This section describes how to set up and run a Murmur server.  Murmur is the server of the @uref{https://mumble.info, Mumble} voice-over-IP (VoIP) suite."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17257
+#: guix-git/doc/guix.texi:22347
 #, no-wrap
 msgid "{Data Type} murmur-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17260
+#: guix-git/doc/guix.texi:22350
 msgid "The service type for the Murmur server.  An example configuration can look like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17269
+#. type: lisp
+#: guix-git/doc/guix.texi:22359
 #, no-wrap
 msgid ""
 "(service murmur-service-type\n"
@@ -31095,503 +40508,1666 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17273
+#: guix-git/doc/guix.texi:22363
 msgid "After reconfiguring your system, you can manually set the murmur @code{SuperUser} password with the command that is printed during the activation phase."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17282
+#: guix-git/doc/guix.texi:22372
 msgid "It is recommended to register a normal Mumble user account and grant it admin or moderator rights.  You can use the @code{mumble} client to login as new normal user, register yourself, and log out.  For the next step login with the name @code{SuperUser} use the @code{SuperUser} password that you set previously, and grant your newly registered mumble user administrator or moderator rights and create some channels."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17284
+#: guix-git/doc/guix.texi:22374
 msgid "Available @code{murmur-configuration} fields are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17286
+#: guix-git/doc/guix.texi:22376
 #, no-wrap
 msgid "@code{package} (default: @code{mumble})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17288
+#: guix-git/doc/guix.texi:22378
 msgid "Package that contains @code{bin/murmurd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17289
+#: guix-git/doc/guix.texi:22379
 #, no-wrap
 msgid "@code{user} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17291
+#: guix-git/doc/guix.texi:22381
 msgid "User who will run the Murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17292
+#: guix-git/doc/guix.texi:22382
 #, no-wrap
 msgid "@code{group} (default: @code{\"murmur\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17294
+#: guix-git/doc/guix.texi:22384
 msgid "Group of the user who will run the murmur server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17295
+#: guix-git/doc/guix.texi:22385
 #, no-wrap
 msgid "@code{port} (default: @code{64738})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17297
+#: guix-git/doc/guix.texi:22387
 msgid "Port on which the server will listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17298
+#: guix-git/doc/guix.texi:22388
 #, no-wrap
 msgid "@code{welcome-text} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17300
+#: guix-git/doc/guix.texi:22390
 msgid "Welcome text sent to clients when they connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17301
+#: guix-git/doc/guix.texi:22391
 #, no-wrap
 msgid "@code{server-password} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17303
+#: guix-git/doc/guix.texi:22393
 msgid "Password the clients have to enter in order to connect."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17304
+#: guix-git/doc/guix.texi:22394
 #, no-wrap
 msgid "@code{max-users} (default: @code{100})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17306
+#: guix-git/doc/guix.texi:22396
 msgid "Maximum of users that can be connected to the server at once."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17307
+#: guix-git/doc/guix.texi:22397
 #, no-wrap
 msgid "@code{max-user-bandwidth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17309
+#: guix-git/doc/guix.texi:22399
 msgid "Maximum voice traffic a user can send per second."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17310
+#: guix-git/doc/guix.texi:22400
 #, no-wrap
 msgid "@code{database-file} (default: @code{\"/var/lib/murmur/db.sqlite\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17313
+#: guix-git/doc/guix.texi:22403
 msgid "File name of the sqlite database.  The service's user will become the owner of the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17314
+#: guix-git/doc/guix.texi:22404
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/murmur/murmur.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17317
+#: guix-git/doc/guix.texi:22407
 msgid "File name of the log file.  The service's user will become the owner of the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17318
+#: guix-git/doc/guix.texi:22408
 #, no-wrap
 msgid "@code{autoban-attempts} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17321
+#: guix-git/doc/guix.texi:22411
 msgid "Maximum number of logins a user can make in @code{autoban-timeframe} without getting auto banned for @code{autoban-time}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17322
+#: guix-git/doc/guix.texi:22412
 #, no-wrap
 msgid "@code{autoban-timeframe} (default: @code{120})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17324
+#: guix-git/doc/guix.texi:22414
 msgid "Timeframe for autoban in seconds."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17325
+#: guix-git/doc/guix.texi:22415
 #, no-wrap
 msgid "@code{autoban-time} (default: @code{300})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17328
+#: guix-git/doc/guix.texi:22418
 msgid "Amount of time in seconds for which a client gets banned when violating the autoban limits."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17329
+#: guix-git/doc/guix.texi:22419
 #, no-wrap
 msgid "@code{opus-threshold} (default: @code{100})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17332
+#: guix-git/doc/guix.texi:22422
 msgid "Percentage of clients that need to support opus before switching over to opus audio codec."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17333
+#: guix-git/doc/guix.texi:22423
 #, no-wrap
 msgid "@code{channel-nesting-limit} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17335
+#: guix-git/doc/guix.texi:22425
 msgid "How deep channels can be nested at maximum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17336
+#: guix-git/doc/guix.texi:22426
 #, no-wrap
 msgid "@code{channelname-regex} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17338
+#: guix-git/doc/guix.texi:22428
 msgid "A string in form of a Qt regular expression that channel names must conform to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17339
+#: guix-git/doc/guix.texi:22429
 #, no-wrap
 msgid "@code{username-regex} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17341
+#: guix-git/doc/guix.texi:22431
 msgid "A string in form of a Qt regular expression that user names must conform to."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17342
+#: guix-git/doc/guix.texi:22432
 #, no-wrap
 msgid "@code{text-message-length} (default: @code{5000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17344
+#: guix-git/doc/guix.texi:22434
 msgid "Maximum size in bytes that a user can send in one text chat message."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17345
+#: guix-git/doc/guix.texi:22435
 #, no-wrap
 msgid "@code{image-message-length} (default: @code{(* 128 1024)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17347
+#: guix-git/doc/guix.texi:22437
 msgid "Maximum size in bytes that a user can send in one image message."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17348
+#: guix-git/doc/guix.texi:22438
 #, no-wrap
 msgid "@code{cert-required?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17351
-msgid "If it is set to @code{#t} clients that use weak password authentification will not be accepted. Users must have completed the certificate wizard to join."
+#: guix-git/doc/guix.texi:22441
+msgid "If it is set to @code{#t} clients that use weak password authentication will not be accepted.  Users must have completed the certificate wizard to join."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17352
+#: guix-git/doc/guix.texi:22442
 #, no-wrap
 msgid "@code{remember-channel?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17355
+#: guix-git/doc/guix.texi:22445
 msgid "Should murmur remember the last channel each user was in when they disconnected and put them into the remembered channel when they rejoin."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17356
+#: guix-git/doc/guix.texi:22446
 #, no-wrap
 msgid "@code{allow-html?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17358
+#: guix-git/doc/guix.texi:22448
 msgid "Should html be allowed in text messages, user comments, and channel descriptions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17359
+#: guix-git/doc/guix.texi:22449
 #, no-wrap
 msgid "@code{allow-ping?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17363
-msgid "Setting to true exposes the current user count, the maximum user count, and the server's maximum bandwidth per client to unauthenticated users. In the Mumble client, this information is shown in the Connect dialog."
+#: guix-git/doc/guix.texi:22453
+msgid "Setting to true exposes the current user count, the maximum user count, and the server's maximum bandwidth per client to unauthenticated users.  In the Mumble client, this information is shown in the Connect dialog."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17365
+#: guix-git/doc/guix.texi:22455
 msgid "Disabling this setting will prevent public listing of the server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17366
+#: guix-git/doc/guix.texi:22456
 #, no-wrap
 msgid "@code{bonjour?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17368
+#: guix-git/doc/guix.texi:22458
 msgid "Should the server advertise itself in the local network through the bonjour protocol."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17369
+#: guix-git/doc/guix.texi:22459
 #, no-wrap
 msgid "@code{send-version?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17371
+#: guix-git/doc/guix.texi:22461
 msgid "Should the murmur server version be exposed in ping requests."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17372
+#: guix-git/doc/guix.texi:22462
 #, no-wrap
 msgid "@code{log-days} (default: @code{31})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17376
+#: guix-git/doc/guix.texi:22466
 msgid "Murmur also stores logs in the database, which are accessible via RPC.  The default is 31 days of months, but you can set this setting to 0 to keep logs forever, or -1 to disable logging to the database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17377
+#: guix-git/doc/guix.texi:22467
 #, no-wrap
 msgid "@code{obfuscate-ips?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17379
+#: guix-git/doc/guix.texi:22469
 msgid "Should logged ips be obfuscated to protect the privacy of users."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17380
+#: guix-git/doc/guix.texi:22470
 #, no-wrap
 msgid "@code{ssl-cert} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17382
+#: guix-git/doc/guix.texi:22472
 msgid "File name of the SSL/TLS certificate used for encrypted connections."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17385
+#. type: lisp
+#: guix-git/doc/guix.texi:22475
 #, no-wrap
 msgid "(ssl-cert \"/etc/letsencrypt/live/example.com/fullchain.pem\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17386
+#: guix-git/doc/guix.texi:22476
 #, no-wrap
 msgid "@code{ssl-key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17388
+#: guix-git/doc/guix.texi:22478
 msgid "Filepath to the ssl private key used for encrypted connections."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17390
+#. type: lisp
+#: guix-git/doc/guix.texi:22480
 #, no-wrap
 msgid "(ssl-key \"/etc/letsencrypt/live/example.com/privkey.pem\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17392
+#: guix-git/doc/guix.texi:22482
 #, no-wrap
 msgid "@code{ssl-dh-params} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17397
+#: guix-git/doc/guix.texi:22487
 msgid "File name of a PEM-encoded file with Diffie-Hellman parameters for the SSL/TLS encryption.  Alternatively you set it to @code{\"@@ffdhe2048\"}, @code{\"@@ffdhe3072\"}, @code{\"@@ffdhe4096\"}, @code{\"@@ffdhe6144\"} or @code{\"@@ffdhe8192\"} to use bundled parameters from RFC 7919."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17398
+#: guix-git/doc/guix.texi:22488
 #, no-wrap
 msgid "@code{ssl-ciphers} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17401
+#: guix-git/doc/guix.texi:22491
 msgid "The @code{ssl-ciphers} option chooses the cipher suites to make available for use in SSL/TLS."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17405
+#: guix-git/doc/guix.texi:22495
 msgid "This option is specified using @uref{https://www.openssl.org/docs/apps/ciphers.html#CIPHER-LIST-FORMAT, OpenSSL cipher list notation}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17410
+#: guix-git/doc/guix.texi:22500
 msgid "It is recommended that you try your cipher string using 'openssl ciphers <string>' before setting it here, to get a feel for which cipher suites you will get.  After setting this option, it is recommend that you inspect your Murmur log to ensure that Murmur is using the cipher suites that you expected it to."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17414
+#: guix-git/doc/guix.texi:22504
 msgid "Note: Changing this option may impact the backwards compatibility of your Murmur server, and can remove the ability for older Mumble clients to be able to connect to it."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17415
+#: guix-git/doc/guix.texi:22505
 #, no-wrap
 msgid "@code{public-registration} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17417
+#: guix-git/doc/guix.texi:22507
 msgid "Must be a @code{<murmur-public-registration-configuration>} record or @code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17422
+#: guix-git/doc/guix.texi:22512
 msgid "You can optionally register your server in the public server list that the @code{mumble} client shows on startup.  You cannot register your server if you have set a @code{server-password}, or set @code{allow-ping} to @code{#f}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17424
+#: guix-git/doc/guix.texi:22514
 msgid "It might take a few hours until it shows up in the public list."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17425 doc/guix.texi:18856
+#: guix-git/doc/guix.texi:22515 guix-git/doc/guix.texi:24751
 #, no-wrap
 msgid "@code{file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17427
+#: guix-git/doc/guix.texi:22517
 msgid "Optional alternative override for this configuration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17430
+#: guix-git/doc/guix.texi:22520
 #, no-wrap
 msgid "{Data Type} murmur-public-registration-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17432
+#: guix-git/doc/guix.texi:22522
 msgid "Configuration for public registration of a murmur service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17436
-msgid "This is a display name for your server. Not to be confused with the hostname."
+#: guix-git/doc/guix.texi:22526
+msgid "This is a display name for your server.  Not to be confused with the hostname."
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:17437 doc/guix.texi:23817
+#: guix-git/doc/guix.texi:22527 guix-git/doc/guix.texi:31202
+#: guix-git/doc/guix.texi:32243
 #, no-wrap
 msgid "password"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17440
-msgid "A password to identify your registration.  Subsequent updates will need the same password. Don't lose your password."
-msgstr ""
-
-#. type: code{#1}
-#: doc/guix.texi:17441
-#, no-wrap
-msgid "url"
+#: guix-git/doc/guix.texi:22530
+msgid "A password to identify your registration.  Subsequent updates will need the same password.  Don't lose your password."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17444
+#: guix-git/doc/guix.texi:22534
 msgid "This should be a @code{http://} or @code{https://} link to your web site."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17445
+#: guix-git/doc/guix.texi:22535 guix-git/doc/guix.texi:25630
 #, no-wrap
 msgid "@code{hostname} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17448
+#: guix-git/doc/guix.texi:22538
 msgid "By default your server will be listed by its IP address.  If it is set your server will be linked by this host name instead."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:22548
+msgid "The @code{(gnu services file-sharing)} module provides services that assist with transferring files over peer-to-peer file-sharing networks."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:17456
+#: guix-git/doc/guix.texi:22549
+#, fuzzy, no-wrap
+#| msgid "Version Control Services"
+msgid "Transmission Daemon Service"
+msgstr "版本控制服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22557
+msgid "@uref{https://transmissionbt.com/, Transmission} is a flexible BitTorrent client that offers a variety of graphical and command-line interfaces.  A @code{transmission-daemon-service-type} service provides Transmission's headless variant, @command{transmission-daemon}, as a system service, allowing users to share files via BitTorrent even when they are not logged in."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22558
+#, no-wrap
+msgid "{Scheme Variable} transmission-daemon-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22562
+msgid "The service type for the Transmission Daemon BitTorrent client. Its value must be a @code{transmission-daemon-configuration} object as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22573
+#, no-wrap
+msgid ""
+"(service transmission-daemon-service-type\n"
+"         (transmission-daemon-configuration\n"
+"          ;; Restrict access to the RPC (\"control\") interface\n"
+"          (rpc-authentication-required? #t)\n"
+"          (rpc-username \"transmission\")\n"
+"          (rpc-password\n"
+"           (transmission-password-hash\n"
+"            \"transmission\" ; desired password\n"
+"            \"uKd1uMs9\"))   ; arbitrary salt value\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22578
+#, no-wrap
+msgid ""
+"          ;; Accept requests from this and other hosts on the\n"
+"          ;; local network\n"
+"          (rpc-whitelist-enabled? #t)\n"
+"          (rpc-whitelist '(\"::1\" \"127.0.0.1\" \"192.168.0.*\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22582
+#, no-wrap
+msgid ""
+"          ;; Limit bandwidth use during work hours\n"
+"          (alt-speed-down (* 1024 2)) ;   2 MB/s\n"
+"          (alt-speed-up 512)          ; 512 kB/s\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22589
+#, no-wrap
+msgid ""
+"          (alt-speed-time-enabled? #t)\n"
+"          (alt-speed-time-day 'weekdays)\n"
+"          (alt-speed-time-begin\n"
+"           (+ (* 60 8) 30))           ; 8:30 am\n"
+"          (alt-speed-time-end\n"
+"           (+ (* 60 (+ 12 5)) 30))))  ; 5:30 pm\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22602
+msgid "Once the service is started, users can interact with the daemon through its Web interface (at @code{http://localhost:9091/}) or by using the @command{transmission-remote} command-line tool, available in the @code{transmission} package.  (Emacs users may want to also consider the @code{emacs-transmission} package.)  Both communicate with the daemon through its remote procedure call (RPC) interface, which by default is available to all users on the system; you may wish to change this by assigning values to the @code{rpc-authentication-required?}, @code{rpc-username} and @code{rpc-password} settings, as shown in the example above and documented further below."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22610
+msgid "The value for @code{rpc-password} must be a password hash of the type generated and used by Transmission clients.  This can be copied verbatim from an existing @file{settings.json} file, if another Transmission client is already being used.  Otherwise, the @code{transmission-password-hash} and @code{transmission-random-salt} procedures provided by this module can be used to obtain a suitable hash value."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22611
+#, no-wrap
+msgid "{Scheme Procedure} transmission-password-hash @var{password} @var{salt}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22615
+msgid "Returns a string containing the result of hashing @var{password} together with @var{salt}, in the format recognized by Transmission clients for their @code{rpc-password} configuration setting."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22619
+msgid "@var{salt} must be an eight-character string.  The @code{transmission-random-salt} procedure can be used to generate a suitable salt value at random."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22621
+#, no-wrap
+msgid "{Scheme Procedure} transmission-random-salt"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:22625
+msgid "Returns a string containing a random, eight-character salt value of the type generated and used by Transmission clients, suitable for passing to the @code{transmission-password-hash} procedure."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22631
+msgid "These procedures are accessible from within a Guile REPL started with the @command{guix repl} command (@pxref{Invoking guix repl}).  This is useful for obtaining a random salt value to provide as the second parameter to `transmission-password-hash`, as in this example session:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:22637
+#, no-wrap
+msgid ""
+"$ guix repl\n"
+"scheme@@(guix-user)> ,use (gnu services file-sharing)\n"
+"scheme@@(guix-user)> (transmission-random-salt)\n"
+"$1 = \"uKd1uMs9\"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22640
+msgid "Alternatively, a complete password hash can generated in a single step:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:22645
+#, no-wrap
+msgid ""
+"scheme@@(guix-user)> (transmission-password-hash \"transmission\"\n"
+"(transmission-random-salt))\n"
+"$2 = \"@{c8bbc6d1740cd8dc819a6e25563b67812c1c19c9VtFPfdsX\"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22650
+msgid "The resulting string can be used as-is for the value of @code{rpc-password}, allowing the password to be kept hidden even in the operating-system configuration."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22659
+msgid "Torrent files downloaded by the daemon are directly accessible only to users in the ``transmission'' user group, who receive read-only access to the directory specified by the @code{download-dir} configuration setting (and also the directory specified by @code{incomplete-dir}, if @code{incomplete-dir-enabled?} is @code{#t}).  Downloaded files can be moved to another directory or deleted altogether using @command{transmission-remote} with its @code{--move} and @code{--remove-and-delete} options."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22666
+msgid "If the @code{watch-dir-enabled?} setting is set to @code{#t}, users in the ``transmission'' group are able also to place @file{.torrent} files in the directory specified by @code{watch-dir} to have the corresponding torrents added by the daemon.  (The @code{trash-original-torrent-files?} setting controls whether the daemon deletes these files after processing them.)"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22671
+msgid "Some of the daemon's configuration settings can be changed temporarily by @command{transmission-remote} and similar tools. To undo these changes, use the service's @code{reload} action to have the daemon reload its settings from disk:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:22674
+#, no-wrap
+msgid "# herd reload transmission-daemon\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22678
+msgid "The full set of available configuration settings is defined by the @code{transmission-daemon-configuration} data type."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:22679
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} transmission-daemon-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:22683
+msgid "The data type representing configuration settings for Transmission Daemon.  These correspond directly to the settings recognized by Transmission clients in their @file{settings.json} file."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:22697
+msgid "Available @code{transmission-daemon-configuration} fields are:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22698
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} package transmission"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22700
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Transmission package to use."
+msgstr "软件包数据类型。"
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22703
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer stop-wait-period"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22709
+msgid "The period, in seconds, to wait when stopping the service for @command{transmission-daemon} to exit before killing its process.  This allows the daemon time to complete its housekeeping and send a final update to trackers as it shuts down.  On slow hosts, or hosts with a slow network connection, this value may need to be increased."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22711 guix-git/doc/guix.texi:23083
+#: guix-git/doc/guix.texi:30315 guix-git/doc/guix.texi:30550
+#: guix-git/doc/guix.texi:30558 guix-git/doc/guix.texi:30566
+msgid "Defaults to @samp{10}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22714
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string download-dir"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22716
+msgid "The directory to which torrent files are downloaded."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22718
+msgid "Defaults to @samp{\"/var/lib/transmission-daemon/downloads\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22721
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean incomplete-dir-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22726
+msgid "If @code{#t}, files will be held in @code{incomplete-dir} while their torrent is being downloaded, then moved to @code{download-dir} once the torrent is complete.  Otherwise, files for all torrents (including those still being downloaded) will be placed in @code{download-dir}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22731
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-string incomplete-dir"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22734
+msgid "The directory in which files from incompletely downloaded torrents will be held when @code{incomplete-dir-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22736 guix-git/doc/guix.texi:22780
+#: guix-git/doc/guix.texi:22993 guix-git/doc/guix.texi:23049
+#: guix-git/doc/guix.texi:23223 guix-git/doc/guix.texi:23234
+#: guix-git/doc/guix.texi:23307 guix-git/doc/guix.texi:24032
+#: guix-git/doc/guix.texi:24075 guix-git/doc/guix.texi:24083
+#: guix-git/doc/guix.texi:24091 guix-git/doc/guix.texi:24099
+#: guix-git/doc/guix.texi:24108 guix-git/doc/guix.texi:24116
+#: guix-git/doc/guix.texi:24123 guix-git/doc/guix.texi:24131
+#: guix-git/doc/guix.texi:24139 guix-git/doc/guix.texi:24149
+#: guix-git/doc/guix.texi:24156 guix-git/doc/guix.texi:24180
+#: guix-git/doc/guix.texi:24188 guix-git/doc/guix.texi:24214
+#: guix-git/doc/guix.texi:24223 guix-git/doc/guix.texi:24232
+#: guix-git/doc/guix.texi:24241 guix-git/doc/guix.texi:24250
+#: guix-git/doc/guix.texi:24259 guix-git/doc/guix.texi:24267
+#: guix-git/doc/guix.texi:24275 guix-git/doc/guix.texi:24282
+#: guix-git/doc/guix.texi:24290 guix-git/doc/guix.texi:24297
+#: guix-git/doc/guix.texi:24305 guix-git/doc/guix.texi:24313
+#: guix-git/doc/guix.texi:24322 guix-git/doc/guix.texi:24331
+#: guix-git/doc/guix.texi:24339 guix-git/doc/guix.texi:24347
+#: guix-git/doc/guix.texi:24355 guix-git/doc/guix.texi:24366
+#: guix-git/doc/guix.texi:24376 guix-git/doc/guix.texi:24387
+#: guix-git/doc/guix.texi:24396 guix-git/doc/guix.texi:24406
+#: guix-git/doc/guix.texi:24414 guix-git/doc/guix.texi:24425
+#: guix-git/doc/guix.texi:24434 guix-git/doc/guix.texi:24444
+#: guix-git/doc/guix.texi:27607 guix-git/doc/guix.texi:27614
+#: guix-git/doc/guix.texi:27621 guix-git/doc/guix.texi:27628
+#: guix-git/doc/guix.texi:27635 guix-git/doc/guix.texi:27642
+#: guix-git/doc/guix.texi:27650 guix-git/doc/guix.texi:27658
+#: guix-git/doc/guix.texi:27665 guix-git/doc/guix.texi:27672
+#: guix-git/doc/guix.texi:27679 guix-git/doc/guix.texi:27686
+#: guix-git/doc/guix.texi:27716 guix-git/doc/guix.texi:27754
+#: guix-git/doc/guix.texi:27761 guix-git/doc/guix.texi:27770
+#: guix-git/doc/guix.texi:27792 guix-git/doc/guix.texi:27800
+#: guix-git/doc/guix.texi:27807 guix-git/doc/guix.texi:27962
+#: guix-git/doc/guix.texi:27982 guix-git/doc/guix.texi:27997
+#: guix-git/doc/guix.texi:28004 guix-git/doc/guix.texi:30687
+#: guix-git/doc/guix.texi:30695 guix-git/doc/guix.texi:30703
+#: guix-git/doc/guix.texi:30711 guix-git/doc/guix.texi:30719
+#: guix-git/doc/guix.texi:30727
+msgid "Defaults to @samp{disabled}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22739
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} umask umask"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22742
+msgid "The file mode creation mask used for downloaded files.  (See the @command{umask} man page for more information.)"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22744
+msgid "Defaults to @samp{18}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22747
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean rename-partial-files?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22750
+msgid "When @code{#t}, ``.part'' is appended to the name of partially downloaded files."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22755
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} preallocation-mode preallocation"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22760
+msgid "The mode by which space should be preallocated for downloaded files, one of @code{none}, @code{fast} (or @code{sparse}) and @code{full}.  Specifying @code{full} will minimize disk fragmentation at a cost to file-creation speed."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22762
+msgid "Defaults to @samp{fast}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22765
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean watch-dir-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22770
+msgid "If @code{#t}, the directory specified by @code{watch-dir} will be watched for new @file{.torrent} files and the torrents they describe added automatically (and the original files removed, if @code{trash-original-torrent-files?} is @code{#t})."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22775
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-string watch-dir"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22778
+msgid "The directory to be watched for @file{.torrent} files indicating new torrents to be added, when @code{watch-dir-enabled} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22783
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean trash-original-torrent-files?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22787
+msgid "When @code{#t}, @file{.torrent} files will be deleted from the watch directory once their torrent has been added (see @code{watch-directory-enabled?})."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22792
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean speed-limit-down-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22795
+msgid "When @code{#t}, the daemon's download speed will be limited to the rate specified by @code{speed-limit-down}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22800
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer speed-limit-down"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22802
+msgid "The default global-maximum download speed, in kilobytes per second."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22807
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean speed-limit-up-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22810
+msgid "When @code{#t}, the daemon's upload speed will be limited to the rate specified by @code{speed-limit-up}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22815
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer speed-limit-up"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22817
+msgid "The default global-maximum upload speed, in kilobytes per second."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22822
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean alt-speed-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22828
+msgid "When @code{#t}, the alternate speed limits @code{alt-speed-down} and @code{alt-speed-up} are used (in place of @code{speed-limit-down} and @code{speed-limit-up}, if they are enabled) to constrain the daemon's bandwidth usage.  This can be scheduled to occur automatically at certain times during the week; see @code{alt-speed-time-enabled?}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22833
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer alt-speed-down"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22835
+msgid "The alternate global-maximum download speed, in kilobytes per second."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22837 guix-git/doc/guix.texi:22844
+#: guix-git/doc/guix.texi:23016 guix-git/doc/guix.texi:30322
+#: guix-git/doc/guix.texi:30337
+msgid "Defaults to @samp{50}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22840
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer alt-speed-up"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22842
+msgid "The alternate global-maximum upload speed, in kilobytes per second."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22847
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean alt-speed-time-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22852
+msgid "When @code{#t}, the alternate speed limits @code{alt-speed-down} and @code{alt-speed-up} will be enabled automatically during the periods specified by @code{alt-speed-time-day}, @code{alt-speed-time-begin} and @code{alt-time-speed-end}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22857
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} day-list alt-speed-time-day"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22862
+msgid "The days of the week on which the alternate-speed schedule should be used, specified either as a list of days (@code{sunday}, @code{monday}, and so on) or using one of the symbols @code{weekdays}, @code{weekends} or @code{all}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22864
+msgid "Defaults to @samp{all}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22867
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer alt-speed-time-begin"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22870
+msgid "The time of day at which to enable the alternate speed limits, expressed as a number of minutes since midnight."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22872
+msgid "Defaults to @samp{540}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22875
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer alt-speed-time-end"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22878
+msgid "The time of day at which to disable the alternate speed limits, expressed as a number of minutes since midnight."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22880
+msgid "Defaults to @samp{1020}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22883
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string bind-address-ipv4"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22886
+msgid "The IP address at which to listen for peer connections, or ``0.0.0.0'' to listen at all available IP addresses."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22888 guix-git/doc/guix.texi:23191
+#: guix-git/doc/guix.texi:28237
+msgid "Defaults to @samp{\"0.0.0.0\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22891
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string bind-address-ipv6"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22894
+msgid "The IPv6 address at which to listen for peer connections, or ``::'' to listen at all available IPv6 addresses."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22896
+msgid "Defaults to @samp{\"::\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22899
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean peer-port-random-on-start?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22905
+msgid "If @code{#t}, when the daemon starts it will select a port at random on which to listen for peer connections, from the range specified (inclusively) by @code{peer-port-random-low} and @code{peer-port-random-high}.  Otherwise, it listens on the port specified by @code{peer-port}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22910
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} port-number peer-port-random-low"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22913
+msgid "The lowest selectable port number when @code{peer-port-random-on-start?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22915
+msgid "Defaults to @samp{49152}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22918
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} port-number peer-port-random-high"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22921
+msgid "The highest selectable port number when @code{peer-port-random-on-start} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22923
+msgid "Defaults to @samp{65535}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22926
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} port-number peer-port"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22929
+msgid "The port on which to listen for peer connections when @code{peer-port-random-on-start?} is @code{#f}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22931
+msgid "Defaults to @samp{51413}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22934
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean port-forwarding-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22938
+msgid "If @code{#t}, the daemon will attempt to configure port-forwarding on an upstream gateway automatically using @acronym{UPnP} and @acronym{NAT-PMP}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22943
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} encryption-mode encryption"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22948
+msgid "The encryption preference for peer connections, one of @code{prefer-unencrypted-connections}, @code{prefer-encrypted-connections} or @code{require-encrypted-connections}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22950
+msgid "Defaults to @samp{prefer-encrypted-connections}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22953
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-string peer-congestion-algorithm"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22958
+msgid "The TCP congestion-control algorithm to use for peer connections, specified using a string recognized by the operating system in calls to @code{setsockopt} (or set to @code{disabled}, in which case the operating-system default is used)."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22967
+msgid "Note that on GNU/Linux systems, the kernel must be configured to allow processes to use a congestion-control algorithm not in the default set; otherwise, it will deny these requests with ``Operation not permitted''.  To see which algorithms are available on your system and which are currently permitted for use, look at the contents of the files @file{tcp_available_congestion_control} and @file{tcp_allowed_congestion_control} in the @file{/proc/sys/net/ipv4} directory."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22975
+msgid "As an example, to have Transmission Daemon use @uref{http://www-ece.rice.edu/networks/TCP-LP/,the TCP Low Priority congestion-control algorithm}, you'll need to modify your kernel configuration to build in support for the algorithm, then update your operating-system configuration to allow its use by adding a @code{sysctl-service-type} service (or updating the existing one's configuration) with lines like the following:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22982
+#, no-wrap
+msgid ""
+"(service sysctl-service-type\n"
+"         (sysctl-configuration\n"
+"          (settings\n"
+"           (\"net.ipv4.tcp_allowed_congestion_control\" .\n"
+"            \"reno cubic lp\"))))\n"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22985
+msgid "The Transmission Daemon configuration can then be updated with"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:22988
+#, no-wrap
+msgid "(peer-congestion-algorithm \"lp\")\n"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22991
+msgid "and the system reconfigured to have the changes take effect."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:22996
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} tcp-type-of-service peer-socket-tos"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23000
+msgid "The type of service to request in outgoing @acronym{TCP} packets, one of @code{default}, @code{low-cost}, @code{throughput}, @code{low-delay} and @code{reliability}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23002
+msgid "Defaults to @samp{default}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23005
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer peer-limit-global"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23007
+msgid "The global limit on the number of connected peers."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23009
+msgid "Defaults to @samp{200}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23012
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer peer-limit-per-torrent"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23014
+msgid "The per-torrent limit on the number of connected peers."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23019
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer upload-slots-per-torrent"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23022
+msgid "The maximum number of peers to which the daemon will upload data simultaneously for each torrent."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23024
+msgid "Defaults to @samp{14}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23027
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer peer-id-ttl-hours"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23030
+msgid "The maximum lifespan, in hours, of the peer ID associated with each public torrent before it is regenerated."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23032
+msgid "Defaults to @samp{6}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23035
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean blocklist-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23038
+msgid "When @code{#t}, the daemon will ignore peers mentioned in the blocklist it has most recently downloaded from @code{blocklist-url}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23043
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-string blocklist-url"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23047
+msgid "The URL of a peer blocklist (in @acronym{P2P}-plaintext or eMule @file{.dat} format) to be periodically downloaded and applied when @code{blocklist-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23052
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean download-queue-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23055
+msgid "If @code{#t}, the daemon will be limited to downloading at most @code{download-queue-size} non-stalled torrents simultaneously."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23060
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer download-queue-size"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23064
+msgid "The size of the daemon's download queue, which limits the number of non-stalled torrents it will download at any one time when @code{download-queue-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23069
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean seed-queue-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23072
+msgid "If @code{#t}, the daemon will be limited to seeding at most @code{seed-queue-size} non-stalled torrents simultaneously."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23077
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer seed-queue-size"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23081
+msgid "The size of the daemon's seed queue, which limits the number of non-stalled torrents it will seed at any one time when @code{seed-queue-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23086
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean queue-stalled-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23091
+msgid "When @code{#t}, the daemon will consider torrents for which it has not shared data in the past @code{queue-stalled-minutes} minutes to be stalled and not count them against its @code{download-queue-size} and @code{seed-queue-size} limits."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23096
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer queue-stalled-minutes"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23100
+msgid "The maximum period, in minutes, a torrent may be idle before it is considered to be stalled, when @code{queue-stalled-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23105
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean ratio-limit-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23108
+msgid "When @code{#t}, a torrent being seeded will automatically be paused once it reaches the ratio specified by @code{ratio-limit}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23113
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-rational ratio-limit"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23116
+msgid "The ratio at which a torrent being seeded will be paused, when @code{ratio-limit-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23118
+msgid "Defaults to @samp{2.0}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23121
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean idle-seeding-limit-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23124
+msgid "When @code{#t}, a torrent being seeded will automatically be paused once it has been idle for @code{idle-seeding-limit} minutes."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23129
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer idle-seeding-limit"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23133
+msgid "The maximum period, in minutes, a torrent being seeded may be idle before it is paused, when @code{idle-seeding-limit-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23138
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean dht-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23142
+msgid "Enable @uref{http://bittorrent.org/beps/bep_0005.html,the distributed hash table (@acronym{DHT}) protocol}, which supports the use of trackerless torrents."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23147
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean lpd-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23152
+msgid "Enable @uref{https://en.wikipedia.org/wiki/Local_Peer_Discovery,local peer discovery} (@acronym{LPD}), which allows the discovery of peers on the local network and may reduce the amount of data sent over the public Internet."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23157
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean pex-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23161
+msgid "Enable @uref{https://en.wikipedia.org/wiki/Peer_exchange,peer exchange} (@acronym{PEX}), which reduces the daemon's reliance on external trackers and may improve its performance."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23166
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean utp-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23171
+msgid "Enable @uref{http://bittorrent.org/beps/bep_0029.html,the micro transport protocol} (@acronym{uTP}), which aims to reduce the impact of BitTorrent traffic on other users of the local network while maintaining full utilization of the available bandwidth."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23176
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean rpc-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23181
+msgid "If @code{#t}, enable the remote procedure call (@acronym{RPC})  interface, which allows remote control of the daemon via its Web interface, the @command{transmission-remote} command-line client, and similar tools."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23186
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string rpc-bind-address"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23189
+msgid "The IP address at which to listen for @acronym{RPC} connections, or ``0.0.0.0'' to listen at all available IP addresses."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23194
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} port-number rpc-port"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23196
+msgid "The port on which to listen for @acronym{RPC} connections."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23198
+msgid "Defaults to @samp{9091}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23201
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string rpc-url"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23203
+msgid "The path prefix to use in the @acronym{RPC}-endpoint @acronym{URL}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23205
+msgid "Defaults to @samp{\"/transmission/\"}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23208
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean rpc-authentication-required?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23213
+msgid "When @code{#t}, clients must authenticate (see @code{rpc-username} and @code{rpc-password}) when using the @acronym{RPC} interface.  Note this has the side effect of disabling host-name whitelisting (see @code{rpc-host-whitelist-enabled?}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23218
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-string rpc-username"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23221
+msgid "The username required by clients to access the @acronym{RPC} interface when @code{rpc-authentication-required?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23226
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-transmission-password-hash rpc-password"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23232
+msgid "The password required by clients to access the @acronym{RPC} interface when @code{rpc-authentication-required?} is @code{#t}.  This must be specified using a password hash in the format recognized by Transmission clients, either copied from an existing @file{settings.json} file or generated using the @code{transmission-password-hash} procedure."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23237
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean rpc-whitelist-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23240
+msgid "When @code{#t}, @acronym{RPC} requests will be accepted only when they originate from an address specified in @code{rpc-whitelist}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23245
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string-list rpc-whitelist"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23249
+msgid "The list of IP and IPv6 addresses from which @acronym{RPC} requests will be accepted when @code{rpc-whitelist-enabled?} is @code{#t}.  Wildcards may be specified using @samp{*}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23251
+msgid "Defaults to @samp{(\"127.0.0.1\" \"::1\")}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23254
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean rpc-host-whitelist-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23259
+msgid "When @code{#t}, @acronym{RPC} requests will be accepted only when they are addressed to a host named in @code{rpc-host-whitelist}.  Note that requests to ``localhost'' or ``localhost.'', or to a numeric address, are always accepted regardless of these settings."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23262
+msgid "Note also this functionality is disabled when @code{rpc-authentication-required?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23267
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} string-list rpc-host-whitelist"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23270
+msgid "The list of host names recognized by the @acronym{RPC} server when @code{rpc-host-whitelist-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23275
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} message-level message-level"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23279
+msgid "The minimum severity level of messages to be logged (to @file{/var/log/transmission.log}) by the daemon, one of @code{none} (no logging), @code{error}, @code{info} and @code{debug}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23284
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean start-added-torrents?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23287
+msgid "When @code{#t}, torrents are started as soon as they are added; otherwise, they are added in ``paused'' state."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23292
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean script-torrent-done-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23296
+msgid "When @code{#t}, the script specified by @code{script-torrent-done-filename} will be invoked each time a torrent completes."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23301
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} maybe-file-object script-torrent-done-filename"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23305
+msgid "A file name or file-like object specifying a script to run each time a torrent completes, when @code{script-torrent-done-enabled?} is @code{#t}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23310
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean scrape-paused-torrents-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23313
+msgid "When @code{#t}, the daemon will scrape trackers for a torrent even when the torrent is paused."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23318
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} non-negative-integer cache-size-mb"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23322
+msgid "The amount of memory, in megabytes, to allocate for the daemon's in-memory cache.  A larger value may increase performance by reducing the frequency of disk I/O."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23324
+msgid "Defaults to @samp{4}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23327
+#, no-wrap
+msgid "{@code{transmission-daemon-configuration} parameter} boolean prefetch-enabled?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:23331
+msgid "When @code{#t}, the daemon will try to improve I/O performance by hinting to the operating system which data is likely to be read next from disk to satisfy requests from peers."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:23344
 #, no-wrap
 msgid "Tailon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17460
+#: guix-git/doc/guix.texi:23348
 msgid "@uref{https://tailon.readthedocs.io/, Tailon} is a web application for viewing and searching log files."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17463
+#: guix-git/doc/guix.texi:23351
 msgid "The following example will configure the service with default values.  By default, Tailon can be accessed on port 8080 (@code{http://localhost:8080})."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17466
+#. type: lisp
+#: guix-git/doc/guix.texi:23354
 #, no-wrap
 msgid "(service tailon-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17470
+#: guix-git/doc/guix.texi:23358
 msgid "The following example customises more of the Tailon configuration, adding @command{sed} to the list of allowed commands."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17477
+#. type: lisp
+#: guix-git/doc/guix.texi:23365
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -31602,34 +42178,34 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17480
+#: guix-git/doc/guix.texi:23368
 #, no-wrap
 msgid "{Data Type} tailon-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17483
+#: guix-git/doc/guix.texi:23371
 msgid "Data type representing the configuration of Tailon.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17485
+#: guix-git/doc/guix.texi:23373
 #, no-wrap
 msgid "@code{config-file} (default: @code{(tailon-configuration-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17489
-msgid "The configuration file to use for Tailon. This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-Expressions})."
+#: guix-git/doc/guix.texi:23377
+msgid "The configuration file to use for Tailon.  This can be set to a @dfn{tailon-configuration-file} record value, or any gexp (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17492
+#: guix-git/doc/guix.texi:23380
 msgid "For example, to instead use a local file, the @code{local-file} function can be used:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17497
+#. type: lisp
+#: guix-git/doc/guix.texi:23385
 #, no-wrap
 msgid ""
 "(service tailon-service-type\n"
@@ -31638,150 +42214,144 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17499
+#: guix-git/doc/guix.texi:23387
 #, no-wrap
 msgid "@code{package} (default: @code{tailon})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17501
+#: guix-git/doc/guix.texi:23389
 msgid "The tailon package to use."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17505
+#: guix-git/doc/guix.texi:23393
 #, no-wrap
 msgid "{Data Type} tailon-configuration-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17508
+#: guix-git/doc/guix.texi:23396
 msgid "Data type representing the configuration options for Tailon.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17510
+#: guix-git/doc/guix.texi:23398
 #, no-wrap
 msgid "@code{files} (default: @code{(list \"/var/log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17515
-msgid "List of files to display. The list can include strings for a single file or directory, or a list, where the first item is the name of a subsection, and the remaining items are the files or directories in that subsection."
+#: guix-git/doc/guix.texi:23403
+msgid "List of files to display.  The list can include strings for a single file or directory, or a list, where the first item is the name of a subsection, and the remaining items are the files or directories in that subsection."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17516
+#: guix-git/doc/guix.texi:23404
 #, no-wrap
 msgid "@code{bind} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17518
+#: guix-git/doc/guix.texi:23406
 msgid "Address and port to which Tailon should bind on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17519
+#: guix-git/doc/guix.texi:23407
 #, no-wrap
 msgid "@code{relative-root} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17521
+#: guix-git/doc/guix.texi:23409
 msgid "URL path to use for Tailon, set to @code{#f} to not use a path."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17522
+#: guix-git/doc/guix.texi:23410
 #, no-wrap
 msgid "@code{allow-transfers?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17524
+#: guix-git/doc/guix.texi:23412
 msgid "Allow downloading the log files in the web interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17525
+#: guix-git/doc/guix.texi:23413
 #, no-wrap
 msgid "@code{follow-names?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17527
+#: guix-git/doc/guix.texi:23415
 msgid "Allow tailing of not-yet existent files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17528
+#: guix-git/doc/guix.texi:23416
 #, no-wrap
 msgid "@code{tail-lines} (default: @code{200})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17530
+#: guix-git/doc/guix.texi:23418
 msgid "Number of lines to read initially from each file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17531
+#: guix-git/doc/guix.texi:23419
 #, no-wrap
 msgid "@code{allowed-commands} (default: @code{(list \"tail\" \"grep\" \"awk\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17533
-msgid "Commands to allow running. By default, @code{sed} is disabled."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:17534
-#, no-wrap
-msgid "@code{debug?} (default: @code{#f})"
+#: guix-git/doc/guix.texi:23421
+msgid "Commands to allow running.  By default, @code{sed} is disabled."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17536
+#: guix-git/doc/guix.texi:23424
 msgid "Set @code{debug?} to @code{#t} to show debug messages."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17537
+#: guix-git/doc/guix.texi:23425
 #, no-wrap
 msgid "@code{wrap-lines} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17541
-msgid "Initial line wrapping state in the web interface. Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to initially not wrap lines."
+#: guix-git/doc/guix.texi:23429
+msgid "Initial line wrapping state in the web interface.  Set to @code{#t} to initially wrap lines (the default), or to @code{#f} to initially not wrap lines."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17542
+#: guix-git/doc/guix.texi:23430
 #, no-wrap
 msgid "@code{http-auth} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17546
-msgid "HTTP authentication type to use. Set to @code{#f} to disable authentication (the default). Supported values are @code{\"digest\"} or @code{\"basic\"}."
+#: guix-git/doc/guix.texi:23434
+msgid "HTTP authentication type to use.  Set to @code{#f} to disable authentication (the default).  Supported values are @code{\"digest\"} or @code{\"basic\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17547
+#: guix-git/doc/guix.texi:23435
 #, no-wrap
 msgid "@code{users} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17552
-msgid "If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here. To configure users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password."
+#: guix-git/doc/guix.texi:23440
+msgid "If HTTP authentication is enabled (see @code{http-auth}), access will be restricted to the credentials provided here.  To configure users, use a list of pairs, where the first element of the pair is the username, and the 2nd element of the pair is the password."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17558
+#. type: lisp
+#: guix-git/doc/guix.texi:23446
 #, no-wrap
 msgid ""
 "(tailon-configuration-file\n"
@@ -31791,35 +42361,35 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17564
+#: guix-git/doc/guix.texi:23452
 #, no-wrap
 msgid "Darkstat Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17565
+#: guix-git/doc/guix.texi:23453
 #, no-wrap
 msgid "darkstat"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17568
+#: guix-git/doc/guix.texi:23456
 msgid "Darkstat is a packet sniffer that captures network traffic, calculates statistics about usage, and serves reports over HTTP."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:17569
+#: guix-git/doc/guix.texi:23457
 #, no-wrap
 msgid "{Scheme Variable} darkstat-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:17574
+#: guix-git/doc/guix.texi:23462
 msgid "This is the service type for the @uref{https://unix4lyfe.org/darkstat/, darkstat} service, its value must be a @code{darkstat-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17579
+#. type: lisp
+#: guix-git/doc/guix.texi:23467
 #, no-wrap
 msgid ""
 "(service darkstat-service-type\n"
@@ -31828,712 +42398,716 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17582
+#: guix-git/doc/guix.texi:23470
 #, no-wrap
 msgid "{Data Type} darkstat-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17584
+#: guix-git/doc/guix.texi:23472
 msgid "Data type representing the configuration of @command{darkstat}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17586
+#: guix-git/doc/guix.texi:23474
 #, no-wrap
 msgid "@code{package} (default: @code{darkstat})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17588
+#: guix-git/doc/guix.texi:23476
 msgid "The darkstat package to use."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:17589
+#: guix-git/doc/guix.texi:23477
 #, no-wrap
 msgid "interface"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17591
+#: guix-git/doc/guix.texi:23479
 msgid "Capture traffic on the specified network interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17592
+#: guix-git/doc/guix.texi:23480
 #, no-wrap
 msgid "@code{port} (default: @code{\"667\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17594
+#: guix-git/doc/guix.texi:23482
 msgid "Bind the web interface to the specified port."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:17595
-#, no-wrap
-msgid "@code{bind-address} (default: @code{\"127.0.0.1\"})"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:17597 doc/guix.texi:17635
+#: guix-git/doc/guix.texi:23485 guix-git/doc/guix.texi:23520
 msgid "Bind the web interface to the specified address."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17598
+#: guix-git/doc/guix.texi:23486
 #, no-wrap
 msgid "@code{base} (default: @code{\"/\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17601
-msgid "Specify the path of the base URL.  This can be useful if @command{darkstat} is accessed via a reverse proxy."
+#: guix-git/doc/guix.texi:23489
+msgid "Specify the path of the base URL@.  This can be useful if @command{darkstat} is accessed via a reverse proxy."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17605
+#: guix-git/doc/guix.texi:23493
 #, no-wrap
 msgid "Prometheus Node Exporter Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17607
+#: guix-git/doc/guix.texi:23495
 #, no-wrap
 msgid "prometheus-node-exporter"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17612
+#: guix-git/doc/guix.texi:23500
 msgid "The Prometheus ``node exporter'' makes hardware and operating system statistics provided by the Linux kernel available for the Prometheus monitoring system.  This service should be deployed on all physical nodes and virtual machines, where monitoring these statistics is desirable."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:17613
+#: guix-git/doc/guix.texi:23501
 #, no-wrap
 msgid "{Scheme variable} prometheus-node-exporter-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:17618
-msgid "This is the service type for the @uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter} service, its value must be a @code{prometheus-node-exporter-configuration} record as in this example:"
+#: guix-git/doc/guix.texi:23505
+msgid "This is the service type for the @uref{https://github.com/prometheus/node_exporter/, prometheus-node-exporter} service, its value must be a @code{prometheus-node-exporter-configuration}."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:17623
+#. type: lisp
+#: guix-git/doc/guix.texi:23508
 #, no-wrap
-msgid ""
-"(service prometheus-node-exporter-service-type\n"
-"         (prometheus-node-exporter-configuration\n"
-"           (web-listen-address \":9100\")))\n"
+msgid "(service prometheus-node-exporter-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17626
+#: guix-git/doc/guix.texi:23511
 #, no-wrap
 msgid "{Data Type} prometheus-node-exporter-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:17628
+#: guix-git/doc/guix.texi:23513
 msgid "Data type representing the configuration of @command{node_exporter}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17630
+#: guix-git/doc/guix.texi:23515
 #, no-wrap
 msgid "@code{package} (default: @code{go-github-com-prometheus-node-exporter})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:17632
+#: guix-git/doc/guix.texi:23517
 msgid "The prometheus-node-exporter package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17633
+#: guix-git/doc/guix.texi:23518
 #, no-wrap
 msgid "@code{web-listen-address} (default: @code{\":9100\"})"
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:23521
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{textfile-directory} (default: @code{\"/var/lib/prometheus/node-exporter\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:23525
+msgid "This directory can be used to export metrics specific to this machine.  Files containing metrics in the text format, with the filename ending in @code{.prom} should be placed in this directory."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:23528
+msgid "Extra options to pass to the Prometheus node exporter."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:17639
+#: guix-git/doc/guix.texi:23532
 #, no-wrap
 msgid "Zabbix server"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17640
+#: guix-git/doc/guix.texi:23533
 #, no-wrap
 msgid "zabbix zabbix-server"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17643
+#: guix-git/doc/guix.texi:23536
 msgid "Zabbix provides monitoring metrics, among others network utilization, CPU load and disk space consumption:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17645
+#: guix-git/doc/guix.texi:23538
 #, no-wrap
 msgid "High performance, high capacity (able to monitor hundreds of thousands of devices)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17646
+#: guix-git/doc/guix.texi:23539
 #, no-wrap
 msgid "Auto-discovery of servers and network devices and interfaces."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17647
+#: guix-git/doc/guix.texi:23540
 #, no-wrap
 msgid "Low-level discovery, allows to automatically start monitoring new items, file systems or network interfaces among others."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17648
+#: guix-git/doc/guix.texi:23541
 #, no-wrap
 msgid "Distributed monitoring with centralized web administration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17649
+#: guix-git/doc/guix.texi:23542
 #, no-wrap
 msgid "Native high performance agents."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17650
+#: guix-git/doc/guix.texi:23543
 #, no-wrap
 msgid "SLA, and ITIL KPI metrics on reporting."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17651
+#: guix-git/doc/guix.texi:23544
 #, no-wrap
 msgid "High-level (business) view of monitored resources through user-defined visual console screens and dashboards."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:17652
+#: guix-git/doc/guix.texi:23545
 #, no-wrap
 msgid "Remote command execution through Zabbix proxies."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17658
+#: guix-git/doc/guix.texi:23551
 msgid "Available @code{zabbix-server-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17659
+#: guix-git/doc/guix.texi:23552
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} package zabbix-server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17661
+#: guix-git/doc/guix.texi:23554
 msgid "The zabbix-server package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17664
+#: guix-git/doc/guix.texi:23557
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17666
+#: guix-git/doc/guix.texi:23559
 msgid "User who will run the Zabbix server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17668 doc/guix.texi:17675 doc/guix.texi:17689
-#: doc/guix.texi:17696 doc/guix.texi:17797 doc/guix.texi:17804
-#: doc/guix.texi:17915 doc/guix.texi:17922
+#: guix-git/doc/guix.texi:23561 guix-git/doc/guix.texi:23568
+#: guix-git/doc/guix.texi:23582 guix-git/doc/guix.texi:23589
+#: guix-git/doc/guix.texi:23690 guix-git/doc/guix.texi:23697
+#: guix-git/doc/guix.texi:23808 guix-git/doc/guix.texi:23815
 msgid "Defaults to @samp{\"zabbix\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17671
+#: guix-git/doc/guix.texi:23564
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} group group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17673
+#: guix-git/doc/guix.texi:23566
 msgid "Group who will run the Zabbix server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17678
+#: guix-git/doc/guix.texi:23571
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17680 doc/guix.texi:17899
+#: guix-git/doc/guix.texi:23573 guix-git/doc/guix.texi:23792
 msgid "Database host name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17682
+#: guix-git/doc/guix.texi:23575
 msgid "Defaults to @samp{\"127.0.0.1\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17685
+#: guix-git/doc/guix.texi:23578
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17687 doc/guix.texi:17913
+#: guix-git/doc/guix.texi:23580 guix-git/doc/guix.texi:23806
 msgid "Database name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17692
+#: guix-git/doc/guix.texi:23585
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17694 doc/guix.texi:17920
+#: guix-git/doc/guix.texi:23587 guix-git/doc/guix.texi:23813
 msgid "Database user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17699
+#: guix-git/doc/guix.texi:23592
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string db-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17702
+#: guix-git/doc/guix.texi:23595
 msgid "Database password.  Please, use @code{include-files} with @code{DBPassword=SECRET} inside a specified file instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17707
+#: guix-git/doc/guix.texi:23600
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} number db-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17709 doc/guix.texi:17906
+#: guix-git/doc/guix.texi:23602 guix-git/doc/guix.texi:23799
 msgid "Database port."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17711 doc/guix.texi:17908
+#: guix-git/doc/guix.texi:23604 guix-git/doc/guix.texi:23801
 msgid "Defaults to @samp{5432}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17714
+#: guix-git/doc/guix.texi:23607
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string log-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17716 doc/guix.texi:17817
+#: guix-git/doc/guix.texi:23609 guix-git/doc/guix.texi:23710
 msgid "Specifies where log messages are written to:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17720 doc/guix.texi:17821
+#: guix-git/doc/guix.texi:23613 guix-git/doc/guix.texi:23714
 msgid "@code{system} - syslog."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17723 doc/guix.texi:17824
+#: guix-git/doc/guix.texi:23616 guix-git/doc/guix.texi:23717
 msgid "@code{file} - file specified with @code{log-file} parameter."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:17726 doc/guix.texi:17827
+#: guix-git/doc/guix.texi:23619 guix-git/doc/guix.texi:23720
 msgid "@code{console} - standard output."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17733
+#: guix-git/doc/guix.texi:23626
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string log-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17735 doc/guix.texi:17836
+#: guix-git/doc/guix.texi:23628 guix-git/doc/guix.texi:23729
 msgid "Log file name for @code{log-type} @code{file} parameter."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17737
+#: guix-git/doc/guix.texi:23630
 msgid "Defaults to @samp{\"/var/log/zabbix/server.log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17740
+#: guix-git/doc/guix.texi:23633
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17742 doc/guix.texi:17843
+#: guix-git/doc/guix.texi:23635 guix-git/doc/guix.texi:23736
 msgid "Name of PID file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17744
+#: guix-git/doc/guix.texi:23637
 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_server.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17747
+#: guix-git/doc/guix.texi:23640
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string ssl-ca-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17750
+#: guix-git/doc/guix.texi:23643
 msgid "The location of certificate authority (CA) files for SSL server certificate verification."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17752
+#: guix-git/doc/guix.texi:23645
 msgid "Defaults to @samp{\"/etc/ssl/certs/ca-certificates.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17755
+#: guix-git/doc/guix.texi:23648
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string ssl-cert-location"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17757
+#: guix-git/doc/guix.texi:23650
 msgid "Location of SSL client certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17759
+#: guix-git/doc/guix.texi:23652
 msgid "Defaults to @samp{\"/etc/ssl/certs\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17762
+#: guix-git/doc/guix.texi:23655
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} string extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17764 doc/guix.texi:17868
+#: guix-git/doc/guix.texi:23657 guix-git/doc/guix.texi:23761
 msgid "Extra options will be appended to Zabbix server configuration file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17769
+#: guix-git/doc/guix.texi:23662
 #, no-wrap
 msgid "{@code{zabbix-server-configuration} parameter} include-files include-files"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17772 doc/guix.texi:17876
+#: guix-git/doc/guix.texi:23665 guix-git/doc/guix.texi:23769
 msgid "You may include individual files or all files in a directory in the configuration file."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17779
+#: guix-git/doc/guix.texi:23672
 #, no-wrap
 msgid "Zabbix agent"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17780
+#: guix-git/doc/guix.texi:23673
 #, no-wrap
 msgid "zabbix zabbix-agent"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17783
+#: guix-git/doc/guix.texi:23676
 msgid "Zabbix agent gathers information for Zabbix server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17787
+#: guix-git/doc/guix.texi:23680
 msgid "Available @code{zabbix-agent-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17788
+#: guix-git/doc/guix.texi:23681
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} package zabbix-agent"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17790
+#: guix-git/doc/guix.texi:23683
 msgid "The zabbix-agent package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17793
+#: guix-git/doc/guix.texi:23686
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17795
+#: guix-git/doc/guix.texi:23688
 msgid "User who will run the Zabbix agent."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17800
+#: guix-git/doc/guix.texi:23693
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} group group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17802
+#: guix-git/doc/guix.texi:23695
 msgid "Group who will run the Zabbix agent."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17807
+#: guix-git/doc/guix.texi:23700
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string hostname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17810
+#: guix-git/doc/guix.texi:23703
 msgid "Unique, case sensitive hostname which is required for active checks and must match hostname as configured on the server."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17812
-msgid "Defaults to @samp{\"Zabbix server\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:17815
+#: guix-git/doc/guix.texi:23708
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string log-type"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17834
+#: guix-git/doc/guix.texi:23727
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string log-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17838
+#: guix-git/doc/guix.texi:23731
 msgid "Defaults to @samp{\"/var/log/zabbix/agent.log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17841
+#: guix-git/doc/guix.texi:23734
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17845
+#: guix-git/doc/guix.texi:23738
 msgid "Defaults to @samp{\"/var/run/zabbix/zabbix_agent.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17848
+#: guix-git/doc/guix.texi:23741
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} list server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17852
+#: guix-git/doc/guix.texi:23745
 msgid "List of IP addresses, optionally in CIDR notation, or hostnames of Zabbix servers and Zabbix proxies.  Incoming connections will be accepted only from the hosts listed here."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17854 doc/guix.texi:17863
+#: guix-git/doc/guix.texi:23747 guix-git/doc/guix.texi:23756
 msgid "Defaults to @samp{(\"127.0.0.1\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17857
+#: guix-git/doc/guix.texi:23750
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} list server-active"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17861
+#: guix-git/doc/guix.texi:23754
 msgid "List of IP:port (or hostname:port) pairs of Zabbix servers and Zabbix proxies for active checks.  If port is not specified, default port is used.  If this parameter is not specified, active checks are disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17866
+#: guix-git/doc/guix.texi:23759
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} string extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17873
+#: guix-git/doc/guix.texi:23766
 #, no-wrap
 msgid "{@code{zabbix-agent-configuration} parameter} include-files include-files"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17883
+#: guix-git/doc/guix.texi:23776
 #, no-wrap
 msgid "Zabbix front-end"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17884
+#: guix-git/doc/guix.texi:23777
 #, no-wrap
 msgid "zabbix zabbix-front-end"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17887
+#: guix-git/doc/guix.texi:23780
 msgid "This service provides a WEB interface to Zabbix server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17891
+#: guix-git/doc/guix.texi:23784
 msgid "Available @code{zabbix-front-end-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17892
+#: guix-git/doc/guix.texi:23785
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17894 doc/guix.texi:22296
+#: guix-git/doc/guix.texi:23787 guix-git/doc/guix.texi:29949
 msgid "NGINX configuration."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17897
+#: guix-git/doc/guix.texi:23790
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17904
+#: guix-git/doc/guix.texi:23797
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} number db-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17911
+#: guix-git/doc/guix.texi:23804
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17918
+#: guix-git/doc/guix.texi:23811
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17925
+#: guix-git/doc/guix.texi:23818
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-password"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17927
+#: guix-git/doc/guix.texi:23820
 msgid "Database password.  Please, use @code{db-secret-file} instead."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17932
+#: guix-git/doc/guix.texi:23825
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string db-secret-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17936
-msgid "Secret file which will be appended to @file{zabbix.conf.php} file.  This file contains credentials for use by Zabbix front-end.  You are expected to create it manually."
+#: guix-git/doc/guix.texi:23830
+msgid "Secret file containing the credentials for the Zabbix front-end.  The value must be a local file name, not a G-expression.  You are expected to create this file manually.  Its contents will be copied into @file{zabbix.conf.php} as the value of @code{$DB['PASSWORD']}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17941
+#: guix-git/doc/guix.texi:23835
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} string zabbix-host"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17943
+#: guix-git/doc/guix.texi:23837
 msgid "Zabbix server hostname."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17948
+#: guix-git/doc/guix.texi:23842
 #, no-wrap
 msgid "{@code{zabbix-front-end-configuration} parameter} number zabbix-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17950
+#: guix-git/doc/guix.texi:23844
 msgid "Zabbix server port."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:17952
+#: guix-git/doc/guix.texi:23846
 msgid "Defaults to @samp{10051}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:17960
+#: guix-git/doc/guix.texi:23854
 #, no-wrap
 msgid "Kerberos"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17964
+#: guix-git/doc/guix.texi:23858
 msgid "The @code{(gnu services kerberos)} module provides services relating to the authentication protocol @dfn{Kerberos}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:17965
+#: guix-git/doc/guix.texi:23859
 #, no-wrap
 msgid "Krb5 Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17972
+#: guix-git/doc/guix.texi:23866
 msgid "Programs using a Kerberos client library normally expect a configuration file in @file{/etc/krb5.conf}.  This service generates such a file from a definition provided in the operating system declaration.  It does not cause any daemon to be started."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17976
+#: guix-git/doc/guix.texi:23870
 msgid "No ``keytab'' files are provided by this service---you must explicitly create them.  This service is known to work with the MIT client library, @code{mit-krb5}.  Other implementations have not been tested."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17977
+#: guix-git/doc/guix.texi:23871
 #, no-wrap
 msgid "{Scheme Variable} krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:17979
+#: guix-git/doc/guix.texi:23873
 msgid "A service type for Kerberos 5 clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:17983
+#: guix-git/doc/guix.texi:23877
 msgid "Here is an example of its use:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:17997
+#: guix-git/doc/guix.texi:23891
 #, no-wrap
 msgid ""
 "(service krb5-service-type\n"
@@ -32552,206 +43126,206 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18001
+#: guix-git/doc/guix.texi:23895
 msgid "This example provides a Kerberos@tie{}5 client configuration which:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18002
+#: guix-git/doc/guix.texi:23896
 #, no-wrap
 msgid "Recognizes two realms, @i{viz:} ``EXAMPLE.COM'' and ``ARGRX.EDU'', both"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18004
+#: guix-git/doc/guix.texi:23898
 msgid "of which have distinct administration servers and key distribution centers;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18004
+#: guix-git/doc/guix.texi:23898
 #, no-wrap
 msgid "Will default to the realm ``EXAMPLE.COM'' if the realm is not explicitly"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:18006
+#: guix-git/doc/guix.texi:23900
 msgid "specified by clients;"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18006
+#: guix-git/doc/guix.texi:23900
 #, no-wrap
 msgid "Accepts services which only support encryption types known to be weak."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18014
+#: guix-git/doc/guix.texi:23908
 msgid "The @code{krb5-realm} and @code{krb5-configuration} types have many fields.  Only the most commonly used ones are described here.  For a full list, and more detailed explanation of each, see the MIT @uref{https://web.mit.edu/kerberos/krb5-devel/doc/admin/conf_files/krb5_conf.html,,krb5.conf} documentation."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18016
+#: guix-git/doc/guix.texi:23910
 #, no-wrap
 msgid "{Data Type} krb5-realm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18017
+#: guix-git/doc/guix.texi:23911
 #, no-wrap
 msgid "realm, kerberos"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18023
+#: guix-git/doc/guix.texi:23917
 msgid "This field is a string identifying the name of the realm.  A common convention is to use the fully qualified DNS name of your organization, converted to upper case."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18024
+#: guix-git/doc/guix.texi:23918
 #, no-wrap
 msgid "admin-server"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18027
+#: guix-git/doc/guix.texi:23921
 msgid "This field is a string identifying the host where the administration server is running."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18028
+#: guix-git/doc/guix.texi:23922
 #, no-wrap
 msgid "kdc"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18031
+#: guix-git/doc/guix.texi:23925
 msgid "This field is a string identifying the key distribution center for the realm."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18034
+#: guix-git/doc/guix.texi:23928
 #, no-wrap
 msgid "{Data Type} krb5-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18037
+#: guix-git/doc/guix.texi:23931
 #, no-wrap
 msgid "@code{allow-weak-crypto?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18040
+#: guix-git/doc/guix.texi:23934
 msgid "If this flag is @code{#t} then services which only offer encryption algorithms known to be weak will be accepted."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18041
+#: guix-git/doc/guix.texi:23935
 #, no-wrap
 msgid "@code{default-realm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18048
+#: guix-git/doc/guix.texi:23942
 msgid "This field should be a string identifying the default Kerberos realm for the client.  You should set this field to the name of your Kerberos realm.  If this value is @code{#f} then a realm must be specified with every Kerberos principal when invoking programs such as @command{kinit}."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18049
+#: guix-git/doc/guix.texi:23943
 #, no-wrap
 msgid "realms"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18054
+#: guix-git/doc/guix.texi:23948
 msgid "This should be a non-empty list of @code{krb5-realm} objects, which clients may access.  Normally, one of them will have a @code{name} field matching the @code{default-realm} field."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18058
+#: guix-git/doc/guix.texi:23952
 #, no-wrap
 msgid "PAM krb5 Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18059
+#: guix-git/doc/guix.texi:23953
 #, no-wrap
 msgid "pam-krb5"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18065
+#: guix-git/doc/guix.texi:23959
 msgid "The @code{pam-krb5} service allows for login authentication and password management via Kerberos.  You will need this service if you want PAM enabled applications to authenticate users using Kerberos."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18066
+#: guix-git/doc/guix.texi:23960
 #, no-wrap
 msgid "{Scheme Variable} pam-krb5-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18068
+#: guix-git/doc/guix.texi:23962
 msgid "A service type for the Kerberos 5 PAM module."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18070
+#: guix-git/doc/guix.texi:23964
 #, no-wrap
 msgid "{Data Type} pam-krb5-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18073
+#: guix-git/doc/guix.texi:23967
 msgid "Data type representing the configuration of the Kerberos 5 PAM module.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18074
+#: guix-git/doc/guix.texi:23968
 #, no-wrap
 msgid "@code{pam-krb5} (default: @code{pam-krb5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18076
+#: guix-git/doc/guix.texi:23970
 msgid "The pam-krb5 package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18077
+#: guix-git/doc/guix.texi:23971
 #, no-wrap
 msgid "@code{minimum-uid} (default: @code{1000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18080
+#: guix-git/doc/guix.texi:23974
 msgid "The smallest user ID for which Kerberos authentications should be attempted.  Local accounts with lower values will silently fail to authenticate."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18086
+#: guix-git/doc/guix.texi:23980
 #, no-wrap
 msgid "LDAP"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18087
+#: guix-git/doc/guix.texi:23981
 #, no-wrap
 msgid "nslcd, LDAP service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18094
+#: guix-git/doc/guix.texi:23988
 msgid "The @code{(gnu services authentication)} module provides the @code{nslcd-service-type}, which can be used to authenticate against an LDAP server.  In addition to configuring the service itself, you may want to add @code{ldap} as a name service to the Name Service Switch. @xref{Name Service Switch} for detailed information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18098
+#: guix-git/doc/guix.texi:23992
 msgid "Here is a simple operating system declaration with a default configuration of the @code{nslcd-service-type} and a Name Service Switch configuration that consults the @code{ldap} name service last:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18121
+#. type: lisp
+#: guix-git/doc/guix.texi:24015
 #, no-wrap
 msgid ""
 "(use-service-modules authentication)\n"
@@ -32778,671 +43352,643 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18126
+#: guix-git/doc/guix.texi:24020
 msgid "Available @code{nslcd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18127
+#: guix-git/doc/guix.texi:24021
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} package nss-pam-ldapd"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18129
+#: guix-git/doc/guix.texi:24023
 msgid "The @code{nss-pam-ldapd} package to use."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18132
+#: guix-git/doc/guix.texi:24026
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number threads"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18136
+#: guix-git/doc/guix.texi:24030
 msgid "The number of threads to start that can handle requests and perform LDAP queries.  Each thread opens a separate connection to the LDAP server.  The default is to start 5 threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18138 doc/guix.texi:18180 doc/guix.texi:18188
-#: doc/guix.texi:18196 doc/guix.texi:18204 doc/guix.texi:18213
-#: doc/guix.texi:18221 doc/guix.texi:18228 doc/guix.texi:18236
-#: doc/guix.texi:18244 doc/guix.texi:18254 doc/guix.texi:18261
-#: doc/guix.texi:18285 doc/guix.texi:18293 doc/guix.texi:18319
-#: doc/guix.texi:18328 doc/guix.texi:18337 doc/guix.texi:18346
-#: doc/guix.texi:18355 doc/guix.texi:18364 doc/guix.texi:18372
-#: doc/guix.texi:18380 doc/guix.texi:18387 doc/guix.texi:18395
-#: doc/guix.texi:18402 doc/guix.texi:18410 doc/guix.texi:18418
-#: doc/guix.texi:18427 doc/guix.texi:18436 doc/guix.texi:18444
-#: doc/guix.texi:18452 doc/guix.texi:18460 doc/guix.texi:18471
-#: doc/guix.texi:18481 doc/guix.texi:18492 doc/guix.texi:18501
-#: doc/guix.texi:18511 doc/guix.texi:18519 doc/guix.texi:18530
-#: doc/guix.texi:18539 doc/guix.texi:18549 doc/guix.texi:20839
-#: doc/guix.texi:20846 doc/guix.texi:20853 doc/guix.texi:20860
-#: doc/guix.texi:20867 doc/guix.texi:20874 doc/guix.texi:20882
-#: doc/guix.texi:20890 doc/guix.texi:20897 doc/guix.texi:20904
-#: doc/guix.texi:20911 doc/guix.texi:20918 doc/guix.texi:20948
-#: doc/guix.texi:20986 doc/guix.texi:20993 doc/guix.texi:21002
-#: doc/guix.texi:21024 doc/guix.texi:21032 doc/guix.texi:21039
-#: doc/guix.texi:21194 doc/guix.texi:21214 doc/guix.texi:21229
-#: doc/guix.texi:21236 doc/guix.texi:23034 doc/guix.texi:23042
-#: doc/guix.texi:23050 doc/guix.texi:23058 doc/guix.texi:23066
-#: doc/guix.texi:23074
-msgid "Defaults to @samp{disabled}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:18141
+#: guix-git/doc/guix.texi:24035
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18143
+#: guix-git/doc/guix.texi:24037
 msgid "This specifies the user id with which the daemon should be run."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18145 doc/guix.texi:18152
+#: guix-git/doc/guix.texi:24039 guix-git/doc/guix.texi:24046
 msgid "Defaults to @samp{\"nslcd\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18148
+#: guix-git/doc/guix.texi:24042
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string gid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18150
+#: guix-git/doc/guix.texi:24044
 msgid "This specifies the group id with which the daemon should be run."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18155
+#: guix-git/doc/guix.texi:24049
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} log-option log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18162
-msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL.  The SCHEME argument may either be the symbols \"none\" or \"syslog\", or an absolute file name.  The LEVEL argument is optional and specifies the log level.  The log level may be one of the following symbols: \"crit\", \"error\", \"warning\", \"notice\", \"info\" or \"debug\".  All messages with the specified log level or higher are logged."
+#: guix-git/doc/guix.texi:24057
+msgid "This option controls the way logging is done via a list containing SCHEME and LEVEL@.  The SCHEME argument may either be the symbols @samp{none} or @samp{syslog}, or an absolute file name.  The LEVEL argument is optional and specifies the log level.  The log level may be one of the following symbols: @samp{crit}, @samp{error}, @samp{warning}, @samp{notice}, @samp{info} or @samp{debug}.  All messages with the specified log level or higher are logged."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18164
+#: guix-git/doc/guix.texi:24059
 msgid "Defaults to @samp{(\"/var/log/nslcd\" info)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18167
+#: guix-git/doc/guix.texi:24062
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list uri"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18170
+#: guix-git/doc/guix.texi:24065
 msgid "The list of LDAP server URIs.  Normally, only the first server will be used with the following servers as fall-back."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18172
+#: guix-git/doc/guix.texi:24067
 msgid "Defaults to @samp{(\"ldap://localhost:389/\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18175
+#: guix-git/doc/guix.texi:24070
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string ldap-version"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18178
+#: guix-git/doc/guix.texi:24073
 msgid "The version of the LDAP protocol to use.  The default is to use the maximum version supported by the LDAP library."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18183
+#: guix-git/doc/guix.texi:24078
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string binddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18186
+#: guix-git/doc/guix.texi:24081
 msgid "Specifies the distinguished name with which to bind to the directory server for lookups.  The default is to bind anonymously."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18191
+#: guix-git/doc/guix.texi:24086
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string bindpw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18194
+#: guix-git/doc/guix.texi:24089
 msgid "Specifies the credentials with which to bind.  This option is only applicable when used with binddn."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18199
+#: guix-git/doc/guix.texi:24094
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmoddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18202
+#: guix-git/doc/guix.texi:24097
 msgid "Specifies the distinguished name to use when the root user tries to modify a user's password using the PAM module."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18207
+#: guix-git/doc/guix.texi:24102
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string rootpwmodpw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18211
+#: guix-git/doc/guix.texi:24106
 msgid "Specifies the credentials with which to bind if the root user tries to change a user's password.  This option is only applicable when used with rootpwmoddn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18216
+#: guix-git/doc/guix.texi:24111
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-mech"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18219
+#: guix-git/doc/guix.texi:24114
 msgid "Specifies the SASL mechanism to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18224
+#: guix-git/doc/guix.texi:24119
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-realm"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18226
+#: guix-git/doc/guix.texi:24121
 msgid "Specifies the SASL realm to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18231
+#: guix-git/doc/guix.texi:24126
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authcid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18234
+#: guix-git/doc/guix.texi:24129
 msgid "Specifies the authentication identity to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18239
+#: guix-git/doc/guix.texi:24134
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string sasl-authzid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18242
+#: guix-git/doc/guix.texi:24137
 msgid "Specifies the authorization identity to be used when performing SASL authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18247
+#: guix-git/doc/guix.texi:24142
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean sasl-canonicalize?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18252
+#: guix-git/doc/guix.texi:24147
 msgid "Determines whether the LDAP server host name should be canonicalised.  If this is enabled the LDAP library will do a reverse host name lookup.  By default, it is left up to the LDAP library whether this check is performed or not."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18257
+#: guix-git/doc/guix.texi:24152
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string krb5-ccname"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18259
+#: guix-git/doc/guix.texi:24154
 msgid "Set the name for the GSS-API Kerberos credentials cache."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18264
+#: guix-git/doc/guix.texi:24159
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} string base"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18266
+#: guix-git/doc/guix.texi:24161
 msgid "The directory search base."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18268
+#: guix-git/doc/guix.texi:24163
 msgid "Defaults to @samp{\"dc=example,dc=com\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18271
+#: guix-git/doc/guix.texi:24166
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} scope-option scope"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18275
+#: guix-git/doc/guix.texi:24170
 msgid "Specifies the search scope (subtree, onelevel, base or children).  The default scope is subtree; base scope is almost never useful for name service lookups; children scope is not supported on all servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18277
+#: guix-git/doc/guix.texi:24172
 msgid "Defaults to @samp{(subtree)}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18280
+#: guix-git/doc/guix.texi:24175
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-deref-option deref"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18283
+#: guix-git/doc/guix.texi:24178
 msgid "Specifies the policy for dereferencing aliases.  The default policy is to never dereference aliases."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18288
+#: guix-git/doc/guix.texi:24183
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean referrals"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18291
+#: guix-git/doc/guix.texi:24186
 msgid "Specifies whether automatic referral chasing should be enabled.  The default behaviour is to chase referrals."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18296
+#: guix-git/doc/guix.texi:24191
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list-of-map-entries maps"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18301
+#: guix-git/doc/guix.texi:24196
 msgid "This option allows for custom attributes to be looked up instead of the default RFC 2307 attributes.  It is a list of maps, each consisting of the name of a map, the RFC 2307 attribute to match and the query expression for the attribute as it is available in the directory."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18306
+#: guix-git/doc/guix.texi:24201
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list-of-filter-entries filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18309
+#: guix-git/doc/guix.texi:24204
 msgid "A list of filters consisting of the name of a map to which the filter applies and an LDAP search filter expression."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18314
+#: guix-git/doc/guix.texi:24209
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number bind-timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18317
+#: guix-git/doc/guix.texi:24212
 msgid "Specifies the time limit in seconds to use when connecting to the directory server.  The default value is 10 seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18322
+#: guix-git/doc/guix.texi:24217
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18326
+#: guix-git/doc/guix.texi:24221
 msgid "Specifies the time limit (in seconds) to wait for a response from the LDAP server.  A value of zero, which is the default, is to wait indefinitely for searches to be completed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18331
+#: guix-git/doc/guix.texi:24226
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number idle-timelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18335
+#: guix-git/doc/guix.texi:24230
 msgid "Specifies the period if inactivity (in seconds) after which the con‐ nection to the LDAP server will be closed.  The default is not to time out connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18340
+#: guix-git/doc/guix.texi:24235
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-sleeptime"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18344
+#: guix-git/doc/guix.texi:24239
 msgid "Specifies the number of seconds to sleep when connecting to all LDAP servers fails.  By default one second is waited between the first failure and the first retry."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18349
+#: guix-git/doc/guix.texi:24244
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number reconnect-retrytime"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18353
+#: guix-git/doc/guix.texi:24248
 msgid "Specifies the time after which the LDAP server is considered to be permanently unavailable.  Once this time is reached retries will be done only once per this time period.  The default value is 10 seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18358
+#: guix-git/doc/guix.texi:24253
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-ssl-option ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18362
+#: guix-git/doc/guix.texi:24257
 msgid "Specifies whether to use SSL/TLS or not (the default is not to).  If 'start-tls is specified then StartTLS is used rather than raw LDAP over SSL."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18367
+#: guix-git/doc/guix.texi:24262
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-tls-reqcert-option tls-reqcert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18370
+#: guix-git/doc/guix.texi:24265
 msgid "Specifies what checks to perform on a server-supplied certificate.  The meaning of the values is described in the ldap.conf(5) manual page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18375
+#: guix-git/doc/guix.texi:24270
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertdir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18378
+#: guix-git/doc/guix.texi:24273
 msgid "Specifies the directory containing X.509 certificates for peer authen‐ tication.  This parameter is ignored when using GnuTLS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18383
+#: guix-git/doc/guix.texi:24278
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cacertfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18385
+#: guix-git/doc/guix.texi:24280
 msgid "Specifies the path to the X.509 certificate for peer authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18390
+#: guix-git/doc/guix.texi:24285
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-randfile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18393
+#: guix-git/doc/guix.texi:24288
 msgid "Specifies the path to an entropy source.  This parameter is ignored when using GnuTLS."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18398
+#: guix-git/doc/guix.texi:24293
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-ciphers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18400
+#: guix-git/doc/guix.texi:24295
 msgid "Specifies the ciphers to use for TLS as a string."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18405
+#: guix-git/doc/guix.texi:24300
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18408
+#: guix-git/doc/guix.texi:24303
 msgid "Specifies the path to the file containing the local certificate for client TLS authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18413
+#: guix-git/doc/guix.texi:24308
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string tls-key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18416
+#: guix-git/doc/guix.texi:24311
 msgid "Specifies the path to the file containing the private key for client TLS authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18421
+#: guix-git/doc/guix.texi:24316
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number pagesize"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18425
+#: guix-git/doc/guix.texi:24320
 msgid "Set this to a number greater than 0 to request paged results from the LDAP server in accordance with RFC2696.  The default (0) is to not request paged results."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18430
+#: guix-git/doc/guix.texi:24325
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-ignore-users-option nss-initgroups-ignoreusers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18434
+#: guix-git/doc/guix.texi:24329
 msgid "This option prevents group membership lookups through LDAP for the specified users.  Alternatively, the value 'all-local may be used.  With that value nslcd builds a full list of non-LDAP users on startup."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18439
+#: guix-git/doc/guix.texi:24334
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-min-uid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18442
+#: guix-git/doc/guix.texi:24337
 msgid "This option ensures that LDAP users with a numeric user id lower than the specified value are ignored."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18447
+#: guix-git/doc/guix.texi:24342
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-uid-offset"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18450
+#: guix-git/doc/guix.texi:24345
 msgid "This option specifies an offset that is added to all LDAP numeric user ids.  This can be used to avoid user id collisions with local users."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18455
+#: guix-git/doc/guix.texi:24350
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-number nss-gid-offset"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18458
+#: guix-git/doc/guix.texi:24353
 msgid "This option specifies an offset that is added to all LDAP numeric group ids.  This can be used to avoid user id collisions with local groups."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18463
+#: guix-git/doc/guix.texi:24358
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-nested-groups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18469
+#: guix-git/doc/guix.texi:24364
 msgid "If this option is set, the member attribute of a group may point to another group.  Members of nested groups are also returned in the higher level group and parent groups are returned when finding groups for a specific user.  The default is not to perform extra searches for nested groups."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18474
+#: guix-git/doc/guix.texi:24369
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-getgrent-skipmembers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18479
+#: guix-git/doc/guix.texi:24374
 msgid "If this option is set, the group member list is not retrieved when looking up groups.  Lookups for finding which groups a user belongs to will remain functional so the user will likely still get the correct groups assigned on login."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18484
+#: guix-git/doc/guix.texi:24379
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean nss-disable-enumeration"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18490
+#: guix-git/doc/guix.texi:24385
 msgid "If this option is set, functions which cause all user/group entries to be loaded from the directory will not succeed in doing so.  This can dramatically reduce LDAP server load in situations where there are a great number of users and/or groups.  This option is not recommended for most configurations."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18495
+#: guix-git/doc/guix.texi:24390
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string validnames"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18499
+#: guix-git/doc/guix.texi:24394
 msgid "This option can be used to specify how user and group names are verified within the system.  This pattern is used to check all user and group names that are requested and returned from LDAP."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18504
+#: guix-git/doc/guix.texi:24399
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean ignorecase"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18509
+#: guix-git/doc/guix.texi:24404
 msgid "This specifies whether or not to perform searches using case-insensitive matching.  Enabling this could open up the system to authorization bypass vulnerabilities and introduce nscd cache poisoning vulnerabilities which allow denial of service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18514
+#: guix-git/doc/guix.texi:24409
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-boolean pam-authc-ppolicy"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18517
+#: guix-git/doc/guix.texi:24412
 msgid "This option specifies whether password policy controls are requested and handled from the LDAP server when performing user authentication."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18522
+#: guix-git/doc/guix.texi:24417
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authc-search"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18528
+#: guix-git/doc/guix.texi:24423
 msgid "By default nslcd performs an LDAP search with the user's credentials after BIND (authentication) to ensure that the BIND operation was successful.  The default search is a simple check to see if the user's DN exists.  A search filter can be specified that will be used instead.  It should return at least one entry."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18533
+#: guix-git/doc/guix.texi:24428
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-authz-search"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18537
+#: guix-git/doc/guix.texi:24432
 msgid "This option allows flexible fine tuning of the authorisation check that should be performed.  The search filter specified is executed and if any entries match, access is granted, otherwise access is denied."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18542
+#: guix-git/doc/guix.texi:24437
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} maybe-string pam-password-prohibit-message"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18547
+#: guix-git/doc/guix.texi:24442
 msgid "If this option is set password modification using pam_ldap will be denied and the specified message will be presented to the user instead.  The message can be used to direct the user to an alternative means of changing their password."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18552
+#: guix-git/doc/guix.texi:24447
 #, no-wrap
 msgid "{@code{nslcd-configuration} parameter} list pam-services"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:18554
+#: guix-git/doc/guix.texi:24449
 msgid "List of pam service names for which LDAP authentication should suffice."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18565
+#: guix-git/doc/guix.texi:24460
 #, no-wrap
 msgid "web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18566
+#: guix-git/doc/guix.texi:24461
 #, no-wrap
 msgid "www"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18567
+#: guix-git/doc/guix.texi:24462
 #, no-wrap
 msgid "HTTP"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18570
+#: guix-git/doc/guix.texi:24465
 msgid "The @code{(gnu services web)} module provides the Apache HTTP Server, the nginx web server, and also a fastcgi wrapper daemon."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18571
+#: guix-git/doc/guix.texi:24466
 #, no-wrap
 msgid "Apache HTTP Server"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18573
+#: guix-git/doc/guix.texi:24468
 #, no-wrap
 msgid "{Scheme Variable} httpd-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18577
+#: guix-git/doc/guix.texi:24472
 msgid "Service type for the @uref{https://httpd.apache.org/,Apache HTTP} server (@dfn{httpd}).  The value for this service type is a @code{httpd-configuration} record."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18579 doc/guix.texi:18760
+#: guix-git/doc/guix.texi:24474 guix-git/doc/guix.texi:24655
 msgid "A simple example configuration is given below."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18587
+#. type: lisp
+#: guix-git/doc/guix.texi:24482
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -33454,133 +44000,133 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18591
+#: guix-git/doc/guix.texi:24486
 msgid "Other services can also extend the @code{httpd-service-type} to add to the configuration."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18600 doc/guix.texi:18740
+#. type: lisp
+#: guix-git/doc/guix.texi:24495 guix-git/doc/guix.texi:24635
 #, no-wrap
 msgid ""
-"(simple-service 'my-extra-server httpd-service-type\n"
+"(simple-service 'www.example.com-server httpd-service-type\n"
 "                (list\n"
 "                  (httpd-virtualhost\n"
 "                    \"*:80\"\n"
-"                    (list (string-append\n"
-"                           \"ServerName \"www.example.com\n"
-"                            DocumentRoot \\\"/srv/http/www.example.com\\\"\")))))\n"
+"                    (list (string-join '(\"ServerName www.example.com\"\n"
+"                                          \"DocumentRoot /srv/http/www.example.com\")\n"
+"                                       \"\\n\")))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18606
+#: guix-git/doc/guix.texi:24501
 msgid "The details for the @code{httpd-configuration}, @code{httpd-module}, @code{httpd-config-file} and @code{httpd-virtualhost} record types are given below."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18607
+#: guix-git/doc/guix.texi:24502
 #, no-wrap
 msgid "{Data Type} httpd-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18609
+#: guix-git/doc/guix.texi:24504
 msgid "This data type represents the configuration for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18611
+#: guix-git/doc/guix.texi:24506
 #, no-wrap
 msgid "@code{package} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18613
+#: guix-git/doc/guix.texi:24508
 msgid "The httpd package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18614 doc/guix.texi:18703
+#: guix-git/doc/guix.texi:24509 guix-git/doc/guix.texi:24598
 #, no-wrap
 msgid "@code{pid-file} (default: @code{\"/var/run/httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18616
+#: guix-git/doc/guix.texi:24511
 msgid "The pid file used by the shepherd-service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18617
+#: guix-git/doc/guix.texi:24512
 #, no-wrap
 msgid "@code{config} (default: @code{(httpd-config-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18622
-msgid "The configuration file to use with the httpd service. The default value is a @code{httpd-config-file} record, but this can also be a different G-expression that generates a file, for example a @code{plain-file}. A file outside of the store can also be specified through a string."
+#: guix-git/doc/guix.texi:24517
+msgid "The configuration file to use with the httpd service.  The default value is a @code{httpd-config-file} record, but this can also be a different G-expression that generates a file, for example a @code{plain-file}.  A file outside of the store can also be specified through a string."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18626
+#: guix-git/doc/guix.texi:24521
 #, no-wrap
 msgid "{Data Type} httpd-module"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18628
+#: guix-git/doc/guix.texi:24523
 msgid "This data type represents a module for the httpd service."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18632
+#: guix-git/doc/guix.texi:24527
 msgid "The name of the module."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18638
-msgid "The file for the module. This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}."
+#: guix-git/doc/guix.texi:24533
+msgid "The file for the module.  This can be relative to the httpd package being used, the absolute location of a file, or a G-expression for a file within the store, for example @code{(file-append mod-wsgi \"/modules/mod_wsgi.so\")}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18642
+#: guix-git/doc/guix.texi:24537
 #, no-wrap
 msgid "{Scheme Variable} %default-httpd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18644
+#: guix-git/doc/guix.texi:24539
 msgid "A default list of @code{httpd-module} objects."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18646
+#: guix-git/doc/guix.texi:24541
 #, no-wrap
 msgid "{Data Type} httpd-config-file"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18648
+#: guix-git/doc/guix.texi:24543
 msgid "This data type represents a configuration file for the httpd service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18650
+#: guix-git/doc/guix.texi:24545
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-httpd-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18653
-msgid "The modules to load. Additional modules can be added here, or loaded by additional configuration."
+#: guix-git/doc/guix.texi:24548
+msgid "The modules to load.  Additional modules can be added here, or loaded by additional configuration."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18656
+#: guix-git/doc/guix.texi:24551
 msgid "For example, in order to handle requests for PHP files, you can use Apache’s @code{mod_proxy_fcgi} module along with @code{php-fpm-service-type}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18678
+#. type: lisp
+#: guix-git/doc/guix.texi:24573
 #, no-wrap
 msgid ""
 "(service httpd-service-type\n"
@@ -33606,165 +44152,165 @@ msgid ""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18680
+#: guix-git/doc/guix.texi:24575
 #, no-wrap
 msgid "@code{server-root} (default: @code{httpd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18684
-msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package. Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root."
+#: guix-git/doc/guix.texi:24579
+msgid "The @code{ServerRoot} in the configuration file, defaults to the httpd package.  Directives including @code{Include} and @code{LoadModule} are taken as relative to the server root."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18685
+#: guix-git/doc/guix.texi:24580
 #, no-wrap
 msgid "@code{server-name} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18689
+#: guix-git/doc/guix.texi:24584
 msgid "The @code{ServerName} in the configuration file, used to specify the request scheme, hostname and port that the server uses to identify itself."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18693
-msgid "This doesn't need to be set in the server config, and can be specifyed in virtual hosts. The default is @code{#f} to not specify a @code{ServerName}."
+#: guix-git/doc/guix.texi:24588
+msgid "This doesn't need to be set in the server config, and can be specified in virtual hosts.  The default is @code{#f} to not specify a @code{ServerName}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18694
+#: guix-git/doc/guix.texi:24589
 #, no-wrap
 msgid "@code{document-root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18696
+#: guix-git/doc/guix.texi:24591
 msgid "The @code{DocumentRoot} from which files will be served."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18697
+#: guix-git/doc/guix.texi:24592
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18702
-msgid "The list of values for the @code{Listen} directives in the config file. The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use."
+#: guix-git/doc/guix.texi:24597
+msgid "The list of values for the @code{Listen} directives in the config file.  The value should be a list of strings, when each string can specify the port number to listen on, and optionally the IP address and protocol to use."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18707
-msgid "The @code{PidFile} to use. This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly."
+#: guix-git/doc/guix.texi:24602
+msgid "The @code{PidFile} to use.  This should match the @code{pid-file} set in the @code{httpd-configuration} so that the Shepherd service is configured correctly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18708
+#: guix-git/doc/guix.texi:24603
 #, no-wrap
 msgid "@code{error-log} (default: @code{\"/var/log/httpd/error_log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18710
+#: guix-git/doc/guix.texi:24605
 msgid "The @code{ErrorLog} to which the server will log errors."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18711
+#: guix-git/doc/guix.texi:24606 guix-git/doc/guix.texi:25167
 #, no-wrap
 msgid "@code{user} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18713
+#: guix-git/doc/guix.texi:24608
 msgid "The @code{User} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18714
+#: guix-git/doc/guix.texi:24609
 #, no-wrap
 msgid "@code{group} (default: @code{\"httpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18716
+#: guix-git/doc/guix.texi:24611
 msgid "The @code{Group} which the server will answer requests as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18717
+#: guix-git/doc/guix.texi:24612
 #, no-wrap
 msgid "@code{extra-config} (default: @code{(list \"TypesConfig etc/httpd/mime.types\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18720
+#: guix-git/doc/guix.texi:24615
 msgid "A flat list of strings and G-expressions which will be added to the end of the configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18723
+#: guix-git/doc/guix.texi:24618
 msgid "Any values which the service is extended with will be appended to this list."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18727
+#: guix-git/doc/guix.texi:24622
 #, no-wrap
 msgid "{Data Type} httpd-virtualhost"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18729
+#: guix-git/doc/guix.texi:24624
 msgid "This data type represents a virtualhost configuration block for the httpd service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18731
+#: guix-git/doc/guix.texi:24626
 msgid "These should be added to the extra-config for the httpd-service."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18743
+#: guix-git/doc/guix.texi:24638
 #, no-wrap
 msgid "addresses-and-ports"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18745
+#: guix-git/doc/guix.texi:24640
 msgid "The addresses and ports for the @code{VirtualHost} directive."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18746
+#: guix-git/doc/guix.texi:24641
 #, no-wrap
 msgid "contents"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18749
+#: guix-git/doc/guix.texi:24644
 msgid "The contents of the @code{VirtualHost} directive, this should be a list of strings and G-expressions."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18753
+#: guix-git/doc/guix.texi:24648
 #, no-wrap
 msgid "NGINX"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18755
+#: guix-git/doc/guix.texi:24650
 #, no-wrap
 msgid "{Scheme Variable} nginx-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18758
+#: guix-git/doc/guix.texi:24653
 msgid "Service type for the @uref{https://nginx.org/,NGinx} web server.  The value for this service type is a @code{<nginx-configuration>} record."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18768 doc/guix.texi:18822
+#. type: lisp
+#: guix-git/doc/guix.texi:24663 guix-git/doc/guix.texi:24717
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -33776,12 +44322,12 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18773
+#: guix-git/doc/guix.texi:24668
 msgid "In addition to adding server blocks to the service configuration directly, this service can be extended by other services to add server blocks, as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18779
+#. type: lisp
+#: guix-git/doc/guix.texi:24674
 #, no-wrap
 msgid ""
 "(simple-service 'my-extra-server nginx-service-type\n"
@@ -33791,88 +44337,88 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18790
+#: guix-git/doc/guix.texi:24685
 msgid "At startup, @command{nginx} has not yet read its configuration file, so it uses a default file to log error messages.  If it fails to load its configuration file, that is where error messages are logged.  After the configuration file is loaded, the default error log file changes as per configuration.  In our case, startup error messages can be found in @file{/var/run/nginx/logs/error.log}, and after configuration in @file{/var/log/nginx/error.log}.  The second location can be changed with the @var{log-directory} configuration option."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18791
+#: guix-git/doc/guix.texi:24686
 #, no-wrap
 msgid "{Data Type} nginx-configuration"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:18795
-msgid "This data type represents the configuration for NGinx. Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided."
+#: guix-git/doc/guix.texi:24690
+msgid "This data type represents the configuration for NGinx.  Some configuration can be done through this and the other provided record types, or alternatively, a config file can be provided."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18797
+#: guix-git/doc/guix.texi:24692
 #, no-wrap
 msgid "@code{nginx} (default: @code{nginx})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18799
+#: guix-git/doc/guix.texi:24694
 msgid "The nginx package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18800
+#: guix-git/doc/guix.texi:24695
 #, no-wrap
 msgid "@code{log-directory} (default: @code{\"/var/log/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18802
+#: guix-git/doc/guix.texi:24697
 msgid "The directory to which NGinx will write log files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18803
+#: guix-git/doc/guix.texi:24698
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/nginx\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18806
+#: guix-git/doc/guix.texi:24701
 msgid "The directory in which NGinx will create a pid file, and write temporary files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18807
+#: guix-git/doc/guix.texi:24702
 #, no-wrap
 msgid "@code{server-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18811
+#: guix-git/doc/guix.texi:24706
 msgid "A list of @dfn{server blocks} to create in the generated configuration file, the elements should be of type @code{<nginx-server-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18815
+#: guix-git/doc/guix.texi:24710
 msgid "The following example would setup NGinx to serve @code{www.example.com} from the @code{/srv/http/www.example.com} directory, without using HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18824
+#: guix-git/doc/guix.texi:24719
 #, no-wrap
 msgid "@code{upstream-blocks} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18828
+#: guix-git/doc/guix.texi:24723
 msgid "A list of @dfn{upstream blocks} to create in the generated configuration file, the elements should be of type @code{<nginx-upstream-configuration>}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18835
+#: guix-git/doc/guix.texi:24730
 msgid "Configuring upstreams through the @code{upstream-blocks} can be useful when combined with @code{locations} in the @code{<nginx-server-configuration>} records.  The following example creates a server configuration with one location configuration, that will proxy requests to a upstream configuration, which will handle requests with two servers."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18854
+#. type: lisp
+#: guix-git/doc/guix.texi:24749
 #, no-wrap
 msgid ""
 "(service\n"
@@ -33895,360 +44441,439 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18862
+#: guix-git/doc/guix.texi:24757
 msgid "If a configuration @var{file} is provided, this will be used, rather than generating a configuration file from the provided @code{log-directory}, @code{run-directory}, @code{server-blocks} and @code{upstream-blocks}.  For proper operation, these arguments should match what is in @var{file} to ensure that the directories are created when the service is activated."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18866
+#: guix-git/doc/guix.texi:24761
 msgid "This can be useful if you have an existing configuration file, or it's not possible to do what is required through the other parts of the nginx-configuration record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18867
+#: guix-git/doc/guix.texi:24762
 #, no-wrap
 msgid "@code{server-names-hash-bucket-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18870
+#: guix-git/doc/guix.texi:24765
 msgid "Bucket size for the server names hash tables, defaults to @code{#f} to use the size of the processors cache line."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18871
+#: guix-git/doc/guix.texi:24766
 #, no-wrap
 msgid "@code{server-names-hash-bucket-max-size} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18873
+#: guix-git/doc/guix.texi:24768
 msgid "Maximum bucket size for the server names hash tables."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18877
+#: guix-git/doc/guix.texi:24772
+msgid "List of nginx dynamic modules to load.  This should be a list of file names of loadable modules, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:24780
+#, no-wrap
+msgid ""
+"(modules\n"
+" (list\n"
+"  (file-append nginx-accept-language-module \"\\\n"
+"/etc/nginx/modules/ngx_http_accept_language_module.so\")\n"
+"  (file-append nginx-lua-module \"\\\n"
+"/etc/nginx/modules/ngx_http_lua_module.so\")))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:24782
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{lua-package-path} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:24785
+msgid "List of nginx lua packages to load.  This should be a list of package names of loadable lua modules, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:24792
+#, no-wrap
+msgid ""
+"(lua-package-path (list lua-resty-core\n"
+"                        lua-resty-lrucache\n"
+"                        lua-resty-signal\n"
+"                        lua-tablepool\n"
+"                        lua-resty-shell))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:24794
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{lua-package-cpath} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:24797
+msgid "List of nginx lua C packages to load.  This should be a list of package names of loadable lua C modules, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:24800
+#, no-wrap
+msgid "(lua-package-cpath (list lua-resty-signal))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:24802
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{global-directives} (default: @code{'((events . ()))})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:24805
+msgid "Association list of global directives for the top level of the nginx configuration.  Values may themselves be association lists."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:24811
+#, no-wrap
+msgid ""
+"(global-directives\n"
+" `((worker_processes . 16)\n"
+"   (pcre_jit . on)\n"
+"   (events . ((worker_connections . 1024)))))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:24816
 msgid "Extra content for the @code{http} block.  Should be string or a string valued G-expression."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18881
+#: guix-git/doc/guix.texi:24820
 #, no-wrap
 msgid "{Data Type} nginx-server-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18884
+#: guix-git/doc/guix.texi:24823
 msgid "Data type representing the configuration of an nginx server block.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18886
+#: guix-git/doc/guix.texi:24825
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"80\" \"443 ssl\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18891
+#: guix-git/doc/guix.texi:24830
 msgid "Each @code{listen} directive sets the address and port for IP, or the path for a UNIX-domain socket on which the server will accept requests.  Both address and port, or only address or only port can be specified.  An address may also be a hostname, for example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:18894
+#. type: lisp
+#: guix-git/doc/guix.texi:24833
 #, no-wrap
 msgid "'(\"127.0.0.1:8000\" \"127.0.0.1\" \"8000\" \"*:8000\" \"localhost:8000\")\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18896
+#: guix-git/doc/guix.texi:24835
 #, no-wrap
 msgid "@code{server-name} (default: @code{(list 'default)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18899
+#: guix-git/doc/guix.texi:24838
 msgid "A list of server names this server represents. @code{'default} represents the default server for connections matching no other server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18900
+#: guix-git/doc/guix.texi:24839
 #, no-wrap
 msgid "@code{root} (default: @code{\"/srv/http\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18902
+#: guix-git/doc/guix.texi:24841
 msgid "Root of the website nginx will serve."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18903
+#: guix-git/doc/guix.texi:24842
 #, no-wrap
 msgid "@code{locations} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18907
+#: guix-git/doc/guix.texi:24846
 msgid "A list of @dfn{nginx-location-configuration} or @dfn{nginx-named-location-configuration} records to use within this server block."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18908
+#: guix-git/doc/guix.texi:24847
 #, no-wrap
 msgid "@code{index} (default: @code{(list \"index.html\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18911
+#: guix-git/doc/guix.texi:24850
 msgid "Index files to look for when clients ask for a directory.  If it cannot be found, Nginx will send the list of files in the directory."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18912
+#: guix-git/doc/guix.texi:24851
 #, no-wrap
 msgid "@code{try-files} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18915
+#: guix-git/doc/guix.texi:24854
 msgid "A list of files whose existence is checked in the specified order.  @code{nginx} will use the first file it finds to process the request."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18916
+#: guix-git/doc/guix.texi:24855
 #, no-wrap
 msgid "@code{ssl-certificate} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18919
+#: guix-git/doc/guix.texi:24858
 msgid "Where to find the certificate for secure connections.  Set it to @code{#f} if you don't have a certificate or you don't want to use HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18920
+#: guix-git/doc/guix.texi:24859
 #, no-wrap
 msgid "@code{ssl-certificate-key} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18923
+#: guix-git/doc/guix.texi:24862
 msgid "Where to find the private key for secure connections.  Set it to @code{#f} if you don't have a key or you don't want to use HTTPS."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18924
+#: guix-git/doc/guix.texi:24863
 #, no-wrap
 msgid "@code{server-tokens?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18926
+#: guix-git/doc/guix.texi:24865
 msgid "Whether the server should add its configuration to response."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:18927
+#: guix-git/doc/guix.texi:24866
 #, no-wrap
 msgid "@code{raw-content} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18929
+#: guix-git/doc/guix.texi:24868
 msgid "A list of raw lines added to the server block."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18933
+#: guix-git/doc/guix.texi:24872
 #, no-wrap
 msgid "{Data Type} nginx-upstream-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18936
+#: guix-git/doc/guix.texi:24875
 msgid "Data type representing the configuration of an nginx @code{upstream} block.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18940
+#: guix-git/doc/guix.texi:24879
 msgid "Name for this group of servers."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18941
+#: guix-git/doc/guix.texi:24880
 #, no-wrap
 msgid "servers"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18948
+#: guix-git/doc/guix.texi:24887
 msgid "Specify the addresses of the servers in the group.  The address can be specified as a IP address (e.g.@: @samp{127.0.0.1}), domain name (e.g.@: @samp{backend1.example.com}) or a path to a UNIX socket using the prefix @samp{unix:}.  For addresses using an IP address or domain name, the default port is 80, and a different port can be specified explicitly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18952
+#: guix-git/doc/guix.texi:24891
 #, no-wrap
 msgid "{Data Type} nginx-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18955
+#: guix-git/doc/guix.texi:24894
 msgid "Data type representing the configuration of an nginx @code{location} block.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18959
+#: guix-git/doc/guix.texi:24898
 msgid "URI which this location block matches."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:18961
+#: guix-git/doc/guix.texi:24900
 msgid "nginx-location-configuration body"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:18961 doc/guix.texi:18982
+#: guix-git/doc/guix.texi:24900 guix-git/doc/guix.texi:24921
 #, no-wrap
 msgid "body"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18968
-msgid "Body of the location block, specified as a list of strings. This can contain many configuration directives.  For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}."
+#: guix-git/doc/guix.texi:24907
+msgid "Body of the location block, specified as a list of strings.  This can contain many configuration directives.  For example, to pass requests to a upstream server group defined using an @code{nginx-upstream-configuration} block, the following directive would be specified in the body @samp{(list \"proxy_pass http://upstream-name;\")}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18972
+#: guix-git/doc/guix.texi:24911
 #, no-wrap
 msgid "{Data Type} nginx-named-location-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:18977
+#: guix-git/doc/guix.texi:24916
 msgid "Data type representing the configuration of an nginx named location block.  Named location blocks are used for request redirection, and not used for regular request processing.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18981
+#: guix-git/doc/guix.texi:24920
 msgid "Name to identify this location block."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:18987
+#: guix-git/doc/guix.texi:24926
 msgid "@xref{nginx-location-configuration body}, as the body for named location blocks can be used in a similar way to the @code{nginx-location-configuration body}.  One restriction is that the body of a named location block cannot contain location blocks."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:18991
+#: guix-git/doc/guix.texi:24930
 #, no-wrap
 msgid "Varnish Cache"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:18992
+#: guix-git/doc/guix.texi:24931
 #, no-wrap
 msgid "Varnish"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:18997
+#: guix-git/doc/guix.texi:24936
 msgid "Varnish is a fast cache server that sits in between web applications and end users.  It proxies requests from clients and caches the accessed URLs such that multiple requests for the same resource only creates one request to the back-end."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:18998
+#: guix-git/doc/guix.texi:24937
 #, no-wrap
 msgid "{Scheme Variable} varnish-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19000
+#: guix-git/doc/guix.texi:24939
 msgid "Service type for the Varnish daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19002
+#: guix-git/doc/guix.texi:24941
 #, no-wrap
 msgid "{Data Type} varnish-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19005
+#: guix-git/doc/guix.texi:24944
 msgid "Data type representing the @code{varnish} service configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19007
+#: guix-git/doc/guix.texi:24946
 #, no-wrap
 msgid "@code{package} (default: @code{varnish})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19009
+#: guix-git/doc/guix.texi:24948
 msgid "The Varnish package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19010
+#: guix-git/doc/guix.texi:24949
 #, no-wrap
 msgid "@code{name} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19015
+#: guix-git/doc/guix.texi:24954
 msgid "A name for this Varnish instance.  Varnish will create a directory in @file{/var/varnish/} with this name and keep temporary files there.  If the name starts with a forward slash, it is interpreted as an absolute directory name."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19018
+#: guix-git/doc/guix.texi:24957
 msgid "Pass the @code{-n} argument to other Varnish programs to connect to the named instance, e.g.@: @command{varnishncsa -n default}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19019
+#: guix-git/doc/guix.texi:24958
 #, no-wrap
 msgid "@code{backend} (default: @code{\"localhost:8080\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19021
+#: guix-git/doc/guix.texi:24960
 msgid "The backend to use.  This option has no effect if @code{vcl} is set."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19022
+#: guix-git/doc/guix.texi:24961
 #, no-wrap
 msgid "@code{vcl} (default: #f)"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19027
+#: guix-git/doc/guix.texi:24966
 msgid "The @dfn{VCL} (Varnish Configuration Language) program to run.  If this is @code{#f}, Varnish will proxy @code{backend} using the default configuration.  Otherwise this must be a file-like object with valid VCL syntax."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19031
-msgid "For example, to mirror @url{http://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:"
+#: guix-git/doc/guix.texi:24970
+msgid "For example, to mirror @url{https://www.gnu.org,www.gnu.org} with VCL you can do something along these lines:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19038
+#. type: lisp
+#: guix-git/doc/guix.texi:24976
 #, no-wrap
 msgid ""
 "(define %gnu-mirror\n"
-"  (plain-file\n"
-"   \"gnu.vcl\"\n"
-"   \"vcl 4.1;\n"
-"backend gnu @{ .host = \"www.gnu.org\"; @}\"))\n"
+"  (plain-file \"gnu.vcl\"\n"
+"              \"vcl 4.1;\n"
+"backend gnu @{ .host = \\\"www.gnu.org\\\"; @}\"))\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19046
+#. type: lisp
+#: guix-git/doc/guix.texi:24984
 #, no-wrap
 msgid ""
 "(operating-system\n"
-"  ...\n"
+"  ;; @dots{}\n"
 "  (services (cons (service varnish-service-type\n"
 "                           (varnish-configuration\n"
 "                            (listen '(\":80\"))\n"
@@ -34257,554 +44882,1069 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19050
+#: guix-git/doc/guix.texi:24988
 msgid "The configuration of an already running Varnish instance can be inspected and changed using the @command{varnishadm} program."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19054
+#: guix-git/doc/guix.texi:24992
 msgid "Consult the @url{https://varnish-cache.org/docs/,Varnish User Guide} and @url{https://book.varnish-software.com/4.0/,Varnish Book} for comprehensive documentation on Varnish and its configuration language."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19055
+#: guix-git/doc/guix.texi:24993
 #, no-wrap
 msgid "@code{listen} (default: @code{'(\"localhost:80\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19057
+#: guix-git/doc/guix.texi:24995
 msgid "List of addresses Varnish will listen on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19058
+#: guix-git/doc/guix.texi:24996
 #, no-wrap
 msgid "@code{storage} (default: @code{'(\"malloc,128m\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19060
+#: guix-git/doc/guix.texi:24998
 msgid "List of storage backends that will be available in VCL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19061
+#: guix-git/doc/guix.texi:24999
 #, no-wrap
 msgid "@code{parameters} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19063
+#: guix-git/doc/guix.texi:25001
 msgid "List of run-time parameters in the form @code{'((\"parameter\" . \"value\"))}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19066
+#: guix-git/doc/guix.texi:25004
 msgid "Additional arguments to pass to the @command{varnishd} process."
 msgstr ""
 
+#. type: cindex
+#: guix-git/doc/guix.texi:25008 guix-git/doc/guix.texi:25009
+#, no-wrap
+msgid "Patchwork"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25012
+msgid "Patchwork is a patch tracking system.  It can collect patches sent to a mailing list, and display them in a web interface."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:25013
+#, no-wrap
+msgid "{Scheme Variable} patchwork-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:25015
+#, fuzzy
+#| msgid "Share your work."
+msgid "Service type for Patchwork."
+msgstr "分享你的工作。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25019
+msgid "The following example is an example of a minimal service for Patchwork, for the @code{patchwork.example.com} domain."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:25039
+#, no-wrap
+msgid ""
+"(service patchwork-service-type\n"
+"         (patchwork-configuration\n"
+"          (domain \"patchwork.example.com\")\n"
+"          (settings-module\n"
+"           (patchwork-settings-module\n"
+"            (allowed-hosts (list domain))\n"
+"            (default-from-email \"patchwork@@patchwork.example.com\")))\n"
+"          (getmail-retriever-config\n"
+"           (getmail-retriever-configuration\n"
+"            (type \"SimpleIMAPSSLRetriever\")\n"
+"            (server \"imap.example.com\")\n"
+"            (port 993)\n"
+"            (username \"patchwork\")\n"
+"            (password-command\n"
+"             (list (file-append coreutils \"/bin/cat\")\n"
+"                   \"/etc/getmail-patchwork-imap-password\"))\n"
+"            (extra-parameters\n"
+"            '((mailboxes . (\"Patches\"))))))))\n"
+"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25045
+msgid "There are three records for configuring the Patchwork service.  The @code{<patchwork-configuration>} relates to the configuration for Patchwork within the HTTPD service."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25049
+msgid "The @code{settings-module} field within the @code{<patchwork-configuration>} record can be populated with the @code{<patchwork-settings-module>} record, which describes a settings module that is generated within the Guix store."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25053
+msgid "For the @code{database-configuration} field within the @code{<patchwork-settings-module>}, the @code{<patchwork-database-configuration>} must be used."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25054
+#, no-wrap
+msgid "{Data Type} patchwork-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25057
+msgid "Data type representing the Patchwork service configuration.  This type has the following parameters:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25059
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{patchwork} (default: @code{patchwork})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25061
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Patchwork package to use."
+msgstr "软件包数据类型。"
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25062
+#, no-wrap
+msgid "domain"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25065
+msgid "The domain to use for Patchwork, this is used in the HTTPD service virtual host."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25066
+#, no-wrap
+msgid "settings-module"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25072
+msgid "The settings module to use for Patchwork.  As a Django application, Patchwork is configured with a Python module containing the settings.  This can either be an instance of the @code{<patchwork-settings-module>} record, any other record that represents the settings in the store, or a directory outside of the store."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25073
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{static-path}  (default: @code{\"/static/\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25075
+msgid "The path under which the HTTPD service should serve the static files."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25076
+#, no-wrap
+msgid "getmail-retriever-config"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25080
+msgid "The getmail-retriever-configuration record value to use with Patchwork.  Getmail will be configured with this value, the messages will be delivered to Patchwork."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25084
+#, no-wrap
+msgid "{Data Type} patchwork-settings-module"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25089
+msgid "Data type representing a settings module for Patchwork.  Some of these settings relate directly to Patchwork, but others relate to Django, the web framework used by Patchwork, or the Django Rest Framework library.  This type has the following parameters:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25091
+#, no-wrap
+msgid "@code{database-configuration} (default: @code{(patchwork-database-configuration)})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25094
+msgid "The database connection settings used for Patchwork.  See the @code{<patchwork-database-configuration>} record type for more information."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25095
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{secret-key-file} (default: @code{\"/etc/patchwork/django-secret-key\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25098
+msgid "Patchwork, as a Django web application uses a secret key for cryptographically signing values.  This file should contain a unique unpredictable value."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25101
+msgid "If this file does not exist, it will be created and populated with a random value by the patchwork-setup shepherd service."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25103
+msgid "This setting relates to Django."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25104
+#, no-wrap
+msgid "allowed-hosts"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25107
+msgid "A list of valid hosts for this Patchwork service.  This should at least include the domain specified in the @code{<patchwork-configuration>} record."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25109 guix-git/doc/guix.texi:25123
+#: guix-git/doc/guix.texi:25129 guix-git/doc/guix.texi:25135
+msgid "This is a Django setting."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25110
+#, no-wrap
+msgid "default-from-email"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25112
+msgid "The email address from which Patchwork should send email by default."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25114 guix-git/doc/guix.texi:25140
+#: guix-git/doc/guix.texi:25145 guix-git/doc/guix.texi:25150
+msgid "This is a Patchwork setting."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25115
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{static-url} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25118
+msgid "The URL to use when serving static assets.  It can be part of a URL, or a full URL, but must end in a @code{/}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25121
+msgid "If the default value is used, the @code{static-path} value from the @code{<patchwork-configuration>} record will be used."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25124
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{admins} (default: @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25127
+msgid "Email addresses to send the details of errors that occur.  Each value should be a list containing two elements, the name and then the email address."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25133
+msgid "Whether to run Patchwork in debug mode.  If set to @code{#t}, detailed error messages will be shown."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25136
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{enable-rest-api?} (default: @code{#t})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25138
+msgid "Whether to enable the Patchwork REST API."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25141
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{enable-xmlrpc?} (default: @code{#t})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25143
+msgid "Whether to enable the XML RPC API."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25146
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{force-https-links?} (default: @code{#t})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25148
+msgid "Whether to use HTTPS links on Patchwork pages."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25153
+msgid "Extra code to place at the end of the Patchwork settings module."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25157
+#, no-wrap
+msgid "{Data Type} patchwork-database-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25159
+msgid "Data type representing the database configuration for Patchwork."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25161
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{engine} (default: @code{\"django.db.backends.postgresql_psycopg2\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25163
+msgid "The database engine to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25164
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{name} (default: @code{\"patchwork\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25166
+#, fuzzy
+#| msgid "The host name of the remote machine."
+msgid "The name of the database to use."
+msgstr "远程机器的主机名。"
+
+#. type: table
+#: guix-git/doc/guix.texi:25169
+msgid "The user to connect to the database as."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25170
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{password} (default: @code{\"\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25172
+msgid "The password to use when connecting to the database."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25173
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{host} (default: @code{\"\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25175
+msgid "The host to make the database connection to."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25176
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{\"\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25178
+msgid "The port on which to connect to the database."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:25182
+#, no-wrap
+msgid "Mumi"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:25184
+#, fuzzy, no-wrap
+#| msgid "user interfaces"
+msgid "Mumi, Debbugs Web interface"
+msgstr "用户界面"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:25185
+#, fuzzy, no-wrap
+#| msgid "user interfaces"
+msgid "Debbugs, Mumi Web interface"
+msgstr "用户界面"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25190
+msgid "@uref{https://git.elephly.net/gitweb.cgi?p=software/mumi.git, Mumi} is a Web interface to the Debbugs bug tracker, by default for @uref{https://bugs.gnu.org, the GNU instance}.  Mumi is a Web server, but it also fetches and indexes mail retrieved from Debbugs."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:25191
+#, no-wrap
+msgid "{Scheme Variable} mumi-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:25193
+msgid "This is the service type for Mumi."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25195
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} mumi-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25198
+msgid "Data type representing the Mumi service configuration.  This type has the following fields:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25200
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{mumi} (default: @code{mumi})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25202
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Mumi package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:25203
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{mailer?} (default: @code{#true})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25205
+msgid "Whether to enable or disable the mailer component."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25206
+#, no-wrap
+msgid "mumi-configuration-sender"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25208
+msgid "The email address used as the sender for comments."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:25209
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "mumi-configuration-smtp"
+msgstr "系统配置"
+
+#. type: table
+#: guix-git/doc/guix.texi:25214
+msgid "A URI to configure the SMTP settings for Mailutils.  This could be something like @code{sendmail:///path/to/bin/msmtp} or any other URI supported by Mailutils.  @xref{SMTP Mailboxes, SMTP Mailboxes,, mailutils, GNU@tie{}Mailutils}."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:19070
+#: guix-git/doc/guix.texi:25219
 #, no-wrap
 msgid "FastCGI"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19071
+#: guix-git/doc/guix.texi:25220
 #, no-wrap
 msgid "fastcgi"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19072
+#: guix-git/doc/guix.texi:25221
 #, no-wrap
 msgid "fcgiwrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19079
+#: guix-git/doc/guix.texi:25228
 msgid "FastCGI is an interface between the front-end and the back-end of a web service.  It is a somewhat legacy facility; new web services should generally just talk HTTP between the front-end and the back-end.  However there are a number of back-end services such as PHP or the optimized HTTP Git repository access that use FastCGI, so we have support for it in Guix."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19086
+#: guix-git/doc/guix.texi:25235
 msgid "To use FastCGI, you configure the front-end web server (e.g., nginx) to dispatch some subset of its requests to the fastcgi backend, which listens on a local TCP or UNIX socket.  There is an intermediary @code{fcgiwrap} program that sits between the actual backend process and the web server.  The front-end indicates which backend program to run, passing that information to the @code{fcgiwrap} process."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19087
+#: guix-git/doc/guix.texi:25236
 #, no-wrap
 msgid "{Scheme Variable} fcgiwrap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19089
+#: guix-git/doc/guix.texi:25238
 msgid "A service type for the @code{fcgiwrap} FastCGI proxy."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19091
+#: guix-git/doc/guix.texi:25240
 #, no-wrap
 msgid "{Data Type} fcgiwrap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19094
+#: guix-git/doc/guix.texi:25243
 msgid "Data type representing the configuration of the @code{fcgiwrap} service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19095
+#: guix-git/doc/guix.texi:25244
 #, no-wrap
 msgid "@code{package} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19097
+#: guix-git/doc/guix.texi:25246
 msgid "The fcgiwrap package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19098
+#: guix-git/doc/guix.texi:25247
 #, no-wrap
 msgid "@code{socket} (default: @code{tcp:127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19104
+#: guix-git/doc/guix.texi:25253
 msgid "The socket on which the @code{fcgiwrap} process should listen, as a string.  Valid @var{socket} values include @code{unix:@var{/path/to/unix/socket}}, @code{tcp:@var{dot.ted.qu.ad}:@var{port}} and @code{tcp6:[@var{ipv6_addr}]:port}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19105
+#: guix-git/doc/guix.texi:25254
 #, no-wrap
 msgid "@code{user} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:19106
+#: guix-git/doc/guix.texi:25255
 #, no-wrap
 msgid "@code{group} (default: @code{fcgiwrap})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19111
+#: guix-git/doc/guix.texi:25260
 msgid "The user and group names, as strings, under which to run the @code{fcgiwrap} process.  The @code{fastcgi} service will ensure that if the user asks for the specific user or group names @code{fcgiwrap} that the corresponding user and/or group is present on the system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19118
-msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user.  To enable this capability on the back-end., run @code{fcgiwrap} as the @code{root} user and group.  Note that this capability also has to be configured on the front-end as well."
+#: guix-git/doc/guix.texi:25267
+msgid "It is possible to configure a FastCGI-backed web service to pass HTTP authentication information from the front-end to the back-end, and to allow @code{fcgiwrap} to run the back-end process as a corresponding local user.  To enable this capability on the back-end, run @code{fcgiwrap} as the @code{root} user and group.  Note that this capability also has to be configured on the front-end as well."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19121
+#: guix-git/doc/guix.texi:25270
 #, no-wrap
 msgid "php-fpm"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19124
+#: guix-git/doc/guix.texi:25273
 msgid "PHP-FPM (FastCGI Process Manager) is an alternative PHP FastCGI implementation with some additional features useful for sites of any size."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19126
+#: guix-git/doc/guix.texi:25275
 msgid "These features include:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19127
+#: guix-git/doc/guix.texi:25276
 #, no-wrap
 msgid "Adaptive process spawning"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19128
+#: guix-git/doc/guix.texi:25277
 #, no-wrap
 msgid "Basic statistics (similar to Apache's mod_status)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19129
+#: guix-git/doc/guix.texi:25278
 #, no-wrap
 msgid "Advanced process management with graceful stop/start"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19130
+#: guix-git/doc/guix.texi:25279
 #, no-wrap
 msgid "Ability to start workers with different uid/gid/chroot/environment"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19132
+#: guix-git/doc/guix.texi:25281
 msgid "and different php.ini (replaces safe_mode)"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19132
+#: guix-git/doc/guix.texi:25281
 #, no-wrap
 msgid "Stdout & stderr logging"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19133
+#: guix-git/doc/guix.texi:25282
 #, no-wrap
 msgid "Emergency restart in case of accidental opcode cache destruction"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19134
+#: guix-git/doc/guix.texi:25283
 #, no-wrap
 msgid "Accelerated upload support"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19135
+#: guix-git/doc/guix.texi:25284
 #, no-wrap
 msgid "Support for a \"slowlog\""
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19136
+#: guix-git/doc/guix.texi:25285
 #, no-wrap
 msgid "Enhancements to FastCGI, such as fastcgi_finish_request() -"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19139
+#: guix-git/doc/guix.texi:25288
 msgid "a special function to finish request & flush all data while continuing to do something time-consuming (video converting, stats processing, etc.)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19141
+#: guix-git/doc/guix.texi:25290
 msgid "...@: and much more."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19142
+#: guix-git/doc/guix.texi:25291
 #, no-wrap
 msgid "{Scheme Variable} php-fpm-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19144
+#: guix-git/doc/guix.texi:25293
 msgid "A Service type for @code{php-fpm}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19146
+#: guix-git/doc/guix.texi:25295
 #, no-wrap
 msgid "{Data Type} php-fpm-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19148
+#: guix-git/doc/guix.texi:25297
 msgid "Data Type for php-fpm service configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19149
+#: guix-git/doc/guix.texi:25298
 #, no-wrap
 msgid "@code{php} (default: @code{php})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19151
+#: guix-git/doc/guix.texi:25300
 msgid "The php package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19151
+#: guix-git/doc/guix.texi:25300
 #, no-wrap
 msgid "@code{socket} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.sock\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19153
+#: guix-git/doc/guix.texi:25302
 msgid "The address on which to accept FastCGI requests.  Valid syntaxes are:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19154
+#: guix-git/doc/guix.texi:25303
 #, no-wrap
 msgid "\"ip.add.re.ss:port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19156
+#: guix-git/doc/guix.texi:25305
 msgid "Listen on a TCP socket to a specific address on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19156
+#: guix-git/doc/guix.texi:25305
 #, no-wrap
 msgid "\"port\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19158
+#: guix-git/doc/guix.texi:25307
 msgid "Listen on a TCP socket to all addresses on a specific port."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19158
+#: guix-git/doc/guix.texi:25307
 #, no-wrap
 msgid "\"/path/to/unix/socket\""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19160
+#: guix-git/doc/guix.texi:25309
 msgid "Listen on a unix socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19162
+#: guix-git/doc/guix.texi:25311
 #, no-wrap
 msgid "@code{user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19164
+#: guix-git/doc/guix.texi:25313
 msgid "User who will own the php worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19164
+#: guix-git/doc/guix.texi:25313
 #, no-wrap
 msgid "@code{group} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19166
+#: guix-git/doc/guix.texi:25315
 msgid "Group of the worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19166
+#: guix-git/doc/guix.texi:25315
 #, no-wrap
 msgid "@code{socket-user} (default: @code{php-fpm})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19168
+#: guix-git/doc/guix.texi:25317
 msgid "User who can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19168
-#, no-wrap
-msgid "@code{socket-group} (default: @code{php-fpm})"
-msgstr ""
+#: guix-git/doc/guix.texi:25317
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{socket-group} (default: @code{nginx})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
 
 #. type: table
-#: doc/guix.texi:19170
+#: guix-git/doc/guix.texi:25319
 msgid "Group that can speak to the php-fpm socket."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19170
+#: guix-git/doc/guix.texi:25319
 #, no-wrap
 msgid "@code{pid-file} (default: @code{(string-append \"/var/run/php\" (version-major (package-version php)) \"-fpm.pid\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19173
+#: guix-git/doc/guix.texi:25322
 msgid "The process id of the php-fpm process is written to this file once the service has started."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19173
+#: guix-git/doc/guix.texi:25322
 #, no-wrap
 msgid "@code{log-file} (default: @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19175
+#: guix-git/doc/guix.texi:25324
 msgid "Log for the php-fpm master process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19175
+#: guix-git/doc/guix.texi:25324
 #, no-wrap
 msgid "@code{process-manager} (default: @code{(php-fpm-dynamic-process-manager-configuration)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19178
-msgid "Detailed settings for the php-fpm process manager.  Must be either:"
+#: guix-git/doc/guix.texi:25327
+msgid "Detailed settings for the php-fpm process manager.  Must be one of:"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19179
+#: guix-git/doc/guix.texi:25328
 #, no-wrap
 msgid "<php-fpm-dynamic-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19180
+#: guix-git/doc/guix.texi:25329
 #, no-wrap
 msgid "<php-fpm-static-process-manager-configuration>"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19181
+#: guix-git/doc/guix.texi:25330
 #, no-wrap
 msgid "<php-fpm-on-demand-process-manager-configuration>"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19183
+#: guix-git/doc/guix.texi:25332
 #, no-wrap
 msgid "@code{display-errors} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19188
+#: guix-git/doc/guix.texi:25337
 msgid "Determines whether php errors and warning should be sent to clients and displayed in their browsers.  This is useful for local php development, but a security risk for public sites, as error messages can reveal passwords and personal data."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19188
+#: guix-git/doc/guix.texi:25337
 #, no-wrap
 msgid "@code{timezone} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19190
+#: guix-git/doc/guix.texi:25339
 msgid "Specifies @code{php_admin_value[date.timezone]} parameter."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19190
+#: guix-git/doc/guix.texi:25339
 #, no-wrap
 msgid "@code{workers-logfile} (default @code{(string-append \"/var/log/php\" (version-major (package-version php)) \"-fpm.www.log\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19193
+#: guix-git/doc/guix.texi:25342
 msgid "This file will log the @code{stderr} outputs of php worker processes.  Can be set to @code{#f} to disable logging."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19193
+#: guix-git/doc/guix.texi:25342
 #, no-wrap
 msgid "@code{file} (default @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19196
+#: guix-git/doc/guix.texi:25345
 msgid "An optional override of the whole configuration.  You can use the @code{mixed-text-file} function or an absolute filepath for it."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:25345
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{php-ini-file} (default @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25349
+msgid "An optional override of the default php settings.  It may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).  You can use the @code{mixed-text-file} function or an absolute filepath for it."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25353
+msgid "For local development it is useful to set a higher timeout and memory limit for spawned php processes.  This be accomplished with the following operating system configuration snippet:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:25358
+#, no-wrap
+msgid ""
+"(define %local-php-ini\n"
+"  (plain-file \"php.ini\"\n"
+"              \"memory_limit = 2G\n"
+"max_execution_time = 1800\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:25365
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ;; @dots{}\n"
+"  (services (cons (service php-fpm-service-type\n"
+"                           (php-fpm-configuration\n"
+"                            (php-ini-file %local-php-ini)))\n"
+"                  %base-services)))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25370
+msgid "Consult the @url{https://www.php.net/manual/en/ini.core.php,core php.ini directives} for comprehensive documentation on the acceptable @file{php.ini} directives."
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:19199
+#: guix-git/doc/guix.texi:25373
 #, no-wrap
 msgid "{Data type} php-fpm-dynamic-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19203
+#: guix-git/doc/guix.texi:25377
 msgid "Data Type for the @code{dynamic} php-fpm process manager.  With the @code{dynamic} process manager, spare worker processes are kept around based on it's configured limits."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19204 doc/guix.texi:19220 doc/guix.texi:19230
+#: guix-git/doc/guix.texi:25378 guix-git/doc/guix.texi:25394
+#: guix-git/doc/guix.texi:25404
 #, no-wrap
 msgid "@code{max-children} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19206 doc/guix.texi:19222 doc/guix.texi:19232
+#: guix-git/doc/guix.texi:25380 guix-git/doc/guix.texi:25396
+#: guix-git/doc/guix.texi:25406
 msgid "Maximum of worker processes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19206
+#: guix-git/doc/guix.texi:25380
 #, no-wrap
 msgid "@code{start-servers} (default: @code{2})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19208
+#: guix-git/doc/guix.texi:25382
 msgid "How many worker processes should be started on start-up."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19208
+#: guix-git/doc/guix.texi:25382
 #, no-wrap
 msgid "@code{min-spare-servers} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19210
+#: guix-git/doc/guix.texi:25384
 msgid "How many spare worker processes should be kept around at minimum."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19210
+#: guix-git/doc/guix.texi:25384
 #, no-wrap
 msgid "@code{max-spare-servers} (default: @code{3})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19212
+#: guix-git/doc/guix.texi:25386
 msgid "How many spare worker processes should be kept around at maximum."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19215
+#: guix-git/doc/guix.texi:25389
 #, no-wrap
 msgid "{Data type} php-fpm-static-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19219
+#: guix-git/doc/guix.texi:25393
 msgid "Data Type for the @code{static} php-fpm process manager.  With the @code{static} process manager, an unchanging number of worker processes are created."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19225
+#: guix-git/doc/guix.texi:25399
 #, no-wrap
 msgid "{Data type} php-fpm-on-demand-process-manager-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19229
+#: guix-git/doc/guix.texi:25403
 msgid "Data Type for the @code{on-demand} php-fpm process manager.  With the @code{on-demand} process manager, worker processes are only created as requests arrive."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19232
+#: guix-git/doc/guix.texi:25406
 #, no-wrap
 msgid "@code{process-idle-timeout} (default: @code{10})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19234
+#: guix-git/doc/guix.texi:25408
 msgid "The time in seconds after which a process with no requests is killed."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19238
+#: guix-git/doc/guix.texi:25412
 #, no-wrap
-msgid "{Scheme Procedure} nginx-php-fpm-location @"
+msgid "{Scheme Procedure} nginx-php-location @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19244
+#: guix-git/doc/guix.texi:25418
 msgid "[#:nginx-package nginx] @ [socket (string-append \"/var/run/php\" @ (version-major (package-version php)) @ \"-fpm.sock\")] A helper function to quickly add php to an @code{nginx-server-configuration}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19247
+#: guix-git/doc/guix.texi:25421
 msgid "A simple services setup for nginx with php can look like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19260
+#. type: lisp
+#: guix-git/doc/guix.texi:25434
 #, no-wrap
 msgid ""
 "(services (cons* (service dhcp-client-service-type)\n"
@@ -34822,34 +45962,34 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19262
+#: guix-git/doc/guix.texi:25436
 #, no-wrap
 msgid "cat-avatar-generator"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19266
+#: guix-git/doc/guix.texi:25440
 msgid "The cat avatar generator is a simple service to demonstrate the use of php-fpm in @code{Nginx}.  It is used to generate cat avatar from a seed, for instance the hash of a user's email address."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19267
+#: guix-git/doc/guix.texi:25441
 #, no-wrap
 msgid "{Scheme Procedure} cat-avatar-generator-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19275
+#: guix-git/doc/guix.texi:25449
 msgid "[#:cache-dir \"/var/cache/cat-avatar-generator\"] @ [#:package cat-avatar-generator] @ [#:configuration (nginx-server-configuration)] Returns an nginx-server-configuration that inherits @code{configuration}.  It extends the nginx configuration to add a server block that serves @code{package}, a version of cat-avatar-generator.  During execution, cat-avatar-generator will be able to use @code{cache-dir} as its cache directory."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19278
+#: guix-git/doc/guix.texi:25452
 msgid "A simple setup for cat-avatar-generator can look like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19285
+#. type: lisp
+#: guix-git/doc/guix.texi:25459
 #, no-wrap
 msgid ""
 "(services (cons* (cat-avatar-generator-service\n"
@@ -34861,155 +46001,155 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19287
+#: guix-git/doc/guix.texi:25461
 #, no-wrap
 msgid "Hpcguix-web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19289
+#: guix-git/doc/guix.texi:25463
 #, no-wrap
 msgid "hpcguix-web"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19294
-msgid "The @uref{hpcguix-web, https://github.com/UMCUGenetics/hpcguix-web/} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC)  clusters."
+#: guix-git/doc/guix.texi:25468
+msgid "The @uref{https://github.com/UMCUGenetics/hpcguix-web/, hpcguix-web} program is a customizable web interface to browse Guix packages, initially designed for users of high-performance computing (HPC)  clusters."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19295
+#: guix-git/doc/guix.texi:25469
 #, no-wrap
 msgid "{Scheme Variable} hpcguix-web-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19297
+#: guix-git/doc/guix.texi:25471
 msgid "The service type for @code{hpcguix-web}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19299
+#: guix-git/doc/guix.texi:25473
 #, no-wrap
 msgid "{Data Type} hpcguix-web-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19301
+#: guix-git/doc/guix.texi:25475
 msgid "Data type for the hpcguix-web service configuration."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:19303
+#: guix-git/doc/guix.texi:25477
 #, no-wrap
 msgid "specs"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19306
+#: guix-git/doc/guix.texi:25480
 msgid "A gexp (@pxref{G-Expressions}) specifying the hpcguix-web service configuration.  The main items available in this spec are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19308
+#: guix-git/doc/guix.texi:25482
 #, no-wrap
 msgid "@code{title-prefix} (default: @code{\"hpcguix | \"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19310
+#: guix-git/doc/guix.texi:25484
 msgid "The page title prefix."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19311
+#: guix-git/doc/guix.texi:25485
 #, no-wrap
 msgid "@code{guix-command} (default: @code{\"guix\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19313
+#: guix-git/doc/guix.texi:25487
 msgid "The @command{guix} command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19314
+#: guix-git/doc/guix.texi:25488
 #, no-wrap
 msgid "@code{package-filter-proc} (default: @code{(const #t)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19316
+#: guix-git/doc/guix.texi:25490
 msgid "A procedure specifying how to filter packages that are displayed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19317
+#: guix-git/doc/guix.texi:25491
 #, no-wrap
 msgid "@code{package-page-extension-proc} (default: @code{(const '())})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19319
+#: guix-git/doc/guix.texi:25493
 msgid "Extension package for @code{hpcguix-web}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19320
+#: guix-git/doc/guix.texi:25494
 #, no-wrap
 msgid "@code{menu} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19322
+#: guix-git/doc/guix.texi:25496
 msgid "Additional entry in page @code{menu}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19323
+#: guix-git/doc/guix.texi:25497
 #, no-wrap
 msgid "@code{channels} (default: @code{%default-channels})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19325
+#: guix-git/doc/guix.texi:25499
 msgid "List of channels from which the package list is built (@pxref{Channels})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19326
+#: guix-git/doc/guix.texi:25500
 #, no-wrap
 msgid "@code{package-list-expiration} (default: @code{(* 12 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19329
+#: guix-git/doc/guix.texi:25503
 msgid "The expiration time, in seconds, after which the package list is rebuilt from the latest instances of the given channels."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19334
+#: guix-git/doc/guix.texi:25508
 msgid "See the hpcguix-web repository for a @uref{https://github.com/UMCUGenetics/hpcguix-web/blob/master/hpcweb-configuration.scm, complete example}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19335
+#: guix-git/doc/guix.texi:25509
 #, no-wrap
 msgid "@code{package} (default: @code{hpcguix-web})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19337
+#: guix-git/doc/guix.texi:25511
 msgid "The hpcguix-web package to use."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19341
+#: guix-git/doc/guix.texi:25515
 msgid "A typical hpcguix-web service declaration looks like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19350
+#. type: lisp
+#: guix-git/doc/guix.texi:25524
 #, no-wrap
 msgid ""
 "(service hpcguix-web-service-type\n"
@@ -35022,77 +46162,371 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:19357
+#: guix-git/doc/guix.texi:25531
 msgid "The hpcguix-web service periodically updates the package list it publishes by pulling channels from Git.  To that end, it needs to access X.509 certificates so that it can authenticate Git servers when communicating over HTTPS, and it assumes that @file{/etc/ssl/certs} contains those certificates."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:19361
+#: guix-git/doc/guix.texi:25535
 msgid "Thus, make sure to add @code{nss-certs} or another certificate package to the @code{packages} field of your configuration.  @ref{X.509 Certificates}, for more information on X.509 certificates."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19366
+#: guix-git/doc/guix.texi:25537 guix-git/doc/guix.texi:25539
+#, no-wrap
+msgid "gmnisrv"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25542
+msgid "The @uref{https://git.sr.ht/~sircmpwn/gmnisrv, gmnisrv} program is a simple @uref{https://gemini.circumlunar.space/, Gemini} protocol server."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25543
+#, no-wrap
+msgid "{Scheme Variable} gmnisrv-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25546
+msgid "This is the type of the gmnisrv service, whose value should be a @code{gmnisrv-configuration} object, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:25551
+#, no-wrap
+msgid ""
+"(service gmnisrv-service-type\n"
+"         (gmnisrv-configuration\n"
+"           (config-file (local-file \"./my-gmnisrv.ini\"))))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25554
+#, no-wrap
+msgid "{Data Type} gmnisrv-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25556
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of gmnisrv."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:25558
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{package} (default: @var{gmnisrv})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25560
+msgid "Package object of the gmnisrv server."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25561
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{config-file} (default: @code{%default-gmnisrv-config-file})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25567
+msgid "File-like object of the gmnisrv configuration file to use.  The default configuration listens on port 1965 and serves files from @file{/srv/gemini}.  Certificates are stored in @file{/var/lib/gemini/certs}.  For more information, run @command{man gmnisrv} and @command{man gmnisrv.ini}."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:25571
+#, no-wrap
+msgid "Agate"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:25573
+#, no-wrap
+msgid "agate"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:25578
+msgid "The @uref{gemini://qwertqwefsday.eu/agate.gmi, Agate} (@uref{https://github.com/mbrubeck/agate, GitHub page over HTTPS})  program is a simple @uref{https://gemini.circumlunar.space/, Gemini} protocol server written in Rust."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25579
+#, no-wrap
+msgid "{Scheme Variable} agate-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25582
+msgid "This is the type of the agate service, whose value should be an @code{agate-service-type} object, as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:25589
+#, no-wrap
+msgid ""
+"(service agate-service-type\n"
+"\t (agate-configuration\n"
+"\t   (content \"/srv/gemini\")\n"
+"\t   (cert \"/srv/cert.pem\")\n"
+"\t   (key \"/srv/key.rsa\")))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25594
+msgid "The example above represents the minimal tweaking necessary to get Agate up and running.  Specifying the path to the certificate and key is always necessary, as the Gemini protocol requires TLS by default."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25597
+msgid "To obtain a certificate and a key, you could, for example, use OpenSSL, running a command similar to the following example:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:25601
+#, no-wrap
+msgid ""
+"openssl req -x509 -newkey rsa:4096 -keyout key.rsa -out cert.pem \\\n"
+"    -days 3650 -nodes -subj \"/CN=example.com\"\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:25606
+msgid "Of course, you'll have to replace @i{example.com} with your own domain name, and then point the Agate configuration towards the path of the generated key and certificate."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25609
+#, fuzzy, no-wrap
+#| msgid "Manage the operating system configuration."
+msgid "{Data Type} agate-configuration"
+msgstr "管理操作系统配置。"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:25611
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of Agate."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:25613
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{agate})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25615
+#, fuzzy
+#| msgid "The package data type."
+msgid "The package object of the Agate server."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:25616
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{content} (default: @file{\"/srv/gemini\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25618
+msgid "The directory from which Agate will serve files."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25619
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{cert} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25622
+msgid "The path to the TLS certificate PEM file to be used for encrypted connections.  Must be filled in with a value from the user."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25623 guix-git/doc/guix.texi:26051
+#, no-wrap
+msgid "@code{key} (default: @code{#f})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25626
+msgid "The path to the PKCS8 private key file to be used for encrypted connections.  Must be filled in with a value from the user."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25627
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{addr} (default: @code{'(\"0.0.0.0:1965\" \"[::]:1965\")})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25629
+msgid "A list of the addresses to listen on."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:25632
+msgid "The domain name of this Gemini server.  Optional."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25633
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{lang} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25635
+msgid "RFC 4646 language code(s) for text/gemini documents.  Optional."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25636
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{silent?} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25638
+msgid "Set to @code{#t} to disable logging output."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25639
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{serve-secret?} (default: @code{#f})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25642
+msgid "Set to @code{#t} to serve secret files (files/directories starting with a dot)."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25643
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{log-ip?} (default: @code{#t})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25645
+msgid "Whether or not to output IP addresses when logging."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25646
+#, fuzzy, no-wrap
+#| msgid "@code{vt} (default @code{\"vt7\"})"
+msgid "@code{user} (default: @code{\"agate\"})"
+msgstr "@code{vt}（默认值：@code{\"vt7\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25648
+msgid "Owner of the @code{agate} process."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25649
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{group} (default: @code{\"agate\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25651
+msgid "Owner's group of the @code{agate} process."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25652
+#, fuzzy, no-wrap
+#| msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
+msgid "@code{log-file} (default: @file{\"/var/log/agate.log\"})"
+msgstr "@code{private-key}（默认值：@file{~root/.ssh/id_rsa}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25654
+msgid "The file which should store the logging output of Agate."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:25661
 #, no-wrap
 msgid "Web"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19367
+#: guix-git/doc/guix.texi:25662
 #, no-wrap
 msgid "HTTP, HTTPS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19368
+#: guix-git/doc/guix.texi:25663
 #, no-wrap
 msgid "Let's Encrypt"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19369
+#: guix-git/doc/guix.texi:25664
 #, no-wrap
 msgid "TLS certificates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19376
+#: guix-git/doc/guix.texi:25671
 msgid "The @code{(gnu services certbot)} module provides a service to automatically obtain a valid TLS certificate from the Let's Encrypt certificate authority.  These certificates can then be used to serve content securely over HTTPS or other TLS-based protocols, with the knowledge that the client will be able to verify the server's authenticity."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19388
-msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process.  This tool first securely generates a key on the server.  It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key.  The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP.  If that protocol completes successfully, the CA signs the key, resulting in a certificate.  That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature."
+#: guix-git/doc/guix.texi:25683
+msgid "@url{https://letsencrypt.org/, Let's Encrypt} provides the @code{certbot} tool to automate the certification process.  This tool first securely generates a key on the server.  It then makes a request to the Let's Encrypt certificate authority (CA) to sign the key.  The CA checks that the request originates from the host in question by using a challenge-response protocol, requiring the server to provide its response over HTTP@.  If that protocol completes successfully, the CA signs the key, resulting in a certificate.  That certificate is valid for a limited period of time, and therefore to continue to provide TLS services, the server needs to periodically ask the CA to renew its signature."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19395
+#: guix-git/doc/guix.texi:25690
 msgid "The certbot service automates this process: the initial key generation, the initial certification request to the Let's Encrypt service, the web server challenge/response integration, writing the certificate to disk, the automated periodic renewals, and the deployment tasks associated with the renewal (e.g.@: reloading services, copying keys with different permissions)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19401
+#: guix-git/doc/guix.texi:25696
 msgid "Certbot is run twice a day, at a random minute within the hour.  It won't do anything until your certificates are due for renewal or revoked, but running it regularly would give your service a chance of staying online in case a Let's Encrypt-initiated revocation happened for some reason."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19405
+#: guix-git/doc/guix.texi:25700
 msgid "By using this service, you agree to the ACME Subscriber Agreement, which can be found there: @url{https://acme-v01.api.letsencrypt.org/directory}."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19406
+#: guix-git/doc/guix.texi:25701
 #, no-wrap
 msgid "{Scheme Variable} certbot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19409
+#: guix-git/doc/guix.texi:25704
 msgid "A service type for the @code{certbot} Let's Encrypt client.  Its value must be a @code{certbot-configuration} record as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19416
+#. type: lisp
+#: guix-git/doc/guix.texi:25711
 #, no-wrap
 msgid ""
 "(define %nginx-deploy-hook\n"
@@ -35103,8 +46537,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19427
+#. type: lisp
+#: guix-git/doc/guix.texi:25722
 #, no-wrap
 msgid ""
 "(service certbot-service-type\n"
@@ -35120,213 +46554,232 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:19430
+#: guix-git/doc/guix.texi:25725
 msgid "See below for details about @code{certbot-configuration}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19432
+#: guix-git/doc/guix.texi:25727
 #, no-wrap
 msgid "{Data Type} certbot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19435
+#: guix-git/doc/guix.texi:25730
 msgid "Data type representing the configuration of the @code{certbot} service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19437
+#: guix-git/doc/guix.texi:25732
 #, no-wrap
 msgid "@code{package} (default: @code{certbot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19439
+#: guix-git/doc/guix.texi:25734
 msgid "The certbot package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19440
+#: guix-git/doc/guix.texi:25735
 #, no-wrap
 msgid "@code{webroot} (default: @code{/var/www})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19443
+#: guix-git/doc/guix.texi:25738
 msgid "The directory from which to serve the Let's Encrypt challenge/response files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19444
+#: guix-git/doc/guix.texi:25739
 #, no-wrap
 msgid "@code{certificates} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19448
+#: guix-git/doc/guix.texi:25743
 msgid "A list of @code{certificates-configuration}s for which to generate certificates and request signatures.  Each certificate has a @code{name} and several @code{domains}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:25744
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{email} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
 #. type: table
-#: doc/guix.texi:19452
-msgid "Mandatory email used for registration, recovery contact, and important account notifications."
+#: guix-git/doc/guix.texi:25748
+msgid "Optional email address used for registration and recovery contact.  Setting this is encouraged as it allows you to receive important notifications about the account and issued certificates."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19453
+#: guix-git/doc/guix.texi:25749 guix-git/doc/guix.texi:27429
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{server} (default: @code{#f})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:25752
+msgid "Optional URL of ACME server.  Setting this overrides certbot's default, which is the Let's Encrypt server."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:25753
 #, no-wrap
 msgid "@code{rsa-key-size} (default: @code{2048})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19455
+#: guix-git/doc/guix.texi:25755
 msgid "Size of the RSA key."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19456
+#: guix-git/doc/guix.texi:25756
 #, no-wrap
 msgid "@code{default-location} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19465
+#: guix-git/doc/guix.texi:25765
 msgid "The default @code{nginx-location-configuration}.  Because @code{certbot} needs to be able to serve challenges and responses, it needs to be able to run a web server.  It does so by extending the @code{nginx} web service with an @code{nginx-server-configuration} listening on the @var{domains} on port 80, and which has a @code{nginx-location-configuration} for the @code{/.well-known/} URI path subspace used by Let's Encrypt.  @xref{Web Services}, for more on these nginx configuration data types."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19469
+#: guix-git/doc/guix.texi:25769
 msgid "Requests to other URL paths will be matched by the @code{default-location}, which if present is added to all @code{nginx-server-configuration}s."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19473
+#: guix-git/doc/guix.texi:25773
 msgid "By default, the @code{default-location} will issue a redirect from @code{http://@var{domain}/...} to @code{https://@var{domain}/...}, leaving you to define what to serve on your site via @code{https}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19475
+#: guix-git/doc/guix.texi:25775
 msgid "Pass @code{#f} to not issue a default location."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19478
+#: guix-git/doc/guix.texi:25778
 #, no-wrap
 msgid "{Data Type} certificate-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19481
+#: guix-git/doc/guix.texi:25781
 msgid "Data type representing the configuration of a certificate.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19483
+#: guix-git/doc/guix.texi:25783
 #, no-wrap
 msgid "@code{name} (default: @i{see below})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19487
+#: guix-git/doc/guix.texi:25787
 msgid "This name is used by Certbot for housekeeping and in file paths; it doesn't affect the content of the certificate itself.  To see certificate names, run @code{certbot certificates}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19489
+#: guix-git/doc/guix.texi:25789
 msgid "Its default is the first provided domain."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19490
+#: guix-git/doc/guix.texi:25790
 #, no-wrap
 msgid "@code{domains} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19493
+#: guix-git/doc/guix.texi:25793
 msgid "The first domain provided will be the subject CN of the certificate, and all domains will be Subject Alternative Names on the certificate."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19494
+#: guix-git/doc/guix.texi:25794
 #, no-wrap
 msgid "@code{challenge} (default: @code{#f})"
 msgstr "@code{challenge}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19499
-msgid "The challenge type that has to be run by certbot.  If @code{#f} is specified, default to the HTTP challenge.  If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks})."
+#: guix-git/doc/guix.texi:25801
+msgid "The challenge type that has to be run by certbot.  If @code{#f} is specified, default to the HTTP challenge.  If a value is specified, defaults to the manual plugin (see @code{authentication-hook}, @code{cleanup-hook} and the documentation at @url{https://certbot.eff.org/docs/using.html#hooks}), and gives Let's Encrypt permission to log the public IP address of the requesting machine."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19500
+#: guix-git/doc/guix.texi:25802
 #, no-wrap
 msgid "@code{authentication-hook} (default: @code{#f})"
 msgstr "@code{authentication-hook}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19506
+#: guix-git/doc/guix.texi:25808
 msgid "Command to be run in a shell once for each certificate challenge to be answered.  For this command, the shell variable @code{$CERTBOT_DOMAIN} will contain the domain being authenticated, @code{$CERTBOT_VALIDATION} contains the validation string and @code{$CERTBOT_TOKEN} contains the file name of the resource requested when performing an HTTP-01 challenge."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19507
+#: guix-git/doc/guix.texi:25809
 #, no-wrap
 msgid "@code{cleanup-hook} (default: @code{#f})"
 msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19513
+#: guix-git/doc/guix.texi:25815
 msgid "Command to be run in a shell once for each certificate challenge that have been answered by the @code{auth-hook}.  For this command, the shell variables available in the @code{auth-hook} script are still available, and additionally @code{$CERTBOT_AUTH_OUTPUT} will contain the standard output of the @code{auth-hook} script."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19514
+#: guix-git/doc/guix.texi:25816
 #, no-wrap
 msgid "@code{deploy-hook} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19522
+#: guix-git/doc/guix.texi:25824
 msgid "Command to be run in a shell once for each successfully issued certificate.  For this command, the shell variable @code{$RENEWED_LINEAGE} will point to the config live subdirectory (for example, @samp{\"/etc/letsencrypt/live/example.com\"}) containing the new certificates and keys; the shell variable @code{$RENEWED_DOMAINS} will contain a space-delimited list of renewed certificate domains (for example, @samp{\"example.com www.example.com\"}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19529
+#: guix-git/doc/guix.texi:25831
 msgid "For each @code{certificate-configuration}, the certificate is saved to @code{/etc/letsencrypt/live/@var{name}/fullchain.pem} and the key is saved to @code{/etc/letsencrypt/live/@var{name}/privkey.pem}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19531
+#: guix-git/doc/guix.texi:25833
 #, no-wrap
 msgid "DNS (domain name system)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19532
+#: guix-git/doc/guix.texi:25834
 #, no-wrap
 msgid "domain name system (DNS)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19540
+#: guix-git/doc/guix.texi:25842
 msgid "The @code{(gnu services dns)} module provides services related to the @dfn{domain name system} (DNS).  It provides a server service for hosting an @emph{authoritative} DNS server for multiple zones, slave or master.  This service uses @uref{https://www.knot-dns.cz/, Knot DNS}.  And also a caching and forwarding DNS server for the LAN, which uses @uref{http://www.thekelleys.org.uk/dnsmasq/doc.html, dnsmasq}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19541
+#: guix-git/doc/guix.texi:25843
 #, no-wrap
 msgid "Knot Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:19545
+#: guix-git/doc/guix.texi:25847
 msgid "An example configuration of an authoritative server for two zones, one master and one slave, is:"
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19552
+#: guix-git/doc/guix.texi:25854
 #, no-wrap
 msgid ""
 "(define-zone-entries example.org.zone\n"
@@ -35338,7 +46791,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19559
+#: guix-git/doc/guix.texi:25861
 #, no-wrap
 msgid ""
 "(define master-zone\n"
@@ -35351,7 +46804,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19565
+#: guix-git/doc/guix.texi:25867
 #, no-wrap
 msgid ""
 "(define slave-zone\n"
@@ -35363,7 +46816,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19570
+#: guix-git/doc/guix.texi:25872
 #, no-wrap
 msgid ""
 "(define plop-master\n"
@@ -35374,7 +46827,7 @@ msgid ""
 msgstr ""
 
 #. type: lisp
-#: doc/guix.texi:19579
+#: guix-git/doc/guix.texi:25881
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -35388,967 +46841,1061 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19581
+#: guix-git/doc/guix.texi:25883
 #, no-wrap
 msgid "{Scheme Variable} knot-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19583
+#: guix-git/doc/guix.texi:25885
 msgid "This is the type for the Knot DNS server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19591
+#: guix-git/doc/guix.texi:25893
 msgid "Knot DNS is an authoritative DNS server, meaning that it can serve multiple zones, that is to say domain names you would buy from a registrar.  This server is not a resolver, meaning that it can only resolve names for which it is authoritative.  This server can be configured to serve zones as a master server or a slave server as a per-zone basis.  Slave zones will get their data from masters, and will serve it as an authoritative server.  From the point of view of a resolver, there is no difference between master and slave."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19593
+#: guix-git/doc/guix.texi:25895
 msgid "The following data types are used to configure the Knot DNS server:"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19595
+#: guix-git/doc/guix.texi:25897
 #, no-wrap
 msgid "{Data Type} knot-key-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19598
+#: guix-git/doc/guix.texi:25900
 msgid "Data type representing a key.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19600 doc/guix.texi:19620 doc/guix.texi:19735
-#: doc/guix.texi:19761 doc/guix.texi:19796
+#: guix-git/doc/guix.texi:25902 guix-git/doc/guix.texi:25922
+#: guix-git/doc/guix.texi:26037 guix-git/doc/guix.texi:26063
+#: guix-git/doc/guix.texi:26098
 #, no-wrap
 msgid "@code{id} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19603
-msgid "An identifier for other configuration fields to refer to this key. IDs must be unique and must not be empty."
+#: guix-git/doc/guix.texi:25905 guix-git/doc/guix.texi:25925
+msgid "An identifier for other configuration fields to refer to this key.  IDs must be unique and must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19604
+#: guix-git/doc/guix.texi:25906
 #, no-wrap
 msgid "@code{algorithm} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19608
+#: guix-git/doc/guix.texi:25910
 msgid "The algorithm to use.  Choose between @code{#f}, @code{'hmac-md5}, @code{'hmac-sha1}, @code{'hmac-sha224}, @code{'hmac-sha256}, @code{'hmac-sha384} and @code{'hmac-sha512}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19609
+#: guix-git/doc/guix.texi:25911
 #, no-wrap
 msgid "@code{secret} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19611
+#: guix-git/doc/guix.texi:25913
 msgid "The secret key itself."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19615
+#: guix-git/doc/guix.texi:25917
 #, no-wrap
 msgid "{Data Type} knot-acl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19618
+#: guix-git/doc/guix.texi:25920
 msgid "Data type representing an Access Control List (ACL) configuration.  This type has the following parameters:"
 msgstr ""
 
-#. type: table
-#: doc/guix.texi:19623
-msgid "An identifier for ether configuration fields to refer to this key. IDs must be unique and must not be empty."
-msgstr ""
-
 #. type: item
-#: doc/guix.texi:19624 doc/guix.texi:19739
+#: guix-git/doc/guix.texi:25926 guix-git/doc/guix.texi:26041
 #, no-wrap
 msgid "@code{address} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19628
+#: guix-git/doc/guix.texi:25930
 msgid "An ordered list of IP addresses, network subnets, or network ranges represented with strings.  The query must match one of them.  Empty value means that address match is not required."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19629
+#: guix-git/doc/guix.texi:25931
 #, no-wrap
 msgid "@code{key} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19633
+#: guix-git/doc/guix.texi:25935
 msgid "An ordered list of references to keys represented with strings.  The string must match a key ID defined in a @code{knot-key-configuration}.  No key means that a key is not require to match that ACL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19634
+#: guix-git/doc/guix.texi:25936
 #, no-wrap
 msgid "@code{action} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19638
-msgid "An ordered list of actions that are permitted or forbidden by this ACL.  Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}."
+#: guix-git/doc/guix.texi:25940
+msgid "An ordered list of actions that are permitted or forbidden by this ACL@.  Possible values are lists of zero or more elements from @code{'transfer}, @code{'notify} and @code{'update}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19639
+#: guix-git/doc/guix.texi:25941
 #, no-wrap
 msgid "@code{deny?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19642
+#: guix-git/doc/guix.texi:25944
 msgid "When true, the ACL defines restrictions.  Listed actions are forbidden.  When false, listed actions are allowed."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19646
+#: guix-git/doc/guix.texi:25948
 #, no-wrap
 msgid "{Data Type} zone-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19649
-msgid "Data type represnting a record entry in a zone file.  This type has the following parameters:"
+#: guix-git/doc/guix.texi:25951
+msgid "Data type representing a record entry in a zone file.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19651
+#: guix-git/doc/guix.texi:25953
 #, no-wrap
 msgid "@code{name} (default: @code{\"@@\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19657
+#: guix-git/doc/guix.texi:25959
 msgid "The name of the record.  @code{\"@@\"} refers to the origin of the zone.  Names are relative to the origin of the zone.  For example, in the @code{example.org} zone, @code{\"ns.example.org\"} actually refers to @code{ns.example.org.example.org}.  Names ending with a dot are absolute, which means that @code{\"ns.example.org.\"} refers to @code{ns.example.org}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19658
+#: guix-git/doc/guix.texi:25960
 #, no-wrap
 msgid "@code{ttl} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19660
+#: guix-git/doc/guix.texi:25962
 msgid "The Time-To-Live (TTL) of this record.  If not set, the default TTL is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19661
+#: guix-git/doc/guix.texi:25963
 #, no-wrap
 msgid "@code{class} (default: @code{\"IN\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19664
+#: guix-git/doc/guix.texi:25966
 msgid "The class of the record.  Knot currently supports only @code{\"IN\"} and partially @code{\"CH\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19665
+#: guix-git/doc/guix.texi:25967
 #, no-wrap
 msgid "@code{type} (default: @code{\"A\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19669
+#: guix-git/doc/guix.texi:25971
 msgid "The type of the record.  Common types include A (IPv4 address), AAAA (IPv6 address), NS (Name Server) and MX (Mail eXchange).  Many other types are defined."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19670
+#: guix-git/doc/guix.texi:25972
 #, no-wrap
 msgid "@code{data} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19674
+#: guix-git/doc/guix.texi:25976
 msgid "The data contained in the record.  For instance an IP address associated with an A record, or a domain name associated with an NS record.  Remember that domain names are relative to the origin unless they end with a dot."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19678
+#: guix-git/doc/guix.texi:25980
 #, no-wrap
 msgid "{Data Type} zone-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19681
+#: guix-git/doc/guix.texi:25983
 msgid "Data type representing the content of a zone file.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19690
+#: guix-git/doc/guix.texi:25992
 msgid "The list of entries.  The SOA record is taken care of, so you don't need to put it in the list of entries.  This list should probably contain an entry for your primary authoritative DNS server.  Other than using a list of entries directly, you can use @code{define-zone-entries} to define a object containing the list of entries more easily, that you can later pass to the @code{entries} field of the @code{zone-file}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19691
+#: guix-git/doc/guix.texi:25993
 #, no-wrap
 msgid "@code{origin} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19693
+#: guix-git/doc/guix.texi:25995
 msgid "The name of your zone.  This parameter cannot be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19694
+#: guix-git/doc/guix.texi:25996
 #, no-wrap
 msgid "@code{ns} (default: @code{\"ns\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19699
+#: guix-git/doc/guix.texi:26001
 msgid "The domain of your primary authoritative DNS server.  The name is relative to the origin, unless it ends with a dot.  It is mandatory that this primary DNS server corresponds to an NS record in the zone and that it is associated to an IP address in the list of entries."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19700
+#: guix-git/doc/guix.texi:26002
 #, no-wrap
 msgid "@code{mail} (default: @code{\"hostmaster\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19703
+#: guix-git/doc/guix.texi:26005
 msgid "An email address people can contact you at, as the owner of the zone.  This is translated as @code{<mail>@@<origin>}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19704
+#: guix-git/doc/guix.texi:26006
 #, no-wrap
 msgid "@code{serial} (default: @code{1})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19708
+#: guix-git/doc/guix.texi:26010
 msgid "The serial number of the zone.  As this is used to keep track of changes by both slaves and resolvers, it is mandatory that it @emph{never} decreases.  Always increment it when you make a change in your zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19709
+#: guix-git/doc/guix.texi:26011
 #, no-wrap
 msgid "@code{refresh} (default: @code{(* 2 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19713
+#: guix-git/doc/guix.texi:26015
 msgid "The frequency at which slaves will do a zone transfer.  This value is a number of seconds.  It can be computed by multiplications or with @code{(string->duration)}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19714
+#: guix-git/doc/guix.texi:26016
 #, no-wrap
 msgid "@code{retry} (default: @code{(* 15 60)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19717
+#: guix-git/doc/guix.texi:26019
 msgid "The period after which a slave will retry to contact its master when it fails to do so a first time."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19718
+#: guix-git/doc/guix.texi:26020
 #, no-wrap
 msgid "@code{expiry} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19722
+#: guix-git/doc/guix.texi:26024
 msgid "Default TTL of records.  Existing records are considered correct for at most this amount of time.  After this period, resolvers will invalidate their cache and check again that it still exists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19723
+#: guix-git/doc/guix.texi:26025
 #, no-wrap
 msgid "@code{nx} (default: @code{3600})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19726
-msgid "Default TTL of inexistant records.  This delay is usually short because you want your new domains to reach everyone quickly."
+#: guix-git/doc/guix.texi:26028
+msgid "Default TTL of inexistent records.  This delay is usually short because you want your new domains to reach everyone quickly."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19730
+#: guix-git/doc/guix.texi:26032
 #, no-wrap
 msgid "{Data Type} knot-remote-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19733
+#: guix-git/doc/guix.texi:26035
 msgid "Data type representing a remote configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19738
-msgid "An identifier for other configuration fields to refer to this remote. IDs must be unique and must not be empty."
+#: guix-git/doc/guix.texi:26040
+msgid "An identifier for other configuration fields to refer to this remote.  IDs must be unique and must not be empty."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19743
+#: guix-git/doc/guix.texi:26045
 msgid "An ordered list of destination IP addresses.  Addresses are tried in sequence.  An optional port can be given with the @@ separator.  For instance: @code{(list \"1.2.3.4\" \"2.3.4.5@@53\")}.  Default port is 53."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19744
+#: guix-git/doc/guix.texi:26046
 #, no-wrap
 msgid "@code{via} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19748
-msgid "An ordered list of source IP addresses.  An empty list will have Knot choose an appropriate source IP.  An optional port can be given with the @@ separator.  The default is to choose at random."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:19749
-#, no-wrap
-msgid "@code{key} (default: @code{#f})"
+#: guix-git/doc/guix.texi:26050
+msgid "An ordered list of source IP addresses.  An empty list will have Knot choose an appropriate source IP@.  An optional port can be given with the @@ separator.  The default is to choose at random."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19752
+#: guix-git/doc/guix.texi:26054
 msgid "A reference to a key, that is a string containing the identifier of a key defined in a @code{knot-key-configuration} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19756
+#: guix-git/doc/guix.texi:26058
 #, no-wrap
 msgid "{Data Type} knot-keystore-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19759
+#: guix-git/doc/guix.texi:26061
 msgid "Data type representing a keystore to hold dnssec keys.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19763
+#: guix-git/doc/guix.texi:26065
 msgid "The id of the keystore.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19764
+#: guix-git/doc/guix.texi:26066
 #, no-wrap
 msgid "@code{backend} (default: @code{'pem})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19766
+#: guix-git/doc/guix.texi:26068
 msgid "The backend to store the keys in.  Can be @code{'pem} or @code{'pkcs11}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19767
+#: guix-git/doc/guix.texi:26069
 #, no-wrap
 msgid "@code{config} (default: @code{\"/var/lib/knot/keys/keys\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19771
-msgid "The configuration string of the backend.  An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}.  For the pem backend, the string reprensents a path in the file system."
+#: guix-git/doc/guix.texi:26073
+msgid "The configuration string of the backend.  An example for the PKCS#11 is: @code{\"pkcs11:token=knot;pin-value=1234 /gnu/store/.../lib/pkcs11/libsofthsm2.so\"}.  For the pem backend, the string represents a path in the file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19775
+#: guix-git/doc/guix.texi:26077
 #, no-wrap
 msgid "{Data Type} knot-policy-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19779
+#: guix-git/doc/guix.texi:26081
 msgid "Data type representing a dnssec policy.  Knot DNS is able to automatically sign your zones.  It can either generate and manage your keys automatically or use keys that you generate."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19786
+#: guix-git/doc/guix.texi:26088
 msgid "Dnssec is usually implemented using two keys: a Key Signing Key (KSK) that is used to sign the second, and a Zone Signing Key (ZSK) that is used to sign the zone.  In order to be trusted, the KSK needs to be present in the parent zone (usually a top-level domain).  If your registrar supports dnssec, you will have to send them your KSK's hash so they can add a DS record in their zone.  This is not automated and need to be done each time you change your KSK."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19792
+#: guix-git/doc/guix.texi:26094
 msgid "The policy also defines the lifetime of keys.  Usually, ZSK can be changed easily and use weaker cryptographic functions (they use lower parameters) in order to sign records quickly, so they are changed often.  The KSK however requires manual interaction with the registrar, so they are changed less often and use stronger parameters because they sign only one record."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19794
+#: guix-git/doc/guix.texi:26096
 msgid "This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19798
+#: guix-git/doc/guix.texi:26100
 msgid "The id of the policy.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19799
+#: guix-git/doc/guix.texi:26101
 #, no-wrap
 msgid "@code{keystore} (default: @code{\"default\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19804
+#: guix-git/doc/guix.texi:26106
 msgid "A reference to a keystore, that is a string containing the identifier of a keystore defined in a @code{knot-keystore-configuration} field.  The @code{\"default\"} identifier means the default keystore (a kasp database that was setup by this service)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19805
+#: guix-git/doc/guix.texi:26107
 #, no-wrap
 msgid "@code{manual?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19807
+#: guix-git/doc/guix.texi:26109
 msgid "Whether the key management is manual or automatic."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19808
+#: guix-git/doc/guix.texi:26110
 #, no-wrap
 msgid "@code{single-type-signing?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19810
+#: guix-git/doc/guix.texi:26112
 msgid "When @code{#t}, use the Single-Type Signing Scheme."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19811
+#: guix-git/doc/guix.texi:26113
 #, no-wrap
 msgid "@code{algorithm} (default: @code{\"ecdsap256sha256\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19813
+#: guix-git/doc/guix.texi:26115
 msgid "An algorithm of signing keys and issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19814
+#: guix-git/doc/guix.texi:26116
 #, no-wrap
 msgid "@code{ksk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19817
-msgid "The length of the KSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
+#: guix-git/doc/guix.texi:26119
+msgid "The length of the KSK@.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19818
+#: guix-git/doc/guix.texi:26120
 #, no-wrap
 msgid "@code{zsk-size} (default: @code{256})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19821
-msgid "The length of the ZSK.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
+#: guix-git/doc/guix.texi:26123
+msgid "The length of the ZSK@.  Note that this value is correct for the default algorithm, but would be unsecure for other algorithms."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19822
+#: guix-git/doc/guix.texi:26124
 #, no-wrap
 msgid "@code{dnskey-ttl} (default: @code{'default})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19825
+#: guix-git/doc/guix.texi:26127
 msgid "The TTL value for DNSKEY records added into zone apex.  The special @code{'default} value means same as the zone SOA TTL."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19826
+#: guix-git/doc/guix.texi:26128
 #, no-wrap
 msgid "@code{zsk-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19828
+#: guix-git/doc/guix.texi:26130
 msgid "The period between ZSK publication and the next rollover initiation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19829
+#: guix-git/doc/guix.texi:26131
 #, no-wrap
 msgid "@code{propagation-delay} (default: @code{(* 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19832
+#: guix-git/doc/guix.texi:26134
 msgid "An extra delay added for each key rollover step.  This value should be high enough to cover propagation of data from the master server to all slaves."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19833
+#: guix-git/doc/guix.texi:26135
 #, no-wrap
 msgid "@code{rrsig-lifetime} (default: @code{(* 14 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19835
+#: guix-git/doc/guix.texi:26137
 msgid "A validity period of newly issued signatures."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19836
+#: guix-git/doc/guix.texi:26138
 #, no-wrap
 msgid "@code{rrsig-refresh} (default: @code{(* 7 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19838
+#: guix-git/doc/guix.texi:26140
 msgid "A period how long before a signature expiration the signature will be refreshed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19839
+#: guix-git/doc/guix.texi:26141
 #, no-wrap
 msgid "@code{nsec3?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19841
+#: guix-git/doc/guix.texi:26143
 msgid "When @code{#t}, NSEC3 will be used instead of NSEC."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19842
+#: guix-git/doc/guix.texi:26144
 #, no-wrap
 msgid "@code{nsec3-iterations} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19844
+#: guix-git/doc/guix.texi:26146
 msgid "The number of additional times the hashing is performed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19845
+#: guix-git/doc/guix.texi:26147
 #, no-wrap
 msgid "@code{nsec3-salt-length} (default: @code{8})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19848
+#: guix-git/doc/guix.texi:26150
 msgid "The length of a salt field in octets, which is appended to the original owner name before hashing."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19849
+#: guix-git/doc/guix.texi:26151
 #, no-wrap
 msgid "@code{nsec3-salt-lifetime} (default: @code{(* 30 24 3600)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19851
+#: guix-git/doc/guix.texi:26153
 msgid "The validity period of newly issued salt field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19855
+#: guix-git/doc/guix.texi:26157
 #, no-wrap
 msgid "{Data Type} knot-zone-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19858
+#: guix-git/doc/guix.texi:26160
 msgid "Data type representing a zone served by Knot.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19860
+#: guix-git/doc/guix.texi:26162
 #, no-wrap
 msgid "@code{domain} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19862
+#: guix-git/doc/guix.texi:26164
 msgid "The domain served by this configuration.  It must not be empty."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19863
+#: guix-git/doc/guix.texi:26165
 #, no-wrap
 msgid "@code{file} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19866
+#: guix-git/doc/guix.texi:26168
 msgid "The file where this zone is saved.  This parameter is ignored by master zones.  Empty means default location that depends on the domain name."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19867
+#: guix-git/doc/guix.texi:26169
 #, no-wrap
 msgid "@code{zone} (default: @code{(zone-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19870
+#: guix-git/doc/guix.texi:26172
 msgid "The content of the zone file.  This parameter is ignored by slave zones.  It must contain a zone-file record."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19871
+#: guix-git/doc/guix.texi:26173
 #, no-wrap
 msgid "@code{master} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19874
+#: guix-git/doc/guix.texi:26176
 msgid "A list of master remotes.  When empty, this zone is a master.  When set, this zone is a slave.  This is a list of remotes identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19875
+#: guix-git/doc/guix.texi:26177
 #, no-wrap
 msgid "@code{ddns-master} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19878
+#: guix-git/doc/guix.texi:26180
 msgid "The main master.  When empty, it defaults to the first master in the list of masters."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19879
+#: guix-git/doc/guix.texi:26181
 #, no-wrap
 msgid "@code{notify} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19881
+#: guix-git/doc/guix.texi:26183
 msgid "A list of slave remote identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19882
+#: guix-git/doc/guix.texi:26184
 #, no-wrap
 msgid "@code{acl} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19884
+#: guix-git/doc/guix.texi:26186
 msgid "A list of acl identifiers."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19885
+#: guix-git/doc/guix.texi:26187
 #, no-wrap
 msgid "@code{semantic-checks?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19887
+#: guix-git/doc/guix.texi:26189
 msgid "When set, this adds more semantic checks to the zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19888
+#: guix-git/doc/guix.texi:26190
 #, no-wrap
 msgid "@code{disable-any?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19890
+#: guix-git/doc/guix.texi:26192
 msgid "When set, this forbids queries of the ANY type."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19891
+#: guix-git/doc/guix.texi:26193
 #, no-wrap
 msgid "@code{zonefile-sync} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19894
+#: guix-git/doc/guix.texi:26196
 msgid "The delay between a modification in memory and on disk.  0 means immediate synchronization."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19895
+#: guix-git/doc/guix.texi:26197
 #, no-wrap
 msgid "@code{zonefile-load} (default: @code{#f})"
 msgstr "@code{zonefile-load}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19898
+#: guix-git/doc/guix.texi:26200
 msgid "The way the zone file contents are applied during zone load.  Possible values are:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19900
+#: guix-git/doc/guix.texi:26202
 #, no-wrap
 msgid "@code{#f} for using the default value from Knot,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19901
+#: guix-git/doc/guix.texi:26203
 #, no-wrap
 msgid "@code{'none} for not using the zone file at all,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19902
+#: guix-git/doc/guix.texi:26204
 #, no-wrap
 msgid "@code{'difference} for computing the difference between already available"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19904
+#: guix-git/doc/guix.texi:26206
 msgid "contents and zone contents and applying it to the current zone contents,"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19904
+#: guix-git/doc/guix.texi:26206
 #, no-wrap
 msgid "@code{'difference-no-serial} for the same as @code{'difference}, but"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:19907
+#: guix-git/doc/guix.texi:26209
 msgid "ignoring the SOA serial in the zone file, while the server takes care of it automatically."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19907
+#: guix-git/doc/guix.texi:26209
 #, no-wrap
 msgid "@code{'whole} for loading zone contents from the zone file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19910
+#: guix-git/doc/guix.texi:26212
 #, no-wrap
 msgid "@code{journal-content} (default: @code{#f})"
 msgstr "@code{journal-content}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19915
+#: guix-git/doc/guix.texi:26217
 msgid "The way the journal is used to store zone and its changes.  Possible values are @code{'none} to not use it at all, @code{'changes} to store changes and @code{'all} to store contents.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19916
+#: guix-git/doc/guix.texi:26218
 #, no-wrap
 msgid "@code{max-journal-usage} (default: @code{#f})"
 msgstr "@code{max-journal-usage}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19919
+#: guix-git/doc/guix.texi:26221
 msgid "The maximum size for the journal on disk.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19920
+#: guix-git/doc/guix.texi:26222
 #, no-wrap
 msgid "@code{max-journal-depth} (default: @code{#f})"
 msgstr "@code{max-journal-depth}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19923
+#: guix-git/doc/guix.texi:26225
 msgid "The maximum size of the history.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19924
+#: guix-git/doc/guix.texi:26226
 #, no-wrap
 msgid "@code{max-zone-size} (default: @code{#f})"
 msgstr "@code{max-zone-size}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19928
+#: guix-git/doc/guix.texi:26230
 msgid "The maximum size of the zone file.  This limit is enforced for incoming transfer and updates.  @code{#f} does not set this option, so the default value from Knot is used."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19929
+#: guix-git/doc/guix.texi:26231
 #, no-wrap
 msgid "@code{dnssec-policy} (default: @code{#f})"
 msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:19933
+#: guix-git/doc/guix.texi:26235
 msgid "A reference to a @code{knot-policy-configuration} record, or the special name @code{\"default\"}.  If the value is @code{#f}, there is no dnssec signing on this zone."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19934
+#: guix-git/doc/guix.texi:26236
 #, no-wrap
 msgid "@code{serial-policy} (default: @code{'increment})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19936
+#: guix-git/doc/guix.texi:26238
 msgid "A policy between @code{'increment} and @code{'unixtime}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19940
+#: guix-git/doc/guix.texi:26242
 #, no-wrap
 msgid "{Data Type} knot-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:19943
+#: guix-git/doc/guix.texi:26245
 msgid "Data type representing the Knot configuration.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19945
+#: guix-git/doc/guix.texi:26247
 #, no-wrap
 msgid "@code{knot} (default: @code{knot})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19947
+#: guix-git/doc/guix.texi:26249
 msgid "The Knot package."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19948
+#: guix-git/doc/guix.texi:26250
 #, no-wrap
 msgid "@code{run-directory} (default: @code{\"/var/run/knot\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19950
+#: guix-git/doc/guix.texi:26252
 msgid "The run directory.  This directory will be used for pid file and sockets."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19951
+#: guix-git/doc/guix.texi:26253
 #, no-wrap
 msgid "@code{includes} (default: @code{'()})"
 msgstr "@code{includes}（默认值：@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:19954
+#: guix-git/doc/guix.texi:26256
 msgid "A list of strings or file-like objects denoting other files that must be included at the top of the configuration file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:19955
+#: guix-git/doc/guix.texi:26257
 #, no-wrap
 msgid "secrets, Knot service"
 msgstr "秘密，Knot服务。"
 
 #. type: table
-#: doc/guix.texi:19961
+#: guix-git/doc/guix.texi:26263
 msgid "This can be used to manage secrets out-of-band.  For example, secret keys may be stored in an out-of-band file not managed by Guix, and thus not visible in @file{/gnu/store}---e.g., you could store secret key configuration in @file{/etc/knot/secrets.conf} and add this file to the @code{includes} list."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19963
+#: guix-git/doc/guix.texi:26268
+msgid "One can generate a secret tsig key (for nsupdate and zone transfers with the keymgr command from the knot package.  Note that the package is not automatically installed by the service.  The following example shows how to generate a new tsig key:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:26272
+#, no-wrap
+msgid ""
+"keymgr -t mysecret > /etc/knot/secrets.conf\n"
+"chmod 600 /etc/knot/secrets.conf\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26278
+msgid "Also note that the generated key will be named @var{mysecret}, so it is the name that needs to be used in the @var{key} field of the @code{knot-acl-configuration} record and in other places that need to refer to that key."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26280
 msgid "It can also be used to add configuration not supported by this interface."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19964
+#: guix-git/doc/guix.texi:26281
 #, no-wrap
 msgid "@code{listen-v4} (default: @code{\"0.0.0.0\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19966 doc/guix.texi:19969
+#: guix-git/doc/guix.texi:26283 guix-git/doc/guix.texi:26286
 msgid "An ip address on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19967
+#: guix-git/doc/guix.texi:26284
 #, no-wrap
 msgid "@code{listen-v6} (default: @code{\"::\"})"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19970
+#: guix-git/doc/guix.texi:26287
 #, no-wrap
 msgid "@code{listen-port} (default: @code{53})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19972
+#: guix-git/doc/guix.texi:26289
 msgid "A port on which to listen."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19973
+#: guix-git/doc/guix.texi:26290
 #, no-wrap
 msgid "@code{keys} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19975
+#: guix-git/doc/guix.texi:26292
 msgid "The list of knot-key-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19976
+#: guix-git/doc/guix.texi:26293
 #, no-wrap
 msgid "@code{acls} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19978
+#: guix-git/doc/guix.texi:26295
 msgid "The list of knot-acl-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19979
+#: guix-git/doc/guix.texi:26296
 #, no-wrap
 msgid "@code{remotes} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19981
+#: guix-git/doc/guix.texi:26298
 msgid "The list of knot-remote-configuration used by this configuration."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:19982
+#: guix-git/doc/guix.texi:26299
 #, no-wrap
 msgid "@code{zones} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:19984
+#: guix-git/doc/guix.texi:26301
 msgid "The list of knot-zone-configuration used by this configuration."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:19988
+#: guix-git/doc/guix.texi:26305
+#, fuzzy, no-wrap
+#| msgid "Kerberos Services"
+msgid "Knot Resolver Service"
+msgstr "Kerberos服务"
+
+#. type: deffn
+#: guix-git/doc/guix.texi:26307
+#, no-wrap
+msgid "{Scheme Variable} knot-resolver-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:26310
+msgid "This is the type of the knot resolver service, whose value should be an @code{knot-resolver-configuration} object as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:26320
+#, no-wrap
+msgid ""
+"(service knot-resolver-service-type\n"
+"         (knot-resolver-configuration\n"
+"           (kresd-config-file (plain-file \"kresd.conf\" \"\n"
+"net.listen('192.168.0.1', 5353)\n"
+"user('knot-resolver', 'knot-resolver')\n"
+"modules = @{ 'hints > iterate', 'stats', 'predict' @}\n"
+"cache.size = 100 * MB\n"
+"\"))))\n"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:26323
+msgid "For more information, refer its @url{https://knot-resolver.readthedocs.org/en/stable/daemon.html#configuration, manual}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:26325
+#, no-wrap
+msgid "{Data Type} knot-resolver-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:26327
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of knot-resolver."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:26329
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{package} (default: @var{knot-resolver})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26331
+msgid "Package object of the knot DNS resolver."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26332
+#, fuzzy, no-wrap
+#| msgid "@code{compression-level} (default: @code{3})"
+msgid "@code{kresd-config-file} (default: %kresd.conf)"
+msgstr "@code{compression-level}（默认值：@code{3}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26335
+msgid "File-like object of the kresd configuration file to use, by default it will listen on @code{127.0.0.1} and @code{::1}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26336
+#, fuzzy, no-wrap
+#| msgid "@code{parallel-builds} (default: @code{1})"
+msgid "@code{garbage-collection-interval} (default: 1000)"
+msgstr "@code{parallel-builds}（默认值：@code{1}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26338
+msgid "Number of milliseconds for @code{kres-cache-gc} to periodically trim the cache."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:26343
 #, no-wrap
 msgid "Dnsmasq Service"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19990
+#: guix-git/doc/guix.texi:26345
 #, no-wrap
 msgid "{Scheme Variable} dnsmasq-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:19993
+#: guix-git/doc/guix.texi:26348
 msgid "This is the type of the dnsmasq service, whose value should be an @code{dnsmasq-configuration} object as in this example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:19999
+#. type: lisp
+#: guix-git/doc/guix.texi:26354
 #, no-wrap
 msgid ""
 "(service dnsmasq-service-type\n"
@@ -36358,1191 +47905,1783 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20002
+#: guix-git/doc/guix.texi:26357
 #, no-wrap
 msgid "{Data Type} dnsmasq-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20004
+#: guix-git/doc/guix.texi:26359
 msgid "Data type representing the configuration of dnsmasq."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20006
+#: guix-git/doc/guix.texi:26361
 #, no-wrap
 msgid "@code{package} (default: @var{dnsmasq})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20008
+#: guix-git/doc/guix.texi:26363
 msgid "Package object of the dnsmasq server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20009
+#: guix-git/doc/guix.texi:26364
 #, no-wrap
 msgid "@code{no-hosts?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20011
+#: guix-git/doc/guix.texi:26366
 msgid "When true, don't read the hostnames in /etc/hosts."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20012
+#: guix-git/doc/guix.texi:26367
 #, no-wrap
 msgid "@code{port} (default: @code{53})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20015
+#: guix-git/doc/guix.texi:26370
 msgid "The port to listen on.  Setting this to zero completely disables DNS responses, leaving only DHCP and/or TFTP functions."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20016
+#: guix-git/doc/guix.texi:26371
 #, no-wrap
 msgid "@code{local-service?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20019
+#: guix-git/doc/guix.texi:26374
 msgid "Accept DNS queries only from hosts whose address is on a local subnet, ie a subnet for which an interface exists on the server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20020
+#: guix-git/doc/guix.texi:26375
 #, no-wrap
 msgid "@code{listen-addresses} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20022
+#: guix-git/doc/guix.texi:26377
 msgid "Listen on the given IP addresses."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20023
+#: guix-git/doc/guix.texi:26378
 #, no-wrap
 msgid "@code{resolv-file} (default: @code{\"/etc/resolv.conf\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20025
+#: guix-git/doc/guix.texi:26380
 msgid "The file to read the IP address of the upstream nameservers from."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20026
+#: guix-git/doc/guix.texi:26381
 #, no-wrap
 msgid "@code{no-resolv?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20028
+#: guix-git/doc/guix.texi:26383
 msgid "When true, don't read @var{resolv-file}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:26384
+#, no-wrap
+msgid "@code{servers} (default: @code{'()})"
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:20031
+#: guix-git/doc/guix.texi:26386
 msgid "Specify IP address of upstream servers directly."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20032
+#: guix-git/doc/guix.texi:26387
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{addresses} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26391
+msgid "For each entry, specify an IP address to return for any host in the given domains.  Queries in the domains are never forwarded and always replied to with the specified IP address."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26393
+msgid "This is useful for redirecting hosts locally, for example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:26402
+#, no-wrap
+msgid ""
+"(service dnsmasq-service-type\n"
+"         (dnsmasq-configuration\n"
+"           (addresses\n"
+"             '(; Redirect to a local web-server.\n"
+"               \"/example.org/127.0.0.1\"\n"
+"               ; Redirect subdomain to a specific IP.\n"
+"               \"/subdomain.example.org/192.168.1.42\"))))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26405
+msgid "Note that rules in @file{/etc/hosts} take precedence over this."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26406
 #, no-wrap
 msgid "@code{cache-size} (default: @code{150})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20035
+#: guix-git/doc/guix.texi:26409
 msgid "Set the size of dnsmasq's cache.  Setting the cache size to zero disables caching."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20036
+#: guix-git/doc/guix.texi:26410
 #, no-wrap
 msgid "@code{negative-cache?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20038
+#: guix-git/doc/guix.texi:26412
 msgid "When false, disable negative caching."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:26413
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{tftp-enable?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26415
+msgid "Whether to enable the built-in TFTP server."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26416
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{tftp-no-fail?} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26418
+msgid "If true, does not fail dnsmasq if the TFTP server could not start up."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26419
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{tftp-single-port?} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26421
+msgid "Whether to use only one single port for TFTP."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26422
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{tftp-secure?} (default: @code{#f})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26424
+msgid "If true, only files owned by the user running the dnsmasq process are accessible."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26428
+msgid "If dnsmasq is being run as root, different rules apply: @code{tftp-secure?} has no effect, but only files which have the world-readable bit set are accessible."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26429
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{tftp-max} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26431
+msgid "If set, sets the maximal number of concurrent connections allowed."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26432
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{tftp-mtu} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26434
+msgid "If set, sets the MTU for TFTP packets to that value."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26435
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{tftp-no-blocksize?} (default: @code{#f})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26437
+msgid "If true, stops the TFTP server from negotiating the blocksize with a client."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26438
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{tftp-lowercase?} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26440
+msgid "Whether to convert all filenames in TFTP requests to lowercase."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26441
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{tftp-port-range} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26444
+msgid "If set, fixes the dynamical ports (one per client) to the given range (@code{\"<start>,<end>\"})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26445
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{tftp-root} (default: @code{/var/empty,lo})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26452
+msgid "Look for files to transfer using TFTP relative to the given directory.  When this is set, TFTP paths which include @samp{..} are rejected, to stop clients getting outside the specified root.  Absolute paths (starting with @samp{/}) are allowed, but they must be within the TFTP-root.  If the optional interface argument is given, the directory is only used for TFTP requests via that interface."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26453
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{tftp-unique-root} (default: @code{#f})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26458
+msgid "If set, add the IP or hardware address of the TFTP client as a path component on the end of the TFTP-root.  Only valid if a TFTP root is set and the directory exists.  Defaults to adding IP address (in standard dotted-quad format)."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26467
+msgid "For instance, if @option{--tftp-root} is @samp{/tftp} and client @samp{1.2.3.4} requests file @file{myfile} then the effective path will be @file{/tftp/1.2.3.4/myfile} if @file{/tftp/1.2.3.4} exists or @file{/tftp/myfile} otherwise.  When @samp{=mac} is specified it will append the MAC address instead, using lowercase zero padded digits separated by dashes, e.g.: @samp{01-02-03-04-aa-bb}.  Note that resolving MAC addresses is only possible if the client is in the local network or obtained a DHCP lease from dnsmasq."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:20042
+#: guix-git/doc/guix.texi:26471
 #, no-wrap
 msgid "ddclient Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20044
+#: guix-git/doc/guix.texi:26473
 #, no-wrap
 msgid "ddclient"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20048
+#: guix-git/doc/guix.texi:26477
 msgid "The ddclient service described below runs the ddclient daemon, which takes care of automatically updating DNS entries for service providers such as @uref{https://dyn.com/dns/, Dyn}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20051
+#: guix-git/doc/guix.texi:26480
 msgid "The following example show instantiates the service with its default configuration:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:20054
+#. type: lisp
+#: guix-git/doc/guix.texi:26483
 #, no-wrap
 msgid "(service ddclient-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20063
-msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below.)  You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}.)  See the examples in the @file{share/ddclient} directory of the @code{ddclient} package."
+#: guix-git/doc/guix.texi:26492
+msgid "Note that ddclient needs to access credentials that are stored in a @dfn{secret file}, by default @file{/etc/ddclient/secrets} (see @code{secret-file} below).  You are expected to create this file manually, in an ``out-of-band'' fashion (you @emph{could} make this file part of the service configuration, for instance by using @code{plain-file}, but it will be world-readable @i{via} @file{/gnu/store}).  See the examples in the @file{share/ddclient} directory of the @code{ddclient} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20067
+#: guix-git/doc/guix.texi:26496
 msgid "Available @code{ddclient-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20068
+#: guix-git/doc/guix.texi:26497
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} package ddclient"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20070
+#: guix-git/doc/guix.texi:26499
 msgid "The ddclient package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20073
+#: guix-git/doc/guix.texi:26502
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} integer daemon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20075
+#: guix-git/doc/guix.texi:26504
 msgid "The period after which ddclient will retry to check IP and domain name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20080
+#: guix-git/doc/guix.texi:26509
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} boolean syslog"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20082
+#: guix-git/doc/guix.texi:26511
 msgid "Use syslog for the output."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20087
+#: guix-git/doc/guix.texi:26516
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string mail"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20089
+#: guix-git/doc/guix.texi:26518
 msgid "Mail to user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20091 doc/guix.texi:20098 doc/guix.texi:21435
+#: guix-git/doc/guix.texi:26520 guix-git/doc/guix.texi:26527
+#: guix-git/doc/guix.texi:28264
 msgid "Defaults to @samp{\"root\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20094
+#: guix-git/doc/guix.texi:26523
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string mail-failure"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20096
+#: guix-git/doc/guix.texi:26525
 msgid "Mail failed update to user."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20101
+#: guix-git/doc/guix.texi:26530
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string pid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20103
+#: guix-git/doc/guix.texi:26532
 msgid "The ddclient PID file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20105
+#: guix-git/doc/guix.texi:26534
 msgid "Defaults to @samp{\"/var/run/ddclient/ddclient.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20108
+#: guix-git/doc/guix.texi:26537
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} boolean ssl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20110
+#: guix-git/doc/guix.texi:26539
 msgid "Enable SSL support."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20115
+#: guix-git/doc/guix.texi:26544
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string user"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20118
+#: guix-git/doc/guix.texi:26547
 msgid "Specifies the user name or ID that is used when running ddclient program."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20120 doc/guix.texi:20127
+#: guix-git/doc/guix.texi:26549 guix-git/doc/guix.texi:26556
 msgid "Defaults to @samp{\"ddclient\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20123
+#: guix-git/doc/guix.texi:26552
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20125
+#: guix-git/doc/guix.texi:26554
 msgid "Group of the user who will run the ddclient program."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20130
+#: guix-git/doc/guix.texi:26559
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} string secret-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20134
+#: guix-git/doc/guix.texi:26563
 msgid "Secret file which will be appended to @file{ddclient.conf} file.  This file contains credentials for use by ddclient.  You are expected to create it manually."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20136
+#: guix-git/doc/guix.texi:26565
 msgid "Defaults to @samp{\"/etc/ddclient/secrets.conf\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20139
+#: guix-git/doc/guix.texi:26568
 #, no-wrap
 msgid "{@code{ddclient-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20141
+#: guix-git/doc/guix.texi:26570
 msgid "Extra options will be appended to @file{ddclient.conf} file."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20152
+#: guix-git/doc/guix.texi:26581
 #, no-wrap
 msgid "VPN (virtual private network)"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20153
+#: guix-git/doc/guix.texi:26582
 #, no-wrap
 msgid "virtual private network (VPN)"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20159
-msgid "The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs).  It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN.  Both services use @uref{https://openvpn.net/, OpenVPN}."
+#: guix-git/doc/guix.texi:26586
+msgid "The @code{(gnu services vpn)} module provides services related to @dfn{virtual private networks} (VPNs)."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:26587
+#, no-wrap
+msgid "OpenVPN"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:26591
+msgid "It provides a @emph{client} service for your machine to connect to a VPN, and a @emph{server} service for your machine to host a VPN@."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20160
+#: guix-git/doc/guix.texi:26592
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-client-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20162
+#: guix-git/doc/guix.texi:26594
 msgid "[#:config (openvpn-client-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20164
+#: guix-git/doc/guix.texi:26596
 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a client."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20166
+#: guix-git/doc/guix.texi:26598
 #, no-wrap
 msgid "{Scheme Procedure} openvpn-server-service @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20168
+#: guix-git/doc/guix.texi:26600
 msgid "[#:config (openvpn-server-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20170
+#: guix-git/doc/guix.texi:26602
 msgid "Return a service that runs @command{openvpn}, a VPN daemon, as a server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20172
+#: guix-git/doc/guix.texi:26604
 msgid "Both can be run simultaneously."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20177
+#: guix-git/doc/guix.texi:26609
 msgid "Available @code{openvpn-client-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20178
+#: guix-git/doc/guix.texi:26610
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20180 doc/guix.texi:20316
+#: guix-git/doc/guix.texi:26612 guix-git/doc/guix.texi:26767
 msgid "The OpenVPN package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20183
+#: guix-git/doc/guix.texi:26615
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20185 doc/guix.texi:20321
+#: guix-git/doc/guix.texi:26617 guix-git/doc/guix.texi:26772
 msgid "The OpenVPN pid file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20187 doc/guix.texi:20323
+#: guix-git/doc/guix.texi:26619 guix-git/doc/guix.texi:26774
 msgid "Defaults to @samp{\"/var/run/openvpn/openvpn.pid\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20190
+#: guix-git/doc/guix.texi:26622
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20193 doc/guix.texi:20329
+#: guix-git/doc/guix.texi:26625 guix-git/doc/guix.texi:26780
 msgid "The protocol (UDP or TCP) used to open a channel between clients and servers."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20195 doc/guix.texi:20331
+#: guix-git/doc/guix.texi:26627 guix-git/doc/guix.texi:26782
 msgid "Defaults to @samp{udp}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20198
+#: guix-git/doc/guix.texi:26630
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20200 doc/guix.texi:20336
+#: guix-git/doc/guix.texi:26632 guix-git/doc/guix.texi:26787
 msgid "The device type used to represent the VPN connection."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20202 doc/guix.texi:20338
+#: guix-git/doc/guix.texi:26634 guix-git/doc/guix.texi:26789
 msgid "Defaults to @samp{tun}."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:26640 guix-git/doc/guix.texi:26795
+msgid "If you do not have some of these files (eg.@: you use a username and password), you can disable any of the following three fields by setting it to @code{'disabled}."
+msgstr ""
+
 #. type: deftypevr
-#: doc/guix.texi:20205
+#: guix-git/doc/guix.texi:26641
 #, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} string ca"
+msgid "{@code{openvpn-client-configuration} parameter} maybe-string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20207 doc/guix.texi:20343
+#: guix-git/doc/guix.texi:26643 guix-git/doc/guix.texi:26798
 msgid "The certificate authority to check connections against."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20209 doc/guix.texi:20345
+#: guix-git/doc/guix.texi:26645 guix-git/doc/guix.texi:26800
 msgid "Defaults to @samp{\"/etc/openvpn/ca.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20212
+#: guix-git/doc/guix.texi:26648
 #, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} string cert"
+msgid "{@code{openvpn-client-configuration} parameter} maybe-string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20215 doc/guix.texi:20351
+#: guix-git/doc/guix.texi:26651 guix-git/doc/guix.texi:26806
 msgid "The certificate of the machine the daemon is running on.  It should be signed by the authority given in @code{ca}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20217 doc/guix.texi:20353
+#: guix-git/doc/guix.texi:26653 guix-git/doc/guix.texi:26808
 msgid "Defaults to @samp{\"/etc/openvpn/client.crt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20220
+#: guix-git/doc/guix.texi:26656
 #, no-wrap
-msgid "{@code{openvpn-client-configuration} parameter} string key"
+msgid "{@code{openvpn-client-configuration} parameter} maybe-string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20223 doc/guix.texi:20359
+#: guix-git/doc/guix.texi:26659 guix-git/doc/guix.texi:26814
 msgid "The key of the machine the daemon is running on.  It must be the key whose certificate is @code{cert}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20225 doc/guix.texi:20361
+#: guix-git/doc/guix.texi:26661 guix-git/doc/guix.texi:26816
 msgid "Defaults to @samp{\"/etc/openvpn/client.key\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20228
+#: guix-git/doc/guix.texi:26664
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20230 doc/guix.texi:20366
+#: guix-git/doc/guix.texi:26666 guix-git/doc/guix.texi:26821
 msgid "Whether to use the lzo compression algorithm."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20235
+#: guix-git/doc/guix.texi:26671
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20237 doc/guix.texi:20373
+#: guix-git/doc/guix.texi:26673 guix-git/doc/guix.texi:26828
 msgid "Don't re-read key files across SIGUSR1 or --ping-restart."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20242
+#: guix-git/doc/guix.texi:26678
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20245 doc/guix.texi:20381
+#: guix-git/doc/guix.texi:26681 guix-git/doc/guix.texi:26836
 msgid "Don't close and reopen TUN/TAP device or run up/down scripts across SIGUSR1 or --ping-restart restarts."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20250
+#: guix-git/doc/guix.texi:26686
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} boolean fast-io?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26689 guix-git/doc/guix.texi:26844
+msgid "(Experimental) Optimize TUN/TAP/UDP I/O writes by avoiding a call to poll/epoll/select prior to the write operation."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26693
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20252 doc/guix.texi:20388
+#: guix-git/doc/guix.texi:26695 guix-git/doc/guix.texi:26850
 msgid "Verbosity level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20254 doc/guix.texi:20390 doc/guix.texi:21703
-#: doc/guix.texi:21926
+#: guix-git/doc/guix.texi:26697 guix-git/doc/guix.texi:26852
+#: guix-git/doc/guix.texi:28532 guix-git/doc/guix.texi:28756
 msgid "Defaults to @samp{3}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20257
+#: guix-git/doc/guix.texi:26700
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} tls-auth-client tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20260 doc/guix.texi:20396
+#: guix-git/doc/guix.texi:26703 guix-git/doc/guix.texi:26858
 msgid "Add an additional layer of HMAC authentication on top of the TLS control channel to protect against DoS attacks."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20265
+#: guix-git/doc/guix.texi:26708
+#, no-wrap
+msgid "{@code{openvpn-client-configuration} parameter} maybe-string auth-user-pass"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26712
+msgid "Authenticate with server using username/password.  The option is a file containing username/password on 2 lines.  Do not use a file-like object as it would be added to the store and readable by any user."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26714
+msgid "Defaults to @samp{'disabled}."
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26716
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} key-usage verify-key-usage?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20267
+#: guix-git/doc/guix.texi:26718
 msgid "Whether to check the server certificate has server usage extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20272
+#: guix-git/doc/guix.texi:26723
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} bind bind?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20274
+#: guix-git/doc/guix.texi:26725
 msgid "Bind to a specific local port number."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20279
+#: guix-git/doc/guix.texi:26730
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} resolv-retry resolv-retry?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20281
+#: guix-git/doc/guix.texi:26732
 msgid "Retry resolving server address."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20286
+#: guix-git/doc/guix.texi:26737
 #, no-wrap
 msgid "{@code{openvpn-client-configuration} parameter} openvpn-remote-list remote"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20288
+#: guix-git/doc/guix.texi:26739
 msgid "A list of remote servers to connect to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20292
+#: guix-git/doc/guix.texi:26743
 msgid "Available @code{openvpn-remote-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20293
+#: guix-git/doc/guix.texi:26744
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20295
+#: guix-git/doc/guix.texi:26746
 msgid "Server name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20297
+#: guix-git/doc/guix.texi:26748
 msgid "Defaults to @samp{\"my-server\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20300
+#: guix-git/doc/guix.texi:26751
 #, no-wrap
 msgid "{@code{openvpn-remote-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20302
+#: guix-git/doc/guix.texi:26753
 msgid "Port number the server listens to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20304 doc/guix.texi:20405
+#: guix-git/doc/guix.texi:26755 guix-git/doc/guix.texi:26867
 msgid "Defaults to @samp{1194}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20313
+#: guix-git/doc/guix.texi:26764
 msgid "Available @code{openvpn-server-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20314
+#: guix-git/doc/guix.texi:26765
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} package openvpn"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20319
+#: guix-git/doc/guix.texi:26770
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string pid-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20326
+#: guix-git/doc/guix.texi:26777
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} proto proto"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20334
+#: guix-git/doc/guix.texi:26785
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} dev dev"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20341
+#: guix-git/doc/guix.texi:26796
 #, no-wrap
-msgid "{@code{openvpn-server-configuration} parameter} string ca"
+msgid "{@code{openvpn-server-configuration} parameter} maybe-string ca"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20348
+#: guix-git/doc/guix.texi:26803
 #, no-wrap
-msgid "{@code{openvpn-server-configuration} parameter} string cert"
+msgid "{@code{openvpn-server-configuration} parameter} maybe-string cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20356
+#: guix-git/doc/guix.texi:26811
 #, no-wrap
-msgid "{@code{openvpn-server-configuration} parameter} string key"
+msgid "{@code{openvpn-server-configuration} parameter} maybe-string key"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20364
+#: guix-git/doc/guix.texi:26819
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean comp-lzo?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20371
+#: guix-git/doc/guix.texi:26826
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-key?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20378
+#: guix-git/doc/guix.texi:26833
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean persist-tun?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20386
+#: guix-git/doc/guix.texi:26841
+#, no-wrap
+msgid "{@code{openvpn-server-configuration} parameter} boolean fast-io?"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:26848
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number verbosity"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20393
+#: guix-git/doc/guix.texi:26855
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} tls-auth-server tls-auth"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20401
+#: guix-git/doc/guix.texi:26863
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20403
+#: guix-git/doc/guix.texi:26865
 msgid "Specifies the port number on which the server listens."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20408
+#: guix-git/doc/guix.texi:26870
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} ip-mask server"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20410
+#: guix-git/doc/guix.texi:26872
 msgid "An ip and mask specifying the subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20412
+#: guix-git/doc/guix.texi:26874
 msgid "Defaults to @samp{\"10.8.0.0 255.255.255.0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20415
+#: guix-git/doc/guix.texi:26877
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} cidr6 server-ipv6"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20417
+#: guix-git/doc/guix.texi:26879
 msgid "A CIDR notation specifying the IPv6 subnet inside the virtual network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20422
+#: guix-git/doc/guix.texi:26884
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string dh"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20424
+#: guix-git/doc/guix.texi:26886
 msgid "The Diffie-Hellman parameters file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20426
+#: guix-git/doc/guix.texi:26888
 msgid "Defaults to @samp{\"/etc/openvpn/dh2048.pem\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20429
+#: guix-git/doc/guix.texi:26891
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string ifconfig-pool-persist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20431
+#: guix-git/doc/guix.texi:26893
 msgid "The file that records client IPs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20433
+#: guix-git/doc/guix.texi:26895
 msgid "Defaults to @samp{\"/etc/openvpn/ipp.txt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20436
+#: guix-git/doc/guix.texi:26898
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} gateway redirect-gateway?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20438
+#: guix-git/doc/guix.texi:26900
 msgid "When true, the server will act as a gateway for its clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20443
+#: guix-git/doc/guix.texi:26905
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} boolean client-to-client?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20445
+#: guix-git/doc/guix.texi:26907
 msgid "When true, clients are allowed to talk to each other inside the VPN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20450
+#: guix-git/doc/guix.texi:26912
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} keepalive keepalive"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20456
+#: guix-git/doc/guix.texi:26918
 msgid "Causes ping-like messages to be sent back and forth over the link so that each side knows when the other side has gone down.  @code{keepalive} requires a pair.  The first element is the period of the ping sending, and the second element is the timeout before considering the other side down."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20459
+#: guix-git/doc/guix.texi:26921
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} number max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20461
+#: guix-git/doc/guix.texi:26923
 msgid "The maximum number of clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20466
+#: guix-git/doc/guix.texi:26928
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} string status"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20469
+#: guix-git/doc/guix.texi:26931
 msgid "The status file.  This file shows a small report on current connection.  It is truncated and rewritten every minute."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20471
+#: guix-git/doc/guix.texi:26933
 msgid "Defaults to @samp{\"/var/run/openvpn/status\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20474
+#: guix-git/doc/guix.texi:26936
 #, no-wrap
 msgid "{@code{openvpn-server-configuration} parameter} openvpn-ccd-list client-config-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20476
+#: guix-git/doc/guix.texi:26938
 msgid "The list of configuration for some clients."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20480
+#: guix-git/doc/guix.texi:26942
 msgid "Available @code{openvpn-ccd-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20481
+#: guix-git/doc/guix.texi:26943
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20483
+#: guix-git/doc/guix.texi:26945
 msgid "Client name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20485
+#: guix-git/doc/guix.texi:26947
 msgid "Defaults to @samp{\"client\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20488
+#: guix-git/doc/guix.texi:26950
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask iroute"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20490
+#: guix-git/doc/guix.texi:26952
 msgid "Client own network"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20495
+#: guix-git/doc/guix.texi:26957
 #, no-wrap
 msgid "{@code{openvpn-ccd-configuration} parameter} ip-mask ifconfig-push"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20497
+#: guix-git/doc/guix.texi:26959
 msgid "Client VPN IP."
 msgstr ""
 
+#. type: subsubheading
+#: guix-git/doc/guix.texi:26969
+#, no-wrap
+msgid "Wireguard"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:26971
+#, no-wrap
+msgid "{Scheme Variable} wireguard-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:26974
+msgid "A service type for a Wireguard tunnel interface.  Its value must be a @code{wireguard-configuration} record as in this example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:26985
+#, no-wrap
+msgid ""
+"(service wireguard-service-type\n"
+"         (wireguard-configuration\n"
+"          (peers\n"
+"           (list\n"
+"            (wireguard-peer\n"
+"             (name \"my-peer\")\n"
+"             (endpoint \"my.wireguard.com:51820\")\n"
+"             (public-key \"hzpKg9X1yqu1axN6iJp0mWf6BZGo8m1wteKwtTmDGF4=\")\n"
+"             (allowed-ips '(\"10.0.0.2/32\")))))))\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:26989
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} wireguard-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:26991
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of the Wireguard service."
+msgstr "管理操作系统配置。"
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:26993
+#, no-wrap
+msgid "wireguard"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:26995
+#, fuzzy
+#| msgid "The package data type."
+msgid "The wireguard package to use for this service."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:26996
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{interface} (default: @code{\"wg0\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:26998
+msgid "The interface name for the VPN."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:26999
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{addresses} (default: @code{'(\"10.0.0.1/32\")})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27001
+msgid "The IP addresses to be assigned to the above interface."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27002
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{private-key} (default: @code{\"/etc/wireguard/private.key\"})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27005
+msgid "The private key file for the interface.  It is automatically generated if the file does not exist."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27006
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{peers} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27009
+msgid "The authorized peers on this interface.  This is a list of @var{wireguard-peer} records."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27013
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} wireguard-peer"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27015
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing a Wireguard peer attached to a given interface."
+msgstr "管理操作系统配置。"
+
+#. type: table
+#: guix-git/doc/guix.texi:27019
+#, fuzzy
+#| msgid "The Store Monad"
+msgid "The peer name."
+msgstr "仓库monad"
+
+#. type: item
+#: guix-git/doc/guix.texi:27020
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{endpoint} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27023
+msgid "The optional endpoint for the peer, such as @code{\"demo.wireguard.com:51820\"}."
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:27024 guix-git/doc/guix.texi:27408
+#: guix-git/doc/guix.texi:27442 guix-git/doc/guix.texi:32244
+#, no-wrap
+msgid "public-key"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27026
+msgid "The peer public-key represented as a base64 string."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:27027
+#, no-wrap
+msgid "allowed-ips"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27030
+msgid "A list of IP addresses from which incoming traffic for this peer is allowed and to which incoming traffic for this peer is directed."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:20510
+#: guix-git/doc/guix.texi:27036
 #, no-wrap
 msgid "NFS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20515
+#: guix-git/doc/guix.texi:27041
 msgid "The @code{(gnu services nfs)} module provides the following services, which are most commonly used in relation to mounting or exporting directory trees as @dfn{network file systems} (NFS)."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:27045
+msgid "While it is possible to use the individual components that together make up a Network File System service, we recommended to configure an NFS server with the @code{nfs-service-type}."
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:20516
+#: guix-git/doc/guix.texi:27046
+#, fuzzy, no-wrap
+#| msgid "DNS Services"
+msgid "NFS Service"
+msgstr "DNS服务"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:27047
+#, fuzzy, no-wrap
+#| msgid "Web servers."
+msgid "NFS, server"
+msgstr "Web服务。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27052
+msgid "The NFS service takes care of setting up all NFS component services, kernel configuration file systems, and installs configuration files in the locations that NFS expects."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:27053
+#, no-wrap
+msgid "{Scheme Variable} nfs-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:27055
+msgid "A service type for a complete NFS server."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27057
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "{Data Type} nfs-configuration"
+msgstr "系统配置"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27060
+msgid "This data type represents the configuration of the NFS service and all of its subsystems."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27062
+#, fuzzy
+#| msgid "GNU Guix depends on the following packages:"
+msgid "It has the following parameters:"
+msgstr "GNU Guix依赖这些软件包："
+
+#. type: item
+#: guix-git/doc/guix.texi:27063 guix-git/doc/guix.texi:27188
+#: guix-git/doc/guix.texi:27213
+#, no-wrap
+msgid "@code{nfs-utils} (default: @code{nfs-utils})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27065
+#, fuzzy
+#| msgid "The package data type."
+msgid "The nfs-utils package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27066
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{nfs-versions} (default: @code{'(\"4.2\" \"4.1\" \"4.0\")})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27069
+msgid "If a list of string values is provided, the @command{rpc.nfsd} daemon will be limited to supporting the given versions of the NFS protocol."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27070
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{exports} (default: @code{'()})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27075
+msgid "This is a list of directories the NFS server should export.  Each entry is a list consisting of two elements: a directory name and a string containing all options.  This is an example in which the directory @file{/export} is served to all NFS clients as a read-only share:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:27081
+#, no-wrap
+msgid ""
+"(nfs-configuration\n"
+" (exports\n"
+"  '((\"/export\"\n"
+"     \"*(ro,insecure,no_subtree_check,crossmnt,fsid=0)\"))))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27083
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{rpcmountd-port} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27085
+msgid "The network port that the @command{rpc.mountd} daemon should use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27086
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{rpcstatd-port} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27088
+msgid "The network port that the @command{rpc.statd} daemon should use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27089 guix-git/doc/guix.texi:27137
+#, no-wrap
+msgid "@code{rpcbind} (default: @code{rpcbind})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27091 guix-git/doc/guix.texi:27139
+msgid "The rpcbind package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27092
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{idmap-domain} (default: @code{\"localdomain\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27094
+msgid "The local NFSv4 domain name."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27095
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{nfsd-port} (default: @code{2049})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27097
+msgid "The network port that the @command{nfsd} daemon should use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27098
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{nfsd-threads} (default: @code{8})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27100
+msgid "The number of threads used by the @command{nfsd} daemon."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27101
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{nfsd-tcp?} (default: @code{#t})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27103
+msgid "Whether the @command{nfsd} daemon should listen on a TCP socket."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27104
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{nfsd-udp?} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27106
+msgid "Whether the @command{nfsd} daemon should listen on a UDP socket."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27107 guix-git/doc/guix.texi:27191
+#: guix-git/doc/guix.texi:27216
+#, no-wrap
+msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27109 guix-git/doc/guix.texi:27193
+#: guix-git/doc/guix.texi:27218
+msgid "The directory where the pipefs file system is mounted."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27110
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{debug} (default: @code{'()\"})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27114
+msgid "A list of subsystems for which debugging output should be enabled.  This is a list of symbols.  Any of these symbols are valid: @code{nfsd}, @code{nfs}, @code{rpc}, @code{idmap}, @code{statd}, or @code{mountd}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27119
+msgid "If you don't need a complete NFS service or prefer to build it yourself you can use the individual component services that are documented below."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:27120
 #, no-wrap
 msgid "RPC Bind Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20517
+#: guix-git/doc/guix.texi:27121
 #, no-wrap
 msgid "rpcbind"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20523
+#: guix-git/doc/guix.texi:27127
 msgid "The RPC Bind service provides a facility to map program numbers into universal addresses.  Many NFS related services use this facility.  Hence it is automatically started when a dependent service starts."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20524
+#: guix-git/doc/guix.texi:27128
 #, no-wrap
 msgid "{Scheme Variable} rpcbind-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20526
+#: guix-git/doc/guix.texi:27130
 msgid "A service type for the RPC portmapper daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20529
+#: guix-git/doc/guix.texi:27133
 #, no-wrap
 msgid "{Data Type} rpcbind-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20532
+#: guix-git/doc/guix.texi:27136
 msgid "Data type representing the configuration of the RPC Bind Service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20533
-#, no-wrap
-msgid "@code{rpcbind} (default: @code{rpcbind})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20535
-msgid "The rpcbind package to use."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:20536
+#: guix-git/doc/guix.texi:27140
 #, no-wrap
 msgid "@code{warm-start?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20540
+#: guix-git/doc/guix.texi:27144
 msgid "If this parameter is @code{#t}, then the daemon will read a state file on startup thus reloading state information saved by a previous instance."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20544
+#: guix-git/doc/guix.texi:27148
 #, no-wrap
 msgid "Pipefs Pseudo File System"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20545
+#: guix-git/doc/guix.texi:27149
 #, no-wrap
 msgid "pipefs"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20546
+#: guix-git/doc/guix.texi:27150
 #, no-wrap
 msgid "rpc_pipefs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20550
+#: guix-git/doc/guix.texi:27154
 msgid "The pipefs file system is used to transfer NFS related data between the kernel and user space programs."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20551
+#: guix-git/doc/guix.texi:27155
 #, no-wrap
 msgid "{Scheme Variable} pipefs-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20553
+#: guix-git/doc/guix.texi:27157
 msgid "A service type for the pipefs pseudo file system."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20555
+#: guix-git/doc/guix.texi:27159
 #, no-wrap
 msgid "{Data Type} pipefs-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20558
+#: guix-git/doc/guix.texi:27162
 msgid "Data type representing the configuration of the pipefs pseudo file system service.  This type has the following parameters:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20559
+#: guix-git/doc/guix.texi:27163
 #, no-wrap
 msgid "@code{mount-point} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20561
+#: guix-git/doc/guix.texi:27165
 msgid "The directory to which the file system is to be attached."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20565
+#: guix-git/doc/guix.texi:27169
 #, no-wrap
 msgid "GSS Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20566
+#: guix-git/doc/guix.texi:27170
 #, no-wrap
 msgid "GSSD"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20567
+#: guix-git/doc/guix.texi:27171
 #, no-wrap
 msgid "GSS"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20568
+#: guix-git/doc/guix.texi:27172
 #, no-wrap
 msgid "global security system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20575
+#: guix-git/doc/guix.texi:27179
 msgid "The @dfn{global security system} (GSS) daemon provides strong security for RPC based protocols.  Before exchanging RPC requests an RPC client must establish a security context.  Typically this is done using the Kerberos command @command{kinit} or automatically at login time using PAM services (@pxref{Kerberos Services})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20576
+#: guix-git/doc/guix.texi:27180
 #, no-wrap
 msgid "{Scheme Variable} gss-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20578
+#: guix-git/doc/guix.texi:27182
 msgid "A service type for the Global Security System (GSS) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20580
+#: guix-git/doc/guix.texi:27184
 #, no-wrap
 msgid "{Data Type} gss-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20583
+#: guix-git/doc/guix.texi:27187
 msgid "Data type representing the configuration of the GSS daemon service.  This type has the following parameters:"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:20584 doc/guix.texi:20609
-#, no-wrap
-msgid "@code{nfs-utils} (default: @code{nfs-utils})"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:20586
+#: guix-git/doc/guix.texi:27190
 msgid "The package in which the @command{rpc.gssd} command is to be found."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:20587 doc/guix.texi:20612
-#, no-wrap
-msgid "@code{pipefs-directory} (default: @code{\"/var/lib/nfs/rpc_pipefs\"})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:20589 doc/guix.texi:20614
-msgid "The directory where the pipefs file system is mounted."
-msgstr ""
-
 #. type: subsubheading
-#: doc/guix.texi:20594
+#: guix-git/doc/guix.texi:27198
 #, no-wrap
 msgid "IDMAP Daemon Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20595
+#: guix-git/doc/guix.texi:27199
 #, no-wrap
 msgid "idmapd"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20596
+#: guix-git/doc/guix.texi:27200
 #, no-wrap
 msgid "name mapper"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20600
+#: guix-git/doc/guix.texi:27204
 msgid "The idmap daemon service provides mapping between user IDs and user names.  Typically it is required in order to access file systems mounted via NFSv4."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20601
+#: guix-git/doc/guix.texi:27205
 #, no-wrap
 msgid "{Scheme Variable} idmap-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20603
+#: guix-git/doc/guix.texi:27207
 msgid "A service type for the Identity Mapper (IDMAP) daemon."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20605
+#: guix-git/doc/guix.texi:27209
 #, no-wrap
 msgid "{Data Type} idmap-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20608
+#: guix-git/doc/guix.texi:27212
 msgid "Data type representing the configuration of the IDMAP daemon service.  This type has the following parameters:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20611
+#: guix-git/doc/guix.texi:27215
 msgid "The package in which the @command{rpc.idmapd} command is to be found."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20615
+#: guix-git/doc/guix.texi:27219
 #, no-wrap
 msgid "@code{domain} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20619
+#: guix-git/doc/guix.texi:27223
 msgid "The local NFSv4 domain name.  This must be a string or @code{#f}.  If it is @code{#f} then the daemon will use the host's fully qualified domain name."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:27224
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{verbosity} (default: @code{0})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27226
+#, fuzzy
+#| msgid "The host name of the remote machine."
+msgid "The verbosity level of the daemon."
+msgstr "远程机器的主机名。"
+
 #. type: Plain text
-#: doc/guix.texi:20630
-msgid "@uref{https://git.savannah.gnu.org/cgit/guix/guix-cuirass.git, Cuirass} is a continuous integration tool for Guix.  It can be used both for development and for providing substitutes to others (@pxref{Substitutes})."
+#: guix-git/doc/guix.texi:27237
+msgid "@uref{https://guix.gnu.org/cuirass/, Cuirass} is a continuous integration tool for Guix.  It can be used both for development and for providing substitutes to others (@pxref{Substitutes})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20632
+#: guix-git/doc/guix.texi:27239
 msgid "The @code{(gnu services cuirass)} module provides the following service."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20633
+#: guix-git/doc/guix.texi:27240
 #, no-wrap
 msgid "{Scheme Procedure} cuirass-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:20636
+#: guix-git/doc/guix.texi:27243
 msgid "The type of the Cuirass service.  Its value must be a @code{cuirass-configuration} object, as described below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20643
-msgid "To add build jobs, you have to set the @code{specifications} field of the configuration.  Here is an example of a service that polls the Guix repository and builds the packages from a manifest.  Some of the packages are defined in the @code{\"custom-packages\"} input, which is the equivalent of @code{GUIX_PACKAGE_PATH}."
+#: guix-git/doc/guix.texi:27248
+msgid "To add build jobs, you have to set the @code{specifications} field of the configuration.  For instance, the following example will build all the packages provided by the @code{my-channel} channel."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:20671
+#. type: lisp
+#: guix-git/doc/guix.texi:27259
 #, no-wrap
 msgid ""
 "(define %cuirass-specs\n"
-"  #~(list\n"
-"     '((#:name . \"my-manifest\")\n"
-"       (#:load-path-inputs . (\"guix\"))\n"
-"       (#:package-path-inputs . (\"custom-packages\"))\n"
-"       (#:proc-input . \"guix\")\n"
-"       (#:proc-file . \"build-aux/cuirass/gnu-system.scm\")\n"
-"       (#:proc . cuirass-jobs)\n"
-"       (#:proc-args . ((subset . \"manifests\")\n"
-"                       (systems . (\"x86_64-linux\"))\n"
-"                       (manifests . ((\"config\" . \"guix/manifest.scm\")))))\n"
-"       (#:inputs . (((#:name . \"guix\")\n"
-"                     (#:url . \"git://git.savannah.gnu.org/guix.git\")\n"
-"                     (#:load-path . \".\")\n"
-"                     (#:branch . \"master\")\n"
-"                     (#:no-compile? . #t))\n"
-"                    ((#:name . \"config\")\n"
-"                     (#:url . \"git://git.example.org/config.git\")\n"
-"                     (#:load-path . \".\")\n"
-"                     (#:branch . \"master\")\n"
-"                     (#:no-compile? . #t))\n"
-"                    ((#:name . \"custom-packages\")\n"
-"                     (#:url . \"git://git.example.org/custom-packages.git\")\n"
-"                     (#:load-path . \".\")\n"
-"                     (#:branch . \"master\")\n"
-"                     (#:no-compile? . #t)))))))\n"
+"  #~(list (specification\n"
+"           (name \"my-channel\")\n"
+"           (build '(channels my-channel))\n"
+"           (channels\n"
+"            (cons (channel\n"
+"                   (name 'my-channel)\n"
+"                   (url \"https://my-channel.git\"))\n"
+"                  %default-channels)))))\n"
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:20675
+#. type: lisp
+#: guix-git/doc/guix.texi:27263 guix-git/doc/guix.texi:27277
 #, no-wrap
 msgid ""
 "(service cuirass-service-type\n"
@@ -37551,1105 +49690,1512 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20680
+#: guix-git/doc/guix.texi:27267
+msgid "To build the @code{linux-libre} package defined by the default Guix channel, one can use the following configuration."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:27273
+#, no-wrap
+msgid ""
+"(define %cuirass-specs\n"
+"  #~(list (specification\n"
+"           (name \"my-linux\")\n"
+"           (build '(packages \"linux-libre\")))))\n"
+"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27282
+msgid "The other configuration possibilities, as well as the specification record itself are described in the Cuirass manual (@pxref{Specifications,,, cuirass, Cuirass})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27286
 msgid "While information related to build jobs is located directly in the specifications, global settings for the @command{cuirass} process are accessible in other @code{cuirass-configuration} fields."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20681
+#: guix-git/doc/guix.texi:27287
 #, no-wrap
 msgid "{Data Type} cuirass-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:20683
+#: guix-git/doc/guix.texi:27289
 msgid "Data type representing the configuration of Cuirass."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20685
+#: guix-git/doc/guix.texi:27291 guix-git/doc/guix.texi:27423
+#, no-wrap
+msgid "@code{cuirass} (default: @code{cuirass})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27293 guix-git/doc/guix.texi:27425
+msgid "The Cuirass package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27294
 #, no-wrap
 msgid "@code{log-file} (default: @code{\"/var/log/cuirass.log\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20687
+#: guix-git/doc/guix.texi:27296 guix-git/doc/guix.texi:27400
+#: guix-git/doc/guix.texi:27438
 msgid "Location of the log file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20688
+#: guix-git/doc/guix.texi:27297
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{web-log-file} (default: @code{\"/var/log/cuirass-web.log\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27299
+msgid "Location of the log file used by the web interface."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27300
 #, no-wrap
 msgid "@code{cache-directory} (default: @code{\"/var/cache/cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20690
+#: guix-git/doc/guix.texi:27302
 msgid "Location of the repository cache."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20691
+#: guix-git/doc/guix.texi:27303
 #, no-wrap
 msgid "@code{user} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20693
+#: guix-git/doc/guix.texi:27305
 msgid "Owner of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20694
+#: guix-git/doc/guix.texi:27306
 #, no-wrap
 msgid "@code{group} (default: @code{\"cuirass\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20696
+#: guix-git/doc/guix.texi:27308
 msgid "Owner's group of the @code{cuirass} process."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20697
+#: guix-git/doc/guix.texi:27309
 #, no-wrap
 msgid "@code{interval} (default: @code{60})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20700
+#: guix-git/doc/guix.texi:27312
 msgid "Number of seconds between the poll of the repositories followed by the Cuirass jobs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20701
-#, no-wrap
-msgid "@code{database} (default: @code{\"/var/lib/cuirass/cuirass.db\"})"
-msgstr ""
+#: guix-git/doc/guix.texi:27313
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{parameters} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
 
 #. type: table
-#: doc/guix.texi:20704
-msgid "Location of sqlite database which contains the build results and previously added specifications."
+#: guix-git/doc/guix.texi:27316
+msgid "Read parameters from the given @var{parameters} file.  The supported parameters are described here (@pxref{Parameters,,, cuirass, Cuirass})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20705
-#, no-wrap
-msgid "@code{ttl} (default: @code{(* 30 24 3600)})"
+#: guix-git/doc/guix.texi:27317
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{remote-server} (default: @code{#f})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27320
+msgid "A @code{cuirass-remote-server-configuration} record to use the build remote mechanism or @code{#f} to use the default build mechanism."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:27321
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{database} (default: @code{\"dbname=cuirass host=/var/run/postgresql\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
 #. type: table
-#: doc/guix.texi:20709
-msgid "Specifies the time-to-live (TTL) in seconds of garbage collector roots that are registered for build results.  This means that build results are protected from garbage collection for at least @var{ttl} seconds."
+#: guix-git/doc/guix.texi:27326
+msgid "Use @var{database} as the database containing the jobs and the past build results. Since Cuirass uses PostgreSQL as a database engine, @var{database} must be a string such as @code{\"dbname=cuirass host=localhost\"}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20710
+#: guix-git/doc/guix.texi:27327
 #, no-wrap
 msgid "@code{port} (default: @code{8081})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20712
+#: guix-git/doc/guix.texi:27329
 msgid "Port number used by the HTTP server."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20716
+#: guix-git/doc/guix.texi:27333
 msgid "Listen on the network interface for @var{host}.  The default is to accept connections from localhost."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20717
+#: guix-git/doc/guix.texi:27334
 #, no-wrap
 msgid "@code{specifications} (default: @code{#~'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20723
-msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications, where a specification is an association list (@pxref{Associations Lists,,, guile, GNU Guile Reference Manual}) whose keys are keywords (@code{#:keyword-example}) as shown in the example above."
+#: guix-git/doc/guix.texi:27338
+msgid "A gexp (@pxref{G-Expressions}) that evaluates to a list of specifications records.  The specification record is described in the Cuirass manual (@pxref{Specifications,,, cuirass, Cuirass})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20724
+#: guix-git/doc/guix.texi:27339
 #, no-wrap
 msgid "@code{use-substitutes?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20727
+#: guix-git/doc/guix.texi:27342
 msgid "This allows using substitutes to avoid building every dependencies of a job from source."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20728 doc/guix.texi:25286
+#: guix-git/doc/guix.texi:27343 guix-git/doc/guix.texi:34213
 #, no-wrap
 msgid "@code{one-shot?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20730
+#: guix-git/doc/guix.texi:27345
 msgid "Only evaluate specifications and build derivations once."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:20731
+#: guix-git/doc/guix.texi:27346
 #, no-wrap
 msgid "@code{fallback?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:20734
+#: guix-git/doc/guix.texi:27349
 msgid "When substituting a pre-built binary fails, fall back to building packages locally."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:27352
+msgid "Extra options to pass when running the Cuirass processes."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:27356
+#, fuzzy, no-wrap
+#| msgid "reproducible builds"
+msgid "remote build"
+msgstr "可复现的构建"
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:27357
+#, no-wrap
+msgid "Cuirass remote building"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27360
+msgid "Cuirass supports two mechanisms to build derivations."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27362
+#, fuzzy, no-wrap
+#| msgid "Running the build daemon."
+msgid "Using the local Guix daemon."
+msgstr "运行“构建后台进程”"
+
+#. type: itemize
+#: guix-git/doc/guix.texi:27366
+msgid "This is the default build mechanism.  Once the build jobs are evaluated, they are sent to the local Guix daemon.  Cuirass then listens to the Guix daemon output to detect the various build events."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27367
+#, fuzzy, no-wrap
+#| msgid "Preparing the isolated build environment."
+msgid "Using the remote build mechanism."
+msgstr "准备隔离的构建环境。"
+
+#. type: itemize
+#: guix-git/doc/guix.texi:27371
+msgid "The build jobs are not submitted to the local Guix daemon.  Instead, a remote server dispatches build requests to the connect remote workers, according to the build priorities."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27378
+msgid "To enable this build mode a @code{cuirass-remote-server-configuration} record must be passed as @code{remote-server} argument of the @code{cuirass-configuration} record.  The @code{cuirass-remote-server-configuration} record is described below."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27383
+msgid "This build mode scales way better than the default build mode.  This is the build mode that is used on the GNU Guix build farm at @url{https://ci.guix.gnu.org}.  It should be preferred when using Cuirass to build large amount of packages."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27384
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} cuirass-remote-server-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27386
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of the Cuirass remote-server."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27388
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{backend-port} (default: @code{5555})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27391
+msgid "The TCP port for communicating with @code{remote-worker} processes using ZMQ.  It defaults to @code{5555}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27392
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{log-port} (default: @code{5556})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27394
+msgid "The TCP port of the log server.  It defaults to @code{5556}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27395
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{publish-port} (default: @code{5557})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27397
+msgid "The TCP port of the publish server.  It defaults to @code{5557}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27398
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{log-file} (default: @code{\"/var/log/cuirass-remote-server.log\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:27401
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{cache} (default: @code{\"/var/cache/cuirass/remote\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27403
+msgid "Use @var{cache} directory to cache build log files."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:20735
+#: guix-git/doc/guix.texi:27404
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{trigger-url} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27407
+msgid "Once a substitute is successfully fetched, trigger substitute baking at @var{trigger-url}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:27409 guix-git/doc/guix.texi:27443
 #, no-wrap
-msgid "@code{cuirass} (default: @code{cuirass})"
+msgid "private-key"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27418
+msgid "At least one remote worker must also be started on any machine of the local network to actually perform the builds and report their status."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:27419
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} cuirass-remote-worker-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27421
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of the Cuirass remote-worker."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27426
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{workers} (default: @code{1})"
+msgstr "@code{features} （@code{'()}）"
+
 #. type: table
-#: doc/guix.texi:20737
-msgid "The Cuirass package to use."
+#: guix-git/doc/guix.texi:27428
+msgid "Start @var{workers} parallel workers."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:27432
+msgid "Do not use Avahi discovery and connect to the given @code{server} IP address instead."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27433
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{systems} (default: @code{(list (%current-system))})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27435
+msgid "Only request builds for the given @var{systems}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27436
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{log-file} (default: @code{\"/var/log/cuirass-remote-worker.log\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:27439
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{publish-port} (default: @code{5558})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27441
+msgid "The TCP port of the publish server.  It defaults to @code{5558}."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:27450
+#, no-wrap
+msgid "Laminar"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27455
+msgid "@uref{https://laminar.ohwg.net/, Laminar} is a lightweight and modular Continuous Integration service.  It doesn't have a configuration web UI instead uses version-controllable configuration files and scripts."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:27458
+msgid "Laminar encourages the use of existing tools such as bash and cron instead of reinventing them."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:27459
+#, no-wrap
+msgid "{Scheme Procedure} laminar-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:27462
+msgid "The type of the Laminar service.  Its value must be a @code{laminar-configuration} object, as described below."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:27466
+msgid "All configuration values have defaults, a minimal configuration to get Laminar running is shown below. By default, the web interface is available on port 8080."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:27469
+#, no-wrap
+msgid "(service laminar-service-type)\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27472
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} laminar-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:27474
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of Laminar."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27476
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{laminar} (default: @code{laminar})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27478
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Laminar package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27479
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{home-directory} (default: @code{\"/var/lib/laminar\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27481
+msgid "The directory for job configurations and run directories."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27482
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{bind-http} (default: @code{\"*:8080\"})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27485
+msgid "The interface/port or unix socket on which laminard should listen for incoming connections to the web frontend."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27486
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{bind-rpc} (default: @code{\"unix-abstract:laminar\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27489
+msgid "The interface/port or unix socket on which laminard should listen for incoming commands such as build triggers."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27490
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{title} (default: @code{\"Laminar\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27492
+#, fuzzy
+#| msgid "The rottlog service."
+msgid "The page title to show in the web frontend."
+msgstr "rottlog服务。"
+
+#. type: item
+#: guix-git/doc/guix.texi:27493
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{keep-rundirs} (default: @code{0})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27497
+msgid "Set to an integer defining how many rundirs to keep per job.  The lowest-numbered ones will be deleted.  The default is 0, meaning all run dirs will be immediately deleted."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27498
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{archive-url} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27501
+msgid "The web frontend served by laminard will use this URL to form links to artefacts archived jobs."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:27502
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{base-url} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:27504
+msgid "Base URL to use for links to laminar itself."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20743
+#: guix-git/doc/guix.texi:27511
 #, no-wrap
 msgid "tlp"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:20744
+#: guix-git/doc/guix.texi:27512
 #, no-wrap
 msgid "power management with TLP"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:20745
+#: guix-git/doc/guix.texi:27513
 #, no-wrap
 msgid "TLP daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20749
+#: guix-git/doc/guix.texi:27517
 msgid "The @code{(gnu services pm)} module provides a Guix service definition for the Linux power management tool TLP."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20755
+#: guix-git/doc/guix.texi:27523
 msgid "TLP enables various powersaving modes in userspace and kernel.  Contrary to @code{upower-service}, it is not a passive, monitoring tool, as it will apply custom settings each time a new power source is detected.  More information can be found at @uref{https://linrunner.de/en/tlp/tlp.html, TLP home page}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20756
+#: guix-git/doc/guix.texi:27524
 #, no-wrap
 msgid "{Scheme Variable} tlp-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:20760
-msgid "The service type for the TLP tool.  Its value should be a valid TLP configuration (see below).  To use the default settings, simply write:"
+#: guix-git/doc/guix.texi:27528
+msgid "The service type for the TLP tool.  The default settings are optimised for battery life on most systems, but you can tweak them to your heart's content by adding a valid @code{tlp-configuration}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:20762
+#. type: lisp
+#: guix-git/doc/guix.texi:27533
 #, no-wrap
-msgid "(service tlp-service-type)\n"
-msgstr ""
-
-#. type: Plain text
-#: doc/guix.texi:20767
-msgid "By default TLP does not need much configuration but most TLP parameters can be tweaked using @code{tlp-configuration}."
+msgid ""
+"(service tlp-service-type\n"
+"         (tlp-configuration\n"
+"          (cpu-scaling-governor-on-ac (list \"performance\"))\n"
+"          (sched-powersave-on-bat? #t)))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20773
+#: guix-git/doc/guix.texi:27541
 msgid "Each parameter definition is preceded by its type; for example, @samp{boolean foo} indicates that the @code{foo} parameter should be specified as a boolean.  Types starting with @code{maybe-} denote parameters that won't show up in TLP config file when their value is @code{'disabled}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:20783
+#: guix-git/doc/guix.texi:27551
 msgid "Available @code{tlp-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20784
+#: guix-git/doc/guix.texi:27552
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} package tlp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20786
+#: guix-git/doc/guix.texi:27554
 msgid "The TLP package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20789
+#: guix-git/doc/guix.texi:27557
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean tlp-enable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20791
+#: guix-git/doc/guix.texi:27559
 msgid "Set to true if you wish to enable TLP."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20796
+#: guix-git/doc/guix.texi:27564
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string tlp-default-mode"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20799
+#: guix-git/doc/guix.texi:27567
 msgid "Default mode when no power supply can be detected.  Alternatives are AC and BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20801
+#: guix-git/doc/guix.texi:27569
 msgid "Defaults to @samp{\"AC\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20804
+#: guix-git/doc/guix.texi:27572
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20807
+#: guix-git/doc/guix.texi:27575
 msgid "Number of seconds Linux kernel has to wait after the disk goes idle, before syncing on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20812
+#: guix-git/doc/guix.texi:27580
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer disk-idle-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20814
+#: guix-git/doc/guix.texi:27582
 msgid "Same as @code{disk-idle-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20816
+#: guix-git/doc/guix.texi:27584
 msgid "Defaults to @samp{2}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20819
+#: guix-git/doc/guix.texi:27587
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20821
+#: guix-git/doc/guix.texi:27589
 msgid "Dirty pages flushing periodicity, expressed in seconds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20823 doc/guix.texi:21046 doc/guix.texi:22375
-#: doc/guix.texi:22383
+#: guix-git/doc/guix.texi:27591 guix-git/doc/guix.texi:27814
+#: guix-git/doc/guix.texi:30028 guix-git/doc/guix.texi:30036
 msgid "Defaults to @samp{15}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20826
+#: guix-git/doc/guix.texi:27594
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer max-lost-work-secs-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20828
+#: guix-git/doc/guix.texi:27596
 msgid "Same as @code{max-lost-work-secs-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20830
+#: guix-git/doc/guix.texi:27598
 msgid "Defaults to @samp{60}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20833
+#: guix-git/doc/guix.texi:27601
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20837
+#: guix-git/doc/guix.texi:27605
 msgid "CPU frequency scaling governor on AC mode.  With intel_pstate driver, alternatives are powersave and performance.  With acpi-cpufreq driver, alternatives are ondemand, powersave, performance and conservative."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20842
+#: guix-git/doc/guix.texi:27610
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list cpu-scaling-governor-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20844
+#: guix-git/doc/guix.texi:27612
 msgid "Same as @code{cpu-scaling-governor-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20849
+#: guix-git/doc/guix.texi:27617
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20851
+#: guix-git/doc/guix.texi:27619
 msgid "Set the min available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20856
+#: guix-git/doc/guix.texi:27624
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20858
+#: guix-git/doc/guix.texi:27626
 msgid "Set the max available frequency for the scaling governor on AC."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20863
+#: guix-git/doc/guix.texi:27631
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-min-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20865
+#: guix-git/doc/guix.texi:27633
 msgid "Set the min available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20870
+#: guix-git/doc/guix.texi:27638
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-scaling-max-freq-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20872
+#: guix-git/doc/guix.texi:27640
 msgid "Set the max available frequency for the scaling governor on BAT."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20877
+#: guix-git/doc/guix.texi:27645
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20880
+#: guix-git/doc/guix.texi:27648
 msgid "Limit the min P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20885
+#: guix-git/doc/guix.texi:27653
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20888
+#: guix-git/doc/guix.texi:27656
 msgid "Limit the max P-state to control the power dissipation of the CPU, in AC mode.  Values are stated as a percentage of the available performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20893
+#: guix-git/doc/guix.texi:27661
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-min-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20895
+#: guix-git/doc/guix.texi:27663
 msgid "Same as @code{cpu-min-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20900
+#: guix-git/doc/guix.texi:27668
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-non-negative-integer cpu-max-perf-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20902
+#: guix-git/doc/guix.texi:27670
 msgid "Same as @code{cpu-max-perf-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20907
+#: guix-git/doc/guix.texi:27675
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20909
+#: guix-git/doc/guix.texi:27677
 msgid "Enable CPU turbo boost feature on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20914
+#: guix-git/doc/guix.texi:27682
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean cpu-boost-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20916
+#: guix-git/doc/guix.texi:27684
 msgid "Same as @code{cpu-boost-on-ac?} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20921
+#: guix-git/doc/guix.texi:27689
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20924
+#: guix-git/doc/guix.texi:27692
 msgid "Allow Linux kernel to minimize the number of CPU cores/hyper-threads used under light load conditions."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20929
+#: guix-git/doc/guix.texi:27697
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean sched-powersave-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20931
+#: guix-git/doc/guix.texi:27699
 msgid "Same as @code{sched-powersave-on-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20936
+#: guix-git/doc/guix.texi:27704
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean nmi-watchdog?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20938
+#: guix-git/doc/guix.texi:27706
 msgid "Enable Linux kernel NMI watchdog."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20943
+#: guix-git/doc/guix.texi:27711
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string phc-controls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20946
+#: guix-git/doc/guix.texi:27714
 msgid "For Linux kernels with PHC patch applied, change CPU voltages.  An example value would be @samp{\"F:V F:V F:V F:V\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20951
+#: guix-git/doc/guix.texi:27719
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20954
-msgid "Set CPU performance versus energy saving policy on AC.  Alternatives are performance, normal, powersave."
+#: guix-git/doc/guix.texi:27722
+msgid "Set CPU performance versus energy saving policy on AC@.  Alternatives are performance, normal, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20956 doc/guix.texi:21054 doc/guix.texi:21084
+#: guix-git/doc/guix.texi:27724 guix-git/doc/guix.texi:27822
+#: guix-git/doc/guix.texi:27852
 msgid "Defaults to @samp{\"performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20959
+#: guix-git/doc/guix.texi:27727
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string energy-perf-policy-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20961
+#: guix-git/doc/guix.texi:27729
 msgid "Same as @code{energy-perf-policy-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20963 doc/guix.texi:21061
+#: guix-git/doc/guix.texi:27731 guix-git/doc/guix.texi:27829
 msgid "Defaults to @samp{\"powersave\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20966
+#: guix-git/doc/guix.texi:27734
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disks-devices"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20968
+#: guix-git/doc/guix.texi:27736
 msgid "Hard disk devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20971
+#: guix-git/doc/guix.texi:27739
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20973
+#: guix-git/doc/guix.texi:27741
 msgid "Hard disk advanced power management level."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20976
+#: guix-git/doc/guix.texi:27744
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list disk-apm-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20978
+#: guix-git/doc/guix.texi:27746
 msgid "Same as @code{disk-apm-bat} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20981
+#: guix-git/doc/guix.texi:27749
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20984
+#: guix-git/doc/guix.texi:27752
 msgid "Hard disk spin down timeout.  One value has to be specified for each declared hard disk."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20989
+#: guix-git/doc/guix.texi:27757
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-spindown-timeout-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20991
+#: guix-git/doc/guix.texi:27759
 msgid "Same as @code{disk-spindown-timeout-on-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:20996
+#: guix-git/doc/guix.texi:27764
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list disk-iosched"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21000
+#: guix-git/doc/guix.texi:27768
 msgid "Select IO scheduler for disk devices.  One value has to be specified for each declared hard disk.  Example alternatives are cfq, deadline and noop."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21005
+#: guix-git/doc/guix.texi:27773
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21008
+#: guix-git/doc/guix.texi:27776
 msgid "SATA aggressive link power management (ALPM) level.  Alternatives are min_power, medium_power, max_performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21010
+#: guix-git/doc/guix.texi:27778
 msgid "Defaults to @samp{\"max_performance\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21013
+#: guix-git/doc/guix.texi:27781
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string sata-linkpwr-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21015
+#: guix-git/doc/guix.texi:27783
 msgid "Same as @code{sata-linkpwr-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21017
+#: guix-git/doc/guix.texi:27785
 msgid "Defaults to @samp{\"min_power\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21020
+#: guix-git/doc/guix.texi:27788
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string sata-linkpwr-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21022
+#: guix-git/doc/guix.texi:27790
 msgid "Exclude specified SATA host devices for link power management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21027
+#: guix-git/doc/guix.texi:27795
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21030
+#: guix-git/doc/guix.texi:27798
 msgid "Enable Runtime Power Management for AHCI controller and disks on AC mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21035
+#: guix-git/doc/guix.texi:27803
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-on-off-boolean ahci-runtime-pm-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21037
+#: guix-git/doc/guix.texi:27805
 msgid "Same as @code{ahci-runtime-pm-on-ac} on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21042
+#: guix-git/doc/guix.texi:27810
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer ahci-runtime-pm-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21044
+#: guix-git/doc/guix.texi:27812
 msgid "Seconds of inactivity before disk is suspended."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21049
+#: guix-git/doc/guix.texi:27817
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21052
+#: guix-git/doc/guix.texi:27820
 msgid "PCI Express Active State Power Management level.  Alternatives are default, performance, powersave."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21057
+#: guix-git/doc/guix.texi:27825
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string pcie-aspm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21059
+#: guix-git/doc/guix.texi:27827
 msgid "Same as @code{pcie-aspm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21064
+#: guix-git/doc/guix.texi:27832
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21067
+#: guix-git/doc/guix.texi:27835
 msgid "Radeon graphics clock speed level.  Alternatives are low, mid, high, auto, default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21069
+#: guix-git/doc/guix.texi:27837
 msgid "Defaults to @samp{\"high\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21072
+#: guix-git/doc/guix.texi:27840
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-power-profile-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21074
+#: guix-git/doc/guix.texi:27842
 msgid "Same as @code{radeon-power-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21076
+#: guix-git/doc/guix.texi:27844
 msgid "Defaults to @samp{\"low\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21079
+#: guix-git/doc/guix.texi:27847
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21082
+#: guix-git/doc/guix.texi:27850
 msgid "Radeon dynamic power management method (DPM).  Alternatives are battery, performance."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21087
+#: guix-git/doc/guix.texi:27855
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-state-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21089
+#: guix-git/doc/guix.texi:27857
 msgid "Same as @code{radeon-dpm-state-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21091
+#: guix-git/doc/guix.texi:27859
 msgid "Defaults to @samp{\"battery\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21094
+#: guix-git/doc/guix.texi:27862
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21096
+#: guix-git/doc/guix.texi:27864
 msgid "Radeon DPM performance level.  Alternatives are auto, low, high."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21098 doc/guix.texi:21105 doc/guix.texi:21179
+#: guix-git/doc/guix.texi:27866 guix-git/doc/guix.texi:27873
+#: guix-git/doc/guix.texi:27947
 msgid "Defaults to @samp{\"auto\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21101
+#: guix-git/doc/guix.texi:27869
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string radeon-dpm-perf-level-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21103
+#: guix-git/doc/guix.texi:27871
 msgid "Same as @code{radeon-dpm-perf-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21108
+#: guix-git/doc/guix.texi:27876
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-ac?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21110
+#: guix-git/doc/guix.texi:27878
 msgid "Wifi power saving mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21115
+#: guix-git/doc/guix.texi:27883
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} on-off-boolean wifi-pwr-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21117
+#: guix-git/doc/guix.texi:27885
 msgid "Same as @code{wifi-power-ac?} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21122
+#: guix-git/doc/guix.texi:27890
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean wol-disable?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21124
+#: guix-git/doc/guix.texi:27892
 msgid "Disable wake on LAN."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21129
+#: guix-git/doc/guix.texi:27897
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21132
+#: guix-git/doc/guix.texi:27900
 msgid "Timeout duration in seconds before activating audio power saving on Intel HDA and AC97 devices.  A value of 0 disables power saving."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21137
+#: guix-git/doc/guix.texi:27905
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} non-negative-integer sound-power-save-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21139
+#: guix-git/doc/guix.texi:27907
 msgid "Same as @code{sound-powersave-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21141 doc/guix.texi:21668 doc/guix.texi:21812
-msgid "Defaults to @samp{1}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:21144
+#: guix-git/doc/guix.texi:27912
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} y-n-boolean sound-power-save-controller?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21146
+#: guix-git/doc/guix.texi:27914
 msgid "Disable controller in powersaving mode on Intel HDA devices."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21151
+#: guix-git/doc/guix.texi:27919
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean bay-poweroff-on-bat?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21155
+#: guix-git/doc/guix.texi:27923
 msgid "Enable optical drive in UltraBay/MediaBay on BAT mode.  Drive can be powered on again by releasing (and reinserting) the eject lever or by pressing the disc eject button on newer models."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21160
+#: guix-git/doc/guix.texi:27928
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string bay-device"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21162
+#: guix-git/doc/guix.texi:27930
 msgid "Name of the optical drive device to power off."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21164
+#: guix-git/doc/guix.texi:27932
 msgid "Defaults to @samp{\"sr0\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21167
+#: guix-git/doc/guix.texi:27935
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-ac"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21170
+#: guix-git/doc/guix.texi:27938
 msgid "Runtime Power Management for PCI(e) bus devices.  Alternatives are on and auto."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21172
+#: guix-git/doc/guix.texi:27940
 msgid "Defaults to @samp{\"on\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21175
+#: guix-git/doc/guix.texi:27943
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} string runtime-pm-on-bat"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21177
+#: guix-git/doc/guix.texi:27945
 msgid "Same as @code{runtime-pm-ac} but on BAT mode."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21182
+#: guix-git/doc/guix.texi:27950
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean runtime-pm-all?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21185
+#: guix-git/doc/guix.texi:27953
 msgid "Runtime Power Management for all PCI(e) bus devices, except blacklisted ones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21190
+#: guix-git/doc/guix.texi:27958
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-space-separated-string-list runtime-pm-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21192
+#: guix-git/doc/guix.texi:27960
 msgid "Exclude specified PCI(e) device addresses from Runtime Power Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21197
+#: guix-git/doc/guix.texi:27965
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} space-separated-string-list runtime-pm-driver-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21200
+#: guix-git/doc/guix.texi:27968
 msgid "Exclude PCI(e) devices assigned to the specified drivers from Runtime Power Management."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21203
+#: guix-git/doc/guix.texi:27971
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-autosuspend?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21205
+#: guix-git/doc/guix.texi:27973
 msgid "Enable USB autosuspend feature."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21210
+#: guix-git/doc/guix.texi:27978
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-blacklist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21212
+#: guix-git/doc/guix.texi:27980
 msgid "Exclude specified devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21217
+#: guix-git/doc/guix.texi:27985
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean usb-blacklist-wwan?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21219
+#: guix-git/doc/guix.texi:27987
 msgid "Exclude WWAN devices from USB autosuspend."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21224
+#: guix-git/doc/guix.texi:27992
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-string usb-whitelist"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21227
+#: guix-git/doc/guix.texi:27995
 msgid "Include specified devices into USB autosuspend, even if they are already excluded by the driver or via @code{usb-blacklist-wwan?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21232
+#: guix-git/doc/guix.texi:28000
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} maybe-boolean usb-autosuspend-disable-on-shutdown?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21234
+#: guix-git/doc/guix.texi:28002
 msgid "Enable USB autosuspend before shutdown."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21239
+#: guix-git/doc/guix.texi:28007
 #, no-wrap
 msgid "{@code{tlp-configuration} parameter} boolean restore-device-state-on-startup?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21242
+#: guix-git/doc/guix.texi:28010
 msgid "Restore radio device state (bluetooth, wifi, wwan) from previous shutdown on system startup."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21247
+#: guix-git/doc/guix.texi:28015
 #, no-wrap
 msgid "thermald"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21248
+#: guix-git/doc/guix.texi:28016
 #, no-wrap
 msgid "CPU frequency scaling with thermald"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21249
+#: guix-git/doc/guix.texi:28017
 #, no-wrap
 msgid "Thermald daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21253
+#: guix-git/doc/guix.texi:28021
 msgid "The @code{(gnu services pm)} module provides an interface to thermald, a CPU frequency scaling service which helps prevent overheating."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21254
+#: guix-git/doc/guix.texi:28022
 #, no-wrap
 msgid "{Scheme Variable} thermald-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21259
+#: guix-git/doc/guix.texi:28027
 msgid "This is the service type for @uref{https://01.org/linux-thermal-daemon/, thermald}, the Linux Thermal Daemon, which is responsible for controlling the thermal state of processors and preventing overheating."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21261
+#: guix-git/doc/guix.texi:28029
 #, no-wrap
 msgid "{Data Type} thermald-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21263
+#: guix-git/doc/guix.texi:28031
 msgid "Data type representing the configuration of @code{thermald-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21265
+#: guix-git/doc/guix.texi:28033
 #, no-wrap
 msgid "@code{ignore-cpuid-check?} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21267
+#: guix-git/doc/guix.texi:28035
 msgid "Ignore cpuid check for supported CPU models."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21268
+#: guix-git/doc/guix.texi:28036
 #, no-wrap
 msgid "@code{thermald} (default: @var{thermald})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21270
+#: guix-git/doc/guix.texi:28038
 msgid "Package object of thermald."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21279
+#: guix-git/doc/guix.texi:28047
 msgid "The @code{(gnu services audio)} module provides a service to start MPD (the Music Player Daemon)."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:21280
+#: guix-git/doc/guix.texi:28048
 #, no-wrap
 msgid "mpd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21281
+#: guix-git/doc/guix.texi:28049
 #, no-wrap
 msgid "Music Player Daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21286
+#: guix-git/doc/guix.texi:28054
 msgid "The Music Player Daemon (MPD) is a service that can play music while being controlled from the local machine or over the network by a variety of clients."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21289
+#: guix-git/doc/guix.texi:28057
 msgid "The following example shows how one might run @code{mpd} as user @code{\"bob\"} on port @code{6666}.  It uses pulseaudio for output."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:21295
+#. type: lisp
+#: guix-git/doc/guix.texi:28063
 #, no-wrap
 msgid ""
 "(service mpd-service-type\n"
@@ -38659,150 +51205,264 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21297
+#: guix-git/doc/guix.texi:28065
 #, no-wrap
 msgid "{Scheme Variable} mpd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:21299
+#: guix-git/doc/guix.texi:28067
 msgid "The service type for @command{mpd}"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21301
+#: guix-git/doc/guix.texi:28069
 #, no-wrap
 msgid "{Data Type} mpd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:21303
+#: guix-git/doc/guix.texi:28071
 msgid "Data type representing the configuration of @command{mpd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21305
+#: guix-git/doc/guix.texi:28073
 #, no-wrap
 msgid "@code{user} (default: @code{\"mpd\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21307
+#: guix-git/doc/guix.texi:28075
 msgid "The user to run mpd as."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21308
+#: guix-git/doc/guix.texi:28076
 #, no-wrap
 msgid "@code{music-dir} (default: @code{\"~/Music\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21310
+#: guix-git/doc/guix.texi:28078
 msgid "The directory to scan for music files."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21311
+#: guix-git/doc/guix.texi:28079
 #, no-wrap
 msgid "@code{playlist-dir} (default: @code{\"~/.mpd/playlists\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21313
+#: guix-git/doc/guix.texi:28081
 msgid "The directory to store playlists."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21314
+#: guix-git/doc/guix.texi:28082
 #, no-wrap
 msgid "@code{db-file} (default: @code{\"~/.mpd/tag_cache\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21316
+#: guix-git/doc/guix.texi:28084
 msgid "The location of the music database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21317
+#: guix-git/doc/guix.texi:28085
 #, no-wrap
 msgid "@code{state-file} (default: @code{\"~/.mpd/state\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21319
+#: guix-git/doc/guix.texi:28087
 msgid "The location of the file that stores current MPD's state."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21320
+#: guix-git/doc/guix.texi:28088
 #, no-wrap
 msgid "@code{sticker-file} (default: @code{\"~/.mpd/sticker.sql\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21322
+#: guix-git/doc/guix.texi:28090
 msgid "The location of the sticker database."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21323
+#: guix-git/doc/guix.texi:28091
 #, no-wrap
 msgid "@code{port} (default: @code{\"6600\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21325
+#: guix-git/doc/guix.texi:28093
 msgid "The port to run mpd on."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21326
+#: guix-git/doc/guix.texi:28094
 #, no-wrap
 msgid "@code{address} (default: @code{\"any\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21329
+#: guix-git/doc/guix.texi:28097
 msgid "The address that mpd will bind to.  To use a Unix domain socket, an absolute path can be specified here."
 msgstr ""
 
-#. type: subsection
-#: doc/guix.texi:21334
+#. type: item
+#: guix-git/doc/guix.texi:28098
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{outputs} (default: @code{\"(list (mpd-output))\"})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28100
+msgid "The audio outputs that MPD can use.  By default this is a single output using pulseaudio."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:28104
 #, no-wrap
-msgid "Virtualization services"
+msgid "{Data Type} mpd-output"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:28106
+msgid "Data type representing an @command{mpd} audio output."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:28108
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{name} (default: @code{\"MPD\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28110
+msgid "The name of the audio output."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:28111
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{type} (default: @code{\"pulse\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28113
+msgid "The type of audio output."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:28114
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{enabled?} (default: @code{#t})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28119
+msgid "Specifies whether this audio output is enabled when MPD is started.  By default, all audio outputs are enabled.  This is just the default setting when there is no state file; with a state file, the previous state is restored."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:28120
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{tags?} (default: @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28124
+msgid "If set to @code{#f}, then MPD will not send tags to this output.  This is only useful for output plugins that can receive tags, for example the @code{httpd} output plugin."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:28125
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{always-on?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:28129
+msgid "If set to @code{#t}, then MPD attempts to keep this audio output always open.  This may be useful for streaming servers, when you don’t want to disconnect all listeners even when playback is accidentally stopped."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:28130
+#, no-wrap
+msgid "mixer-type"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:28136
+msgid "This field accepts a symbol that specifies which mixer should be used for this audio output: the @code{hardware} mixer, the @code{software} mixer, the @code{null} mixer (allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer External Mixer) or no mixer (@code{none})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:28140
+msgid "An association list of option symbols to string values to be appended to the audio output configuration."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:28146
+msgid "The following example shows a configuration of @code{mpd} that provides an HTTP audio streaming output."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:28158
+#, no-wrap
+msgid ""
+"(service mpd-service-type\n"
+"         (mpd-configuration\n"
+"           (outputs\n"
+"             (list (mpd-output\n"
+"                     (name \"streaming\")\n"
+"                     (type \"httpd\")\n"
+"                     (mixer-type 'null)\n"
+"                     (extra-options\n"
+"                      `((encoder . \"vorbis\")\n"
+"                        (port    . \"8080\"))))))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21339
+#: guix-git/doc/guix.texi:28167
 msgid "The @code{(gnu services virtualization)} module provides services for the libvirt and virtlog daemons, as well as other virtualization-related services."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21340
+#: guix-git/doc/guix.texi:28168
 #, no-wrap
 msgid "Libvirt daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21344
-msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system. This daemon runs on host servers and performs required management tasks for virtualized guests."
+#: guix-git/doc/guix.texi:28173
+msgid "@code{libvirtd} is the server side daemon component of the libvirt virtualization management system.  This daemon runs on host servers and performs required management tasks for virtualized guests."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21345
+#: guix-git/doc/guix.texi:28174
 #, no-wrap
 msgid "{Scheme Variable} libvirt-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21348
+#: guix-git/doc/guix.texi:28177
 msgid "This is the type of the @uref{https://libvirt.org, libvirt daemon}.  Its value must be a @code{libvirt-configuration}."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:21354
+#. type: lisp
+#: guix-git/doc/guix.texi:28183
 #, no-wrap
 msgid ""
 "(service libvirt-service-type\n"
@@ -38812,874 +51472,870 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21359
+#: guix-git/doc/guix.texi:28188
 msgid "Available @code{libvirt-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21360
+#: guix-git/doc/guix.texi:28189
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} package libvirt"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21362
+#: guix-git/doc/guix.texi:28191
 msgid "Libvirt package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21365
+#: guix-git/doc/guix.texi:28194
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tls?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21368
-msgid "Flag listening for secure TLS connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
+#: guix-git/doc/guix.texi:28197
+msgid "Flag listening for secure TLS connections on the public TCP/IP port.  You must set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21371
+#: guix-git/doc/guix.texi:28200
 msgid "It is necessary to setup a CA and issue server certificates before using this capability."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21376
+#: guix-git/doc/guix.texi:28205
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean listen-tcp?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21379
-msgid "Listen for unencrypted TCP connections on the public TCP/IP port.  must set @code{listen} for this to have any effect."
+#: guix-git/doc/guix.texi:28208
+msgid "Listen for unencrypted TCP connections on the public TCP/IP port.  You must set @code{listen} for this to have any effect."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21383
-msgid "Using the TCP socket requires SASL authentication by default.  Only SASL mechanisms which support data encryption are allowed.  This is DIGEST_MD5 and GSSAPI (Kerberos5)"
+#: guix-git/doc/guix.texi:28212
+msgid "Using the TCP socket requires SASL authentication by default.  Only SASL mechanisms which support data encryption are allowed.  This is DIGEST_MD5 and GSSAPI (Kerberos5)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21388
+#: guix-git/doc/guix.texi:28217
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21391
-msgid "Port for accepting secure TLS connections This can be a port number, or service name"
+#: guix-git/doc/guix.texi:28220
+msgid "Port for accepting secure TLS connections.  This can be a port number, or service name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21393
+#: guix-git/doc/guix.texi:28222
 msgid "Defaults to @samp{\"16514\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21396
+#: guix-git/doc/guix.texi:28225
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tcp-port"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21399
-msgid "Port for accepting insecure TCP connections This can be a port number, or service name"
+#: guix-git/doc/guix.texi:28228
+msgid "Port for accepting insecure TCP connections.  This can be a port number, or service name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21401
+#: guix-git/doc/guix.texi:28230
 msgid "Defaults to @samp{\"16509\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21404
+#: guix-git/doc/guix.texi:28233
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string listen-addr"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21406
+#: guix-git/doc/guix.texi:28235
 msgid "IP address or hostname used for client connections."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21408
-msgid "Defaults to @samp{\"0.0.0.0\"}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:21411
+#: guix-git/doc/guix.texi:28240
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean mdns-adv?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21413
+#: guix-git/doc/guix.texi:28242
 msgid "Flag toggling mDNS advertisement of the libvirt service."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21416
+#: guix-git/doc/guix.texi:28245
 msgid "Alternatively can disable for all services on a host by stopping the Avahi daemon."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21421
+#: guix-git/doc/guix.texi:28250
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string mdns-name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21424
+#: guix-git/doc/guix.texi:28253
 msgid "Default mDNS advertisement name.  This must be unique on the immediate broadcast network."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21426
+#: guix-git/doc/guix.texi:28255
 msgid "Defaults to @samp{\"Virtualization Host <hostname>\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21429
+#: guix-git/doc/guix.texi:28258
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-group"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21433
+#: guix-git/doc/guix.texi:28262
 msgid "UNIX domain socket group ownership.  This can be used to allow a 'trusted' set of users access to management capabilities without becoming root."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21438
+#: guix-git/doc/guix.texi:28267
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-ro-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21441
+#: guix-git/doc/guix.texi:28270
 msgid "UNIX socket permissions for the R/O socket.  This is used for monitoring VM status only."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21443 doc/guix.texi:21461
+#: guix-git/doc/guix.texi:28272 guix-git/doc/guix.texi:28290
 msgid "Defaults to @samp{\"0777\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21446
+#: guix-git/doc/guix.texi:28275
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-rw-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21450
+#: guix-git/doc/guix.texi:28279
 msgid "UNIX socket permissions for the R/W socket.  Default allows only root.  If PolicyKit is enabled on the socket, the default will change to allow everyone (eg, 0777)"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21452
+#: guix-git/doc/guix.texi:28281
 msgid "Defaults to @samp{\"0770\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21455
+#: guix-git/doc/guix.texi:28284
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-admin-perms"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21459
+#: guix-git/doc/guix.texi:28288
 msgid "UNIX socket permissions for the admin socket.  Default allows only owner (root), do not change it unless you are sure to whom you are exposing the access to."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21464
+#: guix-git/doc/guix.texi:28293
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string unix-sock-dir"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21466
+#: guix-git/doc/guix.texi:28295
 msgid "The directory in which sockets will be found/created."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21468
+#: guix-git/doc/guix.texi:28297
 msgid "Defaults to @samp{\"/var/run/libvirt\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21471
+#: guix-git/doc/guix.texi:28300
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-ro"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21474
+#: guix-git/doc/guix.texi:28303
 msgid "Authentication scheme for UNIX read-only sockets.  By default socket permissions allow anyone to connect"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21476 doc/guix.texi:21485
+#: guix-git/doc/guix.texi:28305 guix-git/doc/guix.texi:28314
 msgid "Defaults to @samp{\"polkit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21479
+#: guix-git/doc/guix.texi:28308
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-unix-rw"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21483
+#: guix-git/doc/guix.texi:28312
 msgid "Authentication scheme for UNIX read-write sockets.  By default socket permissions only allow root.  If PolicyKit support was compiled into libvirt, the default will be to use 'polkit' auth."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21488
+#: guix-git/doc/guix.texi:28317
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tcp"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21492
+#: guix-git/doc/guix.texi:28321
 msgid "Authentication scheme for TCP sockets.  If you don't enable SASL, then all TCP traffic is cleartext.  Don't do this outside of a dev/test scenario."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21494
+#: guix-git/doc/guix.texi:28323
 msgid "Defaults to @samp{\"sasl\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21497
+#: guix-git/doc/guix.texi:28326
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string auth-tls"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21501
+#: guix-git/doc/guix.texi:28330
 msgid "Authentication scheme for TLS sockets.  TLS sockets already have encryption provided by the TLS layer, and limited authentication is done by certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21504
+#: guix-git/doc/guix.texi:28333
 msgid "It is possible to make use of any SASL authentication mechanism as well, by using 'sasl' for this option"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21506
+#: guix-git/doc/guix.texi:28335
 msgid "Defaults to @samp{\"none\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21509
+#: guix-git/doc/guix.texi:28338
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list access-drivers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21511
+#: guix-git/doc/guix.texi:28340
 msgid "API access control scheme."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21514
+#: guix-git/doc/guix.texi:28343
 msgid "By default an authenticated user is allowed access to all APIs.  Access drivers can place restrictions on this."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21519
+#: guix-git/doc/guix.texi:28348
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string key-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21522
+#: guix-git/doc/guix.texi:28351
 msgid "Server key file path.  If set to an empty string, then no private key is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21527
+#: guix-git/doc/guix.texi:28356
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string cert-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21530
+#: guix-git/doc/guix.texi:28359
 msgid "Server key file path.  If set to an empty string, then no certificate is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21535
+#: guix-git/doc/guix.texi:28364
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string ca-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21538
+#: guix-git/doc/guix.texi:28367
 msgid "Server key file path.  If set to an empty string, then no CA certificate is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21543
+#: guix-git/doc/guix.texi:28372
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string crl-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21546
+#: guix-git/doc/guix.texi:28375
 msgid "Certificate revocation list path.  If set to an empty string, then no CRL is loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21551
+#: guix-git/doc/guix.texi:28380
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-sanity-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21553
+#: guix-git/doc/guix.texi:28382
 msgid "Disable verification of our own server certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21556
+#: guix-git/doc/guix.texi:28385
 msgid "When libvirtd starts it performs some sanity checks against its own certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21561
+#: guix-git/doc/guix.texi:28390
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean tls-no-verify-cert"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21563
+#: guix-git/doc/guix.texi:28392
 msgid "Disable verification of client certificates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21567
+#: guix-git/doc/guix.texi:28396
 msgid "Client certificate verification is the primary authentication mechanism.  Any client which does not present a certificate signed by the CA will be rejected."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21572
+#: guix-git/doc/guix.texi:28401
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list tls-allowed-dn-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21574
+#: guix-git/doc/guix.texi:28403
 msgid "Whitelist of allowed x509 Distinguished Name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21579
+#: guix-git/doc/guix.texi:28408
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-list sasl-allowed-usernames"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21582
+#: guix-git/doc/guix.texi:28411
 msgid "Whitelist of allowed SASL usernames.  The format for username depends on the SASL authentication mechanism."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21587
+#: guix-git/doc/guix.texi:28416
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string tls-priority"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21591
-msgid "Override the compile time default TLS priority string.  The default is usually \"NORMAL\" unless overridden at build time.  Only set this is it is desired for libvirt to deviate from the global default settings."
+#: guix-git/doc/guix.texi:28420
+msgid "Override the compile time default TLS priority string.  The default is usually @samp{\"NORMAL\"} unless overridden at build time.  Only set this is it is desired for libvirt to deviate from the global default settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21593
+#: guix-git/doc/guix.texi:28422
 msgid "Defaults to @samp{\"NORMAL\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21596
+#: guix-git/doc/guix.texi:28425
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21599 doc/guix.texi:22022
+#: guix-git/doc/guix.texi:28428 guix-git/doc/guix.texi:28852
 msgid "Maximum number of concurrent client connections to allow over all sockets combined."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21601
+#: guix-git/doc/guix.texi:28430
 msgid "Defaults to @samp{5000}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21604
+#: guix-git/doc/guix.texi:28433
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21608
+#: guix-git/doc/guix.texi:28437
 msgid "Maximum length of queue of connections waiting to be accepted by the daemon.  Note, that some protocols supporting retransmission may obey this so that a later reattempt at connection succeeds."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21613
+#: guix-git/doc/guix.texi:28442
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-anonymous-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21616
+#: guix-git/doc/guix.texi:28445
 msgid "Maximum length of queue of accepted but not yet authenticated clients.  Set this to zero to turn this feature off"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21618 doc/guix.texi:21636 doc/guix.texi:21652
+#: guix-git/doc/guix.texi:28447 guix-git/doc/guix.texi:28465
+#: guix-git/doc/guix.texi:28481
 msgid "Defaults to @samp{20}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21621
+#: guix-git/doc/guix.texi:28450
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21623
+#: guix-git/doc/guix.texi:28452
 msgid "Number of workers to start up initially."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21628
+#: guix-git/doc/guix.texi:28457
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21630
+#: guix-git/doc/guix.texi:28459
 msgid "Maximum number of worker threads."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21634
+#: guix-git/doc/guix.texi:28463
 msgid "If the number of active clients exceeds @code{min-workers}, then more threads are spawned, up to max_workers limit.  Typically you'd want max_workers to equal maximum number of clients allowed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21639
+#: guix-git/doc/guix.texi:28468
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer prio-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21643
+#: guix-git/doc/guix.texi:28472
 msgid "Number of priority workers.  If all workers from above pool are stuck, some calls marked as high priority (notably domainDestroy) can be executed in this pool."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21648
+#: guix-git/doc/guix.texi:28477
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21650
+#: guix-git/doc/guix.texi:28479
 msgid "Total global limit on concurrent RPC calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21655
+#: guix-git/doc/guix.texi:28484
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21659
+#: guix-git/doc/guix.texi:28488
 msgid "Limit on concurrent requests from a single client connection.  To avoid one client monopolizing the server this should be a small fraction of the global max_requests and max_workers parameter."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21664
+#: guix-git/doc/guix.texi:28493
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-min-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21666
+#: guix-git/doc/guix.texi:28495
 msgid "Same as @code{min-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21671
+#: guix-git/doc/guix.texi:28500
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-workers"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21673
+#: guix-git/doc/guix.texi:28502
 msgid "Same as @code{max-workers} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21678
+#: guix-git/doc/guix.texi:28507
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21680
+#: guix-git/doc/guix.texi:28509
 msgid "Same as @code{max-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21685
+#: guix-git/doc/guix.texi:28514
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-queued-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21687
+#: guix-git/doc/guix.texi:28516
 msgid "Same as @code{max-queued-clients} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21692
+#: guix-git/doc/guix.texi:28521
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-max-client-requests"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21694
+#: guix-git/doc/guix.texi:28523
 msgid "Same as @code{max-client-requests} but for the admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21699
+#: guix-git/doc/guix.texi:28528
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21701 doc/guix.texi:21924
+#: guix-git/doc/guix.texi:28530 guix-git/doc/guix.texi:28754
 msgid "Logging level.  4 errors, 3 warnings, 2 information, 1 debug."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21706
+#: guix-git/doc/guix.texi:28535
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21708 doc/guix.texi:21931
+#: guix-git/doc/guix.texi:28537 guix-git/doc/guix.texi:28761
 msgid "Logging filters."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21711 doc/guix.texi:21934
-msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:"
+#: guix-git/doc/guix.texi:28540
+msgid "A filter allows to select a different logging level for a given category of logs.  The format for a filter is one of:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21715 doc/guix.texi:21938
+#: guix-git/doc/guix.texi:28544 guix-git/doc/guix.texi:28768
 msgid "x:name"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21718 doc/guix.texi:21941
+#: guix-git/doc/guix.texi:28547 guix-git/doc/guix.texi:28771
 msgid "x:+name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21728 doc/guix.texi:21951
-msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:"
+#: guix-git/doc/guix.texi:28558
+msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., @samp{\"remote\"}, @samp{\"qemu\"}, or @samp{\"util.json\"} (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional @samp{\"+\"} prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21732 doc/guix.texi:21777 doc/guix.texi:21955
-#: doc/guix.texi:22000
+#: guix-git/doc/guix.texi:28562 guix-git/doc/guix.texi:28607
+#: guix-git/doc/guix.texi:28785 guix-git/doc/guix.texi:28830
 msgid "1: DEBUG"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21735 doc/guix.texi:21780 doc/guix.texi:21958
-#: doc/guix.texi:22003
+#: guix-git/doc/guix.texi:28565 guix-git/doc/guix.texi:28610
+#: guix-git/doc/guix.texi:28788 guix-git/doc/guix.texi:28833
 msgid "2: INFO"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21738 doc/guix.texi:21783 doc/guix.texi:21961
-#: doc/guix.texi:22006
+#: guix-git/doc/guix.texi:28568 guix-git/doc/guix.texi:28613
+#: guix-git/doc/guix.texi:28791 guix-git/doc/guix.texi:28836
 msgid "3: WARNING"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21741 doc/guix.texi:21786 doc/guix.texi:21964
-#: doc/guix.texi:22009
+#: guix-git/doc/guix.texi:28571 guix-git/doc/guix.texi:28616
+#: guix-git/doc/guix.texi:28794 guix-git/doc/guix.texi:28839
 msgid "4: ERROR"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21746 doc/guix.texi:21969
+#: guix-git/doc/guix.texi:28576 guix-git/doc/guix.texi:28799
 msgid "Multiple filters can be defined in a single filters statement, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21748 doc/guix.texi:21971
+#: guix-git/doc/guix.texi:28578 guix-git/doc/guix.texi:28801
 msgid "Defaults to @samp{\"3:remote 4:event\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21751
+#: guix-git/doc/guix.texi:28581
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21753 doc/guix.texi:21976
+#: guix-git/doc/guix.texi:28583 guix-git/doc/guix.texi:28806
 msgid "Logging outputs."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21756
+#: guix-git/doc/guix.texi:28586
 msgid "An output is one of the places to save logging information.  The format for an output can be:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21758 doc/guix.texi:21981
+#: guix-git/doc/guix.texi:28588 guix-git/doc/guix.texi:28811
 #, no-wrap
 msgid "x:stderr"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21760 doc/guix.texi:21983
+#: guix-git/doc/guix.texi:28590 guix-git/doc/guix.texi:28813
 msgid "output goes to stderr"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21761 doc/guix.texi:21984
+#: guix-git/doc/guix.texi:28591 guix-git/doc/guix.texi:28814
 #, no-wrap
 msgid "x:syslog:name"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21763 doc/guix.texi:21986
+#: guix-git/doc/guix.texi:28593 guix-git/doc/guix.texi:28816
 msgid "use syslog for the output and use the given name as the ident"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21764 doc/guix.texi:21987
+#: guix-git/doc/guix.texi:28594 guix-git/doc/guix.texi:28817
 #, no-wrap
 msgid "x:file:file_path"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21766 doc/guix.texi:21989
+#: guix-git/doc/guix.texi:28596 guix-git/doc/guix.texi:28819
 msgid "output to a file, with the given filepath"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:21767 doc/guix.texi:21990
+#: guix-git/doc/guix.texi:28597 guix-git/doc/guix.texi:28820
 #, no-wrap
 msgid "x:journald"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:21769 doc/guix.texi:21992
+#: guix-git/doc/guix.texi:28599 guix-git/doc/guix.texi:28822
 msgid "output to journald logging system"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21773 doc/guix.texi:21996
+#: guix-git/doc/guix.texi:28603 guix-git/doc/guix.texi:28826
 msgid "In all case the x prefix is the minimal level, acting as a filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21791 doc/guix.texi:22014
+#: guix-git/doc/guix.texi:28621 guix-git/doc/guix.texi:28844
 msgid "Multiple outputs can be defined, they just need to be separated by spaces."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21793 doc/guix.texi:22016
+#: guix-git/doc/guix.texi:28623 guix-git/doc/guix.texi:28846
 msgid "Defaults to @samp{\"3:stderr\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21796
+#: guix-git/doc/guix.texi:28626
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer audit-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21798
+#: guix-git/doc/guix.texi:28628
 msgid "Allows usage of the auditing subsystem to be altered"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21802
+#: guix-git/doc/guix.texi:28632
 msgid "0: disable all auditing"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21805
+#: guix-git/doc/guix.texi:28635
 msgid "1: enable auditing, only if enabled on host"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21808
+#: guix-git/doc/guix.texi:28638
 msgid "2: enable auditing, and exit if disabled on host."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21815
+#: guix-git/doc/guix.texi:28645
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} boolean audit-logging"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21817
+#: guix-git/doc/guix.texi:28647
 msgid "Send audit messages via libvirt logging infrastructure."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21822
+#: guix-git/doc/guix.texi:28652
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} optional-string host-uuid"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21824
-msgid "Host UUID.  UUID must not have all digits be the same."
+#: guix-git/doc/guix.texi:28654
+msgid "Host UUID@.  UUID must not have all digits be the same."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21829
+#: guix-git/doc/guix.texi:28659
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} string host-uuid-source"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21831
+#: guix-git/doc/guix.texi:28661
 msgid "Source to read host UUID."
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21835
+#: guix-git/doc/guix.texi:28665
 msgid "@code{smbios}: fetch the UUID from @code{dmidecode -s system-uuid}"
 msgstr ""
 
 #. type: itemize
-#: doc/guix.texi:21838
+#: guix-git/doc/guix.texi:28668
 msgid "@code{machine-id}: fetch the UUID from @code{/etc/machine-id}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21843
+#: guix-git/doc/guix.texi:28673
 msgid "If @code{dmidecode} does not provide a valid UUID a temporary UUID will be generated."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21845
+#: guix-git/doc/guix.texi:28675
 msgid "Defaults to @samp{\"smbios\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21848
+#: guix-git/doc/guix.texi:28678
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21853
+#: guix-git/doc/guix.texi:28683
 msgid "A keepalive message is sent to a client after @code{keepalive_interval} seconds of inactivity to check if the client is still responding.  If set to -1, libvirtd will never send keepalive requests; however clients can still send them and the daemon will send responses."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21858
+#: guix-git/doc/guix.texi:28688
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21862
+#: guix-git/doc/guix.texi:28692
 msgid "Maximum number of keepalive messages that are allowed to be sent to the client without getting any response before the connection is considered broken."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21869
+#: guix-git/doc/guix.texi:28699
 msgid "In other words, the connection is automatically closed approximately after @code{keepalive_interval * (keepalive_count + 1)} seconds since the last message received from the client.  When @code{keepalive-count} is set to 0, connections will be automatically closed after @code{keepalive-interval} seconds of inactivity without sending any keepalive messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21874
+#: guix-git/doc/guix.texi:28704
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-interval"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21876 doc/guix.texi:21883
+#: guix-git/doc/guix.texi:28706 guix-git/doc/guix.texi:28713
 msgid "Same as above but for admin interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21881
+#: guix-git/doc/guix.texi:28711
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer admin-keepalive-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21888
+#: guix-git/doc/guix.texi:28718
 #, no-wrap
 msgid "{@code{libvirt-configuration} parameter} integer ovs-timeout"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21890
+#: guix-git/doc/guix.texi:28720
 msgid "Timeout for Open vSwitch calls."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21894
+#: guix-git/doc/guix.texi:28724
 msgid "The @code{ovs-vsctl} utility is used for the configuration and its timeout option is set by default to 5 seconds to avoid potential infinite waits blocking libvirt."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:21901
+#: guix-git/doc/guix.texi:28731
 #, no-wrap
 msgid "Virtlog daemon"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21904
+#: guix-git/doc/guix.texi:28734
 msgid "The virtlogd service is a server side daemon component of libvirt that is used to manage logs from virtual machine consoles."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:21910
-msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}. By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs. The @code{virtlogd} daemon has the ability to re-exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime."
+#: guix-git/doc/guix.texi:28740
+msgid "This daemon is not used directly by libvirt client applications, rather it is called on their behalf by @code{libvirtd}.  By maintaining the logs in a standalone daemon, the main @code{libvirtd} daemon can be restarted without risk of losing logs.  The @code{virtlogd} daemon has the ability to re-exec()  itself upon receiving @code{SIGUSR1}, to allow live upgrades without downtime."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21911
+#: guix-git/doc/guix.texi:28741
 #, no-wrap
 msgid "{Scheme Variable} virtlog-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:21914
+#: guix-git/doc/guix.texi:28744
 msgid "This is the type of the virtlog daemon.  Its value must be a @code{virtlog-configuration}."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:21919
+#. type: lisp
+#: guix-git/doc/guix.texi:28749
 #, no-wrap
 msgid ""
 "(service virtlog-service-type\n"
@@ -39688,424 +52344,1940 @@ msgid ""
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21922
+#: guix-git/doc/guix.texi:28752
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer log-level"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21929
+#: guix-git/doc/guix.texi:28759
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-filters"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21974
+#: guix-git/doc/guix.texi:28764
+msgid "A filter allows to select a different logging level for a given category of logs The format for a filter is one of:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:28781
+msgid "where @code{name} is a string which is matched against the category given in the @code{VIR_LOG_INIT()} at the top of each libvirt source file, e.g., \"remote\", \"qemu\", or \"util.json\" (the name in the filter can be a substring of the full category name, in order to match multiple similar categories), the optional \"+\" prefix tells libvirt to log stack trace for each message matching name, and @code{x} is the minimal level where matching messages should be logged:"
+msgstr ""
+
+#. type: deftypevr
+#: guix-git/doc/guix.texi:28804
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} string log-outputs"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:21979
+#: guix-git/doc/guix.texi:28809
 msgid "An output is one of the places to save logging information The format for an output can be:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22019
+#: guix-git/doc/guix.texi:28849
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-clients"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22024
+#: guix-git/doc/guix.texi:28854
 msgid "Defaults to @samp{1024}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22027
+#: guix-git/doc/guix.texi:28857
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22029
+#: guix-git/doc/guix.texi:28859
 msgid "Maximum file size before rolling over."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22031
+#: guix-git/doc/guix.texi:28861
 msgid "Defaults to @samp{2MB}"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22034
+#: guix-git/doc/guix.texi:28864
 #, no-wrap
 msgid "{@code{virtlog-configuration} parameter} integer max-backups"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22036
+#: guix-git/doc/guix.texi:28866
 msgid "Maximum number of backup files to keep."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22038
+#: guix-git/doc/guix.texi:28868
 msgid "Defaults to @samp{3}"
 msgstr ""
 
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:28872
+msgid "transparent-emulation-qemu"
+msgstr ""
+
 #. type: subsubheading
-#: doc/guix.texi:22041
+#: guix-git/doc/guix.texi:28872
 #, no-wrap
 msgid "Transparent Emulation with QEMU"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22043
+#: guix-git/doc/guix.texi:28874
 #, no-wrap
 msgid "emulation"
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:22044
+#: guix-git/doc/guix.texi:28875
 #, no-wrap
 msgid "binfmt_misc"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22050
-msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine.  It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux."
+#: guix-git/doc/guix.texi:28883
+msgid "@code{qemu-binfmt-service-type} provides support for transparent emulation of program binaries built for different architectures---e.g., it allows you to transparently execute an ARMv7 program on an x86_64 machine.  It achieves this by combining the @uref{https://www.qemu.org, QEMU} emulator and the @code{binfmt_misc} feature of the kernel Linux.  This feature only allows you to emulate GNU/Linux on a different architecture, but see below for GNU/Hurd support."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22051
+#: guix-git/doc/guix.texi:28884
 #, no-wrap
 msgid "{Scheme Variable} qemu-binfmt-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:22056
+#: guix-git/doc/guix.texi:28889
 msgid "This is the type of the QEMU/binfmt service for transparent emulation.  Its value must be a @code{qemu-binfmt-configuration} object, which specifies the QEMU package to use as well as the architecture we want to emulated:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:22061
-#, no-wrap
+#. type: lisp
+#: guix-git/doc/guix.texi:28894
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(service qemu-binfmt-service-type\n"
+#| " (qemu-binfmt-configuration\n"
+#| "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+#| "   (guix-support? #t)))\n"
 msgid ""
 "(service qemu-binfmt-service-type\n"
 "         (qemu-binfmt-configuration\n"
-"           (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))))\n"
+"           (platforms (lookup-qemu-platforms \"arm\" \"aarch64\"))))\n"
 msgstr ""
+"(service qemu-binfmt-service-type\n"
+" (qemu-binfmt-configuration\n"
+"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+"   (guix-support? #t)))\n"
 
 #. type: defvr
-#: doc/guix.texi:22067
+#: guix-git/doc/guix.texi:28900
 msgid "In this example, we enable transparent emulation for the ARM and aarch64 platforms.  Running @code{herd stop qemu-binfmt} turns it off, and running @code{herd start qemu-binfmt} turns it back on (@pxref{Invoking herd, the @command{herd} command,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22069
+#: guix-git/doc/guix.texi:28902
 #, no-wrap
 msgid "{Data Type} qemu-binfmt-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22071
+#: guix-git/doc/guix.texi:28904
 msgid "This is the configuration for the @code{qemu-binfmt} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22073
+#: guix-git/doc/guix.texi:28906
 #, no-wrap
 msgid "@code{platforms} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22076
+#: guix-git/doc/guix.texi:28909
 msgid "The list of emulated QEMU platforms.  Each item must be a @dfn{platform object} as returned by @code{lookup-qemu-platforms} (see below)."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:22077
-#, no-wrap
-msgid "@code{guix-support?} (default: @code{#f})"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:22083
-msgid "When it is true, QEMU and all its dependencies are added to the build environment of @command{guix-daemon} (@pxref{Invoking guix-daemon, @code{--chroot-directory} option}).  This allows the @code{binfmt_misc} handlers to be used within the build environment, which in turn means that you can transparently build programs for another architecture."
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:22086
+#: guix-git/doc/guix.texi:28912
 msgid "For example, let's suppose you're on an x86_64 machine and you have this service:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:22092
-#, no-wrap
+#. type: lisp
+#: guix-git/doc/guix.texi:28917
+#, fuzzy, no-wrap
+#| msgid ""
+#| "(service qemu-binfmt-service-type\n"
+#| " (qemu-binfmt-configuration\n"
+#| "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+#| "   (guix-support? #t)))\n"
 msgid ""
 "(service qemu-binfmt-service-type\n"
 "         (qemu-binfmt-configuration\n"
-"           (platforms (lookup-qemu-platforms \"arm\"))\n"
-"           (guix-support? #t)))\n"
+"           (platforms (lookup-qemu-platforms \"arm\"))))\n"
 msgstr ""
+"(service qemu-binfmt-service-type\n"
+" (qemu-binfmt-configuration\n"
+"   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\" \"mips64el\"))\n"
+"   (guix-support? #t)))\n"
 
 #. type: table
-#: doc/guix.texi:22095
+#: guix-git/doc/guix.texi:28920
 msgid "You can run:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:22098
+#: guix-git/doc/guix.texi:28923
 #, no-wrap
 msgid "guix build -s armhf-linux inkscape\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22105
-msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU.  Pretty handy if you'd like to test a package build for an architecture you don't have access to!"
+#: guix-git/doc/guix.texi:28930
+msgid "and it will build Inkscape for ARMv7 @emph{as if it were a native build}, transparently using QEMU to emulate the ARMv7 CPU@.  Pretty handy if you'd like to test a package build for an architecture you don't have access to!"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22106
+#: guix-git/doc/guix.texi:28931
 #, no-wrap
 msgid "@code{qemu} (default: @code{qemu})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22108
+#: guix-git/doc/guix.texi:28933 guix-git/doc/guix.texi:29027
 msgid "The QEMU package to use."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22111
+#: guix-git/doc/guix.texi:28936
 #, no-wrap
 msgid "{Scheme Procedure} lookup-qemu-platforms @var{platforms}@dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22116
+#: guix-git/doc/guix.texi:28941
 msgid "Return the list of QEMU platform objects corresponding to @var{platforms}@dots{}.  @var{platforms} must be a list of strings corresponding to platform names, such as @code{\"arm\"}, @code{\"sparc\"}, @code{\"mips64el\"}, and so on."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22118
+#: guix-git/doc/guix.texi:28943
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22120
+#: guix-git/doc/guix.texi:28945
 msgid "Return true if @var{obj} is a platform object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22122
+#: guix-git/doc/guix.texi:28947
 #, no-wrap
 msgid "{Scheme Procedure} qemu-platform-name @var{platform}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22124
+#: guix-git/doc/guix.texi:28949
 msgid "Return the name of @var{platform}---a string such as @code{\"arm\"}."
 msgstr ""
 
+#. type: subsubheading
+#: guix-git/doc/guix.texi:28952
+#, no-wrap
+msgid "The Hurd in a Virtual Machine"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:28955
+#, no-wrap
+msgid "the Hurd"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:28956
+#, no-wrap
+msgid "childhurd"
+msgstr ""
+
 #. type: Plain text
-#: doc/guix.texi:22136
-msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories.  There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}."
+#: guix-git/doc/guix.texi:28964
+msgid "Service @code{hurd-vm} provides support for running GNU/Hurd in a virtual machine (VM), a so-called @dfn{childhurd}.  This service is meant to be used on GNU/Linux and the given GNU/Hurd operating system configuration is cross-compiled.  The virtual machine is a Shepherd service that can be referred to by the names @code{hurd-vm} and @code{childhurd} and be controlled with commands such as:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:28968
+#, no-wrap
+msgid ""
+"herd start hurd-vm\n"
+"herd stop childhurd\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:28972
+msgid "When the service is running, you can view its console by connecting to it with a VNC client, for example with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:28976
+#, no-wrap
+msgid ""
+"guix environment --ad-hoc tigervnc-client -- \\\n"
+"         vncviewer localhost:5900\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:28982
+msgid "The default configuration (see @code{hurd-vm-configuration} below)  spawns a secure shell (SSH) server in your GNU/Hurd system, which QEMU (the virtual machine emulator) redirects to port 10222 on the host.  Thus, you can connect over SSH to the childhurd with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:28985
+#, no-wrap
+msgid "ssh root@@localhost -p 10022\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:28994
+msgid "The childhurd is volatile and stateless: it starts with a fresh root file system every time you restart it.  By default though, all the files under @file{/etc/childhurd} on the host are copied as is to the root file system of the childhurd when it boots.  This allows you to initialize ``secrets'' inside the VM: SSH host keys, authorized substitute keys, and so on---see the explanation of @code{secret-root} below."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:28995
+#, no-wrap
+msgid "{Scheme Variable} hurd-vm-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29001
+msgid "This is the type of the Hurd in a Virtual Machine service.  Its value must be a @code{hurd-vm-configuration} object, which specifies the operating system (@pxref{operating-system Reference}) and the disk size for the Hurd Virtual Machine, the QEMU package to use as well as the options for running it."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29009
+#, no-wrap
+msgid ""
+"(service hurd-vm-service-type\n"
+"         (hurd-vm-configuration\n"
+"          (disk-size (* 5000 (expt 2 20))) ;5G\n"
+"          (memory-size 1024)))             ;1024MiB\n"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29013
+msgid "would create a disk image big enough to build GNU@tie{}Hello, with some extra memory."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29015
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} hurd-vm-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29018
+msgid "The data type representing the configuration for @code{hurd-vm-service-type}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29020
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{os} (default: @var{%hurd-vm-operating-system})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29024
+msgid "The operating system to instantiate.  This default is bare-bones with a permissive OpenSSH secure shell daemon listening on port 2222 (@pxref{Networking Services, @code{openssh-service-type}})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29025
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{qemu} (default: @code{qemu-minimal})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:29028
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{image} (default: @var{hurd-vm-disk-image})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29031
+msgid "The procedure used to build the disk-image built from this configuration."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29032
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{disk-size} (default: @code{'guess})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29034
+#, fuzzy
+#| msgid "The license of this manual."
+msgid "The size of the disk image."
+msgstr "这个用户手册的许可证。"
+
+#. type: item
+#: guix-git/doc/guix.texi:29035
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{memory-size} (default: @code{512})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29037
+msgid "The memory size of the Virtual Machine in mebibytes."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29038
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{options} (default: @code{'(\"--snapshot\")})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29040
+msgid "The extra options for running QEMU."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29045
+msgid "If set, a non-zero positive integer used to parameterize Childhurd instances.  It is appended to the service's name, e.g. @code{childhurd1}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29046
+#, no-wrap
+msgid "@code{net-options} (default: @var{hurd-vm-net-options})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29048
+msgid "The procedure used to produce the list of QEMU networking options."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29050
+msgid "By default, it produces"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29057
+#, no-wrap
+msgid ""
+"'(\"--device\" \"rtl8139,netdev=net0\"\n"
+"  \"--netdev\" \"user,id=net0\\\n"
+"              ,hostfwd=tcp:127.0.0.1:@var{secrets-port}-:1004\\\n"
+"              ,hostfwd=tcp:127.0.0.1:@var{ssh-port}-:2222\\\n"
+"              ,hostfwd=tcp:127.0.0.1:@var{vnc-port}-:5900\")\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29060
+msgid "with forwarded ports:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:29065
+#, no-wrap
+msgid ""
+"@var{secrets-port}: @code{(+ 11004 (* 1000 @var{ID}))}\n"
+"@var{ssh-port}: @code{(+ 10022 (* 1000 @var{ID}))}\n"
+"@var{vnc-port}: @code{(+ 15900 (* 1000 @var{ID}))}\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29067
+#, fuzzy, no-wrap
+#| msgid "@code{private-key} (default: @file{~root/.ssh/id_rsa})"
+msgid "@code{secret-root} (default: @file{/etc/childhurd})"
+msgstr "@code{private-key}（默认值：@file{~root/.ssh/id_rsa}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29072
+msgid "The root directory with out-of-band secrets to be installed into the childhurd once it runs.  Childhurds are volatile which means that on every startup, secrets such as the SSH host keys and Guix signing key are recreated."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29076
+msgid "If the @file{/etc/childhurd} directory does not exist, the @code{secret-service} running in the Childhurd will be sent an empty list of secrets."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29079
+msgid "By default, the service automatically populates @file{/etc/childhurd} with the following non-volatile secrets, unless they already exist:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:29088
+#, no-wrap
+msgid ""
+"/etc/childhurd/etc/guix/acl\n"
+"/etc/childhurd/etc/guix/signing-key.pub\n"
+"/etc/childhurd/etc/guix/signing-key.sec\n"
+"/etc/childhurd/etc/ssh/ssh_host_ed25519_key\n"
+"/etc/childhurd/etc/ssh/ssh_host_ecdsa_key\n"
+"/etc/childhurd/etc/ssh/ssh_host_ed25519_key.pub\n"
+"/etc/childhurd/etc/ssh/ssh_host_ecdsa_key.pub\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29092
+msgid "These files are automatically sent to the guest Hurd VM when it boots, including permissions."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:29093
+#, fuzzy, no-wrap
+#| msgid "offloading"
+msgid "childhurd, offloading"
+msgstr "下发"
+
+#. type: cindex
+#: guix-git/doc/guix.texi:29094
+#, fuzzy, no-wrap
+#| msgid "offloading"
+msgid "Hurd, offloading"
+msgstr "下发"
+
+#. type: table
+#: guix-git/doc/guix.texi:29098
+msgid "Having these files in place means that only a couple of things are missing to allow the host to offload @code{i586-gnu} builds to the childhurd:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:29103
+msgid "Authorizing the childhurd's key on the host so that the host accepts build results coming from the childhurd, which can be done like so:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:29107
+#, fuzzy, no-wrap
+#| msgid "# guix archive --authorize < master-public-key.txt\n"
+msgid ""
+"guix archive --authorize < \\\n"
+"  /etc/childhurd/etc/guix/signing-key.pub\n"
+msgstr "# guix archive --authorize < master-public-key.txt\n"
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:29112
+msgid "Adding the childhurd to @file{/etc/guix/machines.scm} (@pxref{Daemon Offload Setup})."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29116
+msgid "We're working towards making that happen automatically---get in touch with us at @email{guix-devel@@gnu.org} to discuss it!"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29123
+msgid "Note that by default the VM image is volatile, i.e., once stopped the contents are lost.  If you want a stateful image instead, override the configuration's @code{image} and @code{options} without the @code{--snapshot} flag using something along these lines:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29129
+#, no-wrap
+msgid ""
+"(service hurd-vm-service-type\n"
+"         (hurd-vm-configuration\n"
+"          (image   (const \"/out/of/store/writable/hurd.img\"))\n"
+"          (options '())))\n"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:29131
+#, no-wrap
+msgid "Ganeti"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:29133
+#, no-wrap
+msgid "ganeti"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:29140
+msgid "This service is considered experimental.  Configuration options may be changed in a backwards-incompatible manner, and not all features have been thorougly tested.  Users of this service are encouraged to share their experience at @email{guix-devel@@gnu.org}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29150
+msgid "Ganeti is a virtual machine management system.  It is designed to keep virtual machines running on a cluster of servers even in the event of hardware failures, and to make maintenance and recovery tasks easy.  It consists of multiple services which are described later in this section.  In addition to the Ganeti service, you will need the OpenSSH service (@pxref{Networking Services, @code{openssh-service-type}}), and update the @file{/etc/hosts} file (@pxref{operating-system Reference, @code{hosts-file}}) with the cluster name and address (or use a DNS server)."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29155
+msgid "All nodes participating in a Ganeti cluster should have the same Ganeti and @file{/etc/hosts} configuration.  Here is an example configuration for a Ganeti cluster node that supports multiple storage backends, and installs the @code{debootstrap} and @code{guix} @dfn{OS providers}:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29165
+#, no-wrap
+msgid ""
+"(use-package-modules virtualization)\n"
+"(use-service-modules base ganeti networking ssh)\n"
+"(operating-system\n"
+"  ;; @dots{}\n"
+"  (host-name \"node1\")\n"
+"  (hosts-file (plain-file \"hosts\" (format #f \"\n"
+"127.0.0.1       localhost\n"
+"::1             localhost\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29170
+#, no-wrap
+msgid ""
+"192.168.1.200   ganeti.example.com\n"
+"192.168.1.201   node1.example.com node1\n"
+"192.168.1.202   node2.example.com node2\n"
+"\")))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29184
+#, no-wrap
+msgid ""
+"  ;; Install QEMU so we can use KVM-based instances, and LVM, DRBD and Ceph\n"
+"  ;; in order to use the \"plain\", \"drbd\" and \"rbd\" storage backends.\n"
+"  (packages (append (map specification->package\n"
+"                         '(\"qemu\" \"lvm2\" \"drbd-utils\" \"ceph\"\n"
+"                           ;; Add the debootstrap and guix OS providers.\n"
+"                           \"ganeti-instance-guix\" \"ganeti-instance-debootstrap\"))\n"
+"                    %base-packages))\n"
+"  (services\n"
+"   (append (list (static-networking-service \"eth0\" \"192.168.1.201\"\n"
+"                                            #:netmask \"255.255.255.0\"\n"
+"                                            #:gateway \"192.168.1.254\"\n"
+"                                            #:name-servers '(\"192.168.1.252\"\n"
+"                                                             \"192.168.1.253\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29189
+#, no-wrap
+msgid ""
+"                 ;; Ganeti uses SSH to communicate between nodes.\n"
+"                 (service openssh-service-type\n"
+"                          (openssh-configuration\n"
+"                           (permit-root-login 'without-password)))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29199
+#, no-wrap
+msgid ""
+"                 (service ganeti-service-type\n"
+"                          (ganeti-configuration\n"
+"                           ;; This list specifies allowed file system paths\n"
+"                           ;; for storing virtual machine images.\n"
+"                           (file-storage-paths '(\"/srv/ganeti/file-storage\"))\n"
+"                           ;; This variable configures a single \"variant\" for\n"
+"                           ;; both Debootstrap and Guix that works with KVM.\n"
+"                           (os %default-ganeti-os))))\n"
+"           %base-services)))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29207
+msgid "Users are advised to read the @url{http://docs.ganeti.org/ganeti/master/html/admin.html,Ganeti administrators guide} to learn about the various cluster options and day-to-day operations.  There is also a @url{https://guix.gnu.org/blog/2020/running-a-ganeti-cluster-on-guix/,blog post} describing how to configure and initialize a small cluster."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29208
+#, no-wrap
+msgid "{Scheme Variable} ganeti-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29211
+msgid "This is a service type that includes all the various services that Ganeti nodes should run."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29216
+msgid "Its value is a @code{ganeti-configuration} object that defines the package to use for CLI operations, as well as configuration for the various daemons.  Allowed file storage paths and available guest operating systems are also configured through this data type."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29218
+#, no-wrap
+msgid "{Data Type} ganeti-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29220
+msgid "The @code{ganeti} service takes the following configuration options:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29222 guix-git/doc/guix.texi:29450
+#: guix-git/doc/guix.texi:29500 guix-git/doc/guix.texi:29530
+#: guix-git/doc/guix.texi:29557 guix-git/doc/guix.texi:29589
+#: guix-git/doc/guix.texi:29642 guix-git/doc/guix.texi:29662
+#: guix-git/doc/guix.texi:29688 guix-git/doc/guix.texi:29721
+#: guix-git/doc/guix.texi:29761
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{ganeti} (default: @code{ganeti})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29227
+msgid "The @code{ganeti} package to use.  It will be installed to the system profile and make @command{gnt-cluster}, @command{gnt-instance}, etc available.  Note that the value specified here does not affect the other services as each refer to a specific @code{ganeti} package (see below)."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29228
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{noded-configuration} (default: @code{(ganeti-noded-configuration)})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29229
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{confd-configuration} (default: @code{(ganeti-confd-configuration)})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29230
+#, no-wrap
+msgid "@code{wconfd-configuration} (default: @code{(ganeti-wconfd-configuration)})"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29231
+#, no-wrap
+msgid "@code{luxid-configuration} (default: @code{(ganeti-luxid-configuration)})"
+msgstr ""
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29232
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{rapi-configuration} (default: @code{(ganeti-rapi-configuration)})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29233
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{kvmd-configuration} (default: @code{(ganeti-kvmd-configuration)})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29234
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{mond-configuration} (default: @code{(ganeti-mond-configuration)})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29235
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{metad-configuration} (default: @code{(ganeti-metad-configuration)})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29236
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{watcher-configuration} (default: @code{(ganeti-watcher-configuration)})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: itemx
+#: guix-git/doc/guix.texi:29237
+#, fuzzy, no-wrap
+#| msgid "@code{enlightenment} (default: @code{enlightenment})"
+msgid "@code{cleaner-configuration} (default: @code{(ganeti-cleaner-configuration)})"
+msgstr "@code{enlightenment}（默认值：@code{enlightenment}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29242
+msgid "These options control the various daemons and cron jobs that are distributed with Ganeti.  The possible values for these are described in detail below.  To override a setting, you must use the configuration type for that service:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29252
+#, no-wrap
+msgid ""
+"(service ganeti-service-type\n"
+"         (ganeti-configuration\n"
+"          (rapi-configuration\n"
+"           (ganeti-rapi-configuration\n"
+"            (interface \"eth1\"))))\n"
+"          (watcher-configuration\n"
+"           (ganeti-watcher-configuration\n"
+"            (rapi-ip \"10.0.0.1\"))))\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29254
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{file-storage-paths} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29256
+msgid "List of allowed directories for file storage backend."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29257
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{os} (default: @code{%default-ganeti-os})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29259
+msgid "List of @code{<ganeti-os>} records."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29263
+msgid "In essence @code{ganeti-service-type} is shorthand for declaring each service individually:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29274
+#, no-wrap
+msgid ""
+"(service ganeti-noded-service-type)\n"
+"(service ganeti-confd-service-type)\n"
+"(service ganeti-wconfd-service-type)\n"
+"(service ganeti-luxid-service-type)\n"
+"(service ganeti-kvmd-service-type)\n"
+"(service ganeti-mond-service-type)\n"
+"(service ganeti-metad-service-type)\n"
+"(service ganeti-watcher-service-type)\n"
+"(service ganeti-cleaner-service-type)\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29278
+msgid "Plus a service extension for @code{etc-service-type} that configures the file storage backend and OS variants."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29281
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} ganeti-os"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29284
+msgid "This data type is suitable for passing to the @code{os} parameter of @code{ganeti-configuration}.  It takes the following parameters:"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29290
+msgid "The name for this OS provider.  It is only used to specify where the configuration ends up.  Setting it to ``debootstrap'' will create @file{/etc/ganeti/instance-debootstrap}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:29291
+#, no-wrap
+msgid "extension"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29294
+msgid "The file extension for variants of this OS type.  For example @file{.conf} or @file{.scm}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29295
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{variants} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29297
+msgid "List of @code{ganeti-os-variant} objects for this OS."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29301
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} ganeti-os-variant"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29304
+msgid "This is the data type for a Ganeti OS variant.  It takes the following parameters:"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29308
+#, fuzzy
+#| msgid "The license of this manual."
+msgid "The name of this variant."
+msgstr "这个用户手册的许可证。"
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:29309
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "configuration"
+msgstr "系统配置"
+
+#. type: table
+#: guix-git/doc/guix.texi:29311
+msgid "A configuration file for this variant."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29314
+#, no-wrap
+msgid "{Scheme Variable} %default-debootstrap-hooks"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29316
+msgid "This variable contains hooks to configure networking and the GRUB bootloader."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29318
+#, no-wrap
+msgid "{Scheme Variable} %default-debootstrap-extra-pkgs"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29320
+msgid "This variable contains a list of packages suitable for a fully-virtualized guest."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29322
+#, no-wrap
+msgid "{Data Type} debootstrap-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29325
+msgid "This data type creates configuration files suitable for the debootstrap OS provider."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29327
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{hooks} (default: @code{%default-debootstrap-hooks})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29331
+msgid "When not @code{#f}, this must be a G-expression that specifies a directory with scripts that will run when the OS is installed.  It can also be a list of @code{(name . file-like)} pairs.  For example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29334
+#, no-wrap
+msgid "`((99-hello-world . ,(plain-file \"#!/bin/sh\\necho Hello, World\")))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29339
+msgid "That will create a directory with one executable named @code{99-hello-world} and run it every time this variant is installed.  If set to @code{#f}, hooks in @file{/etc/ganeti/instance-debootstrap/hooks} will be used, if any."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29339
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{proxy} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29341
+msgid "Optional HTTP proxy to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29341
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{mirror} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29344
+msgid "The Debian mirror.  Typically something like @code{http://ftp.no.debian.org/debian}.  The default varies depending on the distribution."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29344
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{arch} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29347
+msgid "The dpkg architecture.  Set to @code{armhf} to debootstrap an ARMv7 instance on an AArch64 host.  Default is to use the current system architecture."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29347
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{suite} (default: @code{\"stable\"})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29350
+msgid "When set, this must be a Debian distribution ``suite'' such as @code{buster} or @code{focal}.  If set to @code{#f}, the default for the OS provider is used."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29350
+#, no-wrap
+msgid "@code{extra-pkgs} (default: @code{%default-debootstrap-extra-pkgs})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29353
+msgid "List of extra packages that will get installed by dpkg in addition to the minimal system."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29353
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{components} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29356
+msgid "When set, must be a list of Debian repository ``components''.  For example @code{'(\"main\" \"contrib\")}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29356
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{generate-cache?} (default: @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29358
+msgid "Whether to automatically cache the generated debootstrap archive."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29358
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{clean-cache} (default: @code{14})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29361
+msgid "Discard the cache after this amount of days.  Use @code{#f} to never clear the cache."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29361
+#, fuzzy, no-wrap
+#| msgid "@code{compression-level} (default: @code{3})"
+msgid "@code{partition-style} (default: @code{'msdos})"
+msgstr "@code{compression-level}（默认值：@code{3}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29364
+msgid "The type of partition to create.  When set, it must be one of @code{'msdos}, @code{'none} or a string."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29364
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{partition-alignment} (default: @code{2048})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29366
+msgid "Alignment of the partition in sectors."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22137
+#: guix-git/doc/guix.texi:29369
 #, no-wrap
-msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]"
+msgid "{Scheme Procedure} debootstrap-variant @var{name} @var{configuration}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22141
-msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access."
+#: guix-git/doc/guix.texi:29372
+msgid "This is a helper procedure that creates a @code{ganeti-os-variant} record.  It takes two parameters: a name and a @code{debootstrap-configuration} object."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29374
+#, no-wrap
+msgid "{Scheme Procedure} debootstrap-os @var{variants}@dots{}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29377
+msgid "This is a helper procedure that creates a @code{ganeti-os} record.  It takes a list of variants created with @code{debootstrap-variant}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29379
+#, no-wrap
+msgid "{Scheme Procedure} guix-variant @var{name} @var{configuration}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29384
+msgid "This is a helper procedure that creates a @code{ganeti-os-variant} record for use with the Guix OS provider.  It takes a name and a G-expression that returns a ``file-like'' (@pxref{G-Expressions, file-like objects}) object containing a Guix System configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22147
-msgid "The optional @var{config} argument should be a @code{<git-daemon-configuration>} object, by default it allows read-only access to exported@footnote{By creating the magic file \"git-daemon-export-ok\" in the repository directory.} repositories under @file{/srv/git}."
+#: guix-git/doc/guix.texi:29386
+#, no-wrap
+msgid "{Scheme Procedure} guix-os @var{variants}@dots{}"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29389
+msgid "This is a helper procedure that creates a @code{ganeti-os} record.  It takes a list of variants produced by @code{guix-variant}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29391
+#, no-wrap
+msgid "{Scheme Variable} %default-debootstrap-variants"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29395
+msgid "This is a convenience variable to make the debootstrap provider work ``out of the box'' without users having to declare variants manually.  It contains a single debootstrap variant with the default configuration:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29400
+#, no-wrap
+msgid ""
+"(list (debootstrap-variant\n"
+"       \"default\"\n"
+"       (debootstrap-configuration)))\n"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29403
+#, no-wrap
+msgid "{Scheme Variable} %default-guix-variants"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29407
+msgid "This is a convenience variable to make the Guix OS provider work without additional configuration.  It creates a virtual machine that has an SSH server, a serial console, and authorizes the Ganeti hosts SSH keys."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29413
+#, no-wrap
+msgid ""
+"(list (guix-variant\n"
+"       \"default\"\n"
+"       (file-append ganeti-instance-guix\n"
+"                    \"/share/doc/ganeti-instance-guix/examples/dynamic.scm\")))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29419
+msgid "Users can implement support for OS providers unbeknownst to Guix by extending the @code{ganeti-os} and @code{ganeti-os-variant} records appropriately.  For example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:29428
+#, no-wrap
+msgid ""
+"(ganeti-os\n"
+" (name \"custom\")\n"
+" (extension \".conf\")\n"
+" (variants\n"
+"  (list (ganeti-os-variant\n"
+"         (name \"foo\")\n"
+"         (configuration (plain-file \"bar\" \"this is fine\"))))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29433
+msgid "That creates @file{/etc/ganeti/instance-custom/variants/foo.conf} which points to a file in the store with contents @code{this is fine}.  It also creates @file{/etc/ganeti/instance-custom/variants/variants.list} with contents @code{foo}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29436
+msgid "Obviously this may not work for all OS providers out there.  If you find the interface limiting, please reach out to @email{guix-devel@@gnu.org}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29439
+msgid "The rest of this section documents the various services that are included by @code{ganeti-service-type}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29440
+#, no-wrap
+msgid "{Scheme Variable} ganeti-noded-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29444
+msgid "@command{ganeti-noded} is the daemon responsible for node-specific functions within the Ganeti system.  The value of this service must be a @code{ganeti-noded-configuration} object."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22150
+#: guix-git/doc/guix.texi:29446
 #, no-wrap
-msgid "{Data Type} git-daemon-configuration"
+msgid "{Data Type} ganeti-noded-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22152
-msgid "Data type representing the configuration for @code{git-daemon-service}."
+#: guix-git/doc/guix.texi:29448
+msgid "This is the configuration for the @code{ganeti-noded} service."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29452 guix-git/doc/guix.texi:29502
+#: guix-git/doc/guix.texi:29532 guix-git/doc/guix.texi:29559
+#: guix-git/doc/guix.texi:29591 guix-git/doc/guix.texi:29644
+#: guix-git/doc/guix.texi:29664 guix-git/doc/guix.texi:29690
+#: guix-git/doc/guix.texi:29723
+msgid "The @code{ganeti} package to use for this service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22154 doc/guix.texi:22210
-#, no-wrap
-msgid "@code{package} (default: @var{git})"
+#: guix-git/doc/guix.texi:29453
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{1811})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29455
+msgid "The TCP port on which the node daemon listens for network requests."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29456 guix-git/doc/guix.texi:29506
+#: guix-git/doc/guix.texi:29598 guix-git/doc/guix.texi:29668
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{address} (default: @code{\"0.0.0.0\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29459
+msgid "The network address that the daemon will bind to.  The default address means bind to all available addresses."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22156 doc/guix.texi:22212
-msgid "Package object of the Git distributed version control system."
+#: guix-git/doc/guix.texi:29463
+msgid "When this is set, it must be a specific network interface (e.g.@: @code{eth0})  that the daemon will bind to."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29464 guix-git/doc/guix.texi:29606
+#, fuzzy, no-wrap
+#| msgid "@code{max-zone-size} (default: @code{#f})"
+msgid "@code{max-clients} (default: @code{20})"
+msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29468
+msgid "This sets a limit on the maximum number of simultaneous client connections that the daemon will handle.  Connections above this count are accepted, but no responses will be sent until enough connections have closed."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29469 guix-git/doc/guix.texi:29611
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{ssl?} (default: @code{#t})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29473
+msgid "Whether to use SSL/TLS to encrypt network communications.  The certificate is automatically provisioned by the cluster and can be rotated with @command{gnt-cluster renew-crypto}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22157 doc/guix.texi:22216
+#: guix-git/doc/guix.texi:29474 guix-git/doc/guix.texi:29614
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{ssl-key} (default: @file{\"/var/lib/ganeti/server.pem\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29476 guix-git/doc/guix.texi:29616
+msgid "This can be used to provide a specific encryption key for TLS communications."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29477 guix-git/doc/guix.texi:29617
+#, fuzzy, no-wrap
+#| msgid "@code{daemon-socket} (default: @code{\"/var/guix/daemon-socket/socket\"})"
+msgid "@code{ssl-cert} (default: @file{\"/var/lib/ganeti/server.pem\"})"
+msgstr "@code{daemon-socket}（默认值：@code{\"/var/guix/daemon-socket/socket\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29479 guix-git/doc/guix.texi:29619
+msgid "This can be used to provide a specific certificate for TLS communications."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29483 guix-git/doc/guix.texi:29623
+msgid "When true, the daemon performs additional logging for debugging purposes.  Note that this will leak encryption details to the log files, use with caution."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29487
+#, no-wrap
+msgid "{Scheme Variable} ganeti-confd-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29493
+msgid "@command{ganeti-confd} answers queries related to the configuration of a Ganeti cluster.  The purpose of this daemon is to have a highly available and fast way to query cluster configuration values.  It is automatically active on all @dfn{master candidates}.  The value of this service must be a @code{ganeti-confd-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29496
 #, no-wrap
-msgid "@code{export-all?} (default: @var{#f})"
+msgid "{Data Type} ganeti-confd-configuration"
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:29498
+msgid "This is the configuration for the @code{ganeti-confd} service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29503
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{1814})"
+msgstr "@code{port}（默认值：@code{22}）"
+
 #. type: table
-#: doc/guix.texi:22160
-msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file."
+#: guix-git/doc/guix.texi:29505
+msgid "The UDP port on which to listen for network requests."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29508
+msgid "Network address that the daemon will bind to."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29511 guix-git/doc/guix.texi:29540
+#: guix-git/doc/guix.texi:29567 guix-git/doc/guix.texi:29647
+#: guix-git/doc/guix.texi:29674 guix-git/doc/guix.texi:29700
+msgid "When true, the daemon performs additional logging for debugging purposes."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29515
+#, no-wrap
+msgid "{Scheme Variable} ganeti-wconfd-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29521
+msgid "@command{ganeti-wconfd} is the daemon that has authoritative knowledge about the cluster configuration and is the only entity that can accept changes to it.  All jobs that need to modify the configuration will do so by sending appropriate requests to this daemon.  It only runs on the @dfn{master node} and will automatically disable itself on other nodes."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29524
+msgid "The value of this service must be a @code{ganeti-wconfd-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29526
+#, no-wrap
+msgid "{Data Type} ganeti-wconfd-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29528 guix-git/doc/guix.texi:29555
+msgid "This is the configuration for the @code{ganeti-wconfd} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22161
+#: guix-git/doc/guix.texi:29533 guix-git/doc/guix.texi:29560
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{no-voting?} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29537
+msgid "The daemon will refuse to start if the majority of cluster nodes does not agree that it is running on the master node.  Set to @code{#t} to start even if a quorum can not be reached (dangerous, use with caution)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29544
 #, no-wrap
-msgid "@code{base-path} (default: @file{/srv/git})"
+msgid "{Scheme Variable} ganeti-luxid-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29549
+msgid "@command{ganeti-luxid} is a daemon used to answer queries related to the configuration and the current live state of a Ganeti cluster.  Additionally, it is the authoritative daemon for the Ganeti job queue.  Jobs can be submitted via this daemon and it schedules and starts them."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29551
+msgid "It takes a @code{ganeti-luxid-configuration} object."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:29553
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} ganeti-luxid-configuration"
+msgstr "{数据类型} build-machine"
+
 #. type: table
-#: doc/guix.texi:22166
-msgid "Whether to remap all the path requests as relative to the given path.  If you run git daemon with @var{(base-path \"/srv/git\")} on example.com, then if you later try to pull @code{git://example.com/hello.git}, git daemon will interpret the path as @code{/srv/git/hello.git}."
+#: guix-git/doc/guix.texi:29564
+msgid "The daemon will refuse to start if it cannot verify that the majority of cluster nodes believes that it is running on the master node.  Set to @code{#t} to ignore such checks and start anyway (this can be dangerous)."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29571
+#, no-wrap
+msgid "{Scheme Variable} ganeti-rapi-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29575
+msgid "@command{ganeti-rapi} provides a remote API for Ganeti clusters.  It runs on the master node and can be used to perform cluster actions programmatically via a JSON-based RPC protocol."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29581
+msgid "Most query operations are allowed without authentication (unless @var{require-authentication?} is set), whereas write operations require explicit authorization via the @file{/var/lib/ganeti/rapi/users} file.  See the @url{http://docs.ganeti.org/ganeti/master/html/rapi.html, Ganeti Remote API documentation} for more information."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29583
+msgid "The value of this service must be a @code{ganeti-rapi-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29585
+#, no-wrap
+msgid "{Data Type} ganeti-rapi-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29587
+msgid "This is the configuration for the @code{ganeti-rapi} service."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22167
+#: guix-git/doc/guix.texi:29592
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{require-authentication?} (default: @code{#f})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29594
+msgid "Whether to require authentication even for read-only operations."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29595
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{5080})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29597
+msgid "The TCP port on which to listen to API requests."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29601
+msgid "The network address that the service will bind to.  By default it listens on all configured addresses."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29605
+msgid "When set, it must specify a specific network interface such as @code{eth0} that the daemon will bind to."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29610
+msgid "The maximum number of simultaneous client requests to handle.  Further connections are allowed, but no responses are sent until enough connections have closed."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29613
+msgid "Whether to use SSL/TLS encryption on the RAPI port."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29627
 #, no-wrap
-msgid "@code{user-path} (default: @var{#f})"
+msgid "{Scheme Variable} ganeti-kvmd-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29635
+msgid "@command{ganeti-kvmd} is responsible for determining whether a given KVM instance was shut down by an administrator or a user.  Normally Ganeti will restart an instance that was not stopped through Ganeti itself.  If the cluster option @code{user_shutdown} is true, this daemon monitors the @code{QMP} socket provided by QEMU and listens for shutdown events, and marks the instance as @dfn{USER_down} instead of @dfn{ERROR_down} when it shuts down gracefully by itself."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29637
+msgid "It takes a @code{ganeti-kvmd-configuration} object."
 msgstr ""
 
+#. type: deftp
+#: guix-git/doc/guix.texi:29639
+#, no-wrap
+msgid "{Data Type} ganeti-kvmd-configuration"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29651
+#, no-wrap
+msgid "{Scheme Variable} ganeti-mond-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29655
+msgid "@command{ganeti-mond} is an optional daemon that provides Ganeti monitoring functionality.  It is responsible for running data collectors and publish the collected information through a HTTP interface."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29657
+msgid "It takes a @code{ganeti-mond-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29659
+#, no-wrap
+msgid "{Data Type} ganeti-mond-configuration"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29665
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{1815})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29667 guix-git/doc/guix.texi:29693
+msgid "The port on which the daemon will listen."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29671
+msgid "The network address that the daemon will bind to.  By default it binds to all available interfaces."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29678
+#, no-wrap
+msgid "{Scheme Variable} ganeti-metad-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29681
+msgid "@command{ganeti-metad} is an optional daemon that can be used to provide information about the cluster to instances or OS install scripts."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29683
+msgid "It takes a @code{ganeti-metad-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29685
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} ganeti-metad-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: item
+#: guix-git/doc/guix.texi:29694
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{address} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
 #. type: table
-#: doc/guix.texi:22174
-msgid "Whether to allow @code{~user} notation to be used in requests.  When specified with empty string, requests to @code{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}.  If @var{(user-path \"path\")} is specified, the same request is taken as a request to access @code{path/foo} repository in the home directory of user @code{alice}."
+#: guix-git/doc/guix.texi:29697
+msgid "If set, the daemon will bind to this address only.  If left unset, the behavior depends on the cluster configuration."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29704
+#, no-wrap
+msgid "{Scheme Variable} ganeti-watcher-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29712
+msgid "@command{ganeti-watcher} is a script designed to run periodically and ensure the health of a cluster.  It will automatically restart instances that have stopped without Ganeti's consent, and repairs DRBD links in case a node has rebooted.  It also archives old cluster jobs and restarts Ganeti daemons that are not running.  If the cluster parameter @code{ensure_node_health} is set, the watcher will also shutdown instances and DRBD devices if the node it is running on is declared offline by known master candidates."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29714
+msgid "It can be paused on all nodes with @command{gnt-cluster watcher pause}."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29716
+msgid "The service takes a @code{ganeti-watcher-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29718
+#, no-wrap
+msgid "{Data Type} ganeti-watcher-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22175
+#: guix-git/doc/guix.texi:29724
 #, no-wrap
-msgid "@code{listen} (default: @var{'()})"
+msgid "@code{schedule} (default: @code{'(next-second-from (next-minute (range 0 60 5)))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22178
-msgid "Whether to listen on specific IP addresses or hostnames, defaults to all."
+#: guix-git/doc/guix.texi:29726
+msgid "How often to run the script.  The default is every five minutes."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22179
+#: guix-git/doc/guix.texi:29727
+#, fuzzy, no-wrap
+#| msgid "@code{cleanup-hook} (default: @code{#f})"
+msgid "@code{rapi-ip} (default: @code{#f})"
+msgstr "@code{cleanup-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29730
+msgid "This option needs to be specified only if the RAPI daemon is configured to use a particular interface or address.  By default the cluster address is used."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29731
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{job-age} (default: @code{(* 6 3600)})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29734
+msgid "Archive cluster jobs older than this age, specified in seconds.  The default is 6 hours.  This keeps @command{gnt-job list} manageable."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29735
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{verify-disks?} (default: @code{#t})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29739
+msgid "If this is @code{#f}, the watcher will not try to repair broken DRBD links automatically.  Administrators will need to use @command{gnt-cluster verify-disks} manually instead."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29742
+msgid "When @code{#t}, the script performs additional logging for debugging purposes."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29746
+#, no-wrap
+msgid "{Scheme Variable} ganeti-cleaner-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29754
+msgid "@command{ganeti-cleaner} is a script designed to run periodically and remove old files from the cluster.  This service type controls two @dfn{cron jobs}: one intended for the master node that permanently purges old cluster jobs, and one intended for every node that removes expired X509 certificates, keys, and outdated @command{ganeti-watcher} information.  Like all Ganeti services, it is safe to include even on non-master nodes as it will disable itself as necessary."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:29756
+msgid "It takes a @code{ganeti-cleaner-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29758
 #, no-wrap
-msgid "@code{port} (default: @var{#f})"
+msgid "{Data Type} ganeti-cleaner-configuration"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22181
-msgid "Whether to listen on an alternative port, which defaults to 9418."
+#: guix-git/doc/guix.texi:29763
+msgid "The @code{ganeti} package to use for the @command{gnt-cleaner} command."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29764
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{master-schedule} (default: @code{\"45 1 * * *\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29767
+msgid "How often to run the master cleaning job.  The default is once per day, at 01:45:00."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22182
+#: guix-git/doc/guix.texi:29768
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{node-schedule} (default: @code{\"45 2 * * *\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29771
+msgid "How often to run the node cleaning job.  The default is once per day, at 02:45:00."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:29785
+msgid "The @code{(gnu services version-control)} module provides a service to allow remote access to local Git repositories.  There are three options: the @code{git-daemon-service}, which provides access to repositories via the @code{git://} unsecured TCP-based protocol, extending the @code{nginx} web server to proxy some requests to @code{git-http-backend}, or providing a web interface with @code{cgit-service-type}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29786
 #, no-wrap
-msgid "@code{whitelist} (default: @var{'()})"
+msgid "{Scheme Procedure} git-daemon-service [#:config (git-daemon-configuration)]"
 msgstr ""
 
+#. type: deffn
+#: guix-git/doc/guix.texi:29790
+msgid "Return a service that runs @command{git daemon}, a simple TCP server to expose repositories over the Git protocol for anonymous access."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:29796
+msgid "The optional @var{config} argument should be a @code{<git-daemon-configuration>} object, by default it allows read-only access to exported@footnote{By creating the magic file @file{git-daemon-export-ok} in the repository directory.} repositories under @file{/srv/git}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29799
+#, no-wrap
+msgid "{Data Type} git-daemon-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:29801
+msgid "Data type representing the configuration for @code{git-daemon-service}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29803
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{package} (default: @code{git})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
 #. type: table
-#: doc/guix.texi:22184
-msgid "If not empty, only allow access to this list of directories."
+#: guix-git/doc/guix.texi:29805 guix-git/doc/guix.texi:29865
+msgid "Package object of the Git distributed version control system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22185
+#: guix-git/doc/guix.texi:29806 guix-git/doc/guix.texi:29869
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{export-all?} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29809
+msgid "Whether to allow access for all Git repositories, even if they do not have the @file{git-daemon-export-ok} file."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29810
 #, no-wrap
-msgid "@code{extra-options} (default: @var{'()})"
+msgid "@code{base-path} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22188
-msgid "Extra options will be passed to @code{git daemon}, please run @command{man git-daemon} for more information."
+#: guix-git/doc/guix.texi:29816
+msgid "Whether to remap all the path requests as relative to the given path.  If you run @command{git daemon} with @code{(base-path \"/srv/git\")} on @samp{example.com}, then if you later try to pull @indicateurl{git://example.com/hello.git}, git daemon will interpret the path as @file{/srv/git/hello.git}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29817
+#, fuzzy, no-wrap
+#| msgid "@code{max-journal-depth} (default: @code{#f})"
+msgid "@code{user-path} (default: @code{#f})"
+msgstr "@code{max-journal-depth}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29825
+msgid "Whether to allow @code{~user} notation to be used in requests.  When specified with empty string, requests to @indicateurl{git://host/~alice/foo} is taken as a request to access @code{foo} repository in the home directory of user @code{alice}.  If @code{(user-path \"@var{path}\")} is specified, the same request is taken as a request to access @file{@var{path}/foo} repository in the home directory of user @code{alice}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29826
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{listen} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29829
+msgid "Whether to listen on specific IP addresses or hostnames, defaults to all."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29830
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29832
+msgid "Whether to listen on an alternative port, which defaults to 9418."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29833
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{whitelist} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:29835
+msgid "If not empty, only allow access to this list of directories."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:29839
+msgid "Extra options will be passed to @command{git daemon}, please run @command{man git-daemon} for more information."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22202
-msgid "The @code{git://} protocol lacks authentication.  When you pull from a repository fetched via @code{git://}, you don't know that the data you receive was modified is really coming from the specified host, and you have your connection is subject to eavesdropping.  It's better to use an authenticated and encrypted transport, such as @code{https}.  Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program.  This program is the back-end of a proper Git web service.  It is designed to sit behind a FastCGI proxy.  @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon."
+#: guix-git/doc/guix.texi:29853
+msgid "The @code{git://} protocol lacks authentication.  When you pull from a repository fetched via @code{git://}, you don't know whether the data you receive was modified or is even coming from the specified host, and your connection is subject to eavesdropping.  It's better to use an authenticated and encrypted transport, such as @code{https}.  Although Git allows you to serve repositories using unsophisticated file-based web servers, there is a faster protocol implemented by the @code{git-http-backend} program.  This program is the back-end of a proper Git web service.  It is designed to sit behind a FastCGI proxy.  @xref{Web Services}, for more on running the necessary @code{fcgiwrap} daemon."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22205
+#: guix-git/doc/guix.texi:29856
 msgid "Guix has a separate configuration data type for serving Git repositories over HTTP."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22206
+#: guix-git/doc/guix.texi:29857
 #, no-wrap
 msgid "{Data Type} git-http-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:22208
-msgid "Data type representing the configuration for @code{git-http-service}."
+#: guix-git/doc/guix.texi:29861
+msgid "Data type representing the configuration for a future @code{git-http-service-type}; can currently be used to configure Nginx through @code{git-http-nginx-location-configuration}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22213
+#: guix-git/doc/guix.texi:29863
+#, no-wrap
+msgid "@code{package} (default: @var{git})"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:29866
 #, no-wrap
 msgid "@code{git-root} (default: @file{/srv/git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22215
+#: guix-git/doc/guix.texi:29868
 msgid "Directory containing the Git repositories to expose to the world."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22219
+#: guix-git/doc/guix.texi:29872
 msgid "Whether to expose access for all Git repositories in @var{git-root}, even if they do not have the @file{git-daemon-export-ok} file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22220
-#, no-wrap
-msgid "@code{uri-path} (default: @file{/git/})"
-msgstr ""
+#: guix-git/doc/guix.texi:29873
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{uri-path} (default: @samp{/git/})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:22225
-msgid "Path prefix for Git access.  With the default @code{/git/} prefix, this will map @code{http://@var{server}/git/@var{repo}.git} to @code{/srv/git/@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are not passed on to this Git instance."
+#: guix-git/doc/guix.texi:29878
+msgid "Path prefix for Git access.  With the default @samp{/git/} prefix, this will map @indicateurl{http://@var{server}/git/@var{repo}.git} to @file{/srv/git/@var{repo}.git}.  Requests whose URI paths do not begin with this prefix are not passed on to this Git instance."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:22226
+#: guix-git/doc/guix.texi:29879
 #, no-wrap
 msgid "@code{fcgiwrap-socket} (default: @code{127.0.0.1:9000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:22229
+#: guix-git/doc/guix.texi:29882
 msgid "The socket on which the @code{fcgiwrap} daemon is listening.  @xref{Web Services}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22236
+#: guix-git/doc/guix.texi:29889
 msgid "There is no @code{git-http-service-type}, currently; instead you can create an @code{nginx-location-configuration} from a @code{git-http-configuration} and then add that location to a web server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22237
+#: guix-git/doc/guix.texi:29890
 #, no-wrap
 msgid "{Scheme Procedure} git-http-nginx-location-configuration @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22242
+#: guix-git/doc/guix.texi:29895
 msgid "[config=(git-http-configuration)] Compute an @code{nginx-location-configuration} that corresponds to the given Git http configuration.  An example nginx service definition to serve the default @file{/srv/git} over HTTPS might be:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:22259
+#. type: lisp
+#: guix-git/doc/guix.texi:29912
 #, no-wrap
 msgid ""
 "(service nginx-service-type\n"
@@ -40126,1420 +54298,1409 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:22266
-msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate.  @xref{Certificate Services}.  The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS.  You will also need to add an @code{fcgiwrap} proxy to your system services.  @xref{Web Services}."
+#: guix-git/doc/guix.texi:29919
+msgid "This example assumes that you are using Let's Encrypt to get your TLS certificate.  @xref{Certificate Services}.  The default @code{certbot} service will redirect all HTTP traffic on @code{git.my-host.org} to HTTPS@.  You will also need to add an @code{fcgiwrap} proxy to your system services.  @xref{Web Services}."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:22268
+#: guix-git/doc/guix.texi:29921
 #, no-wrap
 msgid "Cgit Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22270
+#: guix-git/doc/guix.texi:29923
 #, no-wrap
 msgid "Cgit service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:22271
+#: guix-git/doc/guix.texi:29924
 #, no-wrap
 msgid "Git, web interface"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22274
+#: guix-git/doc/guix.texi:29927
 msgid "@uref{https://git.zx2c4.com/cgit/, Cgit} is a web frontend for Git repositories written in C."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22277
+#: guix-git/doc/guix.texi:29930
 msgid "The following example will configure the service with default values.  By default, Cgit can be accessed on port 80 (@code{http://localhost:80})."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:22280
+#. type: lisp
+#: guix-git/doc/guix.texi:29933
 #, no-wrap
 msgid "(service cgit-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22284
+#: guix-git/doc/guix.texi:29937
 msgid "The @code{file-object} type designates either a file-like object (@pxref{G-Expressions, file-like objects}) or a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:22288
+#: guix-git/doc/guix.texi:29941
 msgid "Available @code{cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22289
+#: guix-git/doc/guix.texi:29942
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} package package"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22291
+#: guix-git/doc/guix.texi:29944
 msgid "The CGIT package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22294
+#: guix-git/doc/guix.texi:29947
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} nginx-server-configuration-list nginx"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22299
+#: guix-git/doc/guix.texi:29952
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22302
+#: guix-git/doc/guix.texi:29955
 msgid "Specifies a command which will be invoked to format the content of about pages (both top-level and for each repository)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22307
+#: guix-git/doc/guix.texi:29960
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string agefile"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22310
+#: guix-git/doc/guix.texi:29963
 msgid "Specifies a path, relative to each repository path, which can be used to specify the date and time of the youngest commit in the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22315
+#: guix-git/doc/guix.texi:29968
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object auth-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22318
+#: guix-git/doc/guix.texi:29971
 msgid "Specifies a command that will be invoked for authenticating repository access."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22323
+#: guix-git/doc/guix.texi:29976
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22326
+#: guix-git/doc/guix.texi:29979
 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22328
+#: guix-git/doc/guix.texi:29981
 msgid "Defaults to @samp{\"name\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22331
+#: guix-git/doc/guix.texi:29984
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string cache-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22333
+#: guix-git/doc/guix.texi:29986
 msgid "Path used to store the cgit cache entries."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22335
+#: guix-git/doc/guix.texi:29988
 msgid "Defaults to @samp{\"/var/cache/cgit\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22338
+#: guix-git/doc/guix.texi:29991
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-static-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22341
+#: guix-git/doc/guix.texi:29994
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed with a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22343 doc/guix.texi:22786
+#: guix-git/doc/guix.texi:29996 guix-git/doc/guix.texi:30439
 msgid "Defaults to @samp{-1}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22346
+#: guix-git/doc/guix.texi:29999
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-dynamic-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22349
+#: guix-git/doc/guix.texi:30002
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of repository pages accessed without a fixed SHA1."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22354
+#: guix-git/doc/guix.texi:30007
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-repo-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22357
+#: guix-git/doc/guix.texi:30010
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository summary page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22362
+#: guix-git/doc/guix.texi:30015
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-root-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22365
+#: guix-git/doc/guix.texi:30018
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22370
+#: guix-git/doc/guix.texi:30023
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-scanrc-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22373
+#: guix-git/doc/guix.texi:30026
 msgid "Number which specifies the time-to-live, in minutes, for the result of scanning a path for Git repositories."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22378
+#: guix-git/doc/guix.texi:30031
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-about-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22381
+#: guix-git/doc/guix.texi:30034
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of the repository about page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22386
+#: guix-git/doc/guix.texi:30039
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-snapshot-ttl"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22389
+#: guix-git/doc/guix.texi:30042
 msgid "Number which specifies the time-to-live, in minutes, for the cached version of snapshots."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22394
+#: guix-git/doc/guix.texi:30047
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer cache-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22397
+#: guix-git/doc/guix.texi:30050
 msgid "The maximum number of entries in the cgit cache.  When set to @samp{0}, caching is disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22402
+#: guix-git/doc/guix.texi:30055
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean case-sensitive-sort?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22404
+#: guix-git/doc/guix.texi:30057
 msgid "Sort items in the repo list case sensitively."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22409
+#: guix-git/doc/guix.texi:30062
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-prefix"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22412
+#: guix-git/doc/guix.texi:30065
 msgid "List of common prefixes which, when combined with a repository URL, generates valid clone URLs for the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22417
+#: guix-git/doc/guix.texi:30070
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22419
+#: guix-git/doc/guix.texi:30072
 msgid "List of @code{clone-url} templates."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22424
+#: guix-git/doc/guix.texi:30077
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22426
+#: guix-git/doc/guix.texi:30079
 msgid "Command which will be invoked to format commit messages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22431
+#: guix-git/doc/guix.texi:30084
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22435 doc/guix.texi:22993
+#: guix-git/doc/guix.texi:30088 guix-git/doc/guix.texi:30646
 msgid "Flag which, when set to @samp{date}, enables strict date ordering in the commit log, and when set to @samp{topo} enables strict topological ordering."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22437
+#: guix-git/doc/guix.texi:30090
 msgid "Defaults to @samp{\"git log\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22440
+#: guix-git/doc/guix.texi:30093
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object css"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22442
+#: guix-git/doc/guix.texi:30095
 msgid "URL which specifies the css document to include in all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22444
+#: guix-git/doc/guix.texi:30097
 msgid "Defaults to @samp{\"/share/cgit/cgit.css\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22447
+#: guix-git/doc/guix.texi:30100
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22451
+#: guix-git/doc/guix.texi:30104
 msgid "Specifies a command which will be invoked to format names and email address of committers, authors, and taggers, as represented in various places throughout the cgit interface."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22456
+#: guix-git/doc/guix.texi:30109
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean embedded?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22459
+#: guix-git/doc/guix.texi:30112
 msgid "Flag which, when set to @samp{#t}, will make cgit generate a HTML fragment suitable for embedding in other HTML pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22464
+#: guix-git/doc/guix.texi:30117
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22468
+#: guix-git/doc/guix.texi:30121
 msgid "Flag which, when set to @samp{#t}, will make cgit print an ASCII-art commit history graph to the left of the commit messages in the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22473
+#: guix-git/doc/guix.texi:30126
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-filter-overrides?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22476
+#: guix-git/doc/guix.texi:30129
 msgid "Flag which, when set to @samp{#t}, allows all filter settings to be overridden in repository-specific cgitrc files."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22481
+#: guix-git/doc/guix.texi:30134
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-follow-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22484
+#: guix-git/doc/guix.texi:30137
 msgid "Flag which, when set to @samp{#t}, allows users to follow a file in the log view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22489
+#: guix-git/doc/guix.texi:30142
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-http-clone?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22492
+#: guix-git/doc/guix.texi:30145
 msgid "If set to @samp{#t}, cgit will act as an dumb HTTP endpoint for Git clones."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22497
+#: guix-git/doc/guix.texi:30150
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22500
+#: guix-git/doc/guix.texi:30153
 msgid "Flag which, when set to @samp{#t}, will make cgit generate extra links \"summary\", \"commit\", \"tree\" for each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22505
+#: guix-git/doc/guix.texi:30158
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-index-owner?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22508
+#: guix-git/doc/guix.texi:30161
 msgid "Flag which, when set to @samp{#t}, will make cgit display the owner of each repo in the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22513
+#: guix-git/doc/guix.texi:30166
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22516
+#: guix-git/doc/guix.texi:30169
 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of modified files for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22521
+#: guix-git/doc/guix.texi:30174
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22524
+#: guix-git/doc/guix.texi:30177
 msgid "Flag which, when set to @samp{#t}, will make cgit print the number of added and removed lines for each commit on the repository log page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22529
+#: guix-git/doc/guix.texi:30182
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22532 doc/guix.texi:23056
+#: guix-git/doc/guix.texi:30185 guix-git/doc/guix.texi:30709
 msgid "Flag which, when set to @code{#t}, will make cgit display remote branches in the summary and refs views."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22537
+#: guix-git/doc/guix.texi:30190
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22541
+#: guix-git/doc/guix.texi:30194
 msgid "Flag which, when set to @code{1}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22546
+#: guix-git/doc/guix.texi:30199
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22550
+#: guix-git/doc/guix.texi:30203
 msgid "Flag which, when set to @samp{#t}, will make cgit use the subject of the parent commit as link text when generating links to parent commits in commit view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22555
+#: guix-git/doc/guix.texi:30208
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-tree-linenumbers?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22558
+#: guix-git/doc/guix.texi:30211
 msgid "Flag which, when set to @samp{#t}, will make cgit generate linenumber links for plaintext blobs printed in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22563
+#: guix-git/doc/guix.texi:30216
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean enable-git-config?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22566
+#: guix-git/doc/guix.texi:30219
 msgid "Flag which, when set to @samp{#f}, will allow cgit to use Git config to set any repo specific settings."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22571
+#: guix-git/doc/guix.texi:30224
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object favicon"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22573
+#: guix-git/doc/guix.texi:30226
 msgid "URL used as link to a shortcut icon for cgit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22575
+#: guix-git/doc/guix.texi:30228
 msgid "Defaults to @samp{\"/favicon.ico\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22578
+#: guix-git/doc/guix.texi:30231
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string footer"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22582
+#: guix-git/doc/guix.texi:30235
 msgid "The content of the file specified with this option will be included verbatim at the bottom of all pages (i.e.@: it replaces the standard \"generated by...\"@: message)."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22587
+#: guix-git/doc/guix.texi:30240
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string head-include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22590
+#: guix-git/doc/guix.texi:30243
 msgid "The content of the file specified with this option will be included verbatim in the HTML HEAD section on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22595
+#: guix-git/doc/guix.texi:30248
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22598
+#: guix-git/doc/guix.texi:30251
 msgid "The content of the file specified with this option will be included verbatim at the top of all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22603
+#: guix-git/doc/guix.texi:30256
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object include"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22606
+#: guix-git/doc/guix.texi:30259
 msgid "Name of a configfile to include before the rest of the current config- file is parsed."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22611
+#: guix-git/doc/guix.texi:30264
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-header"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22614
+#: guix-git/doc/guix.texi:30267
 msgid "The content of the file specified with this option will be included verbatim above the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22619
+#: guix-git/doc/guix.texi:30272
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string index-info"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22622
+#: guix-git/doc/guix.texi:30275
 msgid "The content of the file specified with this option will be included verbatim below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22627
+#: guix-git/doc/guix.texi:30280
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean local-time?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22630
+#: guix-git/doc/guix.texi:30283
 msgid "Flag which, if set to @samp{#t}, makes cgit print commit and tag times in the servers timezone."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22635
+#: guix-git/doc/guix.texi:30288
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22638
+#: guix-git/doc/guix.texi:30291
 msgid "URL which specifies the source of an image which will be used as a logo on all cgit pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22640
+#: guix-git/doc/guix.texi:30293
 msgid "Defaults to @samp{\"/share/cgit/cgit.png\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22643
+#: guix-git/doc/guix.texi:30296
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22645 doc/guix.texi:23102
+#: guix-git/doc/guix.texi:30298 guix-git/doc/guix.texi:30755
 msgid "URL loaded when clicking on the cgit logo image."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22650
+#: guix-git/doc/guix.texi:30303
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22653
+#: guix-git/doc/guix.texi:30306
 msgid "Command which will be invoked to format the Owner column of the main page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22658
+#: guix-git/doc/guix.texi:30311
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-atom-items"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22660
+#: guix-git/doc/guix.texi:30313
 msgid "Number of items to display in atom feeds view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22662 doc/guix.texi:22897 doc/guix.texi:22905
-#: doc/guix.texi:22913
-msgid "Defaults to @samp{10}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:22665
+#: guix-git/doc/guix.texi:30318
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-commit-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22667
+#: guix-git/doc/guix.texi:30320
 msgid "Number of entries to list per page in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22669 doc/guix.texi:22684
-msgid "Defaults to @samp{50}."
-msgstr ""
-
-#. type: deftypevr
-#: doc/guix.texi:22672
+#: guix-git/doc/guix.texi:30325
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-message-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22674
+#: guix-git/doc/guix.texi:30327
 msgid "Number of commit message characters to display in \"log\" view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22676 doc/guix.texi:22692
+#: guix-git/doc/guix.texi:30329 guix-git/doc/guix.texi:30345
 msgid "Defaults to @samp{80}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22679
+#: guix-git/doc/guix.texi:30332
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repo-count"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22682
+#: guix-git/doc/guix.texi:30335
 msgid "Specifies the number of entries to list per page on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22687
+#: guix-git/doc/guix.texi:30340
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-repodesc-length"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22690
+#: guix-git/doc/guix.texi:30343
 msgid "Specifies the maximum number of repo description characters to display on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22695
+#: guix-git/doc/guix.texi:30348
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer max-blob-size"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22697
+#: guix-git/doc/guix.texi:30350
 msgid "Specifies the maximum size of a blob to display HTML for in KBytes."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22702
+#: guix-git/doc/guix.texi:30355
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22705
+#: guix-git/doc/guix.texi:30358
 msgid "Maximum statistics period.  Valid values are @samp{week},@samp{month}, @samp{quarter} and @samp{year}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22710
+#: guix-git/doc/guix.texi:30363
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} mimetype-alist mimetype"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22712
+#: guix-git/doc/guix.texi:30365
 msgid "Mimetype for the specified filename extension."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22716
+#: guix-git/doc/guix.texi:30369
 msgid "Defaults to @samp{((gif \"image/gif\") (html \"text/html\") (jpg \"image/jpeg\") (jpeg \"image/jpeg\") (pdf \"application/pdf\") (png \"image/png\") (svg \"image/svg+xml\"))}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22719
+#: guix-git/doc/guix.texi:30372
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object mimetype-file"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22721
+#: guix-git/doc/guix.texi:30374
 msgid "Specifies the file to use for automatic mimetype lookup."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22726
+#: guix-git/doc/guix.texi:30379
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22729
+#: guix-git/doc/guix.texi:30382
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22734
+#: guix-git/doc/guix.texi:30387
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean nocache?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22736
+#: guix-git/doc/guix.texi:30389
 msgid "If set to the value @samp{#t} caching will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22741
+#: guix-git/doc/guix.texi:30394
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noplainemail?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22744
+#: guix-git/doc/guix.texi:30397
 msgid "If set to @samp{#t} showing full author email addresses will be disabled."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22749
+#: guix-git/doc/guix.texi:30402
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean noheader?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22752
+#: guix-git/doc/guix.texi:30405
 msgid "Flag which, when set to @samp{#t}, will make cgit omit the standard header on all pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22757
+#: guix-git/doc/guix.texi:30410
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} project-list project-list"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22761
+#: guix-git/doc/guix.texi:30414
 msgid "A list of subdirectories inside of @code{repository-directory}, relative to it, that should loaded as Git repositories.  An empty list means that all subdirectories will be loaded."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22766
+#: guix-git/doc/guix.texi:30419
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22768
+#: guix-git/doc/guix.texi:30421
 msgid "Text which will be used as default value for @code{cgit-repo-readme}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22773
+#: guix-git/doc/guix.texi:30426
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean remove-suffix?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22777
+#: guix-git/doc/guix.texi:30430
 msgid "If set to @code{#t} and @code{repository-directory} is enabled, if any repositories are found with a suffix of @code{.git}, this suffix will be removed for the URL and name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22782
+#: guix-git/doc/guix.texi:30435
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer renamelimit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22784
+#: guix-git/doc/guix.texi:30437
 msgid "Maximum number of files to consider when detecting renames."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22789
+#: guix-git/doc/guix.texi:30442
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string repository-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22791
+#: guix-git/doc/guix.texi:30444
 msgid "The way in which repositories in each section are sorted."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22796
+#: guix-git/doc/guix.texi:30449
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} robots-list robots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22798
+#: guix-git/doc/guix.texi:30451
 msgid "Text used as content for the @code{robots} meta-tag."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22800
+#: guix-git/doc/guix.texi:30453
 msgid "Defaults to @samp{(\"noindex\" \"nofollow\")}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22803
+#: guix-git/doc/guix.texi:30456
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22805
+#: guix-git/doc/guix.texi:30458
 msgid "Text printed below the heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22807
+#: guix-git/doc/guix.texi:30460
 msgid "Defaults to @samp{\"a fast webinterface for the git dscm\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22810
+#: guix-git/doc/guix.texi:30463
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22813
-msgid "The content of the file specified with this option will be included verbatim below thef \"about\" link on the repository index page."
+#: guix-git/doc/guix.texi:30466
+msgid "The content of the file specified with this option will be included verbatim below the ``about'' link on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22818
+#: guix-git/doc/guix.texi:30471
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string root-title"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22820
+#: guix-git/doc/guix.texi:30473
 msgid "Text printed as heading on the repository index page."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22825
+#: guix-git/doc/guix.texi:30478
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean scan-hidden-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22831
-msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period.  Otherwise, repository-directory will stay away from such directories, considered as \"hidden\".  Note that this does not apply to the \".git\" directory in non-bare repos."
+#: guix-git/doc/guix.texi:30484
+msgid "If set to @samp{#t} and repository-directory is enabled, repository-directory will recurse into directories whose name starts with a period.  Otherwise, repository-directory will stay away from such directories, considered as ``hidden''.  Note that this does not apply to the @file{.git} directory in non-bare repos."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22836
+#: guix-git/doc/guix.texi:30489
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22839
+#: guix-git/doc/guix.texi:30492
 msgid "Text which specifies the default set of snapshot formats that cgit generates links for."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22844
+#: guix-git/doc/guix.texi:30497
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} repository-directory repository-directory"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22847
+#: guix-git/doc/guix.texi:30500
 msgid "Name of the directory to scan for repositories (represents @code{scan-path})."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22849
+#: guix-git/doc/guix.texi:30502
 msgid "Defaults to @samp{\"/srv/git\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22852
+#: guix-git/doc/guix.texi:30505
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22855 doc/guix.texi:23171
+#: guix-git/doc/guix.texi:30508 guix-git/doc/guix.texi:30824
 msgid "The name of the current repository section - all repositories defined after this option will inherit the current section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22860
+#: guix-git/doc/guix.texi:30513
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string section-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22863
+#: guix-git/doc/guix.texi:30516
 msgid "Flag which, when set to @samp{1}, will sort the sections on the repository listing by name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22868
+#: guix-git/doc/guix.texi:30521
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer section-from-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22871
+#: guix-git/doc/guix.texi:30524
 msgid "A number which, if defined prior to repository-directory, specifies how many path elements from each repo path to use as a default section name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22876
+#: guix-git/doc/guix.texi:30529
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} boolean side-by-side-diffs?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22879
+#: guix-git/doc/guix.texi:30532
 msgid "If set to @samp{#t} shows side-by-side diffs instead of unidiffs per default."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22884
+#: guix-git/doc/guix.texi:30537
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22887
+#: guix-git/doc/guix.texi:30540
 msgid "Specifies a command which will be invoked to format plaintext blobs in the tree view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22892
+#: guix-git/doc/guix.texi:30545
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-branches"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22895
-msgid "Specifies the number of branches to display in the repository \"summary\" view."
+#: guix-git/doc/guix.texi:30548
+msgid "Specifies the number of branches to display in the repository ``summary'' view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22900
+#: guix-git/doc/guix.texi:30553
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-log"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22903
-msgid "Specifies the number of log entries to display in the repository \"summary\" view."
+#: guix-git/doc/guix.texi:30556
+msgid "Specifies the number of log entries to display in the repository ``summary'' view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22908
+#: guix-git/doc/guix.texi:30561
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} integer summary-tags"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22911
-msgid "Specifies the number of tags to display in the repository \"summary\" view."
+#: guix-git/doc/guix.texi:30564
+msgid "Specifies the number of tags to display in the repository ``summary'' view."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22916
+#: guix-git/doc/guix.texi:30569
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string strict-export"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22919
+#: guix-git/doc/guix.texi:30572
 msgid "Filename which, if specified, needs to be present within the repository for cgit to allow access to that repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22924
+#: guix-git/doc/guix.texi:30577
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} string virtual-root"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22926
+#: guix-git/doc/guix.texi:30579
 msgid "URL which, if specified, will be used as root for all cgit links."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22928
+#: guix-git/doc/guix.texi:30581
 msgid "Defaults to @samp{\"/\"}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22931
+#: guix-git/doc/guix.texi:30584
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} repository-cgit-configuration-list repositories"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22933
+#: guix-git/doc/guix.texi:30586
 msgid "A list of @dfn{cgit-repo} records to use with config."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22937
+#: guix-git/doc/guix.texi:30590
 msgid "Available @code{repository-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22938
+#: guix-git/doc/guix.texi:30591
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list snapshots"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22941
+#: guix-git/doc/guix.texi:30594
 msgid "A mask of snapshot formats for this repo that cgit generates links for, restricted by the global @code{snapshots} setting."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22946
+#: guix-git/doc/guix.texi:30599
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object source-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22948
+#: guix-git/doc/guix.texi:30601
 msgid "Override the default @code{source-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22953
+#: guix-git/doc/guix.texi:30606
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22955
+#: guix-git/doc/guix.texi:30608
 msgid "The relative URL used to access the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22960
+#: guix-git/doc/guix.texi:30613
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object about-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22962
+#: guix-git/doc/guix.texi:30615
 msgid "Override the default @code{about-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22967
+#: guix-git/doc/guix.texi:30620
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string branch-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22970
+#: guix-git/doc/guix.texi:30623
 msgid "Flag which, when set to @samp{age}, enables date ordering in the branch ref list, and when set to @samp{name} enables ordering by branch name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22975
+#: guix-git/doc/guix.texi:30628
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list clone-url"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22977
+#: guix-git/doc/guix.texi:30630
 msgid "A list of URLs which can be used to clone repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22982
+#: guix-git/doc/guix.texi:30635
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object commit-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22984
+#: guix-git/doc/guix.texi:30637
 msgid "Override the default @code{commit-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22989
+#: guix-git/doc/guix.texi:30642
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string commit-sort"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:22998
+#: guix-git/doc/guix.texi:30651
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string defbranch"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23003
-msgid "The name of the default branch for this repository.  If no such branch exists in the repository, the first branch name (when sorted) is used as default instead.  By default branch pointed to by HEAD, or \"master\" if there is no suitable HEAD."
+#: guix-git/doc/guix.texi:30656
+msgid "The name of the default branch for this repository.  If no such branch exists in the repository, the first branch name (when sorted) is used as default instead.  By default branch pointed to by HEAD, or ``master'' if there is no suitable HEAD."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23008
+#: guix-git/doc/guix.texi:30661
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string desc"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23010
+#: guix-git/doc/guix.texi:30663
 msgid "The value to show as repository description."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23015
+#: guix-git/doc/guix.texi:30668
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string homepage"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23017
+#: guix-git/doc/guix.texi:30670
 msgid "The value to show as repository homepage."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23022
+#: guix-git/doc/guix.texi:30675
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object email-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23024
+#: guix-git/doc/guix.texi:30677
 msgid "Override the default @code{email-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23029
+#: guix-git/doc/guix.texi:30682
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-commit-graph?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23032
+#: guix-git/doc/guix.texi:30685
 msgid "A flag which can be used to disable the global setting @code{enable-commit-graph?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23037
+#: guix-git/doc/guix.texi:30690
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-filecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23040
+#: guix-git/doc/guix.texi:30693
 msgid "A flag which can be used to disable the global setting @code{enable-log-filecount?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23045
+#: guix-git/doc/guix.texi:30698
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-log-linecount?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23048
+#: guix-git/doc/guix.texi:30701
 msgid "A flag which can be used to disable the global setting @code{enable-log-linecount?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23053
+#: guix-git/doc/guix.texi:30706
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-remote-branches?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23061
+#: guix-git/doc/guix.texi:30714
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-subject-links?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23064
+#: guix-git/doc/guix.texi:30717
 msgid "A flag which can be used to override the global setting @code{enable-subject-links?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23069
+#: guix-git/doc/guix.texi:30722
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} maybe-repo-boolean enable-html-serving?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23072
+#: guix-git/doc/guix.texi:30725
 msgid "A flag which can be used to override the global setting @code{enable-html-serving?}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23077
+#: guix-git/doc/guix.texi:30730
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean hide?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23080
+#: guix-git/doc/guix.texi:30733
 msgid "Flag which, when set to @code{#t}, hides the repository from the repository index."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23085
+#: guix-git/doc/guix.texi:30738
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-boolean ignore?"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23087
+#: guix-git/doc/guix.texi:30740
 msgid "Flag which, when set to @samp{#t}, ignores the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23092
+#: guix-git/doc/guix.texi:30745
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object logo"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23095
+#: guix-git/doc/guix.texi:30748
 msgid "URL which specifies the source of an image which will be used as a logo on this repo’s pages."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23100
+#: guix-git/doc/guix.texi:30753
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string logo-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23107
+#: guix-git/doc/guix.texi:30760
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-file-object owner-filter"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23109
+#: guix-git/doc/guix.texi:30762
 msgid "Override the default @code{owner-filter}."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23114
+#: guix-git/doc/guix.texi:30767
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string module-link"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23118
+#: guix-git/doc/guix.texi:30771
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule is printed in a directory listing.  The arguments for the formatstring are the path and SHA1 of the submodule commit."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23123
+#: guix-git/doc/guix.texi:30776
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} module-link-path module-link-path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23127
+#: guix-git/doc/guix.texi:30780
 msgid "Text which will be used as the formatstring for a hyperlink when a submodule with the specified subdirectory path is printed in a directory listing."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23132
+#: guix-git/doc/guix.texi:30785
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string max-stats"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23134
+#: guix-git/doc/guix.texi:30787
 msgid "Override the default maximum statistics period."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23139
+#: guix-git/doc/guix.texi:30792
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string name"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23141
+#: guix-git/doc/guix.texi:30794
 msgid "The value to show as repository name."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23146
+#: guix-git/doc/guix.texi:30799
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string owner"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23148
+#: guix-git/doc/guix.texi:30801
 msgid "A value used to identify the owner of the repository."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23153
+#: guix-git/doc/guix.texi:30806
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string path"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23155
+#: guix-git/doc/guix.texi:30808
 msgid "An absolute path to the repository directory."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23160
+#: guix-git/doc/guix.texi:30813
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string readme"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23163
-msgid "A path (relative to repo) which specifies a file to include verbatim as the \"About\" page for this repo."
+#: guix-git/doc/guix.texi:30816
+msgid "A path (relative to repo) which specifies a file to include verbatim as the ``About'' page for this repo."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23168
+#: guix-git/doc/guix.texi:30821
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-string section"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23176
+#: guix-git/doc/guix.texi:30829
 #, no-wrap
 msgid "{@code{repository-cgit-configuration} parameter} repo-list extra-options"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23178 doc/guix.texi:23187
+#: guix-git/doc/guix.texi:30831 guix-git/doc/guix.texi:30840
 msgid "Extra options will be appended to cgitrc file."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23185
+#: guix-git/doc/guix.texi:30838
 #, no-wrap
 msgid "{@code{cgit-configuration} parameter} list extra-options"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23199
+#: guix-git/doc/guix.texi:30852
 msgid "However, it could be that you just want to get a @code{cgitrc} up and running.  In that case, you can pass an @code{opaque-cgit-configuration} as a record to @code{cgit-service-type}.  As its name indicates, an opaque configuration does not have easy reflective capabilities."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23201
+#: guix-git/doc/guix.texi:30854
 msgid "Available @code{opaque-cgit-configuration} fields are:"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23202
+#: guix-git/doc/guix.texi:30855
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} package cgit"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23204
+#: guix-git/doc/guix.texi:30857
 msgid "The cgit package."
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23206
+#: guix-git/doc/guix.texi:30859
 #, no-wrap
 msgid "{@code{opaque-cgit-configuration} parameter} string string"
 msgstr ""
 
 #. type: deftypevr
-#: doc/guix.texi:23208
+#: guix-git/doc/guix.texi:30861
 msgid "The contents of the @code{cgitrc}, as a string."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23212
+#: guix-git/doc/guix.texi:30865
 msgid "For example, if your @code{cgitrc} is just the empty string, you could instantiate a cgit service like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23217
+#. type: lisp
+#: guix-git/doc/guix.texi:30870
 #, no-wrap
 msgid ""
 "(service cgit-service-type\n"
@@ -41548,40 +55709,40 @@ msgid ""
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23219
+#: guix-git/doc/guix.texi:30872
 #, no-wrap
 msgid "Gitolite Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23221
+#: guix-git/doc/guix.texi:30874
 #, no-wrap
 msgid "Gitolite service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23222
+#: guix-git/doc/guix.texi:30875
 #, no-wrap
 msgid "Git, hosting"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23225
+#: guix-git/doc/guix.texi:30878
 msgid "@uref{https://gitolite.com/gitolite/, Gitolite} is a tool for hosting Git repositories on a central server."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23228
+#: guix-git/doc/guix.texi:30881
 msgid "Gitolite can handle multiple repositories and users, and supports flexible configuration of the permissions for the users on the repositories."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23231
+#: guix-git/doc/guix.texi:30884
 msgid "The following example will configure Gitolite using the default @code{git} user, and the provided SSH public key."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23238
+#. type: lisp
+#: guix-git/doc/guix.texi:30891
 #, no-wrap
 msgid ""
 "(service gitolite-service-type\n"
@@ -41592,300 +55753,1427 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23243
+#: guix-git/doc/guix.texi:30896
 msgid "Gitolite is configured through a special admin repository which you can clone, for example, if you setup Gitolite on @code{example.com}, you would run the following command to clone the admin repository."
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:23246
+#: guix-git/doc/guix.texi:30899
 #, no-wrap
 msgid "git clone git@@example.com:gitolite-admin\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23252
+#: guix-git/doc/guix.texi:30905
 msgid "When the Gitolite service is activated, the provided @code{admin-pubkey} will be inserted in to the @file{keydir} directory in the gitolite-admin repository.  If this results in a change in the repository, it will be committed using the message ``gitolite setup by GNU Guix''."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23253
+#: guix-git/doc/guix.texi:30906
 #, no-wrap
 msgid "{Data Type} gitolite-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23255
+#: guix-git/doc/guix.texi:30908
 msgid "Data type representing the configuration for @code{gitolite-service-type}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23257
+#: guix-git/doc/guix.texi:30910
 #, no-wrap
 msgid "@code{package} (default: @var{gitolite})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23259
+#: guix-git/doc/guix.texi:30912
 msgid "Gitolite package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23260
+#: guix-git/doc/guix.texi:30913
 #, no-wrap
 msgid "@code{user} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23263
+#: guix-git/doc/guix.texi:30916
 msgid "User to use for Gitolite.  This will be user that you use when accessing Gitolite over SSH."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23264
+#: guix-git/doc/guix.texi:30917
 #, no-wrap
 msgid "@code{group} (default: @var{git})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23266
+#: guix-git/doc/guix.texi:30919
 msgid "Group to use for Gitolite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23267
+#: guix-git/doc/guix.texi:30920
 #, no-wrap
 msgid "@code{home-directory} (default: @var{\"/var/lib/gitolite\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23269
+#: guix-git/doc/guix.texi:30922
 msgid "Directory in which to store the Gitolite configuration and repositories."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23270
+#: guix-git/doc/guix.texi:30923
 #, no-wrap
 msgid "@code{rc-file} (default: @var{(gitolite-rc-file)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23273
+#: guix-git/doc/guix.texi:30926
 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}), representing the configuration for Gitolite."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23274
+#: guix-git/doc/guix.texi:30927
 #, no-wrap
 msgid "@code{admin-pubkey} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23278
+#: guix-git/doc/guix.texi:30931
 msgid "A ``file-like'' object (@pxref{G-Expressions, file-like objects}) used to setup Gitolite.  This will be inserted in to the @file{keydir} directory within the gitolite-admin repository."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23280
+#: guix-git/doc/guix.texi:30933
 msgid "To specify the SSH key as a string, use the @code{plain-file} function."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23283
+#. type: lisp
+#: guix-git/doc/guix.texi:30936
 #, no-wrap
 msgid "(plain-file \"yourname.pub\" \"ssh-rsa AAAA... guix@@example.com\")\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23288
+#: guix-git/doc/guix.texi:30941
 #, no-wrap
 msgid "{Data Type} gitolite-rc-file"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23290
+#: guix-git/doc/guix.texi:30943
 msgid "Data type representing the Gitolite RC file."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23292
+#: guix-git/doc/guix.texi:30945
 #, no-wrap
 msgid "@code{umask} (default: @code{#o0077})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23295
+#: guix-git/doc/guix.texi:30948
 msgid "This controls the permissions Gitolite sets on the repositories and their contents."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23299
-msgid "A value like @code{#o0027} will give read access to the group used by Gitolite (by default: @code{git}). This is necessary when using Gitolite with software like cgit or gitweb."
+#: guix-git/doc/guix.texi:30952
+msgid "A value like @code{#o0027} will give read access to the group used by Gitolite (by default: @code{git}).  This is necessary when using Gitolite with software like cgit or gitweb."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23300
+#: guix-git/doc/guix.texi:30953
 #, no-wrap
 msgid "@code{git-config-keys} (default: @code{\"\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23303
-msgid "Gitolite allows you to set git config values using the \"config\" keyword. This setting allows control over the config keys to accept."
+#: guix-git/doc/guix.texi:30956
+msgid "Gitolite allows you to set git config values using the @samp{config} keyword.  This setting allows control over the config keys to accept."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23304
+#: guix-git/doc/guix.texi:30957
 #, no-wrap
 msgid "@code{roles} (default: @code{'((\"READERS\" . 1) (\"WRITERS\" . ))})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23306
+#: guix-git/doc/guix.texi:30959
 msgid "Set the role names allowed to be used by users running the perms command."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23307
+#: guix-git/doc/guix.texi:30960
 #, no-wrap
 msgid "@code{enable} (default: @code{'(\"help\" \"desc\" \"info\" \"perms\" \"writable\" \"ssh-authkeys\" \"git-config\" \"daemon\" \"gitweb\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23309
+#: guix-git/doc/guix.texi:30962
 msgid "This setting controls the commands and features to enable within Gitolite."
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23317
+#: guix-git/doc/guix.texi:30970
 #, no-wrap
 msgid "The Battle for Wesnoth Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23318
+#: guix-git/doc/guix.texi:30971
 #, no-wrap
 msgid "wesnothd"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23322
+#: guix-git/doc/guix.texi:30975
 msgid "@uref{https://wesnoth.org, The Battle for Wesnoth} is a fantasy, turn based tactical strategy game, with several single player campaigns, and multiplayer games (both networked and local)."
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:23323
+#: guix-git/doc/guix.texi:30976
 #, no-wrap
 msgid "{Scheme Variable} wesnothd-service-type"
 msgstr ""
 
 #. type: defvar
-#: doc/guix.texi:23327
+#: guix-git/doc/guix.texi:30980
 msgid "Service type for the wesnothd service.  Its value must be a @code{wesnothd-configuration} object.  To run wesnothd in the default configuration, instantiate it as:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23330
+#. type: lisp
+#: guix-git/doc/guix.texi:30983
 #, no-wrap
 msgid "(service wesnothd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23333
+#: guix-git/doc/guix.texi:30986
 #, no-wrap
 msgid "{Data Type} wesnothd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23335
+#: guix-git/doc/guix.texi:30988
 msgid "Data type representing the configuration of @command{wesnothd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23337
+#: guix-git/doc/guix.texi:30990
 #, no-wrap
 msgid "@code{package} (default: @code{wesnoth-server})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23339
+#: guix-git/doc/guix.texi:30992
 msgid "The wesnoth server package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23340
+#: guix-git/doc/guix.texi:30993
 #, no-wrap
 msgid "@code{port} (default: @code{15000})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23342
+#: guix-git/doc/guix.texi:30995
 msgid "The port to bind the server to."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23348
+#: guix-git/doc/guix.texi:31001
+#, no-wrap
+msgid "pam-mount"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31006
+msgid "The @code{(gnu services pam-mount)} module provides a service allowing users to mount volumes when they log in.  It should be able to mount any volume format supported by the system."
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31007
+#, no-wrap
+msgid "{Scheme Variable} pam-mount-service-type"
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31009
+msgid "Service type for PAM Mount support."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31011
+#, no-wrap
+msgid "{Data Type} pam-mount-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31013
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "Data type representing the configuration of PAM Mount."
+msgstr "管理操作系统配置。"
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31017
+#, fuzzy, no-wrap
+#| msgid "Modules"
+msgid "rules"
+msgstr "模块"
+
+#. type: table
+#: guix-git/doc/guix.texi:31020
+msgid "The configuration rules that will be used to generate @file{/etc/security/pam_mount.conf.xml}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31024
+msgid "The configuration rules are SXML elements (@pxref{SXML,,, guile, GNU Guile Reference Manual}), and the default ones don't mount anything for anyone at login:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31039
+#, no-wrap
+msgid ""
+"`((debug (@@ (enable \"0\")))\n"
+"  (mntoptions (@@ (allow ,(string-join\n"
+"                          '(\"nosuid\" \"nodev\" \"loop\"\n"
+"                            \"encryption\" \"fsck\" \"nonempty\"\n"
+"                            \"allow_root\" \"allow_other\")\n"
+"                          \",\"))))\n"
+"  (mntoptions (@@ (require \"nosuid,nodev\")))\n"
+"  (logout (@@ (wait \"0\")\n"
+"             (hup \"0\")\n"
+"             (term \"no\")\n"
+"             (kill \"no\")))\n"
+"  (mkmountpoint (@@ (enable \"1\")\n"
+"                   (remove \"true\"))))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31045
+msgid "Some @code{volume} elements must be added to automatically mount volumes at login.  Here's an example allowing the user @code{alice} to mount her encrypted @env{HOME} directory and allowing the user @code{bob} to mount the partition where he stores his data:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31070
+#, no-wrap
+msgid ""
+"(define pam-mount-rules\n"
+"`((debug (@@ (enable \"0\")))\n"
+"            (volume (@@ (user \"alice\")\n"
+"                       (fstype \"crypt\")\n"
+"                       (path \"/dev/sda2\")\n"
+"                       (mountpoint \"/home/alice\")))\n"
+"            (volume (@@ (user \"bob\")\n"
+"                       (fstype \"auto\")\n"
+"                       (path \"/dev/sdb3\")\n"
+"                       (mountpoint \"/home/bob/data\")\n"
+"                       (options \"defaults,autodefrag,compress\")))\n"
+"            (mntoptions (@@ (allow ,(string-join\n"
+"                                    '(\"nosuid\" \"nodev\" \"loop\"\n"
+"                                      \"encryption\" \"fsck\" \"nonempty\"\n"
+"                                      \"allow_root\" \"allow_other\")\n"
+"                                    \",\"))))\n"
+"            (mntoptions (@@ (require \"nosuid,nodev\")))\n"
+"            (logout (@@ (wait \"0\")\n"
+"                       (hup \"0\")\n"
+"                       (term \"no\")\n"
+"                       (kill \"no\")))\n"
+"            (mkmountpoint (@@ (enable \"1\")\n"
+"                             (remove \"true\")))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31074
+#, no-wrap
+msgid ""
+"(service pam-mount-service-type\n"
+"         (pam-mount-configuration\n"
+"           (rules pam-mount-rules)))\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31078
+msgid "The complete list of possible options can be found in the man page for @uref{http://pam-mount.sourceforge.net/pam_mount.conf.5.html, pam_mount.conf}."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31085
+#, no-wrap
+msgid "Guix Build Coordinator"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31091
+msgid "The @uref{https://git.cbaines.net/guix/build-coordinator/,Guix Build Coordinator} aids in distributing derivation builds among machines running an @dfn{agent}.  The build daemon is still used to build the derivations, but the Guix Build Coordinator manages allocating builds and working with the results."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:31096
+msgid "This service is considered experimental.  Configuration options may be changed in a backwards-incompatible manner, and not all features have been thorougly tested."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31103
+msgid "The Guix Build Coordinator consists of one @dfn{coordinator}, and one or more connected @dfn{agent} processes.  The coordinator process handles clients submitting builds, and allocating builds to agents.  The agent processes talk to a build daemon to actually perform the builds, then send the results back to the coordinator."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31107
+msgid "There is a script to run the coordinator component of the Guix Build Coordinator, but the Guix service uses a custom Guile script instead, to provide better integration with G-expressions used in the configuration."
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31108
+#, no-wrap
+msgid "{Scheme Variable} guix-build-coordinator-service-type"
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31111
+msgid "Service type for the Guix Build Coordinator.  Its value must be a @code{guix-build-coordinator-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31113
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} guix-build-coordinator-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31115
+msgid "Data type representing the configuration of the Guix Build Coordinator."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31117 guix-git/doc/guix.texi:31161
+#: guix-git/doc/guix.texi:31278
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{package} (default: @code{guix-build-coordinator})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31119 guix-git/doc/guix.texi:31163
+#: guix-git/doc/guix.texi:31280
+msgid "The Guix Build Coordinator package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31120
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{user} (default: @code{\"guix-build-coordinator\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31122 guix-git/doc/guix.texi:31166
+#: guix-git/doc/guix.texi:31283 guix-git/doc/guix.texi:31329
+#, fuzzy
+#| msgid "The mcron service."
+msgid "The system user to run the service as."
+msgstr "mcron服务。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31123
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{group} (default: @code{\"guix-build-coordinator\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31125 guix-git/doc/guix.texi:31332
+msgid "The system group to run the service as."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31126
+#, no-wrap
+msgid "@code{database-uri-string} (default: @code{\"sqlite:///var/lib/guix-build-coordinator/guix_build_coordinator.db\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31128
+msgid "The URI to use for the database."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31129
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{agent-communication-uri} (default: @code{\"http://0.0.0.0:8745\"})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31131
+msgid "The URI describing how to listen to requests from agent processes."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31132
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{client-communication-uri} (default: @code{\"http://127.0.0.1:8746\"})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31136
+msgid "The URI describing how to listen to requests from clients.  The client API allows submitting builds and currently isn't authenticated, so take care when configuring this value."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31137
+#, no-wrap
+msgid "@code{allocation-strategy} (default: @code{#~basic-build-allocation-strategy})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31141
+msgid "A G-expression for the allocation strategy to be used.  This is a procedure that takes the datastore as an argument and populates the allocation plan in the database."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31142
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{hooks} (default: @var{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31145
+msgid "An association list of hooks.  These provide a way to execute arbitrary code upon certain events, like a build result being processed."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31146
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{guile} (default: @code{guile-3.0-latest})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31148
+msgid "The Guile package with which to run the Guix Build Coordinator."
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31152
+#, no-wrap
+msgid "{Scheme Variable} guix-build-coordinator-agent-service-type"
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31155
+msgid "Service type for a Guix Build Coordinator agent.  Its value must be a @code{guix-build-coordinator-agent-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31157
+#, no-wrap
+msgid "{Data Type} guix-build-coordinator-agent-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31159
+msgid "Data type representing the configuration a Guix Build Coordinator agent."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31164
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{user} (default: @code{\"guix-build-coordinator-agent\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:31167 guix-git/doc/guix.texi:31284
+#, fuzzy, no-wrap
+#| msgid "@code{vt} (default @code{\"vt7\"})"
+msgid "@code{coordinator} (default: @code{\"http://localhost:8745\"})"
+msgstr "@code{vt}（默认值：@code{\"vt7\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31169 guix-git/doc/guix.texi:31286
+msgid "The URI to use when connecting to the coordinator."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31170
+#, fuzzy, no-wrap
+#| msgid "Substitute Authentication"
+msgid "authentication"
+msgstr "验证substitute"
+
+#. type: table
+#: guix-git/doc/guix.texi:31173
+msgid "Record describing how this agent should authenticate with the coordinator.  Possible record types are described below."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31174 guix-git/doc/guix.texi:31287
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{systems} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31177
+msgid "The systems for which this agent should fetch builds.  The agent process will use the current system it's running on as the default."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31178
+#, fuzzy, no-wrap
+#| msgid "@code{parallel-builds} (default: @code{1})"
+msgid "@code{max-parallel-builds} (default: @code{1})"
+msgstr "@code{parallel-builds}（默认值：@code{1}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31180
+#, fuzzy
+#| msgid "The number of builds that may run in parallel on the machine."
+msgid "The number of builds to perform in parallel."
+msgstr "那台机器上可以并行运行的构建任务数量。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31181
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{derivation-substitute-urls} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31184
+msgid "URLs from which to attempt to fetch substitutes for derivations, if the derivations aren't already available."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31185
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{non-derivation-substitute-urls} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31188
+msgid "URLs from which to attempt to fetch substitutes for build inputs, if the input store items aren't already available."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31192
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} guix-build-coordinator-agent-password-auth"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31195
+msgid "Data type representing an agent authenticating with a coordinator via a UUID and password."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31201 guix-git/doc/guix.texi:31217
+msgid "The UUID of the agent.  This should be generated by the coordinator process, stored in the coordinator database, and used by the intended agent."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31204
+msgid "The password to use when connecting to the coordinator."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31208
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} guix-build-coordinator-agent-password-file-auth"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31211
+msgid "Data type representing an agent authenticating with a coordinator via a UUID and password read from a file."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31218
+#, no-wrap
+msgid "password-file"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31221
+msgid "A file containing the password to use when connecting to the coordinator."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31225
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} guix-build-coordinator-agent-dynamic-auth"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31228
+msgid "Data type representing an agent authenticating with a coordinator via a dynamic auth token and agent name."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31230 guix-git/doc/guix.texi:31247
+#, fuzzy, no-wrap
+#| msgid "Channels"
+msgid "agent-name"
+msgstr "通道"
+
+#. type: table
+#: guix-git/doc/guix.texi:31234 guix-git/doc/guix.texi:31251
+msgid "Name of an agent, this is used to match up to an existing entry in the database if there is one.  When no existing entry is found, a new entry is automatically added."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31235
+#, no-wrap
+msgid "token"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31238
+msgid "Dynamic auth token, this is created and stored in the coordinator database, and is used by the agent to authenticate."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31242
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} guix-build-coordinator-agent-dynamic-auth-with-file"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31245
+msgid "Data type representing an agent authenticating with a coordinator via a dynamic auth token read from a file and agent name."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:31252
+#, no-wrap
+msgid "token-file"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31255
+msgid "File containing the dynamic auth token, this is created and stored in the coordinator database, and is used by the agent to authenticate."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31265
+msgid "The Guix Build Coordinator package contains a script to query an instance of the Guix Data Service for derivations to build, and then submit builds for those derivations to the coordinator.  The service type below assists in running this script.  This is an additional tool that may be useful when building derivations contained within an instance of the Guix Data Service."
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31266
+#, no-wrap
+msgid "{Scheme Variable} guix-build-coordinator-queue-builds-service-type"
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31271
+msgid "Service type for the guix-build-coordinator-queue-builds-from-guix-data-service script.  Its value must be a @code{guix-build-coordinator-queue-builds-configuration} object."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31273
+#, no-wrap
+msgid "{Data Type} guix-build-coordinator-queue-builds-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31276
+msgid "Data type representing the options to the queue builds from guix data service script."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31281
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{user} (default: @code{\"guix-build-coordinator-queue-builds\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31289
+msgid "The systems for which to fetch derivations to build."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31290
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{systems-and-targets} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31293
+msgid "An association list of system and target pairs for which to fetch derivations to build."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31294
+#, no-wrap
+msgid "@code{guix-data-service} (default: @code{\"https://data.guix.gnu.org\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31297
+msgid "The Guix Data Service instance from which to query to find out about derivations to build."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31298
+#, no-wrap
+msgid "@code{processed-commits-file} (default: @code{\"/var/cache/guix-build-coordinator-queue-builds/processed-commits\"})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31301
+msgid "A file to record which commits have been processed, to avoid needlessly processing them again if the service is restarted."
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31305
+#, fuzzy, no-wrap
+#| msgid "Database Services"
+msgid "Guix Data Service"
+msgstr "数据库服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31309
+msgid "The @uref{http://data.guix.gnu.org,Guix Data Service} processes, stores and provides data about GNU Guix.  This includes information about packages, derivations and lint warnings."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31312
+msgid "The data is stored in a PostgreSQL database, and available through a web interface."
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31313
+#, no-wrap
+msgid "{Scheme Variable} guix-data-service-type"
+msgstr ""
+
+#. type: defvar
+#: guix-git/doc/guix.texi:31318
+msgid "Service type for the Guix Data Service.  Its value must be a @code{guix-data-service-configuration} object.  The service optionally extends the getmail service, as the guix-commits mailing list is used to find out about changes in the Guix git repository."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31320
+#, no-wrap
+msgid "{Data Type} guix-data-service-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31322
+msgid "Data type representing the configuration of the Guix Data Service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31324
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{package} (default: @code{guix-data-service})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31326
+msgid "The Guix Data Service package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31327
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{user} (default: @code{\"guix-data-service\"})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:31330
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{group} (default: @code{\"guix-data-service\"})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:31333
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{port} (default: @code{8765})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31335
+#, fuzzy
+#| msgid "The rottlog service."
+msgid "The port to bind the web service to."
+msgstr "rottlog服务。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31336
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{host} (default: @code{\"127.0.0.1\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31338
+#, fuzzy
+#| msgid "The rottlog service."
+msgid "The host to bind the web service to."
+msgstr "rottlog服务。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31339
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{getmail-idle-mailboxes} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31342
+msgid "If set, this is the list of mailboxes that the getmail service will be configured to listen to."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31343
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{commits-getmail-retriever-configuration} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31347
+msgid "If set, this is the @code{getmail-retriever-configuration} object with which to configure getmail to fetch mail from the guix-commits mailing list."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31348
+#, no-wrap
+msgid "@code{extra-options} (default: @var{'()})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31350
+msgid "Extra command line options for @code{guix-data-service}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31351
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{extra-process-jobs-options} (default: @var{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31353
+msgid "Extra command line options for @code{guix-data-service-process-jobs}."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31360
+#, no-wrap
+msgid "oom"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31361
+#, no-wrap
+msgid "out of memory killer"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31362
+#, no-wrap
+msgid "earlyoom"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31363
+#, no-wrap
+msgid "early out of memory daemon"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31364
+#, fuzzy, no-wrap
+#| msgid "Mail Services"
+msgid "Early OOM Service"
+msgstr "邮件服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31371
+msgid "@uref{https://github.com/rfjakob/earlyoom,Early OOM}, also known as Earlyoom, is a minimalist out of memory (OOM) daemon that runs in user space and provides a more responsive and configurable alternative to the in-kernel OOM killer.  It is useful to prevent the system from becoming unresponsive when it runs out of memory."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31372
+#, no-wrap
+msgid "{Scheme Variable} earlyoom-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31377
+msgid "The service type for running @command{earlyoom}, the Early OOM daemon.  Its value must be a @code{earlyoom-configuration} object, described below.  The service can be instantiated in its default configuration with:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31380
+#, no-wrap
+msgid "(service earlyoom-service-type)\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31383
+#, no-wrap
+msgid "{Data Type} earlyoom-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31385
+msgid "This is the configuration record for the @code{earlyoom-service-type}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31387
+#, fuzzy, no-wrap
+#| msgid "@code{gnome} (default: @code{gnome})"
+msgid "@code{earlyoom} (default: @var{earlyoom})"
+msgstr "@code{gnome}（默认值：@code{gnome}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31389
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Earlyoom package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31390
+#, fuzzy, no-wrap
+#| msgid "@code{parallel-builds} (default: @code{1})"
+msgid "@code{minimum-available-memory} (default: @code{10})"
+msgstr "@code{parallel-builds}（默认值：@code{1}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31392
+msgid "The threshold for the minimum @emph{available} memory, in percentages."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31393
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{minimum-free-swap} (default: @code{10})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31395
+msgid "The threshold for the minimum free swap memory, in percentages."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31396
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{prefer-regexp} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31399
+msgid "A regular expression (as a string) to match the names of the processes that should be preferably killed."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31400
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{avoid-regexp} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31403
+msgid "A regular expression (as a string) to match the names of the processes that should @emph{not} be killed."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31404
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{memory-report-interval} (default: @code{0})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31407
+msgid "The interval in seconds at which a memory report is printed.  It is disabled by default."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31408
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{ignore-positive-oom-score-adj?} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31411
+msgid "A boolean indicating whether the positive adjustments set in @file{/proc/*/oom_score_adj} should be ignored."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31412
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{show-debug-messages?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31415
+msgid "A boolean indicating whether debug messages should be printed.  The logs are saved at @file{/var/log/earlyoom.log}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31416
+#, fuzzy, no-wrap
+#| msgid "@code{authentication-hook} (default: @code{#f})"
+msgid "@code{send-notification-command} (default: @code{#f})"
+msgstr "@code{authentication-hook}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31419
+msgid "This can be used to provide a custom command used for sending notifications."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31422
+#, no-wrap
+msgid "modprobe"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31423
+#, no-wrap
+msgid "kernel module loader"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31424
+#, no-wrap
+msgid "Kernel Module Loader Service"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31430
+msgid "The kernel module loader service allows one to load loadable kernel modules at boot.  This is especially useful for modules that don't autoload and need to be manually loaded, as it's the case with @code{ddcci}."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31431
+#, no-wrap
+msgid "{Scheme Variable} kernel-module-loader-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31437
+msgid "The service type for loading loadable kernel modules at boot with @command{modprobe}.  Its value must be a list of strings representing module names.  For example loading the drivers provided by @code{ddcci-driver-linux}, in debugging mode by passing some module parameters, can be done as follow:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31442
+#, no-wrap
+msgid ""
+"(use-modules (gnu) (gnu services))\n"
+"(use-package-modules linux)\n"
+"(use-service-modules linux)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31446
+#, no-wrap
+msgid ""
+"(define ddcci-config\n"
+"  (plain-file \"ddcci.conf\"\n"
+"              \"options ddcci dyndbg delay=120\"))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31456
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ...\n"
+"  (services (cons* (service kernel-module-loader-service-type\n"
+"                            '(\"ddcci\" \"ddcci_backlight\"))\n"
+"                   (simple-service 'ddcci-config etc-service-type\n"
+"                                   (list `(\"modprobe.d/ddcci.conf\"\n"
+"                                           ,ddcci-config)))\n"
+"                   %base-services))\n"
+"  (kernel-loadable-modules (list ddcci-driver-linux)))\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31459
+#, no-wrap
+msgid "zram"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31460
+#, no-wrap
+msgid "compressed swap"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31461
+#, no-wrap
+msgid "Compressed RAM-based block devices"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31462
+#, fuzzy, no-wrap
+#| msgid "Game Services"
+msgid "Zram Device Service"
+msgstr "游戏服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31468
+msgid "The Zram device service provides a compressed swap device in system memory.  The Linux Kernel documentation has more information about @uref{https://www.kernel.org/doc/html/latest/admin-guide/blockdev/zram.html,zram} devices."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31469
+#, no-wrap
+msgid "{Scheme Variable} zram-device-service-type"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:31473
+msgid "This service creates the zram block device, formats it as swap and enables it as a swap device.  The service's value is a @code{zram-device-configuration} record."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31474
+#, no-wrap
+msgid "{Data Type} zram-device-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31477
+msgid "This is the data type representing the configuration for the zram-device service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31479
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{size} (default @code{\"1G\"})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31483
+msgid "This is the amount of space you wish to provide for the zram device.  It accepts a string and can be a number of bytes or use a suffix, eg.: @code{\"512M\"} or @code{1024000}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31483
+#, fuzzy, no-wrap
+#| msgid "@code{compression-level} (default: @code{3})"
+msgid "@code{compression-algorithm} (default @code{'lzo})"
+msgstr "@code{compression-level}（默认值：@code{3}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31487
+msgid "This is the compression algorithm you wish to use.  It is difficult to list all the possible compression options, but common ones supported by Guix's Linux Libre Kernel include @code{'lzo}, @code{'lz4} and @code{'zstd}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31487
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{memory-limit} (default @code{0})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31494
+msgid "This is the maximum amount of memory which the zram device can use.  Setting it to '0' disables the limit.  While it is generally expected that compression will be 2:1, it is possible that uncompressable data can be written to swap and this is a method to limit how much memory can be used.  It accepts a string and can be a number of bytes or use a suffix, eg.: @code{\"2G\"}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31494
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{priority} (default @code{-1})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31499
+msgid "This is the priority of the swap device created from the zram device.  @code{swapon} accepts values between -1 and 32767, with higher values indicating higher priority.  Higher priority swap will generally be used first."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31507
+#, no-wrap
+msgid "{Scheme Variable} hurd-console-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31509
+msgid "This service starts the fancy @code{VGA} console client on the Hurd."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31511
+msgid "The service's value is a @code{hurd-console-configuration} record."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31513
+#, no-wrap
+msgid "{Data Type} hurd-console-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31516
+msgid "This is the data type representing the configuration for the hurd-console-service."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31518 guix-git/doc/guix.texi:31534
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{hurd} (default: @var{hurd})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31520 guix-git/doc/guix.texi:31536
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Hurd package to use."
+msgstr "软件包数据类型。"
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31523
+#, no-wrap
+msgid "{Scheme Variable} hurd-getty-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31525
+msgid "This service starts a tty using the Hurd @code{getty} program."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31527
+msgid "The service's value is a @code{hurd-getty-configuration} record."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31529
+#, no-wrap
+msgid "{Data Type} hurd-getty-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31532
+msgid "This is the data type representing the configuration for the hurd-getty-service."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31539
+msgid "The name of the console this Getty runs on---e.g., @code{\"tty1\"}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31540
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{baud-rate} (default: @code{38400})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31542
+msgid "An integer specifying the baud rate of the tty."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31549
 #, no-wrap
 msgid "fingerprint"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23349
+#: guix-git/doc/guix.texi:31550
 #, no-wrap
 msgid "Fingerprint Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23353
+#: guix-git/doc/guix.texi:31554
 msgid "The @code{(gnu services authentication)} module provides a DBus service to read and identify fingerprints via a fingerprint sensor."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23354
+#: guix-git/doc/guix.texi:31555
 #, no-wrap
 msgid "{Scheme Variable} fprintd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23357
+#: guix-git/doc/guix.texi:31558
 msgid "The service type for @command{fprintd}, which provides the fingerprint reading capability."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23360
+#. type: lisp
+#: guix-git/doc/guix.texi:31561
 #, no-wrap
 msgid "(service fprintd-service-type)\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23363
+#: guix-git/doc/guix.texi:31564
 #, no-wrap
 msgid "sysctl"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23364
+#: guix-git/doc/guix.texi:31565
 #, no-wrap
 msgid "System Control Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23368
+#: guix-git/doc/guix.texi:31569
 msgid "The @code{(gnu services sysctl)} provides a service to configure kernel parameters at boot."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23369
+#: guix-git/doc/guix.texi:31570
 #, no-wrap
 msgid "{Scheme Variable} sysctl-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23373
+#: guix-git/doc/guix.texi:31574
 msgid "The service type for @command{sysctl}, which modifies kernel parameters under @file{/proc/sys/}.  To enable IPv4 forwarding, it can be instantiated as:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23378
+#. type: lisp
+#: guix-git/doc/guix.texi:31579
 #, no-wrap
 msgid ""
 "(service sysctl-service-type\n"
@@ -41893,443 +57181,482 @@ msgid ""
 "           (settings '((\"net.ipv4.ip_forward\" . \"1\")))))\n"
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:31586
+msgid "Since @code{sysctl-service-type} is used in the default lists of services, @code{%base-services} and @code{%desktop-services}, you can use @code{modify-services} to change its configuration and add the kernel parameters that you want (@pxref{Service Reference, @code{modify-services}})."
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31593
+#, no-wrap
+msgid ""
+"(modify-services %base-services\n"
+"  (sysctl-service-type config =>\n"
+"                       (sysctl-configuration\n"
+"                         (settings (append '((\"net.ipv4.ip_forward\" . \"1\"))\n"
+"                                           %default-sysctl-settings)))))\n"
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:23381
+#: guix-git/doc/guix.texi:31597
 #, no-wrap
 msgid "{Data Type} sysctl-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23383
+#: guix-git/doc/guix.texi:31599
 msgid "The data type representing the configuration of @command{sysctl}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23385
+#: guix-git/doc/guix.texi:31601
 #, no-wrap
 msgid "@code{sysctl} (default: @code{(file-append procps \"/sbin/sysctl\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23387
+#: guix-git/doc/guix.texi:31603
 msgid "The @command{sysctl} executable to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23388
-#, no-wrap
-msgid "@code{settings} (default: @code{'()})"
-msgstr ""
+#: guix-git/doc/guix.texi:31604
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{settings} (default: @code{%default-sysctl-settings})"
+msgstr "@code{mate}（默认值：@code{mate}）"
 
 #. type: table
-#: doc/guix.texi:23390
+#: guix-git/doc/guix.texi:31606
 msgid "An association list specifies kernel parameters and their values."
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:31609
+#, no-wrap
+msgid "{Scheme Variable} %default-sysctl-settings"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31612
+msgid "An association list specifying the default @command{sysctl} parameters on Guix System."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:23393
+#: guix-git/doc/guix.texi:31614
 #, no-wrap
 msgid "pcscd"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23394
+#: guix-git/doc/guix.texi:31615
 #, no-wrap
 msgid "PC/SC Smart Card Daemon Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23401
-msgid "The @code{(gnu services security-token)} module provides the following service to run @command{pcscd}, the PC/SC Smart Card Daemon.  @command{pcscd} is the daemon program for pcsc-lite and the MuscleCard framework. It is a resource manager that coordinates communications with smart card readers, smart cards and cryptographic tokens that are connected to the system."
+#: guix-git/doc/guix.texi:31622
+msgid "The @code{(gnu services security-token)} module provides the following service to run @command{pcscd}, the PC/SC Smart Card Daemon.  @command{pcscd} is the daemon program for pcsc-lite and the MuscleCard framework.  It is a resource manager that coordinates communications with smart card readers, smart cards and cryptographic tokens that are connected to the system."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23402
+#: guix-git/doc/guix.texi:31623
 #, no-wrap
 msgid "{Scheme Variable} pcscd-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23406
+#: guix-git/doc/guix.texi:31627
 msgid "Service type for the @command{pcscd} service.  Its value must be a @code{pcscd-configuration} object.  To run pcscd in the default configuration, instantiate it as:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23409
+#. type: lisp
+#: guix-git/doc/guix.texi:31630
 #, no-wrap
 msgid "(service pcscd-service-type)\n"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23412
+#: guix-git/doc/guix.texi:31633
 #, no-wrap
 msgid "{Data Type} pcscd-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23414
+#: guix-git/doc/guix.texi:31635
 msgid "The data type representing the configuration of @command{pcscd}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23416
+#: guix-git/doc/guix.texi:31637
 #, no-wrap
 msgid "@code{pcsc-lite} (default: @code{pcsc-lite})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23418
+#: guix-git/doc/guix.texi:31639
 msgid "The pcsc-lite package that provides pcscd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23418
+#: guix-git/doc/guix.texi:31639
 #, no-wrap
 msgid "@code{usb-drivers} (default: @code{(list ccid)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23421
-msgid "List of packages that provide USB drivers to pcscd. Drivers are expected to be under @file{pcsc/drivers} in the store directory of the package."
+#: guix-git/doc/guix.texi:31642
+msgid "List of packages that provide USB drivers to pcscd.  Drivers are expected to be under @file{pcsc/drivers} in the store directory of the package."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23424
+#: guix-git/doc/guix.texi:31645
 #, no-wrap
 msgid "lirc"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23425
+#: guix-git/doc/guix.texi:31646
 #, no-wrap
 msgid "Lirc Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23428
+#: guix-git/doc/guix.texi:31649
 msgid "The @code{(gnu services lirc)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23429
+#: guix-git/doc/guix.texi:31650
 #, no-wrap
 msgid "{Scheme Procedure} lirc-service [#:lirc lirc] @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23434
+#: guix-git/doc/guix.texi:31655
 msgid "[#:device #f] [#:driver #f] [#:config-file #f] @ [#:extra-options '()] Return a service that runs @url{http://www.lirc.org,LIRC}, a daemon that decodes infrared signals from remote controls."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23438
+#: guix-git/doc/guix.texi:31659
 msgid "Optionally, @var{device}, @var{driver} and @var{config-file} (configuration file name) may be specified.  See @command{lircd} manual for details."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23441
+#: guix-git/doc/guix.texi:31662
 msgid "Finally, @var{extra-options} is a list of additional command-line options passed to @command{lircd}."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23443
+#: guix-git/doc/guix.texi:31664
 #, no-wrap
 msgid "spice"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23444
+#: guix-git/doc/guix.texi:31665
 #, no-wrap
 msgid "Spice Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23447
+#: guix-git/doc/guix.texi:31668
 msgid "The @code{(gnu services spice)} module provides the following service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23448
+#: guix-git/doc/guix.texi:31669
 #, no-wrap
 msgid "{Scheme Procedure} spice-vdagent-service [#:spice-vdagent]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23452
+#: guix-git/doc/guix.texi:31673
 msgid "Returns a service that runs @url{https://www.spice-space.org,VDAGENT}, a daemon that enables sharing the clipboard with a vm and setting the guest display resolution when the graphical console window resizes."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23454
+#: guix-git/doc/guix.texi:31675
 #, no-wrap
 msgid "inputattach"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23455
+#: guix-git/doc/guix.texi:31676
 #, no-wrap
 msgid "inputattach Service"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23457
+#: guix-git/doc/guix.texi:31678
 #, no-wrap
 msgid "tablet input, for Xorg"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23458
+#: guix-git/doc/guix.texi:31679
 #, no-wrap
 msgid "touchscreen input, for Xorg"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23462
+#: guix-git/doc/guix.texi:31683
 msgid "The @uref{https://linuxwacom.github.io/, inputattach} service allows you to use input devices such as Wacom tablets, touchscreens, or joysticks with the Xorg display server."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23463
+#: guix-git/doc/guix.texi:31684
 #, no-wrap
 msgid "{Scheme Variable} inputattach-service-type"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23466
+#: guix-git/doc/guix.texi:31687
 msgid "Type of a service that runs @command{inputattach} on a device and dispatches events from it."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23468
+#: guix-git/doc/guix.texi:31689
 #, no-wrap
 msgid "{Data Type} inputattach-configuration"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23470
+#: guix-git/doc/guix.texi:31691
 #, no-wrap
 msgid "@code{device-type} (default: @code{\"wacom\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23473
+#: guix-git/doc/guix.texi:31694
 msgid "The type of device to connect to.  Run @command{inputattach --help}, from the @code{inputattach} package, to see the list of supported device types."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23474
+#: guix-git/doc/guix.texi:31695
 #, no-wrap
 msgid "@code{device} (default: @code{\"/dev/ttyS0\"})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23476
+#: guix-git/doc/guix.texi:31697
 msgid "The device file to connect to the device."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:31701
+msgid "Baud rate to use for the serial connection.  Should be a number or @code{#f}."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:23477
+#: guix-git/doc/guix.texi:31702
 #, no-wrap
 msgid "@code{log-file} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23479
+#: guix-git/doc/guix.texi:31704
 msgid "If true, this must be the name of a file to log messages to."
 msgstr ""
 
-#. type: subsection
-#: doc/guix.texi:23482
-#, no-wrap
-msgid "Dictionary Services"
-msgstr ""
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31707
+#, fuzzy, no-wrap
+#| msgid "Defining Services"
+msgid "Dictionary Service"
+msgstr "定义服务"
 
 #. type: cindex
-#: doc/guix.texi:23483
+#: guix-git/doc/guix.texi:31708
 #, no-wrap
 msgid "dictionary"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23485
+#: guix-git/doc/guix.texi:31710
 msgid "The @code{(gnu services dict)} module provides the following service:"
 msgstr ""
 
+#. type: defvr
+#: guix-git/doc/guix.texi:31711
+#, no-wrap
+msgid "{Scheme Variable} dicod-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31714
+msgid "This is the type of the service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
+msgstr ""
+
 #. type: deffn
-#: doc/guix.texi:23486
+#: guix-git/doc/guix.texi:31716
 #, no-wrap
 msgid "{Scheme Procedure} dicod-service [#:config (dicod-configuration)]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23489
+#: guix-git/doc/guix.texi:31719
 msgid "Return a service that runs the @command{dicod} daemon, an implementation of DICT server (@pxref{Dicod,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23493
-msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{<dicod-configuration>} object, by default it serves the GNU Collaborative International Dictonary of English."
+#: guix-git/doc/guix.texi:31723
+msgid "The optional @var{config} argument specifies the configuration for @command{dicod}, which should be a @code{<dicod-configuration>} object, by default it serves the GNU Collaborative International Dictionary of English."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23497
+#: guix-git/doc/guix.texi:31727
 msgid "You can add @command{open localhost} to your @file{~/.dico} file to make @code{localhost} the default server for @command{dico} client (@pxref{Initialization File,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23499
+#: guix-git/doc/guix.texi:31729
 #, no-wrap
 msgid "{Data Type} dicod-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23501
+#: guix-git/doc/guix.texi:31731
 msgid "Data type representing the configuration of dicod."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23503
+#: guix-git/doc/guix.texi:31733
 #, no-wrap
 msgid "@code{dico} (default: @var{dico})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23505
+#: guix-git/doc/guix.texi:31735
 msgid "Package object of the GNU Dico dictionary server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23506
+#: guix-git/doc/guix.texi:31736
 #, no-wrap
 msgid "@code{interfaces} (default: @var{'(\"localhost\")})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23510
+#: guix-git/doc/guix.texi:31740
 msgid "This is the list of IP addresses and ports and possibly socket file names to listen to (@pxref{Server Settings, @code{listen} directive,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23511
+#: guix-git/doc/guix.texi:31741
 #, no-wrap
 msgid "@code{handlers} (default: @var{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23513
+#: guix-git/doc/guix.texi:31743
 msgid "List of @code{<dicod-handler>} objects denoting handlers (module instances)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23514
+#: guix-git/doc/guix.texi:31744
 #, no-wrap
 msgid "@code{databases} (default: @var{(list %dicod-database:gcide)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23516
+#: guix-git/doc/guix.texi:31746
 msgid "List of @code{<dicod-database>} objects denoting dictionaries to be served."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23519
+#: guix-git/doc/guix.texi:31749
 #, no-wrap
 msgid "{Data Type} dicod-handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23521
+#: guix-git/doc/guix.texi:31751
 msgid "Data type representing a dictionary handler (module instance)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23525
+#: guix-git/doc/guix.texi:31755
 msgid "Name of the handler (module instance)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23526
+#: guix-git/doc/guix.texi:31756
 #, no-wrap
 msgid "@code{module} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23530
+#: guix-git/doc/guix.texi:31760
 msgid "Name of the dicod module of the handler (instance).  If it is @code{#f}, the module has the same name as the handler.  (@pxref{Modules,,, dico, GNU Dico Manual})."
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:23531 doc/guix.texi:23551
-#, no-wrap
-msgid "options"
-msgstr ""
-
 #. type: table
-#: doc/guix.texi:23533
+#: guix-git/doc/guix.texi:31763
 msgid "List of strings or gexps representing the arguments for the module handler"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23536
+#: guix-git/doc/guix.texi:31766
 #, no-wrap
 msgid "{Data Type} dicod-database"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23538
+#: guix-git/doc/guix.texi:31768
 msgid "Data type representing a dictionary database."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23542
+#: guix-git/doc/guix.texi:31772
 msgid "Name of the database, will be used in DICT commands."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:23543
+#: guix-git/doc/guix.texi:31773
 #, no-wrap
 msgid "handler"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23546
+#: guix-git/doc/guix.texi:31776
 msgid "Name of the dicod handler (module instance) used by this database (@pxref{Handlers,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23547
+#: guix-git/doc/guix.texi:31777
 #, no-wrap
 msgid "@code{complex?} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23550
+#: guix-git/doc/guix.texi:31780
 msgid "Whether the database configuration complex.  The complex configuration will need a corresponding @code{<dicod-handler>} object, otherwise not."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23554
+#: guix-git/doc/guix.texi:31784
 msgid "List of strings or gexps representing the arguments for the database (@pxref{Databases,,, dico, GNU Dico Manual})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23557
+#: guix-git/doc/guix.texi:31787
 #, no-wrap
 msgid "{Scheme Variable} %dicod-database:gcide"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23560
+#: guix-git/doc/guix.texi:31790
 msgid "A @code{<dicod-database>} object serving the GNU Collaborative International Dictionary of English using the @code{gcide} package."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23563
+#: guix-git/doc/guix.texi:31793
 msgid "The following is an example @code{dicod-service} configuration."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23578
+#. type: lisp
+#: guix-git/doc/guix.texi:31808
 #, no-wrap
 msgid ""
 "(dicod-service #:config\n"
@@ -42348,236 +57675,667 @@ msgid ""
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23580
+#: guix-git/doc/guix.texi:31810
 #, no-wrap
 msgid "Docker"
 msgstr ""
 
 #. type: subsubheading
-#: doc/guix.texi:23581
+#: guix-git/doc/guix.texi:31811
 #, no-wrap
 msgid "Docker Service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23584
-msgid "The @code{(gnu services docker)} module provides the following service."
+#: guix-git/doc/guix.texi:31814
+msgid "The @code{(gnu services docker)} module provides the following services."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23585
+#: guix-git/doc/guix.texi:31815
 #, no-wrap
 msgid "{Scheme Variable} docker-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23590
+#: guix-git/doc/guix.texi:31820
 msgid "This is the type of the service that runs @url{https://www.docker.com,Docker}, a daemon that can execute application bundles (sometimes referred to as ``containers'') in isolated environments."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23593
+#: guix-git/doc/guix.texi:31823
 #, no-wrap
 msgid "{Data Type} docker-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23595
+#: guix-git/doc/guix.texi:31825
 msgid "This is the data type representing the configuration of Docker and Containerd."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23598
+#: guix-git/doc/guix.texi:31828
 #, no-wrap
 msgid "@code{package} (default: @code{docker})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23600
-msgid "The Docker package to use."
+#: guix-git/doc/guix.texi:31830
+msgid "The Docker daemon package to use."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23601
+#: guix-git/doc/guix.texi:31831
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{package} (default: @code{docker-cli})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31833
+msgid "The Docker client package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31834
 #, no-wrap
 msgid "@code{containerd} (default: @var{containerd})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23603
+#: guix-git/doc/guix.texi:31836
 msgid "The Containerd package to use."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:31837
+#, no-wrap
+msgid "@code{proxy} (default @var{docker-libnetwork-cmd-proxy})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31839
+msgid "The Docker user-land networking proxy package to use."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31840
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{enable-proxy?} (default @code{#t})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31842
+msgid "Enable or disable the use of the Docker user-land networking proxy."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31843
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{debug?} (default @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31845
+#, fuzzy
+#| msgid "How to enable or disable substitutes."
+msgid "Enable or disable debug output."
+msgstr "怎么开启或关闭substitute。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31846
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{enable-iptables?} (default @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31848
+msgid "Enable or disable the addition of iptables rules."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31852
+#, no-wrap
+msgid "Singularity, container service"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31853
+#, no-wrap
+msgid "{Scheme Variable} singularity-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31858
+msgid "This is the type of the service that allows you to run @url{https://www.sylabs.io/singularity/, Singularity}, a Docker-style tool to create and run application bundles (aka. ``containers'').  The value for this service is the Singularity package to use."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31862
+msgid "The service does not install a daemon; instead, it installs helper programs as setuid-root (@pxref{Setuid Programs}) such that unprivileged users can invoke @command{singularity run} and similar commands."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31864
+#, no-wrap
+msgid "Audit"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31865
+#, fuzzy, no-wrap
+#| msgid "Audio Services"
+msgid "Auditd Service"
+msgstr "音频服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31868
+msgid "The @code{(gnu services auditd)} module provides the following service."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31869
+#, no-wrap
+msgid "{Scheme Variable} auditd-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31874
+msgid "This is the type of the service that runs @url{https://people.redhat.com/sgrubb/audit/,auditd}, a daemon that tracks security-relevant information on your system."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31876
+msgid "Examples of things that can be tracked:"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31880
+#, fuzzy
+#| msgid "File Systems"
+msgid "File accesses"
+msgstr "文件系统"
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31882
+#, fuzzy
+#| msgid "System Installation"
+msgid "System calls"
+msgstr "系统安装"
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31884
+msgid "Invoked commands"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31886
+msgid "Failed login attempts"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31888
+msgid "Firewall filtering"
+msgstr ""
+
+#. type: enumerate
+#: guix-git/doc/guix.texi:31890
+#, fuzzy
+#| msgid "Networking Services"
+msgid "Network access"
+msgstr "网络服务"
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31901
+msgid "@command{auditctl} from the @code{audit} package can be used in order to add or remove events to be tracked (until the next reboot).  In order to permanently track events, put the command line arguments of auditctl into a file called @code{audit.rules} in the configuration directory (see below).  @command{aureport} from the @code{audit} package can be used in order to view a report of all recorded events.  The audit daemon by default logs into the file @file{/var/log/audit.log}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31904
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} auditd-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31906
+msgid "This is the data type representing the configuration of auditd."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31909
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{audit} (default: @code{audit})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31911
+#, fuzzy
+#| msgid "The package data type."
+msgid "The audit package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31912
+#, no-wrap
+msgid "@code{configuration-directory} (default: @code{%default-auditd-configuration-directory})"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31916
+msgid "The directory containing the configuration file for the audit package, which must be named @code{auditd.conf}, and optionally some audit rules to instantiate on startup."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31920
+#, no-wrap
+msgid "rshiny"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31921
+#, fuzzy, no-wrap
+#| msgid "Telephony services."
+msgid "R-Shiny service"
+msgstr "电话服务。"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31924
+msgid "The @code{(gnu services science)} module provides the following service."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31925
+#, no-wrap
+msgid "{Scheme Variable} rshiny-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31930
+msgid "This is a type of service which is used to run a webapp created with @code{r-shiny}.  This service sets the @env{R_LIBS_USER} environment variable and runs the provided script to call @code{runApp}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31931
+#, no-wrap
+msgid "{Data Type} rshiny-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:31933
+msgid "This is the data type representing the configuration of rshiny."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31936
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{package} (default: @code{r-shiny})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31938
+#, fuzzy
+#| msgid "The package data type."
+msgid "The package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:31939
+#, fuzzy, no-wrap
+#| msgid "@code{display} (default @code{\":0\"})"
+msgid "@code{binary} (defaunlt @code{\"rshiny\"})"
+msgstr "@code{display}（默认值：@code{\":0\"}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:31942
+msgid "The name of the binary or shell script located at @code{package/bin/} to run when the service is run."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:31944
+msgid "The common way to create this file is as follows:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31962
+#, no-wrap
+msgid ""
+"@dots{}\n"
+"(let* ((out       (assoc-ref %outputs \"out\"))\n"
+"       (targetdir (string-append out \"/share/\" ,name))\n"
+"       (app       (string-append out \"/bin/\" ,name))\n"
+"       (Rbin      (string-append (assoc-ref %build-inputs \"r-min\")\n"
+"                                 \"/bin/Rscript\")))\n"
+"  ;; @dots{}\n"
+"  (mkdir-p (string-append out \"/bin\"))\n"
+"  (call-with-output-file app\n"
+"    (lambda (port)\n"
+"      (format port\n"
+"\"#!~a\n"
+"library(shiny)\n"
+"setwd(\\\"~a\\\")\n"
+"runApp(launch.browser=0, port=4202)~%\\n\"\n"
+"      Rbin targetdir))))\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:31968
+#, no-wrap
+msgid "Nix"
+msgstr ""
+
+#. type: subsubheading
+#: guix-git/doc/guix.texi:31969
+#, fuzzy, no-wrap
+#| msgid "DNS Services"
+msgid "Nix service"
+msgstr "DNS服务"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:31972
+msgid "The @code{(gnu services nix)} module provides the following service."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31973
+#, no-wrap
+msgid "{Scheme Variable} nix-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31978
+msgid "This is the type of the service that runs build daemon of the @url{https://nixos.org/nix/, Nix} package manager.  Here is an example showing how to use it:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31983
+#, no-wrap
+msgid ""
+"(use-modules (gnu))\n"
+"(use-service-modules nix)\n"
+"(use-package-modules package-management)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31988
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ;; @dots{}\n"
+"  (packages (append (list nix)\n"
+"                    %base-packages))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:31991
+#, no-wrap
+msgid ""
+"  (services (append (list (service nix-service-type))\n"
+"                    %base-services)))\n"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:31994
+msgid "After @command{guix system reconfigure} configure Nix for your user:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31996
+#, no-wrap
+msgid "Add a Nix channel and update it.  See"
+msgstr ""
+
+#. type: itemize
+#: guix-git/doc/guix.texi:31998
+msgid "@url{https://nixos.org/nix/manual/, Nix Package Manager Guide}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:31999
+#, no-wrap
+msgid "Create a symlink to your profile and activate Nix profile:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:32005
+#, no-wrap
+msgid ""
+"$ ln -s \"/nix/var/nix/profiles/per-user/$USER/profile\" ~/.nix-profile\n"
+"$ source /run/current-system/profile/etc/profile.d/nix.sh\n"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:32009
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} nix-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:32011
+msgid "This data type represents the configuration of the Nix daemon."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:32013
+#, fuzzy, no-wrap
+#| msgid "@code{xfce} (default: @code{xfce})"
+msgid "@code{nix} (default: @code{nix})"
+msgstr "@code{xfce}（默认值：@code{xfce}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32015
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Nix package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:32016
+#, fuzzy, no-wrap
+#| msgid "@code{speed} (default: @code{1.0})"
+msgid "@code{sandbox} (default: @code{#t})"
+msgstr "@code{speed}（默认值：@code{1.0}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32018
+msgid "Specifies whether builds are sandboxed by default."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:32019
+#, fuzzy, no-wrap
+#| msgid "@code{includes} (default: @code{'()})"
+msgid "@code{build-sandbox-items} (default: @code{'()})"
+msgstr "@code{includes}（默认值：@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32022
+msgid "This is a list of strings or objects appended to the @code{build-sandbox-items} field of the configuration file."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32030
+msgid "Extra command line options for @code{nix-service-type}."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:23610
+#: guix-git/doc/guix.texi:32036
 #, no-wrap
 msgid "setuid programs"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23620
-msgid "Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users.  A notorious example is the @command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/etc/shadow} files---something normally restricted to root, for obvious security reasons.  To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism.)"
+#: guix-git/doc/guix.texi:32046
+msgid "Some programs need to run with ``root'' privileges, even when they are launched by unprivileged users.  A notorious example is the @command{passwd} program, which users can run to change their password, and which needs to access the @file{/etc/passwd} and @file{/etc/shadow} files---something normally restricted to root, for obvious security reasons.  To address that, these executables are @dfn{setuid-root}, meaning that they always run with root privileges (@pxref{How Change Persona,,, libc, The GNU C Library Reference Manual}, for more info about the setuid mechanism)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23627
+#: guix-git/doc/guix.texi:32053
 msgid "The store itself @emph{cannot} contain setuid programs: that would be a security issue since any user on the system can write derivations that populate the store (@pxref{The Store}).  Thus, a different mechanism is used: instead of changing the setuid bit directly on files that are in the store, we let the system administrator @emph{declare} which programs should be setuid root."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23633
+#: guix-git/doc/guix.texi:32059
 msgid "The @code{setuid-programs} field of an @code{operating-system} declaration contains a list of G-expressions denoting the names of programs to be setuid-root (@pxref{Using the Configuration System}).  For instance, the @command{passwd} program, which is part of the Shadow package, can be designated by this G-expression (@pxref{G-Expressions}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:23636
+#: guix-git/doc/guix.texi:32062
 #, no-wrap
 msgid "#~(string-append #$shadow \"/bin/passwd\")\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23640
+#: guix-git/doc/guix.texi:32066
 msgid "A default set of setuid programs is defined by the @code{%setuid-programs} variable of the @code{(gnu system)} module."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23641
+#: guix-git/doc/guix.texi:32067
 #, no-wrap
 msgid "{Scheme Variable} %setuid-programs"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23643
+#: guix-git/doc/guix.texi:32069
 msgid "A list of G-expressions denoting common programs that are setuid-root."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23646
+#: guix-git/doc/guix.texi:32072
 msgid "The list includes commands such as @command{passwd}, @command{ping}, @command{su}, and @command{sudo}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23652
+#: guix-git/doc/guix.texi:32078
 msgid "Under the hood, the actual setuid programs are created in the @file{/run/setuid-programs} directory at system activation time.  The files in this directory refer to the ``real'' binaries, which are in the store."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23656
+#: guix-git/doc/guix.texi:32082
 #, no-wrap
 msgid "HTTPS, certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23657
+#: guix-git/doc/guix.texi:32083
 #, no-wrap
 msgid "X.509 certificates"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23658
+#: guix-git/doc/guix.texi:32084
 #, no-wrap
 msgid "TLS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23665
+#: guix-git/doc/guix.texi:32091
 msgid "Web servers available over HTTPS (that is, HTTP over the transport-layer security mechanism, TLS) send client programs an @dfn{X.509 certificate} that the client can then use to @emph{authenticate} the server.  To do that, clients verify that the server's certificate is signed by a so-called @dfn{certificate authority} (CA).  But to verify the CA's signature, clients must have first acquired the CA's certificate."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23669
+#: guix-git/doc/guix.texi:32095
 msgid "Web browsers such as GNU@tie{}IceCat include their own set of CA certificates, such that they are able to verify CA signatures out-of-the-box."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23673
+#: guix-git/doc/guix.texi:32099
 msgid "However, most other programs that can talk HTTPS---@command{wget}, @command{git}, @command{w3m}, etc.---need to be told where CA certificates can be found."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23680
+#: guix-git/doc/guix.texi:32106
 msgid "In Guix, this is done by adding a package that provides certificates to the @code{packages} field of the @code{operating-system} declaration (@pxref{operating-system Reference}).  Guix includes one such package, @code{nss-certs}, which is a set of CA certificates provided as part of Mozilla's Network Security Services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23685
-msgid "Note that it is @emph{not} part of @var{%base-packages}, so you need to explicitly add it.  The @file{/etc/ssl/certs} directory, which is where most applications and libraries look for certificates by default, points to the certificates installed globally."
+#: guix-git/doc/guix.texi:32111
+msgid "Note that it is @emph{not} part of @code{%base-packages}, so you need to explicitly add it.  The @file{/etc/ssl/certs} directory, which is where most applications and libraries look for certificates by default, points to the certificates installed globally."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23695
-msgid "Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile.  A number of environment variables need to be defined so that applications and libraries know where to find them.  Namely, the OpenSSL library honors the @code{SSL_CERT_DIR} and @code{SSL_CERT_FILE} variables.  Some applications add their own environment variables; for instance, the Git version control system honors the certificate bundle pointed to by the @code{GIT_SSL_CAINFO} environment variable.  Thus, you would typically run something like:"
+#: guix-git/doc/guix.texi:32121
+msgid "Unprivileged users, including users of Guix on a foreign distro, can also install their own certificate package in their profile.  A number of environment variables need to be defined so that applications and libraries know where to find them.  Namely, the OpenSSL library honors the @env{SSL_CERT_DIR} and @env{SSL_CERT_FILE} variables.  Some applications add their own environment variables; for instance, the Git version control system honors the certificate bundle pointed to by the @env{GIT_SSL_CAINFO} environment variable.  Thus, you would typically run something like:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:23701
+#: guix-git/doc/guix.texi:32127
 #, no-wrap
 msgid ""
-"$ guix install nss-certs\n"
-"$ export SSL_CERT_DIR=\"$HOME/.guix-profile/etc/ssl/certs\"\n"
-"$ export SSL_CERT_FILE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
-"$ export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n"
+"guix install nss-certs\n"
+"export SSL_CERT_DIR=\"$HOME/.guix-profile/etc/ssl/certs\"\n"
+"export SSL_CERT_FILE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
+"export GIT_SSL_CAINFO=\"$SSL_CERT_FILE\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23706
-msgid "As another example, R requires the @code{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to run something like this:"
+#: guix-git/doc/guix.texi:32132
+msgid "As another example, R requires the @env{CURL_CA_BUNDLE} environment variable to point to a certificate bundle, so you would have to run something like this:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:23710
+#: guix-git/doc/guix.texi:32136
 #, no-wrap
 msgid ""
-"$ guix install nss-certs\n"
-"$ export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
+"guix install nss-certs\n"
+"export CURL_CA_BUNDLE=\"$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23714
+#: guix-git/doc/guix.texi:32140
 msgid "For other applications you may want to look up the required environment variable in the relevant documentation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23719
+#: guix-git/doc/guix.texi:32145
 #, no-wrap
 msgid "name service switch"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23720
+#: guix-git/doc/guix.texi:32146
 #, no-wrap
 msgid "NSS"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23729
+#: guix-git/doc/guix.texi:32155
 msgid "The @code{(gnu system nss)} module provides bindings to the configuration file of the libc @dfn{name service switch} or @dfn{NSS} (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}).  In a nutshell, the NSS is a mechanism that allows libc to be extended with new ``name'' lookup methods for system databases, which includes host names, service names, user accounts, and more (@pxref{Name Service Switch, System Databases and Name Service Switch,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23736
+#: guix-git/doc/guix.texi:32162
 msgid "The NSS configuration specifies, for each system database, which lookup method is to be used, and how the various methods are chained together---for instance, under which circumstances NSS should try the next method in the list.  The NSS configuration is given in the @code{name-service-switch} field of @code{operating-system} declarations (@pxref{operating-system Reference, @code{name-service-switch}})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23737
+#: guix-git/doc/guix.texi:32163
 #, no-wrap
 msgid "nss-mdns"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23738
+#: guix-git/doc/guix.texi:32164
 #, no-wrap
 msgid ".local, host name lookup"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23743
-msgid "As an example, the declaration below configures the NSS to use the @uref{http://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS)  for host names ending in @code{.local}:"
+#: guix-git/doc/guix.texi:32169
+msgid "As an example, the declaration below configures the NSS to use the @uref{https://0pointer.de/lennart/projects/nss-mdns/, @code{nss-mdns} back-end}, which supports host name lookups over multicast DNS (mDNS)  for host names ending in @code{.local}:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23747
+#. type: lisp
+#: guix-git/doc/guix.texi:32173
 #, no-wrap
 msgid ""
 "(name-service-switch\n"
@@ -42585,8 +58343,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23752
+#. type: lisp
+#: guix-git/doc/guix.texi:32178
 #, no-wrap
 msgid ""
 "                ;; If the above did not succeed, try\n"
@@ -42596,8 +58354,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23758
+#. type: lisp
+#: guix-git/doc/guix.texi:32184
 #, no-wrap
 msgid ""
 "                  ;; 'mdns_minimal' is authoritative for\n"
@@ -42608,8 +58366,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23762
+#. type: lisp
+#: guix-git/doc/guix.texi:32188
 #, no-wrap
 msgid ""
 "                ;; Then fall back to DNS.\n"
@@ -42618,8 +58376,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23766
+#. type: lisp
+#: guix-git/doc/guix.texi:32192
 #, no-wrap
 msgid ""
 "                ;; Finally, try with the \"full\" 'mdns'.\n"
@@ -42628,157 +58386,151 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23771
+#: guix-git/doc/guix.texi:32197
 msgid "Do not worry: the @code{%mdns-host-lookup-nss} variable (see below)  contains this configuration, so you will not have to type it if all you want is to have @code{.local} host lookup working."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23779
-msgid "Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also need to use @code{avahi-service-type} (@pxref{Networking Services, @code{avahi-service-type}}), or @var{%desktop-services}, which includes it (@pxref{Desktop Services}).  Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, @code{nscd-service}})."
+#: guix-git/doc/guix.texi:32205
+msgid "Note that, in this case, in addition to setting the @code{name-service-switch} of the @code{operating-system} declaration, you also need to use @code{avahi-service-type} (@pxref{Networking Services, @code{avahi-service-type}}), or @code{%desktop-services}, which includes it (@pxref{Desktop Services}).  Doing this makes @code{nss-mdns} accessible to the name service cache daemon (@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23782
+#: guix-git/doc/guix.texi:32208
 msgid "For convenience, the following variables provide typical NSS configurations."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23783
+#: guix-git/doc/guix.texi:32209
 #, no-wrap
 msgid "{Scheme Variable} %default-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23786
+#: guix-git/doc/guix.texi:32212
 msgid "This is the default name service switch configuration, a @code{name-service-switch} object."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23788
+#: guix-git/doc/guix.texi:32214
 #, no-wrap
 msgid "{Scheme Variable} %mdns-host-lookup-nss"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23791
+#: guix-git/doc/guix.texi:32217
 msgid "This is the name service switch configuration with support for host name lookup over multicast DNS (mDNS) for host names ending in @code{.local}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23801
+#: guix-git/doc/guix.texi:32227
 msgid "The reference for name service switch configuration is given below.  It is a direct mapping of the configuration file format of the C library , so please refer to the C library manual for more information (@pxref{NSS Configuration File,,, libc, The GNU C Library Reference Manual}).  Compared to the configuration file format of libc NSS, it has the advantage not only of adding this warm parenthetic feel that we like, but also static checks: you will know about syntax errors and typos as soon as you run @command{guix system}."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23802
+#: guix-git/doc/guix.texi:32228
 #, no-wrap
 msgid "{Data Type} name-service-switch"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23807
+#: guix-git/doc/guix.texi:32233
 msgid "This is the data type representation the configuration of libc's name service switch (NSS).  Each field below represents one of the supported system databases."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23809
+#: guix-git/doc/guix.texi:32235
 #, no-wrap
 msgid "aliases"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23810
+#: guix-git/doc/guix.texi:32236
 #, no-wrap
 msgid "ethers"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23812
+#: guix-git/doc/guix.texi:32238
 #, no-wrap
 msgid "gshadow"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23813
+#: guix-git/doc/guix.texi:32239
 #, no-wrap
 msgid "hosts"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23814
+#: guix-git/doc/guix.texi:32240
 #, no-wrap
 msgid "initgroups"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23815
+#: guix-git/doc/guix.texi:32241
 #, no-wrap
 msgid "netgroup"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23816
+#: guix-git/doc/guix.texi:32242
 #, no-wrap
 msgid "networks"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23818
-#, no-wrap
-msgid "public-key"
-msgstr ""
-
-#. type: itemx
-#: doc/guix.texi:23819
+#: guix-git/doc/guix.texi:32245
 #, no-wrap
 msgid "rpc"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:23821
+#: guix-git/doc/guix.texi:32247
 #, no-wrap
 msgid "shadow"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23824
-msgid "The system databases handled by the NSS.  Each of these fields must be a list of @code{<name-service>} objects (see below)."
+#: guix-git/doc/guix.texi:32250
+msgid "The system databases handled by the NSS@.  Each of these fields must be a list of @code{<name-service>} objects (see below)."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23827
+#: guix-git/doc/guix.texi:32253
 #, no-wrap
 msgid "{Data Type} name-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:23831
+#: guix-git/doc/guix.texi:32257
 msgid "This is the data type representing an actual name service and the associated lookup action."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23836
+#: guix-git/doc/guix.texi:32262
 msgid "A string denoting the name service (@pxref{Services in the NSS configuration,,, libc, The GNU C Library Reference Manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23841
+#: guix-git/doc/guix.texi:32267
 msgid "Note that name services listed here must be visible to nscd.  This is achieved by passing the @code{#:name-services} argument to @code{nscd-service} the list of packages providing the needed name services (@pxref{Base Services, @code{nscd-service}})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23842
+#: guix-git/doc/guix.texi:32268
 #, no-wrap
 msgid "reaction"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23846
+#: guix-git/doc/guix.texi:32272
 msgid "An action specified using the @code{lookup-specification} macro (@pxref{Actions in the NSS configuration,,, libc, The GNU C Library Reference Manual}).  For example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23850
+#. type: lisp
+#: guix-git/doc/guix.texi:32276
 #, no-wrap
 msgid ""
 "(lookup-specification (unavailable => continue)\n"
@@ -42786,17 +58538,17 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23864
+#: guix-git/doc/guix.texi:32290
 msgid "For bootstrapping purposes, the Linux-Libre kernel is passed an @dfn{initial RAM disk}, or @dfn{initrd}.  An initrd contains a temporary root file system as well as an initialization script.  The latter is responsible for mounting the real root file system, and for loading any kernel modules that may be needed to achieve that."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23873
+#: guix-git/doc/guix.texi:32299
 msgid "The @code{initrd-modules} field of an @code{operating-system} declaration allows you to specify Linux-libre kernel modules that must be available in the initrd.  In particular, this is where you would list modules needed to actually drive the hard disk where your root partition is---although the default value of @code{initrd-modules} should cover most use cases.  For example, assuming you need the @code{megaraid_sas} module in addition to the default modules to be able to access your root file system, you would write:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23878
+#. type: lisp
+#: guix-git/doc/guix.texi:32304
 #, no-wrap
 msgid ""
 "(operating-system\n"
@@ -42805,28 +58557,28 @@ msgid ""
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23880
+#: guix-git/doc/guix.texi:32306
 #, no-wrap
 msgid "{Scheme Variable} %base-initrd-modules"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:23882
+#: guix-git/doc/guix.texi:32308
 msgid "This is the list of kernel modules included in the initrd by default."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23890
+#: guix-git/doc/guix.texi:32316
 msgid "Furthermore, if you need lower-level customization, the @code{initrd} field of an @code{operating-system} declaration allows you to specify which initrd you would like to use.  The @code{(gnu system linux-initrd)} module provides three ways to build an initrd: the high-level @code{base-initrd} procedure and the low-level @code{raw-initrd} and @code{expression->initrd} procedures."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23895
+#: guix-git/doc/guix.texi:32321
 msgid "The @code{base-initrd} procedure is intended to cover most common uses.  For example, if you want to add a bunch of kernel modules to be loaded at boot time, you can define the @code{initrd} field of the operating system declaration like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:23903
+#. type: lisp
+#: guix-git/doc/guix.texi:32329
 #, no-wrap
 msgid ""
 "(initrd (lambda (file-systems . rest)\n"
@@ -42838,369 +58590,416 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23908
+#: guix-git/doc/guix.texi:32334
 msgid "The @code{base-initrd} procedure also handles common use cases that involves using the system as a QEMU guest, or as a ``live'' system with volatile root file system."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23915
-msgid "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd. An example use of @code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} are not available."
+#: guix-git/doc/guix.texi:32341
+msgid "The @code{base-initrd} procedure is built from @code{raw-initrd} procedure.  Unlike @code{base-initrd}, @code{raw-initrd} doesn't do anything high-level, such as trying to guess which kernel modules and packages should be included to the initrd.  An example use of @code{raw-initrd} is when a user has a custom Linux kernel configuration and default kernel modules included by @code{base-initrd} are not available."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23920
+#: guix-git/doc/guix.texi:32346
 msgid "The initial RAM disk produced by @code{base-initrd} or @code{raw-initrd} honors several options passed on the Linux kernel command line (that is, arguments passed @i{via} the @code{linux} command of GRUB, or the @code{-append} option of QEMU), notably:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23922
+#: guix-git/doc/guix.texi:32348
 #, no-wrap
 msgid "--load=@var{boot}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23925
+#: guix-git/doc/guix.texi:32351
 msgid "Tell the initial RAM disk to load @var{boot}, a file containing a Scheme program, once it has mounted the root file system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23929
+#: guix-git/doc/guix.texi:32355
 msgid "Guix uses this option to yield control to a boot program that runs the service activation programs and then spawns the GNU@tie{}Shepherd, the initialization system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23930
+#: guix-git/doc/guix.texi:32356
 #, no-wrap
 msgid "--root=@var{root}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23934
-msgid "Mount @var{root} as the root file system.  @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file system UUID."
+#: guix-git/doc/guix.texi:32361
+msgid "Mount @var{root} as the root file system.  @var{root} can be a device name like @code{/dev/sda1}, a file system label, or a file system UUID.  When unspecified, the device name from the root file system of the operating system declaration is used."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23938
+#: guix-git/doc/guix.texi:32365
 msgid "Have @file{/run/booted-system} and @file{/run/current-system} point to @var{system}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23939
+#: guix-git/doc/guix.texi:32366
 #, no-wrap
 msgid "modprobe.blacklist=@var{modules}@dots{}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23940
+#: guix-git/doc/guix.texi:32367
 #, no-wrap
 msgid "module, black-listing"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:23941
+#: guix-git/doc/guix.texi:32368
 #, no-wrap
 msgid "black list, of kernel modules"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23946
+#: guix-git/doc/guix.texi:32373
 msgid "Instruct the initial RAM disk as well as the @command{modprobe} command (from the kmod package) to refuse to load @var{modules}.  @var{modules} must be a comma-separated list of module names---e.g., @code{usbkbd,9pnet}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:23947
+#: guix-git/doc/guix.texi:32374
 #, no-wrap
 msgid "--repl"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:23953
+#: guix-git/doc/guix.texi:32380
 msgid "Start a read-eval-print loop (REPL) from the initial RAM disk before it tries to load kernel modules and to mount the root file system.  Our marketing team calls it @dfn{boot-to-Guile}.  The Schemer in you will love it.  @xref{Using Guile Interactively,,, guile, GNU Guile Reference Manual}, for more information on Guile's REPL."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:23959
+#: guix-git/doc/guix.texi:32386
 msgid "Now that you know all the features that initial RAM disks produced by @code{base-initrd} and @code{raw-initrd} provide, here is how to use it and customize it further."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23962
+#: guix-git/doc/guix.texi:32389
 #, no-wrap
 msgid "{Scheme Procedure} raw-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23975
-msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd.  @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}.  @var{linux-modules} is a list of kernel modules to be loaded at boot time.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}).  @var{helper-packages} is a list of packages to be copied in the initrd. It may include @code{e2fsck/static} or other packages needed by the initrd to check the root file system."
+#: guix-git/doc/guix.texi:32403
+msgid "[#:linux-modules '()] [#:mapped-devices '()] @ [#:keyboard-layout #f] @ [#:helper-packages '()] [#:qemu-networking? #f] [#:volatile-root? #f] Return a derivation that builds a raw initrd.  @var{file-systems} is a list of file systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @option{--root}.  @var{linux-modules} is a list of kernel modules to be loaded at boot time.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted (@pxref{Mapped Devices}).  @var{helper-packages} is a list of packages to be copied in the initrd.  It may include @code{e2fsck/static} or other packages needed by the initrd to check the root file system."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23981 doc/guix.texi:24005
+#: guix-git/doc/guix.texi:32409 guix-git/doc/guix.texi:32433
 msgid "When true, @var{keyboard-layout} is a @code{<keyboard-layout>} record denoting the desired console keyboard layout.  This is done before @var{mapped-devices} are set up and before @var{file-systems} are mounted such that, should the user need to enter a passphrase or use the REPL, this happens using the intended keyboard layout."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23985
+#: guix-git/doc/guix.texi:32413
 msgid "When @var{qemu-networking?} is true, set up networking with the standard QEMU parameters.  When @var{virtio?} is true, load additional modules so that the initrd can be used as a QEMU guest with para-virtualized I/O drivers."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23988
+#: guix-git/doc/guix.texi:32416
 msgid "When @var{volatile-root?} is true, the root file system is writable but any changes to it are lost."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23990
+#: guix-git/doc/guix.texi:32418
 #, no-wrap
 msgid "{Scheme Procedure} base-initrd @var{file-systems} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:23999
-msgid "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Return as a file-like object a generic initrd, with kernel modules taken from @var{linux}.  @var{file-systems} is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @code{--root}.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted."
+#: guix-git/doc/guix.texi:32427
+msgid "[#:mapped-devices '()] [#:keyboard-layout #f] @ [#:qemu-networking? #f] [#:volatile-root? #f] @ [#:linux-modules '()] Return as a file-like object a generic initrd, with kernel modules taken from @var{linux}.  @var{file-systems} is a list of file-systems to be mounted by the initrd, possibly in addition to the root file system specified on the kernel command line via @option{--root}.  @var{mapped-devices} is a list of device mappings to realize before @var{file-systems} are mounted."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:24007
+#: guix-git/doc/guix.texi:32435
 msgid "@var{qemu-networking?} and @var{volatile-root?} behaves as in @code{raw-initrd}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:24012
+#: guix-git/doc/guix.texi:32440
 msgid "The initrd is automatically populated with all the kernel modules necessary for @var{file-systems} and for the given options.  Additional kernel modules can be listed in @var{linux-modules}.  They will be added to the initrd, and loaded at boot time in the order in which they appear."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24019
+#: guix-git/doc/guix.texi:32447
 msgid "Needless to say, the initrds we produce and use embed a statically-linked Guile, and the initialization program is a Guile program.  That gives a lot of flexibility.  The @code{expression->initrd} procedure builds such an initrd, given the program to run in that initrd."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:24020
+#: guix-git/doc/guix.texi:32448
 #, no-wrap
 msgid "{Scheme Procedure} expression->initrd @var{exp} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:24026
-msgid "[#:guile %guile-static-stripped] [#:name \"guile-initrd\"] Return as a file-like object a Linux initrd (a gzipped cpio archive)  containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting.  All the derivations referenced by @var{exp} are automatically copied to the initrd."
+#: guix-git/doc/guix.texi:32454
+msgid "[#:guile %guile-3.0-static-stripped] [#:name \"guile-initrd\"] Return as a file-like object a Linux initrd (a gzipped cpio archive)  containing @var{guile} and that evaluates @var{exp}, a G-expression, upon booting.  All the derivations referenced by @var{exp} are automatically copied to the initrd."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24032
+#: guix-git/doc/guix.texi:32460
 #, no-wrap
 msgid "boot loader"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24039
+#: guix-git/doc/guix.texi:32467
 msgid "The operating system supports multiple bootloaders.  The bootloader is configured using @code{bootloader-configuration} declaration.  All the fields of this structure are bootloader agnostic except for one field, @code{bootloader} that indicates the bootloader to be configured and installed."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24044
+#: guix-git/doc/guix.texi:32472
 msgid "Some of the bootloaders do not honor every field of @code{bootloader-configuration}.  For instance, the extlinux bootloader does not support themes and thus ignores the @code{theme} field."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24045
+#: guix-git/doc/guix.texi:32473
 #, no-wrap
 msgid "{Data Type} bootloader-configuration"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24047
+#: guix-git/doc/guix.texi:32475
 msgid "The type of a bootloader configuration declaration."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24051
+#: guix-git/doc/guix.texi:32479
 #, no-wrap
 msgid "EFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24052
+#: guix-git/doc/guix.texi:32480
 #, no-wrap
 msgid "UEFI, bootloader"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24053
+#: guix-git/doc/guix.texi:32481
 #, no-wrap
 msgid "BIOS, bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24057
-msgid "The bootloader to use, as a @code{bootloader} object. For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{extlinux-bootloader} and @code{u-boot-bootloader} are supported."
+#: guix-git/doc/guix.texi:32486
+msgid "The bootloader to use, as a @code{bootloader} object.  For now @code{grub-bootloader}, @code{grub-efi-bootloader}, @code{grub-efi-netboot-bootloader}, @code{extlinux-bootloader} and @code{u-boot-bootloader} are supported."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:32487
+#, no-wrap
+msgid "ARM, bootloaders"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:32488
+#, no-wrap
+msgid "AArch64, bootloaders"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32493
+msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules.  In particular, @code{(gnu bootloader u-boot)} contains definitions of bootloaders for a wide range of ARM and AArch64 systems, using the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot bootloader}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24063
+#: guix-git/doc/guix.texi:32499
 msgid "@code{grub-efi-bootloader} allows to boot on modern systems using the @dfn{Unified Extensible Firmware Interface} (UEFI).  This is what you should use if the installation image contains a @file{/sys/firmware/efi} directory when you boot it on your system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24067
+#: guix-git/doc/guix.texi:32503
 msgid "@code{grub-bootloader} allows you to boot in particular Intel-based machines in ``legacy'' BIOS mode."
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:24068
+#. type: vindex
+#: guix-git/doc/guix.texi:32504
 #, no-wrap
-msgid "ARM, bootloaders"
+msgid "grub-efi-netboot-bootloader"
 msgstr ""
 
-#. type: cindex
-#: doc/guix.texi:24069
-#, no-wrap
-msgid "AArch64, bootloaders"
+#. type: table
+#: guix-git/doc/guix.texi:32508
+msgid "@code{grub-efi-netboot-bootloader} allows you to boot your system over network through TFTP@.  In combination with an NFS root file system this allows you to build a diskless Guix system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24074
-msgid "Available bootloaders are described in @code{(gnu bootloader @dots{})} modules.  In particular, @code{(gnu bootloader u-boot)} contains definitions of bootloaders for a wide range of ARM and AArch64 systems, using the @uref{https://www.denx.de/wiki/U-Boot/, U-Boot bootloader}."
+#: guix-git/doc/guix.texi:32514
+msgid "The installation of the @code{grub-efi-netboot-bootloader} generates the content of the TFTP root directory at @code{target} (@pxref{Bootloader Configuration, @code{target}}), to be served by a TFTP server.  You may want to mount your TFTP server directory onto @code{target} to move the required files to the TFTP server automatically."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24078
+#: guix-git/doc/guix.texi:32523
+msgid "If you plan to use an NFS root file system as well (actually if you mount the store from an NFS share), then the TFTP server needs to serve the file @file{/boot/grub/grub.cfg} and other files from the store (like GRUBs background image, the kernel (@pxref{operating-system Reference, @code{kernel}}) and the initrd (@pxref{operating-system Reference, @code{initrd}})), too.  All these files from the store will be accessed by GRUB through TFTP with their normal store path, for example as @file{tftp://tftp-server/gnu/store/…-initrd/initrd.cpio.gz}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32531
+msgid "Two symlinks are created to make this possible.  The first symlink is @code{target}@file{/efi/Guix/boot/grub/grub.cfg} pointing to @file{../../../boot/grub/grub.cfg}, where @code{target} may be @file{/boot}.  In this case the link is not leaving the served TFTP root directory, but otherwise it does.  The second link is @code{target}@file{/gnu/store} and points to @file{../gnu/store}.  This link is leaving the served TFTP root directory."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32536
+msgid "The assumption behind all this is that you have an NFS server exporting the root file system for your Guix system, and additionally a TFTP server exporting your @code{target} directory—usually @file{/boot}—from that same root file system for your Guix system.  In this constellation the symlinks will work."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32540
+msgid "For other constellations you will have to program your own bootloader installer, which then takes care to make necessary files from the store accessible through TFTP, for example by copying them into the TFTP root directory at @code{target}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32545
+msgid "It is important to note that symlinks pointing outside the TFTP root directory may need to be allowed in the configuration of your TFTP server.  Further the store link exposes the whole store through TFTP@.  Both points need to be considered carefully for security aspects."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32550
+msgid "Beside the @code{grub-efi-netboot-bootloader}, the already mentioned TFTP and NFS servers, you also need a properly configured DHCP server to make the booting over netboot possible.  For all this we can currently only recommend you to look for instructions about @acronym{PXE, Preboot eXecution Environment}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32554
 msgid "This is a string denoting the target onto which to install the bootloader."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24085
-msgid "The interpretation depends on the bootloader in question.  For @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{(hd0)} (@pxref{Invoking grub-install,,, grub, GNU GRUB Manual}).  For @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}."
+#: guix-git/doc/guix.texi:32563
+msgid "The interpretation depends on the bootloader in question.  For @code{grub-bootloader}, for example, it should be a device name understood by the bootloader @command{installer} command, such as @code{/dev/sda} or @code{(hd0)} (@pxref{Invoking grub-install,,, grub, GNU GRUB Manual}).  For @code{grub-efi-bootloader}, it should be the mount point of the EFI file system, usually @file{/boot/efi}.  For @code{grub-efi-netboot-bootloader}, @code{target} should be the mount point corresponding to the TFTP root directory of your TFTP server."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24086
+#: guix-git/doc/guix.texi:32564
 #, no-wrap
 msgid "@code{menu-entries} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24090
+#: guix-git/doc/guix.texi:32568
 msgid "A possibly empty list of @code{menu-entry} objects (see below), denoting entries to appear in the bootloader menu, in addition to the current system entry and the entry pointing to previous system generations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24091
+#: guix-git/doc/guix.texi:32569
 #, no-wrap
 msgid "@code{default-entry} (default: @code{0})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24094
+#: guix-git/doc/guix.texi:32572
 msgid "The index of the default boot menu entry.  Index 0 is for the entry of the current system."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24095
+#: guix-git/doc/guix.texi:32573
 #, no-wrap
 msgid "@code{timeout} (default: @code{5})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24098
+#: guix-git/doc/guix.texi:32576
 msgid "The number of seconds to wait for keyboard input before booting.  Set to 0 to boot immediately, and to -1 to wait indefinitely."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24099
+#: guix-git/doc/guix.texi:32577
 #, no-wrap
 msgid "keyboard layout, for the bootloader"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24103
+#: guix-git/doc/guix.texi:32581
 msgid "If this is @code{#f}, the bootloader's menu (if any) uses the default keyboard layout, usually US@tie{}English (``qwerty'')."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24106
+#: guix-git/doc/guix.texi:32584
 msgid "Otherwise, this must be a @code{keyboard-layout} object (@pxref{Keyboard Layout})."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:24110
+#: guix-git/doc/guix.texi:32588
 msgid "This option is currently ignored by bootloaders other than @code{grub} and @code{grub-efi}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24112
+#: guix-git/doc/guix.texi:32590
 #, no-wrap
 msgid "@code{theme} (default: @var{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24116
+#: guix-git/doc/guix.texi:32594
 msgid "The bootloader theme object describing the theme to use.  If no theme is provided, some bootloaders might use a default theme, that's true for GRUB."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24117
-#, no-wrap
-msgid "@code{terminal-outputs} (default: @code{'gfxterm})"
-msgstr ""
+#: guix-git/doc/guix.texi:32595
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{terminal-outputs} (default: @code{'(gfxterm)})"
+msgstr "@code{features} （@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:24124
+#: guix-git/doc/guix.texi:32602
 msgid "The output terminals used for the bootloader boot menu, as a list of symbols.  GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{gfxterm}, @code{vga_text}, @code{mda_text}, @code{morse}, and @code{pkmodem}.  This field corresponds to the GRUB variable @code{GRUB_TERMINAL_OUTPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24125
+#: guix-git/doc/guix.texi:32603
 #, no-wrap
 msgid "@code{terminal-inputs} (default: @code{'()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24133
+#: guix-git/doc/guix.texi:32611
 msgid "The input terminals used for the bootloader boot menu, as a list of symbols.  For GRUB, the default is the native platform terminal as determined at run-time.  GRUB accepts the values: @code{console}, @code{serial}, @code{serial_@{0-3@}}, @code{at_keyboard}, and @code{usb_keyboard}.  This field corresponds to the GRUB variable @code{GRUB_TERMINAL_INPUT} (@pxref{Simple configuration,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24134
+#: guix-git/doc/guix.texi:32612
 #, no-wrap
 msgid "@code{serial-unit} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24138
+#: guix-git/doc/guix.texi:32616
 msgid "The serial unit used by the bootloader, as an integer from 0 to 3.  For GRUB, it is chosen at run-time; currently GRUB chooses 0, which corresponds to COM1 (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24139
+#: guix-git/doc/guix.texi:32617
 #, no-wrap
 msgid "@code{serial-speed} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24143
+#: guix-git/doc/guix.texi:32621
 msgid "The speed of the serial interface, as an integer.  For GRUB, the default value is chosen at run-time; currently GRUB chooses 9600@tie{}bps (@pxref{Serial terminal,,, grub,GNU GRUB manual})."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24147
+#: guix-git/doc/guix.texi:32625
 #, no-wrap
 msgid "dual boot"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24148
+#: guix-git/doc/guix.texi:32626
 #, no-wrap
 msgid "boot menu"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24154
+#: guix-git/doc/guix.texi:32632
 msgid "Should you want to list additional boot menu entries @i{via} the @code{menu-entries} field above, you will need to create them with the @code{menu-entry} form.  For example, imagine you want to be able to boot another distro (hard to imagine!), you can define a menu entry along these lines:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24161
+#. type: lisp
+#: guix-git/doc/guix.texi:32639
 #, no-wrap
 msgid ""
 "(menu-entry\n"
@@ -43211,162 +59010,295 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24164
+#: guix-git/doc/guix.texi:32642
 msgid "Details below."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24165
+#: guix-git/doc/guix.texi:32643
 #, no-wrap
 msgid "{Data Type} menu-entry"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:24167
+#: guix-git/doc/guix.texi:32645
 msgid "The type of an entry in the bootloader menu."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24172
+#: guix-git/doc/guix.texi:32650
 msgid "The label to show in the menu---e.g., @code{\"GNU\"}."
 msgstr ""
 
-#. type: code{#1}
-#: doc/guix.texi:24173
-#, no-wrap
-msgid "linux"
-msgstr ""
+#. type: item
+#: guix-git/doc/guix.texi:32651
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{linux} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
 
 #. type: table
-#: doc/guix.texi:24175
+#: guix-git/doc/guix.texi:32653
 msgid "The Linux kernel image to boot, for example:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24178
+#. type: lisp
+#: guix-git/doc/guix.texi:32656
 #, no-wrap
 msgid "(file-append linux-libre \"/bzImage\")\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24183
+#: guix-git/doc/guix.texi:32661
 msgid "For GRUB, it is also possible to specify a device explicitly in the file path using GRUB's device naming convention (@pxref{Naming convention,,, grub, GNU GRUB manual}), for example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24186
+#: guix-git/doc/guix.texi:32664
 #, no-wrap
 msgid "\"(hd0,msdos1)/boot/vmlinuz\"\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24190
+#: guix-git/doc/guix.texi:32668
 msgid "If the device is specified explicitly as above, then the @code{device} field is ignored entirely."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24191
+#: guix-git/doc/guix.texi:32669
 #, no-wrap
 msgid "@code{linux-arguments} (default: @code{()})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24194
+#: guix-git/doc/guix.texi:32672
 msgid "The list of extra Linux kernel command-line arguments---e.g., @code{(\"console=ttyS0\")}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:32673
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{initrd} (default: @code{#f})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
 #. type: table
-#: doc/guix.texi:24198
+#: guix-git/doc/guix.texi:32676
 msgid "A G-Expression or string denoting the file name of the initial RAM disk to use (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24198
+#: guix-git/doc/guix.texi:32677
 #, no-wrap
 msgid "@code{device} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24201
+#: guix-git/doc/guix.texi:32680
 msgid "The device where the kernel and initrd are to be found---i.e., for GRUB, @dfn{root} for this menu entry (@pxref{root,,, grub, GNU GRUB manual})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24207
+#: guix-git/doc/guix.texi:32686
 msgid "This may be a file system label (a string), a file system UUID (a bytevector, @pxref{File Systems}), or @code{#f}, in which case the bootloader will search the device containing the file specified by the @code{linux} field (@pxref{search,,, grub, GNU GRUB manual}).  It must @emph{not} be an OS device name such as @file{/dev/sda1}."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:32687
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{multiboot-kernel} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32691
+msgid "The kernel to boot in Multiboot-mode (@pxref{multiboot,,, grub, GNU GRUB manual}).  When this field is set, a Multiboot menu-entry is generated.  For example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:32694
+#, no-wrap
+msgid "(file-append mach \"/boot/gnumach\")\n"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:32696
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{multiboot-arguments} (default: @code{()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32698
+msgid "The list of extra command-line arguments for the multiboot-kernel."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:32699
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{multiboot-modules} (default: @code{()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32701
+msgid "The list of commands for loading Multiboot modules.  For example:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:32707
+#, no-wrap
+msgid ""
+"(list (list (file-append hurd \"/hurd/ext2fs.static\") \"ext2fs\"\n"
+"             @dots{})\n"
+"      (list (file-append libc \"/lib/ld.so.1\") \"exec\"\n"
+"             @dots{}))\n"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:32712 guix-git/doc/guix.texi:32771
+#, no-wrap
+msgid "HDPI"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:32713 guix-git/doc/guix.texi:32772
+#, no-wrap
+msgid "HiDPI"
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:32714 guix-git/doc/guix.texi:32773
+#, fuzzy, no-wrap
+#| msgid "isolation"
+msgid "resolution"
+msgstr "隔离"
+
 #. type: Plain text
-#: doc/guix.texi:24214
-msgid "For now only GRUB has theme support. GRUB themes are created using the @code{grub-theme} form, which is not documented yet."
+#: guix-git/doc/guix.texi:32718
+msgid "For now only GRUB has theme support.  GRUB themes are created using the @code{grub-theme} form, which is not fully documented yet."
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:24219
-msgid "This is the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record."
+#. type: deftp
+#: guix-git/doc/guix.texi:32719
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} grub-theme"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:32721
+msgid "Data type representing the configuration of the GRUB theme."
 msgstr ""
 
-#. type: defvr
-#: doc/guix.texi:24222
+#. type: item
+#: guix-git/doc/guix.texi:32723
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{gfxmode} (default: @code{'(\"auto\")})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:32726
+msgid "The GRUB @code{gfxmode} to set (a list of screen resolution strings, @pxref{gfxmode,,, grub, GNU GRUB manual})."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:32729
+#, no-wrap
+msgid "{Scheme Procedure} grub-theme"
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:32733
+msgid "Return the default GRUB theme used by the operating system if no @code{theme} field is specified in @code{bootloader-configuration} record."
+msgstr ""
+
+#. type: deffn
+#: guix-git/doc/guix.texi:32736
 msgid "It comes with a fancy background image displaying the GNU and Guix logos."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:32740
+msgid "For example, to override the default resolution, you may use something like"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:32748
+#, no-wrap
+msgid ""
+"(bootloader\n"
+" (bootloader-configuration\n"
+" ;; @dots{}\n"
+" (theme (grub-theme\n"
+"         (inherit (grub-theme))\n"
+"         (gfxmode '(\"1024x786x32\" \"auto\"))))))\n"
+msgstr ""
+
 #. type: section
-#: doc/guix.texi:24226
+#: guix-git/doc/guix.texi:32751
 #, no-wrap
 msgid "Invoking @code{guix system}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24231
+#: guix-git/doc/guix.texi:32756
 msgid "Once you have written an operating system declaration as seen in the previous section, it can be @dfn{instantiated} using the @command{guix system} command.  The synopsis is:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24234
+#: guix-git/doc/guix.texi:32759
 #, no-wrap
 msgid "guix system @var{options}@dots{} @var{action} @var{file}\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24240
+#: guix-git/doc/guix.texi:32765
 msgid "@var{file} must be the name of a file containing an @code{operating-system} declaration.  @var{action} specifies how the operating system is instantiated.  Currently the following values are supported:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24242
+#: guix-git/doc/guix.texi:32767
 #, no-wrap
 msgid "search"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24245
+#: guix-git/doc/guix.texi:32770
 msgid "Display available service type definitions that match the given regular expressions, sorted by relevance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24257
+#: guix-git/doc/guix.texi:32792
 #, no-wrap
 msgid ""
-"$ guix system search console font\n"
+"$ guix system search console\n"
 "name: console-fonts\n"
-"location: gnu/services/base.scm:729:2\n"
+"location: gnu/services/base.scm:806:2\n"
 "extends: shepherd-root\n"
-"description: Install the given fonts on the specified ttys (fonts are\n"
-"+ per virtual console on GNU/Linux).  The value of this service is a list\n"
-"+ of tty/font pairs like:\n"
-"+ \n"
-"+      '((\"tty1\" . \"LatGrkCyr-8x16\"))\n"
-"relevance: 20\n"
+"description: Install the given fonts on the specified ttys (fonts are per\n"
+"+ virtual console on GNU/Linux).  The value of this service is a list of\n"
+"+ tty/font pairs.  The font can be the name of a font provided by the `kbd'\n"
+"+ package or any valid argument to `setfont', as in this example:\n"
+"+\n"
+"+      '((\"tty1\" . \"LatGrkCyr-8x16\")\n"
+"+        (\"tty2\" . (file-append\n"
+"+                      font-tamzen\n"
+"+                      \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))\n"
+"+        (\"tty3\" . (file-append\n"
+"+                      font-terminus\n"
+"+                      \"/share/consolefonts/ter-132n\"))) ; for HDPI\n"
+"relevance: 9\n"
 "\n"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24263
+#: guix-git/doc/guix.texi:32798
 #, no-wrap
 msgid ""
 "name: mingetty\n"
-"location: gnu/services/base.scm:1048:2\n"
+"location: gnu/services/base.scm:1190:2\n"
 "extends: shepherd-root\n"
 "description: Provide console login using the `mingetty' program.\n"
 "relevance: 2\n"
@@ -43374,11 +59306,11 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24270
+#: guix-git/doc/guix.texi:32805
 #, no-wrap
 msgid ""
 "name: login\n"
-"location: gnu/services/base.scm:775:2\n"
+"location: gnu/services/base.scm:860:2\n"
 "extends: pam\n"
 "description: Provide a console log-in service as specified by its\n"
 "+ configuration value, a `login-configuration' object.\n"
@@ -43387,254 +59319,298 @@ msgid ""
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24272
+#: guix-git/doc/guix.texi:32807
 #, no-wrap
 msgid "@dots{}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24277
+#: guix-git/doc/guix.texi:32812
 msgid "As for @command{guix package --search}, the result is written in @code{recutils} format, which makes it easy to filter the output (@pxref{Top, GNU recutils databases,, recutils, GNU recutils manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24278
+#: guix-git/doc/guix.texi:32813
 #, no-wrap
 msgid "reconfigure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24283
+#: guix-git/doc/guix.texi:32818
 msgid "Build the operating system described in @var{file}, activate it, and switch to it@footnote{This action (and the related actions @code{switch-generation} and @code{roll-back}) are usable only on systems already running Guix System.}."
 msgstr ""
 
+#. type: quotation
+#: guix-git/doc/guix.texi:32826
+msgid "It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time (@pxref{Invoking guix pull}).  Failing to do that you would see an older version of Guix once @command{reconfigure} has completed."
+msgstr ""
+
 #. type: table
-#: doc/guix.texi:24290
+#: guix-git/doc/guix.texi:32834
 msgid "This effects all the configuration specified in @var{file}: user accounts, system services, global package list, setuid programs, etc.  The command starts system services specified in @var{file} that are not currently running; if a service is currently running this command will arrange for it to be upgraded the next time it is stopped (e.g.@: by @code{herd stop X} or @code{herd restart X})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24296
+#: guix-git/doc/guix.texi:32840
 msgid "This command creates a new generation whose number is one greater than the current generation (as reported by @command{guix system list-generations}).  If that generation already exists, it will be overwritten.  This behavior mirrors that of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24301
+#: guix-git/doc/guix.texi:32845
 msgid "It also adds a bootloader menu entry for the new OS configuration, ---unless @option{--no-bootloader} is passed.  For GRUB, it moves entries for older configurations to a submenu, allowing you to choose an older system generation at boot time should you need it."
 msgstr ""
 
-#. type: quotation
-#: doc/guix.texi:24309
-msgid "It is highly recommended to run @command{guix pull} once before you run @command{guix system reconfigure} for the first time (@pxref{Invoking guix pull}).  Failing to do that you would see an older version of Guix once @command{reconfigure} has completed."
+#. type: cindex
+#: guix-git/doc/guix.texi:32846 guix-git/doc/guix.texi:33171
+#: guix-git/doc/guix.texi:34119
+#, fuzzy, no-wrap
+#| msgid "Configuring the operating system."
+msgid "provenance tracking, of the operating system"
+msgstr "配置操作系统。"
+
+#. type: table
+#: guix-git/doc/guix.texi:32851
+msgid "Upon completion, the new system is deployed under @file{/run/current-system}.  This directory contains @dfn{provenance meta-data}: the list of channels in use (@pxref{Channels}) and @var{file} itself, when available.  You can view it by running:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:32854
+#, no-wrap
+msgid "guix system describe\n"
+msgstr "guix system describe\n"
+
+#. type: table
+#: guix-git/doc/guix.texi:32860
+msgid "This information is useful should you later want to inspect how this particular generation was built.  In fact, assuming @var{file} is self-contained, you can later rebuild generation @var{n} of your operating system with:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:32866
+#, no-wrap
+msgid ""
+"guix time-machine \\\n"
+"  -C /var/guix/profiles/system-@var{n}-link/channels.scm -- \\\n"
+"  system reconfigure \\\n"
+"  /var/guix/profiles/system-@var{n}-link/configuration.scm\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32872
+msgid "You can think of it as some sort of built-in version control! Your system is not just a binary artifact: @emph{it carries its own source}.  @xref{Service Reference, @code{provenance-service-type}}, for more information on provenance tracking."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:32878
+msgid "By default, @command{reconfigure} @emph{prevents you from downgrading your system}, which could (re)introduce security vulnerabilities and also cause problems with ``stateful'' services such as database management systems.  You can override that behavior by passing @option{--allow-downgrades}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24311
+#: guix-git/doc/guix.texi:32879
 #, no-wrap
 msgid "switch-generation"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24320
-msgid "Switch to an existing system generation.  This action atomically switches the system profile to the specified system generation.  It also rearranges the system's existing bootloader menu entries.  It makes the menu entry for the specified system generation the default, and it moves the entries for the other generatiors to a submenu, if supported by the bootloader being used.  The next time the system boots, it will use the specified system generation."
+#: guix-git/doc/guix.texi:32888
+msgid "Switch to an existing system generation.  This action atomically switches the system profile to the specified system generation.  It also rearranges the system's existing bootloader menu entries.  It makes the menu entry for the specified system generation the default, and it moves the entries for the other generations to a submenu, if supported by the bootloader being used.  The next time the system boots, it will use the specified system generation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24324
+#: guix-git/doc/guix.texi:32892
 msgid "The bootloader itself is not being reinstalled when using this command.  Thus, the installed bootloader is used with an updated configuration file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24328
+#: guix-git/doc/guix.texi:32896
 msgid "The target generation can be specified explicitly by its generation number.  For example, the following invocation would switch to system generation 7:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24331
+#: guix-git/doc/guix.texi:32899
 #, no-wrap
 msgid "guix system switch-generation 7\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24339
+#: guix-git/doc/guix.texi:32907
 msgid "The target generation can also be specified relative to the current generation with the form @code{+N} or @code{-N}, where @code{+3} means ``3 generations ahead of the current generation,'' and @code{-1} means ``1 generation prior to the current generation.'' When specifying a negative value such as @code{-1}, you must precede it with @code{--} to prevent it from being parsed as an option.  For example:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24342
+#: guix-git/doc/guix.texi:32910
 #, no-wrap
 msgid "guix system switch-generation -- -1\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24350
+#: guix-git/doc/guix.texi:32918
 msgid "Currently, the effect of invoking this action is @emph{only} to switch the system profile to an existing generation and rearrange the bootloader menu entries.  To actually start using the target system generation, you must reboot after running this action.  In the future, it will be updated to do the same things as @command{reconfigure}, like activating and deactivating services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24352
+#: guix-git/doc/guix.texi:32920
 msgid "This action will fail if the specified generation does not exist."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24353
+#: guix-git/doc/guix.texi:32921
 #, no-wrap
 msgid "roll-back"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24359
+#: guix-git/doc/guix.texi:32927
 msgid "Switch to the preceding system generation.  The next time the system boots, it will use the preceding system generation.  This is the inverse of @command{reconfigure}, and it is exactly the same as invoking @command{switch-generation} with an argument of @code{-1}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24363
+#: guix-git/doc/guix.texi:32931
 msgid "Currently, as with @command{switch-generation}, you must reboot after running this action to actually start using the preceding system generation."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24364
+#: guix-git/doc/guix.texi:32932
 #, no-wrap
 msgid "delete-generations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24365
+#: guix-git/doc/guix.texi:32933
 #, no-wrap
 msgid "deleting system generations"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24366
+#: guix-git/doc/guix.texi:32934
 #, no-wrap
 msgid "saving space"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24370
+#: guix-git/doc/guix.texi:32938
 msgid "Delete system generations, making them candidates for garbage collection (@pxref{Invoking guix gc}, for information on how to run the ``garbage collector'')."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24374
-msgid "This works in the same way as @command{guix package --delete-generations} (@pxref{Invoking guix package, @code{--delete-generations}}).  With no arguments, all system generations but the current one are deleted:"
+#: guix-git/doc/guix.texi:32942
+msgid "This works in the same way as @samp{guix package --delete-generations} (@pxref{Invoking guix package, @option{--delete-generations}}).  With no arguments, all system generations but the current one are deleted:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24377
+#: guix-git/doc/guix.texi:32945
 #, no-wrap
 msgid "guix system delete-generations\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24381
+#: guix-git/doc/guix.texi:32949
 msgid "You can also select the generations you want to delete.  The example below deletes all the system generations that are more than two month old:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24384
+#: guix-git/doc/guix.texi:32952
 #, no-wrap
 msgid "guix system delete-generations 2m\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24389
+#: guix-git/doc/guix.texi:32957
 msgid "Running this command automatically reinstalls the bootloader with an updated list of menu entries---e.g., the ``old generations'' sub-menu in GRUB no longer lists the generations that have been deleted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24394
+#: guix-git/doc/guix.texi:32962
 msgid "Build the derivation of the operating system, which includes all the configuration files and programs needed to boot and run the system.  This action does not actually install anything."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24395
+#: guix-git/doc/guix.texi:32963
 #, no-wrap
 msgid "init"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24399
+#: guix-git/doc/guix.texi:32967
 msgid "Populate the given directory with all the files necessary to run the operating system specified in @var{file}.  This is useful for first-time installations of Guix System.  For instance:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24402
+#: guix-git/doc/guix.texi:32970
 #, no-wrap
 msgid "guix system init my-os-config.scm /mnt\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24409
+#: guix-git/doc/guix.texi:32977
 msgid "copies to @file{/mnt} all the store items required by the configuration specified in @file{my-os-config.scm}.  This includes configuration files, packages, and so on.  It also creates other essential files needed for the system to operate correctly---e.g., the @file{/etc}, @file{/var}, and @file{/run} directories, and the @file{/bin/sh} file."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24413
+#: guix-git/doc/guix.texi:32981
 msgid "This command also installs bootloader on the target specified in @file{my-os-config}, unless the @option{--no-bootloader} option was passed."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24414
+#: guix-git/doc/guix.texi:32982
 #, no-wrap
 msgid "vm"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24415 doc/guix.texi:24683
+#: guix-git/doc/guix.texi:32983 guix-git/doc/guix.texi:33544
 #, no-wrap
 msgid "virtual machine"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24416
+#: guix-git/doc/guix.texi:32984
 #, no-wrap
 msgid "VM"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:24420
+#: guix-git/doc/guix.texi:32988
 msgid "guix system vm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24420
+#: guix-git/doc/guix.texi:32988
 msgid "Build a virtual machine that contains the operating system declared in @var{file}, and return a script to run that virtual machine (VM)."
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:24428
+#: guix-git/doc/guix.texi:32996
 msgid "The @code{vm} action and others below can use KVM support in the Linux-libre kernel.  Specifically, if the machine has hardware virtualization support, the corresponding KVM kernel module should be loaded, and the @file{/dev/kvm} device node must exist and be readable and writable by the user and by the build users of the daemon (@pxref{Build Environment Setup})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24433
+#: guix-git/doc/guix.texi:33001
 msgid "Arguments given to the script are passed to QEMU as in the example below, which enables networking and requests 1@tie{}GiB of RAM for the emulated machine:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24436
+#: guix-git/doc/guix.texi:33004
 #, no-wrap
-msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -net user\n"
+msgid "$ /gnu/store/@dots{}-run-vm.sh -m 1024 -smp 2 -net user,model=virtio-net-pci\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24439
+#: guix-git/doc/guix.texi:33007
 msgid "The VM shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24444
-msgid "Additional file systems can be shared between the host and the VM using the @code{--share} and @code{--expose} command-line options: the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory."
+#: guix-git/doc/guix.texi:33012
+msgid "Additional file systems can be shared between the host and the VM using the @option{--share} and @option{--expose} command-line options: the former specifies a directory to be shared with write access, while the latter provides read-only access to the shared directory."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24448
+#: guix-git/doc/guix.texi:33016
 msgid "The example below creates a VM in which the user's home directory is accessible read-only, and where the @file{/exchange} directory is a read-write mapping of @file{$HOME/tmp} on the host:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24452
+#: guix-git/doc/guix.texi:33020
 #, no-wrap
 msgid ""
 "guix system vm my-config.scm \\\n"
@@ -43642,108 +59618,152 @@ msgid ""
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24457
+#: guix-git/doc/guix.texi:33025
 msgid "On GNU/Linux, the default is to boot directly to the kernel; this has the advantage of requiring only a very tiny root disk image since the store of the host can then be mounted."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24463
-msgid "The @code{--full-boot} option forces a complete boot sequence, starting with the bootloader.  This requires more disk space since a root image containing at least the kernel, initrd, and bootloader data files must be created.  The @code{--image-size} option can be used to specify the size of the image."
+#: guix-git/doc/guix.texi:33031
+msgid "The @option{--full-boot} option forces a complete boot sequence, starting with the bootloader.  This requires more disk space since a root image containing at least the kernel, initrd, and bootloader data files must be created.  The @option{--image-size} option can be used to specify the size of the image."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24464
+#: guix-git/doc/guix.texi:33032
 #, no-wrap
 msgid "System images, creation in various formats"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24465
+#: guix-git/doc/guix.texi:33033
 #, no-wrap
 msgid "Creating system images in various formats"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24466
+#: guix-git/doc/guix.texi:33034
 #, no-wrap
-msgid "vm-image"
+msgid "image"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:24467
+#: guix-git/doc/guix.texi:33035
 #, no-wrap
-msgid "disk-image"
+msgid "docker-image"
 msgstr ""
 
-#. type: itemx
-#: doc/guix.texi:24468
+#. type: table
+#: guix-git/doc/guix.texi:33043
+msgid "Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone.  By default, @command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option to specify a value.  Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in the case of @code{docker-image}."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:33044
 #, no-wrap
-msgid "docker-image"
+msgid "image, creating disk images"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24476
-msgid "Return a virtual machine, disk image, or Docker image of the operating system declared in @var{file} that stands alone.  By default, @command{guix system} estimates the size of the image needed to store the system, but you can use the @option{--image-size} option to specify a value.  Docker images are built to contain exactly what they need, so the @option{--image-size} option is ignored in the case of @code{docker-image}."
+#: guix-git/doc/guix.texi:33056
+msgid "The @code{image} command can produce various image types.  The image type can be selected using the @option{--image-type} option.  It defaults to @code{efi-raw}.  When its value is @code{iso9660}, the @option{--label} option can be used to specify a volume ID with @code{image}.  By default, the root file system of a disk image is mounted non-volatile; the @option{--volatile} option can be provided to make it volatile instead.  When using @code{image}, the bootloader installed on the generated image is taken from the provided @code{operating-system} definition.  The following example demonstrates how to generate an image that uses the @code{grub-efi-bootloader} bootloader and boot it with QEMU:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:33064
+#, no-wrap
+msgid ""
+"image=$(guix system image --image-type=qcow2 \\\n"
+"        gnu/system/examples/lightweight-desktop.tmpl)\n"
+"cp $image /tmp/my-image.qcow2\n"
+"chmod +w /tmp/my-image.qcow2\n"
+"qemu-system-x86_64 -enable-kvm -hda /tmp/my-image.qcow2 -m 1000 \\\n"
+"                   -bios $(guix build ovmf)/share/firmware/ovmf_x64.bin\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24479
-msgid "You can specify the root file system type by using the @option{--file-system-type} option.  It defaults to @code{ext4}."
+#: guix-git/doc/guix.texi:33070
+msgid "When using the @code{efi-raw} image type, a raw disk image is produced; it can be copied as is to a USB stick, for instance.  Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:33073
+#, no-wrap
+msgid "# dd if=$(guix system image my-os.scm) of=/dev/sdc status=progress\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24483
-msgid "When using @code{vm-image}, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for more information on how to run the image in a virtual machine."
+#: guix-git/doc/guix.texi:33077
+msgid "The @code{--list-image-types} command lists all the available image types."
+msgstr ""
+
+#. type: cindex
+#: guix-git/doc/guix.texi:33078
+#, no-wrap
+msgid "creating virtual machine images"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24488
-msgid "When using @code{disk-image}, a raw disk image is produced; it can be copied as is to a USB stick, for instance.  Assuming @code{/dev/sdc} is the device corresponding to a USB stick, one can copy the image to it using the following command:"
+#: guix-git/doc/guix.texi:33087
+msgid "When using the @code{qcow2} image type, the returned image is in qcow2 format, which the QEMU emulator can efficiently use. @xref{Running Guix in a VM}, for more information on how to run the image in a virtual machine.  The @code{grub-bootloader} bootloader is always used independently of what is declared in the @code{operating-system} file passed as argument.  This is to make it easier to work with QEMU, which uses the SeaBIOS BIOS by default, expecting a bootloader to be installed in the Master Boot Record (MBR)."
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24491
+#. type: cindex
+#: guix-git/doc/guix.texi:33088
 #, no-wrap
-msgid "# dd if=$(guix system disk-image my-os.scm) of=/dev/sdc\n"
+msgid "docker-image, creating docker images"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24498
+#: guix-git/doc/guix.texi:33094
 msgid "When using @code{docker-image}, a Docker image is produced.  Guix builds the image from scratch, not from a pre-existing Docker base image.  As a result, it contains @emph{exactly} what you define in the operating system configuration file.  You can then load the image and launch a Docker container using commands like the following:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24504
+#: guix-git/doc/guix.texi:33099
 #, no-wrap
 msgid ""
 "image_id=\"$(docker load < guix-system-docker-image.tar.gz)\"\n"
-"docker run -e GUIX_NEW_SYSTEM=/var/guix/profiles/system \\\\\n"
-"    --entrypoint /var/guix/profiles/system/profile/bin/guile \\\\\n"
-"    $image_id /var/guix/profiles/system/boot\n"
+"container_id=\"$(docker create $image_id)\"\n"
+"docker start $container_id\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33106
+msgid "This command starts a new Docker container from the specified image.  It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration.  You can get an interactive shell running in the container using @command{docker exec}:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:33109
+#, no-wrap
+msgid "docker exec -ti $container_id /run/current-system/profile/bin/bash --login\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33116
+msgid "Depending on what you run in the Docker container, it may be necessary to give the container additional permissions.  For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker create}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24514
-msgid "This command starts a new Docker container from the specified image.  It will boot the Guix system in the usual manner, which means it will start any services you have defined in the operating system configuration.  Depending on what you run in the Docker container, it may be necessary to give the container additional permissions.  For example, if you intend to build software using Guix inside of the Docker container, you may need to pass the @option{--privileged} option to @code{docker run}."
+#: guix-git/doc/guix.texi:33120
+msgid "Last, the @option{--network} option applies to @command{guix system docker-image}: it produces an image where network is supposedly shared with the host, and thus without services like nscd or NetworkManager."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24522
+#: guix-git/doc/guix.texi:33128
 msgid "Return a script to run the operating system declared in @var{file} within a container.  Containers are a set of lightweight isolation mechanisms provided by the kernel Linux-libre.  Containers are substantially less resource-demanding than full virtual machines since the kernel, shared objects, and other resources can be shared with the host system; this also means they provide thinner isolation."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24526
+#: guix-git/doc/guix.texi:33132
 msgid "Currently, the script must be run as root in order to support more than a single user and group.  The container shares its store with the host system."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24530
+#: guix-git/doc/guix.texi:33136
 msgid "As with the @code{vm} action (@pxref{guix system vm}), additional file systems to be shared between the host and container can be specified using the @option{--share} and @option{--expose} options:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24534
+#: guix-git/doc/guix.texi:33140
 #, no-wrap
 msgid ""
 "guix system container my-config.scm \\\n"
@@ -43751,430 +59771,830 @@ msgid ""
 msgstr ""
 
 #. type: quotation
-#: doc/guix.texi:24538
+#: guix-git/doc/guix.texi:33144
 msgid "This option requires Linux-libre 3.19 or newer."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24545
+#: guix-git/doc/guix.texi:33151
 msgid "@var{options} can contain any of the common build options (@pxref{Common Build Options}).  In addition, @var{options} can contain one of the following:"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24554
+#: guix-git/doc/guix.texi:33160
 msgid "Consider the operating-system @var{expr} evaluates to.  This is an alternative to specifying a file which evaluates to an operating system.  This is used to generate the Guix system installer @pxref{Building the Installation Image})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24559
+#: guix-git/doc/guix.texi:33165
 msgid "Attempt to build for @var{system} instead of the host system type.  This works as per @command{guix build} (@pxref{Invoking guix build})."
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:24560
-#, no-wrap
-msgid "--derivation"
+#. type: table
+#: guix-git/doc/guix.texi:33170
+msgid "Return the derivation file name of the given operating system without building anything."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24564
-msgid "Return the derivation file name of the given operating system without building anything."
+#: guix-git/doc/guix.texi:33179
+msgid "As discussed above, @command{guix system init} and @command{guix system reconfigure} always save provenance information @i{via} a dedicated service (@pxref{Service Reference, @code{provenance-service-type}}).  However, other commands don't do that by default.  If you wish to, say, create a virtual machine image that contains provenance information, you can run:"
 msgstr ""
 
-#. type: item
-#: doc/guix.texi:24565
+#. type: example
+#: guix-git/doc/guix.texi:33182
 #, no-wrap
-msgid "--file-system-type=@var{type}"
+msgid "guix system image -t qcow2 --save-provenance config.scm\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33189
+msgid "That way, the resulting image will effectively ``embed its own source'' in the form of meta-data in @file{/run/current-system}.  With that information, one can rebuild the image to make sure it really contains what it pretends to contain; or they could use that to derive a variant of the image."
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:33190
+#, fuzzy, no-wrap
+#| msgid "--log-compression=@var{type}"
+msgid "--image-type=@var{type}"
+msgstr "--log-compression=@var{type}"
+
 #. type: table
-#: doc/guix.texi:24569
-msgid "For the @code{disk-image} action, create a file system of the given @var{type} on the image."
+#: guix-git/doc/guix.texi:33193
+msgid "For the @code{image} action, create an image with given @var{type}."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24571
-msgid "When this option is omitted, @command{guix system} uses @code{ext4}."
+#: guix-git/doc/guix.texi:33196
+msgid "When this option is omitted, @command{guix system} uses the @code{efi-raw} image type."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24572
+#: guix-git/doc/guix.texi:33197
 #, no-wrap
 msgid "ISO-9660 format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24573
+#: guix-git/doc/guix.texi:33198
 #, no-wrap
 msgid "CD image format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24574
+#: guix-git/doc/guix.texi:33199
 #, no-wrap
 msgid "DVD image format"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24577
-msgid "@code{--file-system-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs."
+#: guix-git/doc/guix.texi:33202
+msgid "@option{--image-type=iso9660} produces an ISO-9660 image, suitable for burning on CDs and DVDs."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24578
+#: guix-git/doc/guix.texi:33203
 #, no-wrap
 msgid "--image-size=@var{size}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24583
-msgid "For the @code{vm-image} and @code{disk-image} actions, create an image of the given @var{size}.  @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
+#: guix-git/doc/guix.texi:33208
+msgid "For the @code{image} action, create an image of the given @var{size}.  @var{size} may be a number of bytes, or it may include a unit as a suffix (@pxref{Block size, size specifications,, coreutils, GNU Coreutils})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24587
+#: guix-git/doc/guix.texi:33212
 msgid "When this option is omitted, @command{guix system} computes an estimate of the image size as a function of the size of the system declared in @var{file}."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:33217
+msgid "For the @code{container} action, allow containers to access the host network, that is, do not create a network namespace."
+msgstr ""
+
 #. type: item
-#: doc/guix.texi:24593
+#: guix-git/doc/guix.texi:33223
 #, no-wrap
 msgid "--skip-checks"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24595
+#: guix-git/doc/guix.texi:33225
 msgid "Skip pre-installation safety checks."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24602
+#: guix-git/doc/guix.texi:33232
 msgid "By default, @command{guix system init} and @command{guix system reconfigure} perform safety checks: they make sure the file systems that appear in the @code{operating-system} declaration actually exist (@pxref{File Systems}), and that any Linux kernel modules that may be needed at boot time are listed in @code{initrd-modules} (@pxref{Initial RAM Disk}).  Passing this option skips these tests altogether."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:33235
+msgid "Instruct @command{guix system reconfigure} to allow system downgrades."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33243
+msgid "By default, @command{reconfigure} prevents you from downgrading your system.  It achieves that by comparing the provenance info of your system (shown by @command{guix system describe}) with that of your @command{guix} command (shown by @command{guix describe}).  If the commits for @command{guix} are not descendants of those used for your system, @command{guix system reconfigure} errors out.  Passing @option{--allow-downgrades} allows you to bypass these checks."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:24603
+#: guix-git/doc/guix.texi:33249
 #, no-wrap
 msgid "on-error"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24604
+#: guix-git/doc/guix.texi:33250
 #, no-wrap
 msgid "on-error strategy"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24605
+#: guix-git/doc/guix.texi:33251
 #, no-wrap
 msgid "error strategy"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24606
+#: guix-git/doc/guix.texi:33252
 #, no-wrap
 msgid "--on-error=@var{strategy}"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24609
+#: guix-git/doc/guix.texi:33255
 msgid "Apply @var{strategy} when an error occurs when reading @var{file}.  @var{strategy} may be one of the following:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24611
+#: guix-git/doc/guix.texi:33257
 #, no-wrap
 msgid "nothing-special"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24613
+#: guix-git/doc/guix.texi:33259
 msgid "Report the error concisely and exit.  This is the default strategy."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24614
+#: guix-git/doc/guix.texi:33260
 #, no-wrap
 msgid "backtrace"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24616
+#: guix-git/doc/guix.texi:33262
 msgid "Likewise, but also display a backtrace."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24617
+#: guix-git/doc/guix.texi:33263
 #, no-wrap
 msgid "debug"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24623
+#: guix-git/doc/guix.texi:33269
 msgid "Report the error and enter Guile's debugger.  From there, you can run commands such as @code{,bt} to get a backtrace, @code{,locals} to display local variable values, and more generally inspect the state of the program.  @xref{Debug Commands,,, guile, GNU Guile Reference Manual}, for a list of available debugging commands."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24630
+#: guix-git/doc/guix.texi:33276
 msgid "Once you have built, configured, re-configured, and re-re-configured your Guix installation, you may find it useful to list the operating system generations available on disk---and that you can choose from the bootloader boot menu:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24633
+#: guix-git/doc/guix.texi:33279
+#, no-wrap
+msgid "describe"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33282
+msgid "Describe the current system generation: its file name, the kernel and bootloader used, etc., as well as provenance information when available."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33283
 #, no-wrap
 msgid "list-generations"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24638
+#: guix-git/doc/guix.texi:33288
 msgid "List a summary of each generation of the operating system available on disk, in a human-readable way.  This is similar to the @option{--list-generations} option of @command{guix package} (@pxref{Invoking guix package})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24643
+#: guix-git/doc/guix.texi:33293
 msgid "Optionally, one can specify a pattern, with the same syntax that is used in @command{guix package --list-generations}, to restrict the list of generations displayed.  For instance, the following command displays generations that are up to 10 days old:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24646
+#: guix-git/doc/guix.texi:33296
 #, no-wrap
 msgid "$ guix system list-generations 10d\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24653
+#: guix-git/doc/guix.texi:33303
 msgid "The @command{guix system} command has even more to offer! The following sub-commands allow you to visualize how your system services relate to each other:"
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:24655
+#: guix-git/doc/guix.texi:33305
 msgid "system-extension-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24657
+#: guix-git/doc/guix.texi:33307
 #, no-wrap
 msgid "extension-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24662
-msgid "Emit in Dot/Graphviz format to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service extensions.)"
+#: guix-git/doc/guix.texi:33314
+msgid "Emit to standard output the @dfn{service extension graph} of the operating system defined in @var{file} (@pxref{Service Composition}, for more information on service extensions).  By default the output is in Dot/Graphviz format, but you can choose a different format with @option{--graph-backend}, as with @command{guix graph} (@pxref{Invoking guix graph, @option{--backend}}):"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24664
+#: guix-git/doc/guix.texi:33316
 msgid "The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24667
+#: guix-git/doc/guix.texi:33319
 #, no-wrap
-msgid "$ guix system extension-graph @var{file} | dot -Tpdf > services.pdf\n"
+msgid "$ guix system extension-graph @var{file} | xdot -\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24670
-msgid "produces a PDF file showing the extension relations among services."
+#: guix-git/doc/guix.texi:33322
+msgid "shows the extension relations among services."
 msgstr ""
 
 #. type: anchor{#1}
-#: doc/guix.texi:24672
+#: guix-git/doc/guix.texi:33324
 msgid "system-shepherd-graph"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24672
+#: guix-git/doc/guix.texi:33324
 #, no-wrap
 msgid "shepherd-graph"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24677
-msgid "Emit in Dot/Graphviz format to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in @var{file}.  @xref{Shepherd Services}, for more information and for an example graph."
+#: guix-git/doc/guix.texi:33329
+msgid "Emit to standard output the @dfn{dependency graph} of shepherd services of the operating system defined in @var{file}.  @xref{Shepherd Services}, for more information and for an example graph."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33332
+msgid "Again, the default output format is Dot/Graphviz, but you can pass @option{--graph-backend} to select a different one."
+msgstr ""
+
+#. type: section
+#: guix-git/doc/guix.texi:33336
+#, fuzzy, no-wrap
+#| msgid "Invoking @command{guix-daemon}"
+msgid "Invoking @code{guix deploy}"
+msgstr "调用@command{guix-daemon}"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33344
+msgid "We've already seen @code{operating-system} declarations used to manage a machine's configuration locally.  Suppose you need to configure multiple machines, though---perhaps you're managing a service on the web that's comprised of several servers.  @command{guix deploy} enables you to use those same @code{operating-system} declarations to manage multiple remote hosts at once as a logical ``deployment''."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:33349
+msgid "The functionality described in this section is still under development and is subject to change.  Get in touch with us on @email{guix-devel@@gnu.org}!"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:33353
+#, no-wrap
+msgid "guix deploy @var{file}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33357
+msgid "Such an invocation will deploy the machines that the code within @var{file} evaluates to.  As an example, @var{file} might contain a definition like this:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33364
+#, no-wrap
+msgid ""
+";; This is a Guix deployment of a \"bare bones\" setup, with\n"
+";; no X11 display server, to a machine with an SSH daemon\n"
+";; listening on localhost:2222. A configuration such as this\n"
+";; may be appropriate for virtual machine with ports\n"
+";; forwarded to the host's loopback interface.\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33367
+#, no-wrap
+msgid ""
+"(use-service-modules networking ssh)\n"
+"(use-package-modules bootloaders)\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33388
+#, no-wrap
+msgid ""
+"(define %system\n"
+"  (operating-system\n"
+"   (host-name \"gnu-deployed\")\n"
+"   (timezone \"Etc/UTC\")\n"
+"   (bootloader (bootloader-configuration\n"
+"                (bootloader grub-bootloader)\n"
+"                (target \"/dev/vda\")\n"
+"                (terminal-outputs '(console))))\n"
+"   (file-systems (cons (file-system\n"
+"                        (mount-point \"/\")\n"
+"                        (device \"/dev/vda1\")\n"
+"                        (type \"ext4\"))\n"
+"                       %base-file-systems))\n"
+"   (services\n"
+"    (append (list (service dhcp-client-service-type)\n"
+"                  (service openssh-service-type\n"
+"                           (openssh-configuration\n"
+"                            (permit-root-login #t)\n"
+"                            (allow-empty-passwords? #t))))\n"
+"            %base-services))))\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33398
+#, no-wrap
+msgid ""
+"(list (machine\n"
+"       (operating-system %system)\n"
+"       (environment managed-host-environment-type)\n"
+"       (configuration (machine-ssh-configuration\n"
+"                       (host-name \"localhost\")\n"
+"                       (system \"x86_64-linux\")\n"
+"                       (user \"alice\")\n"
+"                       (identity \"./id_rsa\")\n"
+"                       (port 2222)))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33411
+msgid "The file should evaluate to a list of @var{machine} objects.  This example, upon being deployed, will create a new generation on the remote system realizing the @code{operating-system} declaration @code{%system}.  @code{environment} and @code{configuration} specify how the machine should be provisioned---that is, how the computing resources should be created and managed.  The above example does not create any resources, as a @code{'managed-host} is a machine that is already running the Guix system and available over the network.  This is a particularly simple case; a more complex deployment may involve, for example, starting virtual machines through a Virtual Private Server (VPS) provider.  In such a case, a different @var{environment} type would be used."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33416
+msgid "Do note that you first need to generate a key pair on the coordinator machine to allow the daemon to export signed archives of files from the store (@pxref{Invoking guix archive}), though this step is automatic on Guix System:"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33424
+#, fuzzy
+#| msgid "Each build machine must authorize the key of the master machine so that it accepts store items it receives from the master:"
+msgid "Each target machine must authorize the key of the master machine so that it accepts store items it receives from the coordinator:"
+msgstr "每台构建机器都必须认证主机器的公钥，从而接收从主机器接收的仓库文件："
+
+#. type: example
+#: guix-git/doc/guix.texi:33427
+#, fuzzy, no-wrap
+#| msgid "# guix archive --authorize < master-public-key.txt\n"
+msgid "# guix archive --authorize < coordinator-public-key.txt\n"
+msgstr "# guix archive --authorize < master-public-key.txt\n"
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33438
+msgid "@code{user}, in this example, specifies the name of the user account to log in as to perform the deployment.  Its default value is @code{root}, but root login over SSH may be forbidden in some cases.  To work around this, @command{guix deploy} can log in as an unprivileged user and employ @code{sudo} to escalate privileges.  This will only work if @code{sudo} is currently installed on the remote and can be invoked non-interactively as @code{user}.  That is, the line in @code{sudoers} granting @code{user} the ability to use @code{sudo} must contain the @code{NOPASSWD} tag.  This can be accomplished with the following operating system configuration snippet:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33442
+#, no-wrap
+msgid ""
+"(use-modules ...\n"
+"             (gnu system))               ;for %sudoers-specification\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33444
+#, no-wrap
+msgid ""
+"(define %user \"username\")\n"
+"\n"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:33452
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ...\n"
+"  (sudoers-file\n"
+"     (plain-file \"sudoers\"\n"
+"                 (string-append (plain-file-content %sudoers-specification)\n"
+"                                (format #f \"~a ALL = NOPASSWD: ALL~%\"\n"
+"                                        %user)))))\n"
+"\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:33457
+msgid "For more information regarding the format of the @file{sudoers} file, consult @command{man sudoers}."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33458
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} machine"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33461
+msgid "This is the data type representing a single machine in a heterogeneous Guix deployment."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33465
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "The object of the operating system configuration to deploy."
+msgstr "管理操作系统配置。"
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33466
+#, fuzzy, no-wrap
+#| msgid "build environment"
+msgid "environment"
+msgstr "构建环境"
+
+#. type: table
+#: guix-git/doc/guix.texi:33468
+msgid "An @code{environment-type} describing how the machine should be provisioned."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33469
+#, fuzzy, no-wrap
+#| msgid "@code{journal-content} (default: @code{#f})"
+msgid "@code{configuration} (default: @code{#f})"
+msgstr "@code{journal-content}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33474
+msgid "An object describing the configuration for the machine's @code{environment}.  If the @code{environment} has a default configuration, @code{#f} may be used.  If @code{#f} is used for an environment with no default configuration, however, an error will be thrown."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33477
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} machine-ssh-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33480
+msgid "This is the data type representing the SSH client parameters for a machine with an @code{environment} of @code{managed-host-environment-type}."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33483
+#, fuzzy, no-wrap
+#| msgid "@code{zonefile-load} (default: @code{#f})"
+msgid "@code{build-locally?} (default: @code{#t})"
+msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33485
+msgid "If false, system derivations will be built on the machine being deployed to."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33485
+#, no-wrap
+msgid "system"
+msgstr "系统"
+
+#. type: table
+#: guix-git/doc/guix.texi:33488
+#, fuzzy
+#| msgid "The system type of the remote machine---e.g., @code{\"x86_64-linux\"}."
+msgid "The system type describing the architecture of the machine being deployed to---e.g., @code{\"x86_64-linux\"}."
+msgstr "远程机器的系统类型--如，@code{\"x86_64-linux\"}。"
+
+#. type: item
+#: guix-git/doc/guix.texi:33488
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{authorize?} (default: @code{#t})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33491
+msgid "If true, the coordinator's signing key will be added to the remote's ACL keyring."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33492
+#, fuzzy, no-wrap
+#| msgid "@code{vt} (default @code{\"vt7\"})"
+msgid "@code{user} (default: @code{\"root\"})"
+msgstr "@code{vt}（默认值：@code{\"vt7\"}）"
+
+#. type: item
+#: guix-git/doc/guix.texi:33493
+#, fuzzy, no-wrap
+#| msgid "@code{dnssec-policy} (default: @code{#f})"
+msgid "@code{identity} (default: @code{#f})"
+msgstr "@code{dnssec-policy}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33496
+msgid "If specified, the path to the SSH private key to use to authenticate with the remote host."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33497
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{host-key} (default: @code{#f})"
+msgstr "@code{port}（默认值：@code{22}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33499
+msgid "This should be the SSH host key of the machine, which looks like this:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:33502
+#, fuzzy, no-wrap
+#| msgid "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
+msgid "ssh-ed25519 AAAAC3Nz@dots{} root@@example.org\n"
+msgstr "ssh-ed25519 AAAAC3NzaC@dots{}mde+UhL hint@@example.org\n"
+
+#. type: table
+#: guix-git/doc/guix.texi:33507
+msgid "When @code{host-key} is @code{#f}, the server is authenticated against the @file{~/.ssh/known_hosts} file, just like the OpenSSH @command{ssh} client does."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:33508
+#, fuzzy, no-wrap
+#| msgid "@code{challenge} (default: @code{#f})"
+msgid "@code{allow-downgrades?} (default: @code{#f})"
+msgstr "@code{challenge}（默认值：@code{#f}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:33510
+msgid "Whether to allow potential downgrades."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33518
+msgid "Like @command{guix system reconfigure}, @command{guix deploy} compares the channel commits currently deployed on the remote host (as returned by @command{guix system describe}) to those currently in use (as returned by @command{guix describe}) to determine whether commits currently in use are descendants of those deployed.  When this is not the case and @code{allow-downgrades?} is false, it raises an error.  This ensures you do not accidentally downgrade remote machines."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33521
+#, no-wrap
+msgid "{Data Type} digital-ocean-configuration"
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:33524
+msgid "This is the data type describing the Droplet that should be created for a machine with an @code{environment} of @code{digital-ocean-environment-type}."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33526
+#, fuzzy, no-wrap
+#| msgid "host-key"
+msgid "ssh-key"
+msgstr "主机公钥"
+
+#. type: table
+#: guix-git/doc/guix.texi:33529
+msgid "The path to the SSH private key to use to authenticate with the remote host.  In the future, this field may not exist."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33529
+#, no-wrap
+msgid "tags"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33532
+msgid "A list of string ``tags'' that uniquely identify the machine.  Must be given such that no two machines in the deployment have the same set of tags."
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33532
+#, no-wrap
+msgid "region"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33534
+msgid "A Digital Ocean region slug, such as @code{\"nyc3\"}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33536
+msgid "A Digital Ocean size slug, such as @code{\"s-1vcpu-1gb\"}"
+msgstr ""
+
+#. type: code{#1}
+#: guix-git/doc/guix.texi:33536
+#, no-wrap
+msgid "enable-ipv6?"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:33538
+msgid "Whether or not the droplet should be created with IPv6 networking."
 msgstr ""
 
 #. type: section
-#: doc/guix.texi:24681
+#: guix-git/doc/guix.texi:33542
 #, no-wrap
 msgid "Running Guix in a Virtual Machine"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24690
+#: guix-git/doc/guix.texi:33551
 msgid "To run Guix in a virtual machine (VM), one can use the pre-built Guix VM image distributed at @url{@value{BASE-URL}/guix-system-vm-image-@value{VERSION}.x86_64-linux.xz}.  This image is a compressed image in QCOW format.  You will first need to decompress with @command{xz -d}, and then you can pass it to an emulator such as QEMU (see below for details)."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24696
-msgid "This image boots the Xfce graphical environment and it contains some commonly-used tools.  You can install more software in the image by running @command{guix package} in a terminal (@pxref{Invoking guix package}).  You can also reconfigure the system based on its initial configuration file available as @file{/etc/config.scm} (@pxref{Using the Configuration System})."
+#: guix-git/doc/guix.texi:33558
+msgid "This image boots the Xfce graphical environment and it contains some commonly used tools.  You can install more software in the image by running @command{guix package} in a terminal (@pxref{Invoking guix package}).  You can also reconfigure the system based on its initial configuration file available as @file{/run/current-system/configuration.scm} (@pxref{Using the Configuration System})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24701
+#: guix-git/doc/guix.texi:33563
 msgid "Instead of using this pre-built image, one can also build their own virtual machine image using @command{guix system vm-image} (@pxref{Invoking guix system}).  The returned image is in qcow2 format, which the @uref{https://qemu.org/, QEMU emulator} can efficiently use."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24702
+#: guix-git/doc/guix.texi:33564
 #, no-wrap
 msgid "QEMU"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24709
-msgid "If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy before you can use it.  When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform.  Here is a minimal QEMU invocation that will boot the result of @command{guix system vm-image} on x86_64 hardware:"
+#: guix-git/doc/guix.texi:33571
+msgid "If you built your own image, you must copy it out of the store (@pxref{The Store}) and give yourself permission to write to the copy before you can use it.  When invoking QEMU, you must choose a system emulator that is suitable for your hardware platform.  Here is a minimal QEMU invocation that will boot the result of @command{guix system image -t qcow2} on x86_64 hardware:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24716
+#: guix-git/doc/guix.texi:33578
 #, no-wrap
 msgid ""
 "$ qemu-system-x86_64 \\\n"
-"   -net user -net nic,model=virtio \\\n"
-"   -enable-kvm -m 512 \\\n"
+"   -nic user,model=virtio-net-pci \\\n"
+"   -enable-kvm -m 1024 \\\n"
 "   -device virtio-blk,drive=myhd \\\n"
 "   -drive if=none,file=/tmp/qemu-image,id=myhd\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24719
+#: guix-git/doc/guix.texi:33581
 msgid "Here is what each of these options means:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24721
+#: guix-git/doc/guix.texi:33583
 #, no-wrap
 msgid "qemu-system-x86_64"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24724
+#: guix-git/doc/guix.texi:33586
 msgid "This specifies the hardware platform to emulate.  This should match the host."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24725
-#, no-wrap
-msgid "-net user"
-msgstr ""
-
-#. type: table
-#: doc/guix.texi:24729
-msgid "Enable the unprivileged user-mode network stack.  The guest OS can access the host but not vice versa.  This is the simplest way to get the guest OS online."
-msgstr ""
-
-#. type: item
-#: doc/guix.texi:24730
+#: guix-git/doc/guix.texi:33587
 #, no-wrap
-msgid "-net nic,model=virtio"
+msgid "-nic user,model=virtio-net-pci"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24735
-msgid "You must create a network interface of a given model.  If you do not create a NIC, the boot will fail.  Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -net nic,model=help}."
+#: guix-git/doc/guix.texi:33595
+msgid "Enable the unprivileged user-mode network stack.  The guest OS can access the host but not vice versa.  This is the simplest way to get the guest OS online.  @code{model} specifies which network device to emulate: @code{virtio-net-pci} is a special device made for virtualized operating systems and recommended for most uses.  Assuming your hardware platform is x86_64, you can get a list of available NIC models by running @command{qemu-system-x86_64 -nic model=help}."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24736
+#: guix-git/doc/guix.texi:33596
 #, no-wrap
 msgid "-enable-kvm"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24740
+#: guix-git/doc/guix.texi:33600
 msgid "If your system has hardware virtualization extensions, enabling the virtual machine support (KVM) of the Linux kernel will make things run faster."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24742
+#: guix-git/doc/guix.texi:33602
 #, no-wrap
 msgid "-m 1024"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24745
+#: guix-git/doc/guix.texi:33605
 msgid "RAM available to the guest OS, in mebibytes.  Defaults to 128@tie{}MiB, which may be insufficient for some operations."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24746
+#: guix-git/doc/guix.texi:33606
 #, no-wrap
 msgid "-device virtio-blk,drive=myhd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24751
+#: guix-git/doc/guix.texi:33611
 msgid "Create a @code{virtio-blk} drive called ``myhd''.  @code{virtio-blk} is a ``paravirtualization'' mechanism for block devices that allows QEMU to achieve better performance than if it were emulating a complete disk drive.  See the QEMU and KVM documentation for more info."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24752
+#: guix-git/doc/guix.texi:33612
 #, no-wrap
 msgid "-drive if=none,file=/tmp/qemu-image,id=myhd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24755
-msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store the the ``myhd'' drive."
+#: guix-git/doc/guix.texi:33615
+msgid "Use our QCOW image, the @file{/tmp/qemu-image} file, as the backing store of the ``myhd'' drive."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24765
-msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-net user} flag by default.  To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and start the VM using @command{`guix system vm config.scm` -net user}.  An important caveat of using @command{-net user} for networking is that @command{ping} will not work, because it uses the ICMP protocol.  You'll have to use a different command to check for network connectivity, for example @command{guix download}."
+#: guix-git/doc/guix.texi:33625
+msgid "The default @command{run-vm.sh} script that is returned by an invocation of @command{guix system vm} does not add a @command{-nic user} flag by default.  To get network access from within the vm add the @code{(dhcp-client-service)} to your system definition and start the VM using @command{$(guix system vm config.scm) -nic user}.  An important caveat of using @command{-nic user} for networking is that @command{ping} will not work, because it uses the ICMP protocol.  You'll have to use a different command to check for network connectivity, for example @command{guix download}."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:24766
+#: guix-git/doc/guix.texi:33626
 #, no-wrap
 msgid "Connecting Through SSH"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24774
+#: guix-git/doc/guix.texi:33634
 msgid "To enable SSH inside a VM you need to add an SSH server like @code{openssh-service-type} to your VM (@pxref{Networking Services, @code{openssh-service-type}}).  In addition you need to forward the SSH port, 22 by default, to the host.  You can do this with"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24777
+#: guix-git/doc/guix.texi:33637
 #, no-wrap
-msgid "`guix system vm config.scm` -net user,hostfwd=tcp::10022-:22\n"
+msgid "$(guix system vm config.scm) -nic user,model=virtio-net-pci,hostfwd=tcp::10022-:22\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24780
+#: guix-git/doc/guix.texi:33640
 msgid "To connect to the VM you can run"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24783
+#: guix-git/doc/guix.texi:33643
 #, no-wrap
-msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022\n"
+msgid "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -p 10022 localhost\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24790
+#: guix-git/doc/guix.texi:33650
 msgid "The @command{-p} tells @command{ssh} the port you want to connect to.  @command{-o UserKnownHostsFile=/dev/null} prevents @command{ssh} from complaining every time you modify your @command{config.scm} file and the @command{-o StrictHostKeyChecking=no} prevents you from having to allow a connection to an unknown host every time you connect."
 msgstr ""
 
 #. type: subsection
-#: doc/guix.texi:24791
+#: guix-git/doc/guix.texi:33651
 #, no-wrap
 msgid "Using @command{virt-viewer} with Spice"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24797
+#: guix-git/doc/guix.texi:33657
 msgid "As an alternative to the default @command{qemu} graphical client you can use the @command{remote-viewer} from the @command{virt-viewer} package.  To connect pass the @command{-spice port=5930,disable-ticketing} flag to @command{qemu}.  See previous section for further information on how to do this."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24800
-msgid "Spice also allows you to do some nice stuff like share your clipboard with your VM.  To enable that you'll also have to pass the following flags to @command{qemu}:"
+#: guix-git/doc/guix.texi:33660
+msgid "Spice also allows you to do some nice stuff like share your clipboard with your VM@.  To enable that you'll also have to pass the following flags to @command{qemu}:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:24806
+#: guix-git/doc/guix.texi:33666
 #, no-wrap
 msgid ""
 "-device virtio-serial-pci,id=virtio-serial0,max_ports=16,bus=pci.0,addr=0x5\n"
@@ -44184,81 +60604,81 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24809
-msgid "You'll also need to add the @pxref{Miscellaneous Services, Spice service}."
+#: guix-git/doc/guix.texi:33670
+msgid "You'll also need to add the @code{(spice-vdagent-service)} to your system definition (@pxref{Miscellaneous Services, Spice service})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24816
+#: guix-git/doc/guix.texi:33677
 msgid "The previous sections show the available services and how one can combine them in an @code{operating-system} declaration.  But how do we define them in the first place? And what is a service anyway?"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24828
+#: guix-git/doc/guix.texi:33689
 #, no-wrap
 msgid "daemons"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24841
+#: guix-git/doc/guix.texi:33702
 msgid "Here we define a @dfn{service} as, broadly, something that extends the functionality of the operating system.  Often a service is a process---a @dfn{daemon}---started when the system boots: a secure shell server, a Web server, the Guix build daemon, etc.  Sometimes a service is a daemon whose execution can be triggered by another daemon---e.g., an FTP server started by @command{inetd} or a D-Bus service activated by @command{dbus-daemon}.  Occasionally, a service does not map to a daemon.  For instance, the ``account'' service collects user accounts and makes sure they exist when the system runs; the ``udev'' service collects device management rules and makes them available to the eudev daemon; the @file{/etc} service populates the @file{/etc} directory of the system."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24842
+#: guix-git/doc/guix.texi:33703
 #, no-wrap
 msgid "service extensions"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24854
+#: guix-git/doc/guix.texi:33715
 msgid "Guix system services are connected by @dfn{extensions}.  For instance, the secure shell service @emph{extends} the Shepherd---the initialization system, running as PID@tie{}1---by giving it the command lines to start and stop the secure shell daemon (@pxref{Networking Services, @code{openssh-service-type}}); the UPower service extends the D-Bus service by passing it its @file{.service} specification, and extends the udev service by passing it device management rules (@pxref{Desktop Services, @code{upower-service}}); the Guix daemon service extends the Shepherd by passing it the command lines to start and stop the daemon, and extends the account service by passing it a list of required build user accounts (@pxref{Base Services})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24858
+#: guix-git/doc/guix.texi:33719
 msgid "All in all, services and their ``extends'' relations form a directed acyclic graph (DAG).  If we represent services as boxes and extensions as arrows, a typical system might provide something like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24860
+#: guix-git/doc/guix.texi:33721
 msgid "@image{images/service-graph,,5in,Typical service extension graph.}"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24861
+#: guix-git/doc/guix.texi:33722
 #, no-wrap
 msgid "system service"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24869
+#: guix-git/doc/guix.texi:33730
 msgid "At the bottom, we see the @dfn{system service}, which produces the directory containing everything to run and boot the system, as returned by the @command{guix system build} command.  @xref{Service Reference}, to learn about the other service types shown here.  @xref{system-extension-graph, the @command{guix system extension-graph} command}, for information on how to generate this representation for a particular operating system definition."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:24870
+#: guix-git/doc/guix.texi:33731
 #, no-wrap
 msgid "service types"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24876
+#: guix-git/doc/guix.texi:33737
 msgid "Technically, developers can define @dfn{service types} to express these relations.  There can be any number of services of a given type on the system---for instance, a system running two instances of the GNU secure shell server (lsh) has two instances of @code{lsh-service-type}, with different parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24879
+#: guix-git/doc/guix.texi:33740
 msgid "The following section describes the programming interface for service types and services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24886
+#: guix-git/doc/guix.texi:33747
 msgid "A @dfn{service type} is a node in the DAG described above.  Let us start with a simple example, the service type for the Guix build daemon (@pxref{Invoking guix-daemon}):"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24896
+#. type: lisp
+#: guix-git/doc/guix.texi:33757
 #, no-wrap
 msgid ""
 "(define guix-service-type\n"
@@ -44272,106 +60692,106 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24900
+#: guix-git/doc/guix.texi:33761
 msgid "It defines three things:"
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:24904
+#: guix-git/doc/guix.texi:33765
 msgid "A name, whose sole purpose is to make inspection and debugging easier."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:24909
+#: guix-git/doc/guix.texi:33770
 msgid "A list of @dfn{service extensions}, where each extension designates the target service type and a procedure that, given the parameters of the service, returns a list of objects to extend the service of that type."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:24912
+#: guix-git/doc/guix.texi:33773
 msgid "Every service type has at least one service extension.  The only exception is the @dfn{boot service type}, which is the ultimate service."
 msgstr ""
 
 #. type: enumerate
-#: doc/guix.texi:24915
+#: guix-git/doc/guix.texi:33776
 msgid "Optionally, a default value for instances of this type."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24918
+#: guix-git/doc/guix.texi:33779
 msgid "In this example, @code{guix-service-type} extends three services:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24920
+#: guix-git/doc/guix.texi:33781
 #, no-wrap
 msgid "shepherd-root-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24925
+#: guix-git/doc/guix.texi:33786
 msgid "The @code{guix-shepherd-service} procedure defines how the Shepherd service is extended.  Namely, it returns a @code{<shepherd-service>} object that defines how @command{guix-daemon} is started and stopped (@pxref{Shepherd Services})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24926
+#: guix-git/doc/guix.texi:33787
 #, no-wrap
 msgid "account-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24931
+#: guix-git/doc/guix.texi:33792
 msgid "This extension for this service is computed by @code{guix-accounts}, which returns a list of @code{user-group} and @code{user-account} objects representing the build user accounts (@pxref{Invoking guix-daemon})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24932
+#: guix-git/doc/guix.texi:33793
 #, no-wrap
 msgid "activation-service-type"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24936
+#: guix-git/doc/guix.texi:33797
 msgid "Here @code{guix-activation} is a procedure that returns a gexp, which is a code snippet to run at ``activation time''---e.g., when the service is booted."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24939
+#: guix-git/doc/guix.texi:33800
 msgid "A service of this type is instantiated like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24945
+#. type: lisp
+#: guix-git/doc/guix.texi:33806
 #, no-wrap
 msgid ""
 "(service guix-service-type\n"
 "         (guix-configuration\n"
 "           (build-accounts 5)\n"
-"           (use-substitutes? #f)))\n"
+"           (extra-options '(\"--gc-keep-derivations\"))))\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24953
+#: guix-git/doc/guix.texi:33814
 msgid "The second argument to the @code{service} form is a value representing the parameters of this specific service instance.  @xref{guix-configuration-type, @code{guix-configuration}}, for information about the @code{guix-configuration} data type.  When the value is omitted, the default value specified by @code{guix-service-type} is used:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24956
+#. type: lisp
+#: guix-git/doc/guix.texi:33817
 #, no-wrap
 msgid "(service guix-service-type)\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24960
+#: guix-git/doc/guix.texi:33821
 msgid "@code{guix-service-type} is quite simple because it extends other services but is not extensible itself."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24964
+#: guix-git/doc/guix.texi:33825
 msgid "The service type for an @emph{extensible} service looks like this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24971
+#. type: lisp
+#: guix-git/doc/guix.texi:33832
 #, no-wrap
 msgid ""
 "(define udev-service-type\n"
@@ -44382,8 +60802,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:24979
+#. type: lisp
+#: guix-git/doc/guix.texi:33840
 #, no-wrap
 msgid ""
 "                (compose concatenate)       ;concatenate the list of rules\n"
@@ -44396,96 +60816,96 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:24985
+#: guix-git/doc/guix.texi:33846
 msgid "This is the service type for the @uref{https://wiki.gentoo.org/wiki/Project:Eudev, eudev device management daemon}.  Compared to the previous example, in addition to an extension of @code{shepherd-root-service-type}, we see two new fields:"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24987
+#: guix-git/doc/guix.texi:33848
 #, no-wrap
 msgid "compose"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24990
+#: guix-git/doc/guix.texi:33851
 msgid "This is the procedure to @dfn{compose} the list of extensions to services of this type."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24993
+#: guix-git/doc/guix.texi:33854
 msgid "Services can extend the udev service by passing it lists of rules; we compose those extensions simply by concatenating them."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:24994
+#: guix-git/doc/guix.texi:33855
 #, no-wrap
 msgid "extend"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:24997
+#: guix-git/doc/guix.texi:33858
 msgid "This procedure defines how the value of the service is @dfn{extended} with the composition of the extensions."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25002
+#: guix-git/doc/guix.texi:33863
 msgid "Udev extensions are composed into a list of rules, but the udev service value is itself a @code{<udev-configuration>} record.  So here, we extend that record by appending the list of rules it contains to the list of contributed rules."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25008
+#: guix-git/doc/guix.texi:33869
 msgid "This is a string giving an overview of the service type.  The string can contain Texinfo markup (@pxref{Overview,,, texinfo, GNU Texinfo}).  The @command{guix system search} command searches these strings and displays them (@pxref{Invoking guix system})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25013
+#: guix-git/doc/guix.texi:33874
 msgid "There can be only one instance of an extensible service type such as @code{udev-service-type}.  If there were more, the @code{service-extension} specifications would be ambiguous."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25016
+#: guix-git/doc/guix.texi:33877
 msgid "Still here? The next section provides a reference of the programming interface for services."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25024
+#: guix-git/doc/guix.texi:33885
 msgid "We have seen an overview of service types (@pxref{Service Types and Services}).  This section provides a reference on how to manipulate services and service types.  This interface is provided by the @code{(gnu services)} module."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25025
+#: guix-git/doc/guix.texi:33886
 #, no-wrap
 msgid "{Scheme Procedure} service @var{type} [@var{value}]"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25029
-msgid "Return a new service of @var{type}, a @code{<service-type>} object (see below.)  @var{value} can be any object; it represents the parameters of this particular service instance."
+#: guix-git/doc/guix.texi:33890
+msgid "Return a new service of @var{type}, a @code{<service-type>} object (see below).  @var{value} can be any object; it represents the parameters of this particular service instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25033
+#: guix-git/doc/guix.texi:33894
 msgid "When @var{value} is omitted, the default value specified by @var{type} is used; if @var{type} does not specify a default value, an error is raised."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25035
+#: guix-git/doc/guix.texi:33896
 msgid "For instance, this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25038
+#. type: lisp
+#: guix-git/doc/guix.texi:33899
 #, no-wrap
 msgid "(service openssh-service-type)\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25042
+#: guix-git/doc/guix.texi:33903
 msgid "is equivalent to this:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25046
+#. type: lisp
+#: guix-git/doc/guix.texi:33907
 #, no-wrap
 msgid ""
 "(service openssh-service-type\n"
@@ -44493,50 +60913,50 @@ msgid ""
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25050
+#: guix-git/doc/guix.texi:33911
 msgid "In both cases the result is an instance of @code{openssh-service-type} with the default configuration."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25052
+#: guix-git/doc/guix.texi:33913
 #, no-wrap
 msgid "{Scheme Procedure} service? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25054
+#: guix-git/doc/guix.texi:33915
 msgid "Return true if @var{obj} is a service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25056
+#: guix-git/doc/guix.texi:33917
 #, no-wrap
 msgid "{Scheme Procedure} service-kind @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25058
+#: guix-git/doc/guix.texi:33919
 msgid "Return the type of @var{service}---i.e., a @code{<service-type>} object."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25060
+#: guix-git/doc/guix.texi:33921
 #, no-wrap
 msgid "{Scheme Procedure} service-value @var{service}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25063
+#: guix-git/doc/guix.texi:33924
 msgid "Return the value associated with @var{service}.  It represents its parameters."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25066
+#: guix-git/doc/guix.texi:33927
 msgid "Here is an example of how a service is created and manipulated:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25075
+#. type: lisp
+#: guix-git/doc/guix.texi:33936
 #, no-wrap
 msgid ""
 "(define s\n"
@@ -44549,8 +60969,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25078
+#. type: lisp
+#: guix-git/doc/guix.texi:33939
 #, no-wrap
 msgid ""
 "(service? s)\n"
@@ -44558,8 +60978,8 @@ msgid ""
 "\n"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25081
+#. type: lisp
+#: guix-git/doc/guix.texi:33942
 #, no-wrap
 msgid ""
 "(eq? (service-kind s) nginx-service-type)\n"
@@ -44567,167 +60987,195 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25091
+#: guix-git/doc/guix.texi:33952
 msgid "The @code{modify-services} form provides a handy way to change the parameters of some of the services of a list such as @code{%base-services} (@pxref{Base Services, @code{%base-services}}).  It evaluates to a list of services.  Of course, you could always use standard list combinators such as @code{map} and @code{fold} to do that (@pxref{SRFI-1, List Library,, guile, GNU Guile Reference Manual}); @code{modify-services} simply provides a more concise form for this common pattern."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25092
+#: guix-git/doc/guix.texi:33953
 #, no-wrap
 msgid "{Scheme Syntax} modify-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25094
+#: guix-git/doc/guix.texi:33955
 msgid "(@var{type} @var{variable} => @var{body}) @dots{}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25097
+#: guix-git/doc/guix.texi:33958
 msgid "Modify the services listed in @var{services} according to the given clauses.  Each clause has the form:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25100
+#: guix-git/doc/guix.texi:33961
 #, no-wrap
 msgid "(@var{type} @var{variable} => @var{body})\n"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25107
+#: guix-git/doc/guix.texi:33968
 msgid "where @var{type} is a service type---e.g., @code{guix-service-type}---and @var{variable} is an identifier that is bound within the @var{body} to the service parameters---e.g., a @code{guix-configuration} instance---of the original service of that @var{type}."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25114
+#: guix-git/doc/guix.texi:33975
 msgid "The @var{body} should evaluate to the new service parameters, which will be used to configure the new service.  This new service will replace the original in the resulting list.  Because a service's service parameters are created using @code{define-record-type*}, you can write a succinct @var{body} that evaluates to the new service parameters by using the @code{inherit} feature that @code{define-record-type*} provides."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25116
+#: guix-git/doc/guix.texi:33977
 msgid "@xref{Using the Configuration System}, for example usage."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25123
+#: guix-git/doc/guix.texi:33984
 msgid "Next comes the programming interface for service types.  This is something you want to know when writing new service definitions, but not necessarily when simply looking for ways to customize your @code{operating-system} declaration."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25124
+#: guix-git/doc/guix.texi:33985
 #, no-wrap
 msgid "{Data Type} service-type"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25125
+#: guix-git/doc/guix.texi:33986
 #, no-wrap
 msgid "service type"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25128
+#: guix-git/doc/guix.texi:33989
 msgid "This is the representation of a @dfn{service type} (@pxref{Service Types and Services})."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25132
+#: guix-git/doc/guix.texi:33993
 msgid "This is a symbol, used only to simplify inspection and debugging."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:25133
+#: guix-git/doc/guix.texi:33994
 #, no-wrap
 msgid "extensions"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25135
+#: guix-git/doc/guix.texi:33996
 msgid "A non-empty list of @code{<service-extension>} objects (see below)."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25136
+#: guix-git/doc/guix.texi:33997
 #, no-wrap
 msgid "@code{compose} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25140
+#: guix-git/doc/guix.texi:34001
 msgid "If this is @code{#f}, then the service type denotes services that cannot be extended---i.e., services that do not receive ``values'' from other services."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25144
+#: guix-git/doc/guix.texi:34005
 msgid "Otherwise, it must be a one-argument procedure.  The procedure is called by @code{fold-services} and is passed a list of values collected from extensions.  It may return any single value."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25145
+#: guix-git/doc/guix.texi:34006
 #, no-wrap
 msgid "@code{extend} (default: @code{#f})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25147
+#: guix-git/doc/guix.texi:34008
 msgid "If this is @code{#f}, services of this type cannot be extended."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25153
+#: guix-git/doc/guix.texi:34014
 msgid "Otherwise, it must be a two-argument procedure: @code{fold-services} calls it, passing it the initial value of the service as the first argument and the result of applying @code{compose} to the extension values as the second argument.  It must return a value that is a valid parameter value for the service instance."
 msgstr ""
 
+#. type: table
+#: guix-git/doc/guix.texi:34020
+msgid "This is a string, possibly using Texinfo markup, describing in a couple of sentences what the service is about.  This string allows users to find about the service through @command{guix system search} (@pxref{Invoking guix system})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:34021
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "@code{default-value} (default: @code{&no-default-value})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:34024
+msgid "The default value associated for instances of this service type.  This allows users to use the @code{service} form without its second argument:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:34027
+#, no-wrap
+msgid "(service @var{type})\n"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:34031
+msgid "The returned service in this case has the default value specified by @var{type}."
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:25156
+#: guix-git/doc/guix.texi:34034
 msgid "@xref{Service Types and Services}, for examples."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25158
+#: guix-git/doc/guix.texi:34036
 #, no-wrap
 msgid "{Scheme Procedure} service-extension @var{target-type} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25164
+#: guix-git/doc/guix.texi:34042
 msgid "@var{compute} Return a new extension for services of type @var{target-type}.  @var{compute} must be a one-argument procedure: @code{fold-services} calls it, passing it the value associated with the service that provides the extension; it must return a valid value for the target service."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25166
+#: guix-git/doc/guix.texi:34044
 #, no-wrap
 msgid "{Scheme Procedure} service-extension? @var{obj}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25168
+#: guix-git/doc/guix.texi:34046
 msgid "Return true if @var{obj} is a service extension."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25174
+#: guix-git/doc/guix.texi:34052
 msgid "Occasionally, you might want to simply extend an existing service.  This involves creating a new service type and specifying the extension of interest, which can be verbose; the @code{simple-service} procedure provides a shorthand for this."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25175
+#: guix-git/doc/guix.texi:34053
 #, no-wrap
 msgid "{Scheme Procedure} simple-service @var{name} @var{target} @var{value}"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25179
+#: guix-git/doc/guix.texi:34057
 msgid "Return a service that extends @var{target} with @var{value}.  This works by creating a singleton service type @var{name}, of which the returned service is an instance."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25182
+#: guix-git/doc/guix.texi:34060
 msgid "For example, this extends mcron (@pxref{Scheduled Job Execution}) with an additional job:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25186
+#. type: lisp
+#: guix-git/doc/guix.texi:34064
 #, no-wrap
 msgid ""
 "(simple-service 'my-mcron-job mcron-service-type\n"
@@ -44735,307 +61183,423 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25196
+#: guix-git/doc/guix.texi:34074
 msgid "At the core of the service abstraction lies the @code{fold-services} procedure, which is responsible for ``compiling'' a list of services down to a single directory that contains everything needed to boot and run the system---the directory shown by the @command{guix system build} command (@pxref{Invoking guix system}).  In essence, it propagates service extensions down the service graph, updating each node parameters on the way, until it reaches the root node."
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25197
+#: guix-git/doc/guix.texi:34075
 #, no-wrap
 msgid "{Scheme Procedure} fold-services @var{services} @"
 msgstr ""
 
 #. type: deffn
-#: doc/guix.texi:25201
+#: guix-git/doc/guix.texi:34079
 msgid "[#:target-type @var{system-service-type}] Fold @var{services} by propagating their extensions down to the root of type @var{target-type}; return the root service adjusted accordingly."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25205
+#: guix-git/doc/guix.texi:34083
 msgid "Lastly, the @code{(gnu services)} module also defines several essential service types, some of which are listed below."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25206
+#: guix-git/doc/guix.texi:34084
 #, no-wrap
 msgid "{Scheme Variable} system-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25209
+#: guix-git/doc/guix.texi:34087
 msgid "This is the root of the service graph.  It produces the system directory as returned by the @command{guix system build} command."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25211
+#: guix-git/doc/guix.texi:34089
 #, no-wrap
 msgid "{Scheme Variable} boot-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25214
+#: guix-git/doc/guix.texi:34092
 msgid "The type of the ``boot service'', which produces the @dfn{boot script}.  The boot script is what the initial RAM disk runs when booting."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25216
+#: guix-git/doc/guix.texi:34094
 #, no-wrap
 msgid "{Scheme Variable} etc-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25220
+#: guix-git/doc/guix.texi:34098
 msgid "The type of the @file{/etc} service.  This service is used to create files under @file{/etc} and can be extended by passing it name/file tuples such as:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25223
+#. type: lisp
+#: guix-git/doc/guix.texi:34101
 #, no-wrap
 msgid "(list `(\"issue\" ,(plain-file \"issue\" \"Welcome!\\n\")))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25227
+#: guix-git/doc/guix.texi:34105
 msgid "In this example, the effect would be to add an @file{/etc/issue} file pointing to the given file."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25229
+#: guix-git/doc/guix.texi:34107
 #, no-wrap
 msgid "{Scheme Variable} setuid-program-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25233
+#: guix-git/doc/guix.texi:34111
 msgid "Type for the ``setuid-program service''.  This service collects lists of executable file names, passed as gexps, and adds them to the set of setuid-root programs on the system (@pxref{Setuid Programs})."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25235
+#: guix-git/doc/guix.texi:34113
 #, no-wrap
 msgid "{Scheme Variable} profile-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25239
+#: guix-git/doc/guix.texi:34117
 msgid "Type of the service that populates the @dfn{system profile}---i.e., the programs under @file{/run/current-system/profile}.  Other services can extend it by passing it lists of packages to add to the system profile."
 msgstr ""
 
+#. type: anchor{#1}
+#: guix-git/doc/guix.texi:34121
+msgid "provenance-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:34121
+#, no-wrap
+msgid "{Scheme Variable} provenance-service-type"
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:34125
+msgid "This is the type of the service that records @dfn{provenance meta-data} in the system itself.  It creates several files under @file{/run/current-system}:"
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:34127
+#, fuzzy, no-wrap
+#| msgid "Channels"
+msgid "channels.scm"
+msgstr "通道"
+
+#. type: table
+#: guix-git/doc/guix.texi:34132
+msgid "This is a ``channel file'' that can be passed to @command{guix pull -C} or @command{guix time-machine -C}, and which describes the channels used to build the system, if that information was available (@pxref{Channels})."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:34133
+#, fuzzy, no-wrap
+#| msgid "System Configuration"
+msgid "configuration.scm"
+msgstr "系统配置"
+
+#. type: table
+#: guix-git/doc/guix.texi:34138
+msgid "This is the file that was passed as the value for this @code{provenance-service-type} service.  By default, @command{guix system reconfigure} automatically passes the OS configuration file it received on the command line."
+msgstr ""
+
+#. type: item
+#: guix-git/doc/guix.texi:34139
+#, no-wrap
+msgid "provenance"
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:34142
+msgid "This contains the same information as the two other files but in a format that is more readily processable."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:34146
+msgid "In general, these two pieces of information (channels and configuration file) are enough to reproduce the operating system ``from source''."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:34147
+#, no-wrap
+msgid "Caveats"
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:34154
+msgid "This information is necessary to rebuild your operating system, but it is not always sufficient.  In particular, @file{configuration.scm} itself is insufficient if it is not self-contained---if it refers to external Guile modules or to extra files.  If you want @file{configuration.scm} to be self-contained, we recommend that modules or files it refers to be part of a channel."
+msgstr ""
+
+#. type: quotation
+#: guix-git/doc/guix.texi:34162
+msgid "Besides, provenance meta-data is ``silent'' in the sense that it does not change the bits contained in your system, @emph{except for the meta-data bits themselves}.  Two different OS configurations or sets of channels can lead to the same system, bit-for-bit; when @code{provenance-service-type} is used, these two systems will have different meta-data and thus different store file names, which makes comparison less trivial."
+msgstr ""
+
+#. type: defvr
+#: guix-git/doc/guix.texi:34167
+msgid "This service is automatically added to your operating system configuration when you use @command{guix system reconfigure}, @command{guix system init}, or @command{guix deploy}."
+msgstr ""
+
 #. type: cindex
-#: doc/guix.texi:25245
+#: guix-git/doc/guix.texi:34172
 #, no-wrap
 msgid "shepherd services"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25246
+#: guix-git/doc/guix.texi:34173
 #, no-wrap
 msgid "PID 1"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25247
+#: guix-git/doc/guix.texi:34174
 #, no-wrap
 msgid "init system"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25253
+#: guix-git/doc/guix.texi:34180
 msgid "The @code{(gnu services shepherd)} module provides a way to define services managed by the GNU@tie{}Shepherd, which is the initialization system---the first process that is started when the system boots, also known as PID@tie{}1 (@pxref{Introduction,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25259
+#: guix-git/doc/guix.texi:34186
 msgid "Services in the Shepherd can depend on each other.  For instance, the SSH daemon may need to be started after the syslog daemon has been started, which in turn can only happen once all the file systems have been mounted.  The simple operating system defined earlier (@pxref{Using the Configuration System}) results in a service graph like this:"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25261
+#: guix-git/doc/guix.texi:34188
 msgid "@image{images/shepherd-graph,,5in,Typical shepherd service graph.}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25265
+#: guix-git/doc/guix.texi:34192
 msgid "You can actually generate such a graph for any operating system definition using the @command{guix system shepherd-graph} command (@pxref{system-shepherd-graph, @command{guix system shepherd-graph}})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25269
+#: guix-git/doc/guix.texi:34196
 msgid "The @code{%shepherd-root-service} is a service object representing PID@tie{}1, of type @code{shepherd-root-service-type}; it can be extended by passing it lists of @code{<shepherd-service>} objects."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25270
+#: guix-git/doc/guix.texi:34197
 #, no-wrap
 msgid "{Data Type} shepherd-service"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25272
+#: guix-git/doc/guix.texi:34199
 msgid "The data type representing a service managed by the Shepherd."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:25274
+#: guix-git/doc/guix.texi:34201
 #, no-wrap
 msgid "provision"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25276
+#: guix-git/doc/guix.texi:34203
 msgid "This is a list of symbols denoting what the service provides."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25281
+#: guix-git/doc/guix.texi:34208
 msgid "These are the names that may be passed to @command{herd start}, @command{herd status}, and similar commands (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual}).  @xref{Slots of services, the @code{provides} slot,, shepherd, The GNU Shepherd Manual}, for details."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25282
-#, no-wrap
-msgid "@code{requirements} (default: @code{'()})"
-msgstr ""
+#: guix-git/doc/guix.texi:34209
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "@code{requirement} (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
 
 #. type: table
-#: doc/guix.texi:25284
+#: guix-git/doc/guix.texi:34211
 msgid "List of symbols denoting the Shepherd services this one depends on."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25285
+#: guix-git/doc/guix.texi:34212
 #, no-wrap
 msgid "one-shot services, for the Shepherd"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25290
+#: guix-git/doc/guix.texi:34217
 msgid "Whether this service is @dfn{one-shot}.  One-shot services stop immediately after their @code{start} action has completed.  @xref{Slots of services,,, shepherd, The GNU Shepherd Manual}, for more info."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25291
+#: guix-git/doc/guix.texi:34218
 #, no-wrap
 msgid "@code{respawn?} (default: @code{#t})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25294
+#: guix-git/doc/guix.texi:34221
 msgid "Whether to restart the service when it stops, for instance when the underlying process dies."
 msgstr ""
 
 #. type: code{#1}
-#: doc/guix.texi:25295
+#: guix-git/doc/guix.texi:34222
 #, no-wrap
 msgid "start"
 msgstr ""
 
 #. type: itemx
-#: doc/guix.texi:25296
+#: guix-git/doc/guix.texi:34223
 #, no-wrap
 msgid "@code{stop} (default: @code{#~(const #f)})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25302
+#: guix-git/doc/guix.texi:34229
 msgid "The @code{start} and @code{stop} fields refer to the Shepherd's facilities to start and stop processes (@pxref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}).  They are given as G-expressions that get expanded in the Shepherd configuration file (@pxref{G-Expressions})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25303
+#: guix-git/doc/guix.texi:34230
 #, no-wrap
 msgid "@code{actions} (default: @code{'()})"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25304
+#: guix-git/doc/guix.texi:34231
 #, no-wrap
 msgid "actions, of Shepherd services"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25309
+#: guix-git/doc/guix.texi:34236
 msgid "This is a list of @code{shepherd-action} objects (see below) defining @dfn{actions} supported by the service, in addition to the standard @code{start} and @code{stop} actions.  Actions listed here become available as @command{herd} sub-commands:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25312
+#: guix-git/doc/guix.texi:34239
 #, no-wrap
 msgid "herd @var{action} @var{service} [@var{arguments}@dots{}]\n"
 msgstr ""
 
+#. type: item
+#: guix-git/doc/guix.texi:34241
+#, fuzzy, no-wrap
+#| msgid "@code{port} (default: @code{22})"
+msgid "@code{auto-start?} (default: @code{#t})"
+msgstr "@code{port}（默认值：@code{22}）"
+
 #. type: table
-#: doc/guix.texi:25316
+#: guix-git/doc/guix.texi:34244
+msgid "Whether this service should be started automatically by the Shepherd.  If it is @code{#f} the service has to be started manually with @code{herd start}."
+msgstr ""
+
+#. type: table
+#: guix-git/doc/guix.texi:34247
 msgid "A documentation string, as shown when running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25319
+#: guix-git/doc/guix.texi:34250
 #, no-wrap
 msgid "herd doc @var{service-name}\n"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25323
+#: guix-git/doc/guix.texi:34254
 msgid "where @var{service-name} is one of the symbols in @code{provision} (@pxref{Invoking herd,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25324
+#: guix-git/doc/guix.texi:34255
 #, no-wrap
 msgid "@code{modules} (default: @code{%default-modules})"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25327
+#: guix-git/doc/guix.texi:34258
 msgid "This is the list of modules that must be in scope when @code{start} and @code{stop} are evaluated."
 msgstr ""
 
+#. type: Plain text
+#: guix-git/doc/guix.texi:34266
+msgid "The example below defines a Shepherd service that spawns @command{syslogd}, the system logger from the GNU Networking Utilities (@pxref{syslogd invocation, @command{syslogd},, inetutils, GNU Inetutils}):"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:34278
+#, no-wrap
+msgid ""
+"(let ((config (plain-file \"syslogd.conf\" \"@dots{}\")))\n"
+"  (shepherd-service\n"
+"    (documentation \"Run the syslog daemon (syslogd).\")\n"
+"    (provision '(syslogd))\n"
+"    (requirement '(user-processes))\n"
+"    (start #~(make-forkexec-constructor\n"
+"               (list #$(file-append inetutils \"/libexec/syslogd\")\n"
+"                     \"--rcfile\" #$config)\n"
+"               #:pid-file \"/var/run/syslog.pid\"))\n"
+"    (stop #~(make-kill-destructor))))\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34293
+msgid "Key elements in this example are the @code{start} and @code{stop} fields: they are @dfn{staged} code snippets that use the @code{make-forkexec-constructor} procedure provided by the Shepherd and its dual, @code{make-kill-destructor} (@pxref{Service De- and Constructors,,, shepherd, The GNU Shepherd Manual}).  The @code{start} field will have @command{shepherd} spawn @command{syslogd} with the given option; note that we pass @code{config} after @option{--rcfile}, which is a configuration file declared above (contents of this file are omitted).  Likewise, the @code{stop} field tells how this service is to be stopped; in this case, it is stopped by making the @code{kill} system call on its PID@.  Code staging is achieved using G-expressions: @code{#~} stages code, while @code{#$} ``escapes'' back to host code (@pxref{G-Expressions})."
+msgstr ""
+
 #. type: deftp
-#: doc/guix.texi:25331
+#: guix-git/doc/guix.texi:34294
 #, no-wrap
 msgid "{Data Type} shepherd-action"
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25334
+#: guix-git/doc/guix.texi:34297
 msgid "This is the data type that defines additional actions implemented by a Shepherd service (see above)."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25338
+#: guix-git/doc/guix.texi:34301
 msgid "Symbol naming the action."
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25341
+#: guix-git/doc/guix.texi:34304
 msgid "This is a documentation string for the action.  It can be viewed by running:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25344
+#: guix-git/doc/guix.texi:34307
 #, no-wrap
 msgid "herd doc @var{service} action @var{action}\n"
 msgstr ""
 
 #. type: item
-#: doc/guix.texi:25346
+#: guix-git/doc/guix.texi:34309
 #, no-wrap
 msgid "procedure"
 msgstr ""
 
 #. type: table
-#: doc/guix.texi:25350
+#: guix-git/doc/guix.texi:34313
 msgid "This should be a gexp that evaluates to a procedure of at least one argument, which is the ``running value'' of the service (@pxref{Slots of services,,, shepherd, The GNU Shepherd Manual})."
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25354
+#: guix-git/doc/guix.texi:34317
 msgid "The following example defines an action called @code{say-hello} that kindly greets the user:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25363
+#. type: lisp
+#: guix-git/doc/guix.texi:34326
 #, no-wrap
 msgid ""
 "(shepherd-action\n"
@@ -45048,12 +61612,12 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25366
+#: guix-git/doc/guix.texi:34329
 msgid "Assuming this action is added to the @code{example} service, then you can do:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25372
+#: guix-git/doc/guix.texi:34335
 #, no-wrap
 msgid ""
 "# herd say-hello example\n"
@@ -45063,79 +61627,143 @@ msgid ""
 msgstr ""
 
 #. type: deftp
-#: doc/guix.texi:25377
+#: guix-git/doc/guix.texi:34340
 msgid "This, as you can see, is a fairly sophisticated way to say hello.  @xref{Service Convenience,,, shepherd, The GNU Shepherd Manual}, for more info on actions."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25379
+#: guix-git/doc/guix.texi:34342
 #, no-wrap
 msgid "{Scheme Variable} shepherd-root-service-type"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25381
+#: guix-git/doc/guix.texi:34344
 msgid "The service type for the Shepherd ``root service''---i.e., PID@tie{}1."
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25385
-msgid "This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for an example).  Each extension must pass a list of @code{<shepherd-service>}."
+#: guix-git/doc/guix.texi:34349
+msgid "This is the service type that extensions target when they want to create shepherd services (@pxref{Service Types and Services}, for an example).  Each extension must pass a list of @code{<shepherd-service>}.  Its value must be a @code{shepherd-configuration}, as described below."
+msgstr ""
+
+#. type: deftp
+#: guix-git/doc/guix.texi:34351
+#, fuzzy, no-wrap
+#| msgid "{Data Type} build-machine"
+msgid "{Data Type} shepherd-configuration"
+msgstr "{数据类型} build-machine"
+
+#. type: deftp
+#: guix-git/doc/guix.texi:34353
+#, fuzzy
+#| msgid "Manage the operating system configuration."
+msgid "This data type represents the Shepherd's configuration."
+msgstr "管理操作系统配置。"
+
+#. type: item
+#: guix-git/doc/guix.texi:34355
+#, fuzzy, no-wrap
+#| msgid "@code{mate} (default: @code{mate})"
+msgid "shepherd (default: @code{shepherd})"
+msgstr "@code{mate}（默认值：@code{mate}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:34357
+#, fuzzy
+#| msgid "The package data type."
+msgid "The Shepherd package to use."
+msgstr "软件包数据类型。"
+
+#. type: item
+#: guix-git/doc/guix.texi:34358
+#, fuzzy, no-wrap
+#| msgid "@code{features} (default: @code{'()})"
+msgid "services (default: @code{'()})"
+msgstr "@code{features} （@code{'()}）"
+
+#. type: table
+#: guix-git/doc/guix.texi:34362
+msgid "A list of @code{<shepherd-service>} to start.  You should probably use the service extension mechanism instead (@pxref{Shepherd Services})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34367
+msgid "The following example specifies the Shepherd package for the operating system:"
+msgstr ""
+
+#. type: lisp
+#: guix-git/doc/guix.texi:34382
+#, no-wrap
+msgid ""
+"(operating-system\n"
+"  ;; ...\n"
+"  (services (append (list openssh-service-type))\n"
+"            ;; ...\n"
+"            %desktop-services)\n"
+"  ;; ...\n"
+"  ;; Use own Shepherd package.\n"
+"  (essential-services\n"
+"   (modify-services (operating-system-default-essential-services\n"
+"                     this-operating-system)\n"
+"     (shepherd-root-service-type config => (shepherd-configuration\n"
+"                                            (inherit config)\n"
+"                                            (shepherd my-shepherd))))))\n"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25387
+#: guix-git/doc/guix.texi:34384
 #, no-wrap
 msgid "{Scheme Variable} %shepherd-root-service"
 msgstr ""
 
 #. type: defvr
-#: doc/guix.texi:25389
+#: guix-git/doc/guix.texi:34386
 msgid "This service represents PID@tie{}1."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25395
+#: guix-git/doc/guix.texi:34392
 #, no-wrap
 msgid "documentation, searching for"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25396
+#: guix-git/doc/guix.texi:34393
 #, no-wrap
 msgid "searching for documentation"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25397
+#: guix-git/doc/guix.texi:34394
 #, no-wrap
 msgid "Info, documentation format"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25398
+#: guix-git/doc/guix.texi:34395
 #, no-wrap
 msgid "man pages"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25399
+#: guix-git/doc/guix.texi:34396
 #, no-wrap
 msgid "manual pages"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25406
-msgid "In most cases packages installed with Guix come with documentation.  There are two main documentation formats: ``Info'', a browseable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format traditionally found on Unix.  Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed using @command{man}."
+#: guix-git/doc/guix.texi:34403
+msgid "In most cases packages installed with Guix come with documentation.  There are two main documentation formats: ``Info'', a browsable hypertext format used for GNU software, and ``manual pages'' (or ``man pages''), the linear documentation format traditionally found on Unix.  Info manuals are accessed with the @command{info} command or with Emacs, and man pages are accessed using @command{man}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25410
+#: guix-git/doc/guix.texi:34407
 msgid "You can look for documentation of software installed on your system by keyword.  For example, the following command searches for information about ``TLS'' in Info manuals:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25418
+#: guix-git/doc/guix.texi:34415
 #, no-wrap
 msgid ""
 "$ info -k TLS\n"
@@ -45147,12 +61775,12 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25422
+#: guix-git/doc/guix.texi:34419
 msgid "The command below searches for the same keyword in man pages:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25428
+#: guix-git/doc/guix.texi:34425
 #, no-wrap
 msgid ""
 "$ man -k TLS\n"
@@ -45162,108 +61790,185 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25434
+#: guix-git/doc/guix.texi:34431
 msgid "These searches are purely local to your computer so you have the guarantee that documentation you find corresponds to what you have actually installed, you can access it off-line, and your privacy is respected."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25437
+#: guix-git/doc/guix.texi:34434
 msgid "Once you have these results, you can view the relevant documentation by running, say:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25440
+#: guix-git/doc/guix.texi:34437
 #, no-wrap
 msgid "$ info \"(gnutls)Core TLS API\"\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25444
+#: guix-git/doc/guix.texi:34441
 msgid "or:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25447
+#: guix-git/doc/guix.texi:34444
 #, no-wrap
 msgid "$ man certtool\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25455
+#: guix-git/doc/guix.texi:34452
 msgid "Info manuals contain sections and indices as well as hyperlinks like those found in Web pages.  The @command{info} reader (@pxref{Top, Info reader,, info-stnd, Stand-alone GNU Info}) and its Emacs counterpart (@pxref{Misc Help,,, emacs, The GNU Emacs Manual}) provide intuitive key bindings to navigate manuals.  @xref{Getting Started,,, info, Info: An Introduction}, for an introduction to Info navigation."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25459
+#: guix-git/doc/guix.texi:34456
 #, no-wrap
 msgid "debugging files"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25465
+#: guix-git/doc/guix.texi:34462
 msgid "Program binaries, as produced by the GCC compilers for instance, are typically written in the ELF format, with a section containing @dfn{debugging information}.  Debugging information is what allows the debugger, GDB, to map binary code to source code; it is required to debug a compiled program in good conditions."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25473
-msgid "The problem with debugging information is that is takes up a fair amount of disk space.  For example, debugging information for the GNU C Library weighs in at more than 60 MiB.  Thus, as a user, keeping all the debugging info of all the installed programs is usually not an option.  Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})."
+#: guix-git/doc/guix.texi:34466
+msgid "This chapter explains how to use separate debug info when packages provide it, and how to rebuild packages with debug info when it's missing."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34482
+msgid "The problem with debugging information is that is takes up a fair amount of disk space.  For example, debugging information for the GNU C Library weighs in at more than 60 MiB@.  Thus, as a user, keeping all the debugging info of all the installed programs is usually not an option.  Yet, space savings should not come at the cost of an impediment to debugging---especially in the GNU system, which should make it easier for users to exert their computing freedom (@pxref{GNU Distribution})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25480
+#: guix-git/doc/guix.texi:34489
 msgid "Thankfully, the GNU Binary Utilities (Binutils) and GDB provide a mechanism that allows users to get the best of both worlds: debugging information can be stripped from the binaries and stored in separate files.  GDB is then able to load debugging information from those files, when they are available (@pxref{Separate Debug Files,,, gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25488
+#: guix-git/doc/guix.texi:34497
 msgid "The GNU distribution takes advantage of this by storing debugging information in the @code{lib/debug} sub-directory of a separate package output unimaginatively called @code{debug} (@pxref{Packages with Multiple Outputs}).  Users can choose to install the @code{debug} output of a package when they need it.  For instance, the following command installs the debugging information for the GNU C Library and for GNU Guile:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25491
+#: guix-git/doc/guix.texi:34500
 #, no-wrap
 msgid "guix install glibc:debug guile:debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25497
+#: guix-git/doc/guix.texi:34506
 msgid "GDB must then be told to look for debug files in the user's profile, by setting the @code{debug-file-directory} variable (consider setting it from the @file{~/.gdbinit} file, @pxref{Startup,,, gdb, Debugging with GDB}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25500
+#: guix-git/doc/guix.texi:34509
 #, no-wrap
 msgid "(gdb) set debug-file-directory ~/.guix-profile/lib/debug\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25504
-msgid "From there on, GDB will pick up debugging information from the @code{.debug} files under @file{~/.guix-profile/lib/debug}."
+#: guix-git/doc/guix.texi:34513
+msgid "From there on, GDB will pick up debugging information from the @file{.debug} files under @file{~/.guix-profile/lib/debug}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25511
+#: guix-git/doc/guix.texi:34520
 msgid "In addition, you will most likely want GDB to be able to show the source code being debugged.  To do that, you will have to unpack the source code of the package of interest (obtained with @code{guix build --source}, @pxref{Invoking guix build}), and to point GDB to that source directory using the @code{directory} command (@pxref{Source Path, @code{directory},, gdb, Debugging with GDB})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25520
-msgid "The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}).  Currently, it is opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output.  This may be changed to opt-out in the future if our build farm servers can handle the load.  To check whether a package has a @code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})."
+#: guix-git/doc/guix.texi:34528
+msgid "The @code{debug} output mechanism in Guix is implemented by the @code{gnu-build-system} (@pxref{Build Systems}).  Currently, it is opt-in---debugging information is available only for the packages with definitions explicitly declaring a @code{debug} output.  To check whether a package has a @code{debug} output, use @command{guix package --list-available} (@pxref{Invoking guix package})."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34530
+msgid "Read on for how to deal with packages lacking a @code{debug} output."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34542
+msgid "As we saw above, some packages, but not all, provide debugging info in a @code{debug} output.  What can you do when debugging info is missing? The @option{--with-debug-info} option provides a solution to that: it allows you to rebuild the package(s) for which debugging info is missing---and only those---and to graft those onto the application you're debugging.  Thus, while it's not as fast as installing a @code{debug} output, it is relatively inexpensive."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34547
+msgid "Let's illustrate that.  Suppose you're experiencing a bug in Inkscape and would like to see what's going on in GLib, a library that's deep down in its dependency graph.  As it turns out, GLib does not have a @code{debug} output and the backtrace GDB shows is all sadness:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:34558
+#, no-wrap
+msgid ""
+"(gdb) bt\n"
+"#0  0x00007ffff5f92190 in g_getenv ()\n"
+"   from /gnu/store/@dots{}-glib-2.62.6/lib/libglib-2.0.so.0\n"
+"#1  0x00007ffff608a7d6 in gobject_init_ctor ()\n"
+"   from /gnu/store/@dots{}-glib-2.62.6/lib/libgobject-2.0.so.0\n"
+"#2  0x00007ffff7fe275a in call_init (l=<optimized out>, argc=argc@@entry=1, argv=argv@@entry=0x7fffffffcfd8, \n"
+"    env=env@@entry=0x7fffffffcfe8) at dl-init.c:72\n"
+"#3  0x00007ffff7fe2866 in call_init (env=0x7fffffffcfe8, argv=0x7fffffffcfd8, argc=1, l=<optimized out>)\n"
+"    at dl-init.c:118\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34562
+msgid "To address that, you install Inkscape linked against a variant GLib that contains debug info:"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34568
+msgid "This time, debugging will be a whole lot nicer:"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:34586
+#, no-wrap
+msgid ""
+"$ gdb --args sh -c 'exec inkscape'\n"
+"@dots{}\n"
+"(gdb) b g_getenv\n"
+"Function \"g_getenv\" not defined.\n"
+"Make breakpoint pending on future shared library load? (y or [n]) y\n"
+"Breakpoint 1 (g_getenv) pending.\n"
+"(gdb) r\n"
+"Starting program: /gnu/store/@dots{}-profile/bin/sh -c exec\\ inkscape\n"
+"@dots{}\n"
+"(gdb) bt\n"
+"#0  g_getenv (variable=variable@@entry=0x7ffff60c7a2e \"GOBJECT_DEBUG\") at ../glib-2.62.6/glib/genviron.c:252\n"
+"#1  0x00007ffff608a7d6 in gobject_init () at ../glib-2.62.6/gobject/gtype.c:4380\n"
+"#2  gobject_init_ctor () at ../glib-2.62.6/gobject/gtype.c:4493\n"
+"#3  0x00007ffff7fe275a in call_init (l=<optimized out>, argc=argc@@entry=3, argv=argv@@entry=0x7fffffffd088, \n"
+"    env=env@@entry=0x7fffffffd0a8) at dl-init.c:72\n"
+"@dots{}\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34589
+msgid "Much better!"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34593
+msgid "Note that there can be packages for which @option{--with-debug-info} will not have the desired effect.  @xref{Package Transformation Options, @option{--with-debug-info}}, for more information."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25525
+#: guix-git/doc/guix.texi:34597
 #, no-wrap
 msgid "security updates"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25534
-msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched.  Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates.)  The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:"
+#: guix-git/doc/guix.texi:34606
+msgid "Occasionally, important security vulnerabilities are discovered in software packages and must be patched.  Guix developers try hard to keep track of known vulnerabilities and to apply fixes as soon as possible in the @code{master} branch of Guix (we do not yet provide a ``stable'' branch containing only security updates).  The @command{guix lint} tool helps developers find out about vulnerable versions of software packages in the distribution:"
 msgstr ""
 
 #. type: smallexample
-#: doc/guix.texi:25541
+#: guix-git/doc/guix.texi:34613
 #, no-wrap
 msgid ""
 "$ guix lint -c cve\n"
@@ -45274,44 +61979,39 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25544
+#: guix-git/doc/guix.texi:34616
 msgid "@xref{Invoking guix lint}, for more information."
 msgstr ""
 
-#. type: quotation
-#: doc/guix.texi:25548
-msgid "As of version @value{VERSION}, the feature described below is considered ``beta''."
-msgstr ""
-
 #. type: Plain text
-#: doc/guix.texi:25558
+#: guix-git/doc/guix.texi:34625
 msgid "Guix follows a functional package management discipline (@pxref{Introduction}), which implies that, when a package is changed, @emph{every package that depends on it} must be rebuilt.  This can significantly slow down the deployment of fixes in core packages such as libc or Bash, since basically the whole distribution would need to be rebuilt.  Using pre-built binaries helps (@pxref{Substitutes}), but deployment may still take more time than desired."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25559
+#: guix-git/doc/guix.texi:34626
 #, no-wrap
 msgid "grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25567
+#: guix-git/doc/guix.texi:34634
 msgid "To address this, Guix implements @dfn{grafts}, a mechanism that allows for fast deployment of critical updates without the costs associated with a whole-distribution rebuild.  The idea is to rebuild only the package that needs to be patched, and then to ``graft'' it onto packages explicitly installed by the user and that were previously referring to the original package.  The cost of grafting is typically very low, and order of magnitudes lower than a full rebuild of the dependency chain."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25568
+#: guix-git/doc/guix.texi:34635
 #, no-wrap
 msgid "replacements of packages, for grafts"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25574
+#: guix-git/doc/guix.texi:34641
 msgid "For instance, suppose a security update needs to be applied to Bash.  Guix developers will provide a package definition for the ``fixed'' Bash, say @code{bash-fixed}, in the usual way (@pxref{Defining Packages}).  Then, the original package definition is augmented with a @code{replacement} field pointing to the package containing the bug fix:"
 msgstr ""
 
-#. type: example
-#: doc/guix.texi:25581
+#. type: lisp
+#: guix-git/doc/guix.texi:34648
 #, no-wrap
 msgid ""
 "(define bash\n"
@@ -45322,324 +62022,534 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25591
+#: guix-git/doc/guix.texi:34658
 msgid "From there on, any package depending directly or indirectly on Bash---as reported by @command{guix gc --requisites} (@pxref{Invoking guix gc})---that is installed is automatically ``rewritten'' to refer to @code{bash-fixed} instead of @code{bash}.  This grafting process takes time proportional to the size of the package, usually less than a minute for an ``average'' package on a recent machine.  Grafting is recursive: when an indirect dependency requires grafting, then grafting ``propagates'' up to the package that the user is installing."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25599
+#: guix-git/doc/guix.texi:34666
 msgid "Currently, the length of the name and version of the graft and that of the package it replaces (@code{bash-fixed} and @code{bash} in the example above) must be equal.  This restriction mostly comes from the fact that grafting works by patching files, including binary files, directly.  Other restrictions may apply: for instance, when adding a graft to a package providing a shared library, the original shared library and its replacement must have the same @code{SONAME} and be binary-compatible."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25603
+#: guix-git/doc/guix.texi:34670
 msgid "The @option{--no-grafts} command-line option allows you to forcefully avoid grafting (@pxref{Common Build Options, @option{--no-grafts}}).  Thus, the command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25606
+#: guix-git/doc/guix.texi:34673
 #, no-wrap
 msgid "guix build bash --no-grafts\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25610
+#: guix-git/doc/guix.texi:34677
 msgid "returns the store file name of the original Bash, whereas:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25613
+#: guix-git/doc/guix.texi:34680
 #, no-wrap
 msgid "guix build bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25618
+#: guix-git/doc/guix.texi:34685
 msgid "returns the store file name of the ``fixed'', replacement Bash.  This allows you to distinguish between the two variants of Bash."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25621
+#: guix-git/doc/guix.texi:34688
 msgid "To verify which Bash your whole profile refers to, you can run (@pxref{Invoking guix gc}):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25624
+#: guix-git/doc/guix.texi:34691
 #, no-wrap
-msgid "guix gc -R `readlink -f ~/.guix-profile` | grep bash\n"
+msgid "guix gc -R $(readlink -f ~/.guix-profile) | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25629
+#: guix-git/doc/guix.texi:34696
 msgid "@dots{} and compare the store file names that you get with those above.  Likewise for a complete Guix system generation:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25632
+#: guix-git/doc/guix.texi:34699
 #, no-wrap
-msgid "guix gc -R `guix system build my-config.scm` | grep bash\n"
+msgid "guix gc -R $(guix system build my-config.scm) | grep bash\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25636
+#: guix-git/doc/guix.texi:34703
 msgid "Lastly, to check which Bash running processes are using, you can use the @command{lsof} command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25639
+#: guix-git/doc/guix.texi:34706
 #, no-wrap
 msgid "lsof | grep /gnu/store/.*bash\n"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25647
+#: guix-git/doc/guix.texi:34714
 #, no-wrap
 msgid "bootstrapping"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25657
-msgid "Bootstrapping in our context refers to how the distribution gets built ``from nothing''.  Remember that the build environment of a derivation contains nothing but its declared inputs (@pxref{Introduction}).  So there's an obvious chicken-and-egg problem: how does the first package get built? How does the first compiler get compiled? Note that this is a question of interest only to the curious hacker, not to the regular user, so you can shamelessly skip this section if you consider yourself a ``regular user''."
+#: guix-git/doc/guix.texi:34721
+msgid "Bootstrapping in our context refers to how the distribution gets built ``from nothing''.  Remember that the build environment of a derivation contains nothing but its declared inputs (@pxref{Introduction}).  So there's an obvious chicken-and-egg problem: how does the first package get built? How does the first compiler get compiled?"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34729
+msgid "It is tempting to think of this question as one that only die-hard hackers may care about.  However, while the answer to that question is technical in nature, its implications are wide-ranging.  How the distribution is bootstrapped defines the extent to which we, as individuals and as a collective of users and hackers, can trust the software we run.  It is a central concern from the standpoint of @emph{security} and from a @emph{user freedom} viewpoint."
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25658 doc/guix.texi:25780
+#: guix-git/doc/guix.texi:34730 guix-git/doc/guix.texi:34942
 #, no-wrap
 msgid "bootstrap binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25668
+#: guix-git/doc/guix.texi:34740
 msgid "The GNU system is primarily made of C code, with libc at its core.  The GNU build system itself assumes the availability of a Bourne shell and command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep'.  Furthermore, build programs---programs that run @code{./configure}, @code{make}, etc.---are written in Guile Scheme (@pxref{Derivations}).  Consequently, to be able to build anything at all, from scratch, Guix relies on pre-built binaries of Guile, GCC, Binutils, libc, and the other packages mentioned above---the @dfn{bootstrap binaries}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25671
-msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (more on that later)."
+#: guix-git/doc/guix.texi:34744
+msgid "These bootstrap binaries are ``taken for granted'', though we can also re-create them if needed (@pxref{Preparing to Use the Bootstrap Binaries})."
 msgstr ""
 
-#. type: unnumberedsec
-#: doc/guix.texi:25672
+#. type: section
+#: guix-git/doc/guix.texi:34751
 #, no-wrap
-msgid "Preparing to Use the Bootstrap Binaries"
+msgid "The Reduced Binary Seed Bootstrap"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25677
+#: guix-git/doc/guix.texi:34758
+msgid "Guix---like other GNU/Linux distributions---is traditionally bootstrapped from a set of bootstrap binaries: Bourne shell, command-line tools provided by GNU Coreutils, Awk, Findutils, `sed', and `grep' and Guile, GCC, Binutils, and the GNU C Library (@pxref{Bootstrapping}).  Usually, these bootstrap binaries are ``taken for granted.''"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34764
+msgid "Taking the bootstrap binaries for granted means that we consider them to be a correct and trustworthy ``seed'' for building the complete system.  Therein lies a problem: the combined size of these bootstrap binaries is about 250MB (@pxref{Bootstrappable Builds,,, mes, GNU Mes}).  Auditing or even inspecting these is next to impossible."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34769
+msgid "For @code{i686-linux} and @code{x86_64-linux}, Guix now features a ``Reduced Binary Seed'' bootstrap @footnote{We would like to say: ``Full Source Bootstrap'' and while we are working towards that goal it would be hyperbole to use that term for what we do now.}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34775
+msgid "The Reduced Binary Seed bootstrap removes the most critical tools---from a trust perspective---from the bootstrap binaries: GCC, Binutils and the GNU C Library are replaced by: @code{bootstrap-mescc-tools} (a tiny assembler and linker) and @code{bootstrap-mes} (a small Scheme Interpreter and a C compiler written in Scheme and the Mes C Library, built for TinyCC and for GCC)."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34780
+msgid "Using these new binary seeds the ``missing'' Binutils, GCC, and the GNU C Library are built from source.  From here on the more traditional bootstrap process resumes.  This approach has reduced the bootstrap binaries in size to about 145MB in Guix v1.1."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34788
+msgid "The next step that Guix has taken is to replace the shell and all its utilities with implementations in Guile Scheme, the @emph{Scheme-only bootstrap}.  Gash (@pxref{Gash,,, gash, The Gash manual}) is a POSIX-compatible shell that replaces Bash, and it comes with Gash Utils which has minimalist replacements for Awk, the GNU Core Utilities, Grep, Gzip, Sed, and Tar.  The rest of the bootstrap binary seeds that were removed are now built from source."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34798
+msgid "Building the GNU System from source is currently only possible by adding some historical GNU packages as intermediate steps@footnote{Packages such as @code{gcc-2.95.3}, @code{binutils-2.14}, @code{glibc-2.2.5}, @code{gzip-1.2.4}, @code{tar-1.22}, and some others.  For details, see @file{gnu/packages/commencement.scm}.}.  As Gash and Gash Utils mature, and GNU packages become more bootstrappable again (e.g., new releases of GNU Sed will also ship as gzipped tarballs again, as alternative to the hard to bootstrap @code{xz}-compression), this set of added packages can hopefully be reduced again."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34802
+msgid "The graph below shows the resulting dependency graph for @code{gcc-core-mesboot0}, the bootstrap compiler used for the traditional bootstrap of the rest of the Guix System."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34805
+msgid "@image{images/gcc-core-mesboot0-graph,6in,,Dependency graph of gcc-core-mesboot0}"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34812
+msgid "The only significant binary bootstrap seeds that remain@footnote{ Ignoring the 68KB @code{mescc-tools}; that will be removed later, together with @code{mes}.} are a Scheme interpreter and a Scheme compiler: GNU Mes and GNU Guile@footnote{Not shown in this graph are the static binaries for @file{bash}, @code{tar}, and @code{xz} that are used to get Guile running.}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34815
+msgid "This further reduction has brought down the size of the binary seed to about 60MB for @code{i686-linux} and @code{x86_64-linux}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34820
+msgid "Work is ongoing to remove all binary blobs from our free software bootstrap stack, working towards a Full Source Bootstrap.  Also ongoing is work to bring these bootstraps to the @code{arm-linux} and @code{aarch64-linux} architectures and to the Hurd."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34824
+msgid "If you are interested, join us on @samp{#bootstrappable} on the Freenode IRC network or discuss on @email{bug-mes@@gnu.org} or @email{gash-devel@@nongnu.org}."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34831
 msgid "@image{images/bootstrap-graph,6in,,Dependency graph of the early bootstrap derivations}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25682
+#: guix-git/doc/guix.texi:34836
 msgid "The figure above shows the very beginning of the dependency graph of the distribution, corresponding to the package definitions of the @code{(gnu packages bootstrap)} module.  A similar figure can be generated with @command{guix graph} (@pxref{Invoking guix graph}), along the lines of:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25687
+#: guix-git/doc/guix.texi:34841
 #, no-wrap
 msgid ""
 "guix graph -t derivation \\\n"
 "  -e '(@@@@ (gnu packages bootstrap) %bootstrap-gcc)' \\\n"
-"  | dot -Tps > t.ps\n"
+"  | dot -Tps > gcc.ps\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25696
+#: guix-git/doc/guix.texi:34844
+msgid "or, for the further Reduced Binary Seed bootstrap"
+msgstr ""
+
+#. type: example
+#: guix-git/doc/guix.texi:34849
+#, no-wrap
+msgid ""
+"guix graph -t derivation \\\n"
+"  -e '(@@@@ (gnu packages bootstrap) %bootstrap-mes)' \\\n"
+"  | dot -Tps > mes.ps\n"
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34858
 msgid "At this level of detail, things are slightly complex.  First, Guile itself consists of an ELF executable, along with many source and compiled Scheme files that are dynamically loaded when it runs.  This gets stored in the @file{guile-2.0.7.tar.xz} tarball shown in this graph.  This tarball is part of Guix's ``source'' distribution, and gets inserted into the store with @code{add-to-store} (@pxref{The Store})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25705
+#: guix-git/doc/guix.texi:34867
 msgid "But how do we write a derivation that unpacks this tarball and adds it to the store? To solve this problem, the @code{guile-bootstrap-2.0.drv} derivation---the first one that gets built---uses @code{bash} as its builder, which runs @code{build-bootstrap-guile.sh}, which in turn calls @code{tar} to unpack the tarball.  Thus, @file{bash}, @file{tar}, @file{xz}, and @file{mkdir} are statically-linked binaries, also part of the Guix source distribution, whose sole purpose is to allow the Guile tarball to be unpacked."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25717
-msgid "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs.  Its first task is to download tarballs containing the other pre-built binaries---this is what the @code{.tar.xz.drv} derivations do.  Guix modules such as @code{ftp-client.scm} are used for this purpose.  The @code{module-import.drv} derivations import those modules in a directory in the store, using the original layout.  The @code{module-import-compiled.drv} derivations compile those modules, and write them in an output directory with the right layout.  This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations})."
+#: guix-git/doc/guix.texi:34879
+msgid "Once @code{guile-bootstrap-2.0.drv} is built, we have a functioning Guile that can be used to run subsequent build programs.  Its first task is to download tarballs containing the other pre-built binaries---this is what the @file{.tar.xz.drv} derivations do.  Guix modules such as @code{ftp-client.scm} are used for this purpose.  The @code{module-import.drv} derivations import those modules in a directory in the store, using the original layout.  The @code{module-import-compiled.drv} derivations compile those modules, and write them in an output directory with the right layout.  This corresponds to the @code{#:modules} argument of @code{build-expression->derivation} (@pxref{Derivations})."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25721
-msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, etc., at which point we have a working C tool chain."
+#: guix-git/doc/guix.texi:34884
+msgid "Finally, the various tarballs are unpacked by the derivations @code{gcc-bootstrap-0.drv}, @code{glibc-bootstrap-0.drv}, or @code{bootstrap-mes-0.drv} and @code{bootstrap-mescc-tools-0.drv}, at which point we have a working C tool chain."
 msgstr ""
 
 #. type: unnumberedsec
-#: doc/guix.texi:25723
+#: guix-git/doc/guix.texi:34885
 #, no-wrap
 msgid "Building the Build Tools"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25732
+#: guix-git/doc/guix.texi:34894
 msgid "Bootstrapping is complete when we have a full tool chain that does not depend on the pre-built bootstrap tools discussed above.  This no-dependency requirement is verified by checking whether the files of the final tool chain contain references to the @file{/gnu/store} directories of the bootstrap inputs.  The process that leads to this ``final'' tool chain is described by the package definitions found in the @code{(gnu packages commencement)} module."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25739
+#: guix-git/doc/guix.texi:34901
 msgid "The @command{guix graph} command allows us to ``zoom out'' compared to the graph above, by looking at the level of package objects instead of individual derivations---remember that a package may translate to several derivations, typically one derivation to download its source, one to build the Guile modules it needs, and one to actually build the package from source.  The command:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25744
+#: guix-git/doc/guix.texi:34906
 #, no-wrap
 msgid ""
 "guix graph -t bag \\\n"
 "  -e '(@@@@ (gnu packages commencement)\n"
-"          glibc-final-with-bootstrap-bash)' | dot -Tps > t.ps\n"
+"          glibc-final-with-bootstrap-bash)' | xdot -\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25751
-msgid "produces the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below."
+#: guix-git/doc/guix.texi:34913
+msgid "displays the dependency graph leading to the ``final'' C library@footnote{You may notice the @code{glibc-intermediate} label, suggesting that it is not @emph{quite} final, but as a good approximation, we will consider it final.}, depicted below."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25753
+#: guix-git/doc/guix.texi:34915
 msgid "@image{images/bootstrap-packages,6in,,Dependency graph of the early packages}"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25759
+#: guix-git/doc/guix.texi:34921
 msgid "The first tool that gets built with the bootstrap binaries is GNU@tie{}Make---noted @code{make-boot0} above---which is a prerequisite for all the following packages.  From there Findutils and Diffutils get built."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25764
-msgid "Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @code{--target} equal to @code{--host}.  They are used to build libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool chain."
+#: guix-git/doc/guix.texi:34926
+msgid "Then come the first-stage Binutils and GCC, built as pseudo cross tools---i.e., with @option{--target} equal to @option{--host}.  They are used to build libc.  Thanks to this cross-build trick, this libc is guaranteed not to hold any reference to the initial tool chain."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25770
-msgid "From there the final Binutils and GCC (not shown above) are built.  GCC uses @code{ld} from the final Binutils, and links programs against the just-built libc.  This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, Bash, Coreutils, etc."
+#: guix-git/doc/guix.texi:34932
+msgid "From there the final Binutils and GCC (not shown above) are built.  GCC uses @command{ld} from the final Binutils, and links programs against the just-built libc.  This tool chain is used to build the other packages used by Guix and by the GNU Build System: Guile, Bash, Coreutils, etc."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25776
+#: guix-git/doc/guix.texi:34938
 msgid "And voilà! At this point we have the complete set of build tools that the GNU Build System expects.  These are in the @code{%final-inputs} variable of the @code{(gnu packages commencement)} module, and are implicitly used by any package that uses @code{gnu-build-system} (@pxref{Build Systems, @code{gnu-build-system}})."
 msgstr ""
 
 #. type: unnumberedsec
-#: doc/guix.texi:25778
+#: guix-git/doc/guix.texi:34940
 #, no-wrap
 msgid "Building the Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25785
+#: guix-git/doc/guix.texi:34947
 msgid "Because the final tool chain does not depend on the bootstrap binaries, those rarely need to be updated.  Nevertheless, it is useful to have an automated way to produce them, should an update occur, and this is what the @code{(gnu packages make-bootstrap)} module provides."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25789
-msgid "The following command builds the tarballs containing the bootstrap binaries (Guile, Binutils, GCC, libc, and a tarball containing a mixture of Coreutils and other basic command-line tools):"
+#: guix-git/doc/guix.texi:34953
+msgid "The following command builds the tarballs containing the bootstrap binaries (Binutils, GCC, glibc, for the traditional bootstrap and linux-libre-headers, bootstrap-mescc-tools, bootstrap-mes for the Reduced Binary Seed bootstrap, and Guile, and a tarball containing a mixture of Coreutils and other basic command-line tools):"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25792
+#: guix-git/doc/guix.texi:34956
 #, no-wrap
 msgid "guix build bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25797
+#: guix-git/doc/guix.texi:34961
 msgid "The generated tarballs are those that should be referred to in the @code{(gnu packages bootstrap)} module mentioned at the beginning of this section."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25803
+#: guix-git/doc/guix.texi:34967
 msgid "Still here? Then perhaps by now you've started to wonder: when do we reach a fixed point? That is an interesting question! The answer is unknown, but if you would like to investigate further (and have significant computational and storage resources to do so), then let us know."
 msgstr ""
 
 #. type: unnumberedsec
-#: doc/guix.texi:25804
+#: guix-git/doc/guix.texi:34968
 #, no-wrap
 msgid "Reducing the Set of Bootstrap Binaries"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25812
-msgid "Our bootstrap binaries currently include GCC, Guile, etc.  That's a lot of binary code! Why is that a problem? It's a problem because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced them.  Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}."
+#: guix-git/doc/guix.texi:34976
+msgid "Our traditional bootstrap includes GCC, GNU Libc, Guile, etc.  That's a lot of binary code! Why is that a problem? It's a problem because these big chunks of binary code are practically non-auditable, which makes it hard to establish what source code produced them.  Every unauditable binary also leaves us vulnerable to compiler backdoors as described by Ken Thompson in the 1984 paper @emph{Reflections on Trusting Trust}."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25818
+#: guix-git/doc/guix.texi:34982
 msgid "This is mitigated by the fact that our bootstrap binaries were generated from an earlier Guix revision.  Nevertheless it lacks the level of transparency that we get in the rest of the package dependency graph, where Guix always gives us a source-to-binary mapping.  Thus, our goal is to reduce the set of bootstrap binaries to the bare minimum."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25824
-msgid "The @uref{http://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that.  One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler.  Your help is welcome!"
+#: guix-git/doc/guix.texi:34988
+msgid "The @uref{https://bootstrappable.org, Bootstrappable.org web site} lists on-going projects to do that.  One of these is about replacing the bootstrap GCC with a sequence of assemblers, interpreters, and compilers of increasing complexity, which could be built from source starting from a simple and auditable assembler."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:34997
+msgid "Our first major achievement is the replacement of of GCC, the GNU C Library and Binutils by MesCC-Tools (a simple hex linker and macro assembler) and Mes (@pxref{Top, GNU Mes Reference Manual,, mes, GNU Mes}, a Scheme interpreter and C compiler in Scheme).  Neither MesCC-Tools nor Mes can be fully bootstrapped yet and thus we inject them as binary seeds.  We call this the Reduced Binary Seed bootstrap, as it has halved the size of our bootstrap binaries! Also, it has eliminated the C compiler binary; i686-linux and x86_64-linux Guix packages are now bootstrapped without any binary C compiler."
+msgstr ""
+
+#. type: Plain text
+#: guix-git/doc/guix.texi:35000
+msgid "Work is ongoing to make MesCC-Tools and Mes fully bootstrappable and we are also looking at any other bootstrap binaries.  Your help is welcome!"
 msgstr ""
 
 #. type: chapter
-#: doc/guix.texi:25827
+#: guix-git/doc/guix.texi:35002
 #, no-wrap
 msgid "Porting to a New Platform"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25836
+#: guix-git/doc/guix.texi:35011
 msgid "As discussed above, the GNU distribution is self-contained, and self-containment is achieved by relying on pre-built ``bootstrap binaries'' (@pxref{Bootstrapping}).  These binaries are specific to an operating system kernel, CPU architecture, and application binary interface (ABI).  Thus, to port the distribution to a platform that is not yet supported, one must build those bootstrap binaries, and update the @code{(gnu packages bootstrap)} module to use them on that platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25841
+#: guix-git/doc/guix.texi:35016
 msgid "Fortunately, Guix can @emph{cross compile} those bootstrap binaries.  When everything goes well, and assuming the GNU tool chain supports the target platform, this can be as simple as running a command like this one:"
 msgstr ""
 
 #. type: example
-#: doc/guix.texi:25844
+#: guix-git/doc/guix.texi:35019
 #, no-wrap
 msgid "guix build --target=armv5tel-linux-gnueabi bootstrap-tarballs\n"
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25851
+#: guix-git/doc/guix.texi:35026
 msgid "For this to work, the @code{glibc-dynamic-linker} procedure in @code{(gnu packages bootstrap)} must be augmented to return the right file name for libc's dynamic linker on that platform; likewise, @code{system->linux-architecture} in @code{(gnu packages linux)} must be taught about the new platform."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25860
+#: guix-git/doc/guix.texi:35035
 msgid "Once these are built, the @code{(gnu packages bootstrap)} module needs to be updated to refer to these binaries on the target platform.  That is, the hashes and URLs of the bootstrap tarballs for the new platform must be added alongside those of the currently supported platforms.  The bootstrap Guile tarball is treated specially: it is expected to be available locally, and @file{gnu/local.mk} has rules to download it for the supported architectures; a rule for the new platform must be added as well."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25869
-msgid "In practice, there may be some complications.  First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix above) is not recognized by all the GNU tools.  Typically, glibc recognizes some of these, whereas GCC uses an extra @code{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this).  Second, some of the required packages could fail to build for that platform.  Lastly, the generated binaries could be broken for some reason."
+#: guix-git/doc/guix.texi:35044
+msgid "In practice, there may be some complications.  First, it may be that the extended GNU triplet that specifies an ABI (like the @code{eabi} suffix above) is not recognized by all the GNU tools.  Typically, glibc recognizes some of these, whereas GCC uses an extra @option{--with-abi} configure flag (see @code{gcc.scm} for examples of how to handle this).  Second, some of the required packages could fail to build for that platform.  Lastly, the generated binaries could be broken for some reason."
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:25871
+#: guix-git/doc/guix.texi:35046
 #, no-wrap
 msgid "contributing.texi"
 msgstr "contributing.zh_CN.texi"
 
 #. type: Plain text
-#: doc/guix.texi:25884
-msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix.)  Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes.  Without this work, Guix would not exist."
+#: guix-git/doc/guix.texi:35059
+msgid "Guix is based on the @uref{https://nixos.org/nix/, Nix package manager}, which was designed and implemented by Eelco Dolstra, with contributions from other people (see the @file{nix/AUTHORS} file in Guix).  Nix pioneered functional package management, and promoted unprecedented features, such as transactional package upgrades and rollbacks, per-user profiles, and referentially transparent build processes.  Without this work, Guix would not exist."
 msgstr ""
 
 #. type: Plain text
-#: doc/guix.texi:25887
+#: guix-git/doc/guix.texi:35062
 msgid "The Nix-based software distributions, Nixpkgs and NixOS, have also been an inspiration for Guix."
-msgstr ""
+msgstr "基于 Nix 的软件发行版 Nixpkgs 和 NixOS 也给 Guix 带来了灵感。"
 
 #. type: Plain text
-#: doc/guix.texi:25893
+#: guix-git/doc/guix.texi:35068
 msgid "GNU@tie{}Guix itself is a collective work with contributions from a number of people.  See the @file{AUTHORS} file in Guix for more information on these fine people.  The @file{THANKS} file lists people who have helped by reporting bugs, taking care of the infrastructure, providing artwork and themes, making suggestions, and more---thank you!"
 msgstr ""
 
 #. type: cindex
-#: doc/guix.texi:25898
+#: guix-git/doc/guix.texi:35073
 #, no-wrap
 msgid "license, GNU Free Documentation License"
 msgstr ""
 
 #. type: include
-#: doc/guix.texi:25899
+#: guix-git/doc/guix.texi:35074
 #, no-wrap
 msgid "fdl-1.3.texi"
 msgstr ""
 
+#, fuzzy
+#~| msgid "@xref{Invoking guix pack}, for more info on this handy tool."
+#~ msgid "@xref{Build Phases}, for more info on build phases and ways to customize them."
+#~ msgstr "@xref{Invoking guix pack}，了解这个方便的工具。"
+
+#~ msgid ""
+#~ "(service qemu-binfmt-service-type\n"
+#~ " (qemu-binfmt-configuration\n"
+#~ "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\"))\n"
+#~ "   (guix-support? #t)))\n"
+#~ msgstr ""
+#~ "(service qemu-binfmt-service-type\n"
+#~ " (qemu-binfmt-configuration\n"
+#~ "   (platforms (lookup-qemu-platforms \"arm\" \"aarch64\"))\n"
+#~ "   (guix-support? #t)))\n"
+
+#, fuzzy
+#~| msgid "@code{zonefile-load} (default: @code{#f})"
+#~ msgid "@code{queries-log-file} (default: @code{#f})"
+#~ msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#, fuzzy
+#~| msgid "@code{zonefile-load} (default: @code{#f})"
+#~ msgid "@code{web-queries-log-file} (default: @code{#f})"
+#~ msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#, fuzzy
+#~| msgid "@code{max-zone-size} (default: @code{#f})"
+#~ msgid "@code{queue-size} (default: @code{1})"
+#~ msgstr "@code{max-zone-size}（默认值：@code{#f}）"
+
+#, fuzzy
+#~| msgid "The host name of the remote machine."
+#~ msgid "Size of the database writer queue."
+#~ msgstr "远程机器的主机名。"
+
+#, fuzzy
+#~| msgid "Manage the operating system configuration."
+#~ msgid "Data type representing the configuration of a simple Cuirass instance."
+#~ msgstr "管理操作系统配置。"
+
+#, fuzzy
+#~| msgid "@code{port} (default: @code{22})"
+#~ msgid "@code{build} (default: @code{all})"
+#~ msgstr "@code{port}（默认值：@code{22}）"
+
+#, fuzzy
+#~| msgid "{Data Type} build-machine"
+#~ msgid "{Data Type} build-manifest"
+#~ msgstr "{数据类型} build-machine"
+
+#, fuzzy
+#~| msgid "Channels"
+#~ msgid "channel-name"
+#~ msgstr "通道"
+
+#, fuzzy
+#~| msgid "-c @var{n}"
+#~ msgid "manifest"
+#~ msgstr "-c @var{n}"
+
+#, fuzzy
+#~| msgid "@code{includes} (default: @code{'()})"
+#~ msgid "@code{non-package-channels} (default: @code{'()})"
+#~ msgstr "@code{includes}（默认值：@code{'()}）"
+
+#, fuzzy
+#~| msgid "@code{port} (default: @code{22})"
+#~ msgid "@code{guix-support?} (default: @code{#t})"
+#~ msgstr "@code{port}（默认值：@code{22}）"
+
+#, fuzzy
+#~| msgid "@code{zonefile-load} (default: @code{#f})"
+#~ msgid "@code{password-file} (default: @code{#f})"
+#~ msgstr "@code{zonefile-load}（默认值：@code{#f}）"
+
+#~ msgid "Generally, branches other than @code{master} are considered @emph{frozen} if there has been a recent evaluation, or there is a corresponding @code{-next} branch.  Please ask on the mailing list or IRC if unsure where to place a patch."
+#~ msgstr "通常，@code{master}之外的其它分支如果最近被评审过，或有一个对应的@code{-next}分支，则被视为@emph{冻结}状态。如果不清楚该把补丁放到哪里，请在邮件列表或IRC上提问。"
+
+#~ msgid "@xref{Invoking guix environment}, for more information on that command.  Extra dependencies can be added with @option{--ad-hoc}:"
+#~ msgstr "这个命令更多的信息请参考@xref{Invoking guix environment}。额外的依赖可以通过@option{--ad-hoc}选项添加："
+
+#~ msgid "Fiddling with Guix interactively."
+#~ msgstr "交互式地操作Guix。"
+
+#~ msgid "little-endian 64-bit ARMv8-A processors, Linux-Libre kernel.  This is currently in an experimental stage, with limited support.  @xref{Contributing}, for how to help!"
+#~ msgstr "小端序64位ARMv8-A处理器，Linux-Libre内核。目前处于实验阶段，支持有限。@xref{Contributing}，提供帮助！"
+
+#~ msgid ""
+#~ "$ gpg --keyserver @value{KEY-SERVER} \\\n"
+#~ "      --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n"
+#~ msgstr ""
+#~ "$ gpg --keyserver @value{KEY-SERVER} \\\n"
+#~ "      --recv-keys @value{OPENPGP-SIGNING-KEY-ID}\n"
+
+#~ msgid "@url{https://zlib.net, zlib};"
+#~ msgstr "@url{https://zlib.net, zlib}；"
+
+#~ msgid "Nix, compatibility"
+#~ msgstr "Nix，兼容性"
+
+#~ msgid "When a working installation of @url{https://nixos.org/nix/, the Nix package manager} is available, you can instead configure Guix with @code{--disable-daemon}.  In that case, Nix replaces the three dependencies above."
+#~ msgstr "当一个已经安装的且可用的@url{https://nixos.org/nix/, Nix包管理器}存在时，你可以为Guix配置@code{--disable-daemon}参数。那样Nix可以替换上面的三个依赖。"
+
+#~ msgid "Guix is compatible with Nix, so it is possible to share the same store between both.  To do so, you must pass @command{configure} not only the same @code{--with-store-dir} value, but also the same @code{--localstatedir} value.  The latter is essential because it specifies where the database that stores metadata about the store is located, among other things.  The default values for Nix are @code{--with-store-dir=/nix/store} and @code{--localstatedir=/nix/var}.  Note that @code{--disable-daemon} is not required if your goal is to share the store with Nix."
+#~ msgstr "Guix和Nix兼容，所以两者共享相同的仓库是可行的。如果这样做，你必须传给@command{configure}相同的@code{--with-store-dir}，以及相同的@code{--localstatedir}。后者很重要，因为它指定了储存仓库元数据以及其它信息的数据库的位置，。Nix的默认值是@code{--with-store-dir=/nix/store}和@code{--localstatedir=/nix/var}。注意，如果你的目的是和Nix共享仓库，那么@code{--disable-daemon}参数不是必须的。"
+
+#~ msgid "--no-build-hook"
+#~ msgstr "--no-build-hook"
+
+#~ msgid "Do not use the @dfn{build hook}."
+#~ msgstr "不要使用@dfn{构建钩子}。"
+
+#~ msgid "The build hook is a helper program that the daemon can start and to which it submits build requests.  This mechanism is used to offload builds to other machines (@pxref{Daemon Offload Setup})."
+#~ msgstr "构建钩子是一个可以被后台进程启动并且提交构建请求的辅助程序。这个机制被用来向其它机器下发构建。（@pxref{Daemon Offload Setup}）。"
+
 #~ msgid "The @code{guix} package must remain available in @code{root}'s profile, or it would become subject to garbage collection---in which case you would find yourself badly handicapped by the lack of the @command{guix} command.  In other words, do not remove @code{guix} by running @code{guix package -r guix}."
 #~ msgstr "@code{guix}软件包必须保留在@code{root}的profile里，否则它会被垃圾回收清理掉－－那时你会发现缺少@command{guix}命令。换句话说，不要用@code{guix package -r guix}命令删除@code{guix}。"
diff --git a/po/guix/zh_CN.po b/po/guix/zh_CN.po
index e58852d817..a3839e519b 100644
--- a/po/guix/zh_CN.po
+++ b/po/guix/zh_CN.po
@@ -1,31 +1,32 @@
 # guix in zh_CN
-# Copyright (C) 2015 Free Software Foundation, Inc.
+# Copyright (C) 2015-2020 the authors of Guix (msgids)
 # This file is distributed under the same license as the guix package.
 # Mingye Wang <arthur200126@gmail.com>, 2016.
 # Boyuan Yang <073plan@gmail.com>, 2018.
-#
+# 郑俊杰 <873216071@qq.com>, 2021.
+# Liu Tao <lyuutau@outlook.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: guix 0.14.0\n"
-"Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2017-11-28 08:56+0100\n"
-"PO-Revision-Date: 2018-02-12 16:47+0800\n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
+"POT-Creation-Date: 2021-04-13 01:18+0200\n"
+"PO-Revision-Date: 2021-03-23 18:26+0000\n"
+"Last-Translator: Liu Tao <lyuutau@outlook.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/projects/guix/guix/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Weblate 4.5.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: gnu.scm:82
+#: gnu.scm:81
 #, scheme-format
 msgid "module ~a not found"
 msgstr "未找到模块 ~a"
 
-#: gnu.scm:100
+#: gnu.scm:99
 msgid ""
 "You may use @command{guix package --show=foo | grep location} to search\n"
 "for the location of package @code{foo}.\n"
@@ -33,12 +34,12 @@ msgid ""
 "add @code{bar} to the @code{use-package-modules} form."
 msgstr ""
 
-#: gnu.scm:108
+#: gnu.scm:107
 #, scheme-format
 msgid "Try adding @code{(use-package-modules ~a)}."
-msgstr ""
+msgstr "尝试添加 @code{(use-package-modules ~a)}。"
 
-#: gnu.scm:123
+#: gnu.scm:122
 #, scheme-format
 msgid ""
 "You may use @command{guix system search ~a} to search for a service\n"
@@ -47,177 +48,1269 @@ msgid ""
 "add @code{foo} to the @code{use-service-modules} form."
 msgstr ""
 
-#: gnu.scm:132
+#: gnu.scm:131
 #, scheme-format
 msgid "Try adding @code{(use-service-modules ~a)}."
-msgstr ""
+msgstr "尝试添加 @code{(use-service-modules ~a)}。"
 
-#: gnu/packages.scm:92
+#: gnu/packages.scm:96
 #, scheme-format
 msgid "~a: patch not found"
 msgstr "~a: 未找到补丁"
 
-#: gnu/packages.scm:108
-#, scheme-format
-msgid "could not find bootstrap binary '~a' for system '~a'"
-msgstr "无法找到引导二进制 '~a'，用于系统 '~a'"
-
-#: gnu/packages.scm:240
+#: gnu/packages.scm:480 gnu/packages.scm:521
 #, scheme-format
 msgid "ambiguous package specification `~a'~%"
 msgstr "含糊的软件包规范 `~a'~%"
 
-#: gnu/packages.scm:241
+#: gnu/packages.scm:481 gnu/packages.scm:522
 #, fuzzy, scheme-format
 #| msgid "choosing ~a from ~a~%"
 msgid "choosing ~a@~a from ~a~%"
 msgstr "选择 ~a，从 ~a~%"
 
-#: gnu/packages.scm:246 guix/scripts/package.scm:271
+#: gnu/packages.scm:486 guix/scripts/package.scm:214
 #, fuzzy, scheme-format
 #| msgid "package `~a' lacks output `~a'~%"
 msgid "package '~a' has been superseded by '~a'~%"
 msgstr "包 `~a' 缺乏输出 `~a'~%"
 
-#: gnu/packages.scm:253
+#: gnu/packages.scm:493 gnu/packages.scm:510
 #, scheme-format
 msgid "~A: package not found for version ~a~%"
 msgstr "~A: 无法找到供版本 ~a~% 的软件包"
 
-#: gnu/packages.scm:254
+#: gnu/packages.scm:494 gnu/packages.scm:511
 #, scheme-format
 msgid "~A: unknown package~%"
 msgstr "~A: 未知包~%"
 
-#: gnu/packages.scm:282
+#: gnu/packages.scm:550
 #, scheme-format
 msgid "package `~a' lacks output `~a'~%"
 msgstr "包 `~a' 缺乏输出 `~a'~%"
 
-#: gnu/services.scm:235
+#: gnu/services.scm:254
 #, scheme-format
 msgid "~a: no value specified for service of type '~a'"
 msgstr ""
 
-#: gnu/services.scm:650
+#: gnu/services.scm:358
+msgid ""
+"Build the operating system top-level directory, which in\n"
+"turn refers to everything the operating system needs: its kernel, initrd,\n"
+"system profile, boot script, and so on."
+msgstr ""
+
+#: gnu/services.scm:388
+msgid ""
+"Produce the operating system's boot script, which is spawned\n"
+"by the initrd once the root file system is mounted."
+msgstr ""
+
+#: gnu/services.scm:504
+msgid ""
+"Store provenance information about the system in the system\n"
+"itself: the channels used when building the system, and its configuration\n"
+"file, when available."
+msgstr ""
+
+#: gnu/services.scm:587
+msgid ""
+"Delete files from @file{/tmp}, @file{/var/run}, and other\n"
+"temporary locations at boot time."
+msgstr ""
+
+#: gnu/services.scm:649
+msgid ""
+"Run @dfn{activation} code at boot time and upon\n"
+"@command{guix system reconfigure} completion."
+msgstr ""
+
+#: gnu/services.scm:737
+msgid ""
+"Add special files to the root file system---e.g.,\n"
+"@file{/usr/bin/env}."
+msgstr ""
+
+#: gnu/services.scm:760
+#, scheme-format
+msgid "duplicate '~a' entry for /etc"
+msgstr ""
+
+#: gnu/services.scm:788
+msgid "Populate the @file{/etc} directory."
+msgstr ""
+
+#: gnu/services.scm:805
+msgid ""
+"Populate @file{/run/setuid-programs} with the specified\n"
+"executables, making them setuid-root."
+msgstr ""
+
+#: gnu/services.scm:831
+msgid ""
+"This is the @dfn{system profile}, available as\n"
+"@file{/run/current-system/profile}.  It contains packages that the sysadmin\n"
+"wants to be globally available to all the system users."
+msgstr ""
+
+#: gnu/services.scm:851
+msgid ""
+"Make ``firmware'' files loadable by the operating system\n"
+"kernel.  Firmware may then be uploaded to some of the machine's devices, such\n"
+"as Wifi cards."
+msgstr ""
+
+#: gnu/services.scm:882
+msgid ""
+"Register garbage-collector roots---i.e., store items that\n"
+"will not be reclaimed by the garbage collector."
+msgstr ""
+
+#: gnu/services.scm:908
 #, scheme-format
 msgid "no target of type '~a' for service '~a'"
 msgstr ""
 
-#: gnu/services.scm:662 gnu/services.scm:723
+#: gnu/services.scm:934 gnu/services.scm:1053
 #, scheme-format
 msgid "more than one target service of type '~a'"
 msgstr ""
 
-#: gnu/services.scm:713
+#: gnu/services.scm:1043
 #, scheme-format
 msgid "service of type '~a' not found"
 msgstr ""
 
-#: gnu/system.scm:305
+#: gnu/system.scm:351
+#, fuzzy, scheme-format
+#| msgid "unrecognized option: ~a~%"
+msgid "unrecognized uuid ~a at '~a'~%"
+msgstr "无法识别的选项: ~a~%"
+
+#: gnu/system.scm:433
+#, fuzzy, scheme-format
+#| msgid "unrecognized option: ~a~%"
+msgid "unrecognized crypto-devices ~S at '~a'~%"
+msgstr "无法识别的选项: ~a~%"
+
+#: gnu/system.scm:450
+#, fuzzy, scheme-format
+#| msgid "unrecognized option: ~a~%"
+msgid "unrecognized boot parameters at '~a'~%"
+msgstr "无法识别的选项: ~a~%"
+
+#: gnu/system.scm:563
 #, scheme-format
-msgid "unrecognized boot parameters for '~a'~%"
+msgid "mapped-device '~a' may not be mounted by the bootloader.~%"
 msgstr ""
 
-#: gnu/system.scm:695
+#: gnu/system.scm:1023
 #, scheme-format
 msgid "using a string for file '~a' is deprecated; use 'plain-file' instead~%"
 msgstr ""
 
-#: gnu/system.scm:711
+#: gnu/system.scm:1039
 #, scheme-format
 msgid "using a monadic value for '~a' is deprecated; use 'plain-file' instead~%"
 msgstr ""
 
-#: gnu/system.scm:856
+#: gnu/system.scm:1167
+msgid "missing root file system"
+msgstr ""
+
+#: gnu/system.scm:1243
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid locale name"
 msgstr "~a: 无效的数字~%"
 
-#: gnu/services/shepherd.scm:166
+#: gnu/services/shepherd.scm:143
+msgid ""
+"Run the GNU Shepherd as PID 1---i.e., the operating system's first\n"
+"process.  The Shepherd takes care of managing services such as daemons by\n"
+"ensuring they are started and stopped in the right order."
+msgstr ""
+
+#: gnu/services/shepherd.scm:235
 #, scheme-format
 msgid "service '~a' provided more than once"
 msgstr ""
 
-#: gnu/services/shepherd.scm:181
+#: gnu/services/shepherd.scm:250
 #, scheme-format
 msgid "service '~a' requires '~a', which is not provided by any service"
 msgstr ""
 
-#: gnu/system/shadow.scm:231
+#: gnu/services/shepherd.scm:587
+msgid ""
+"The @code{user-processes} service is responsible for\n"
+"terminating all the processes so that the root file system can be re-mounted\n"
+"read-only, just before rebooting/halting.  Processes still running after a few\n"
+"seconds after @code{SIGTERM} has been sent are terminated with\n"
+"@code{SIGKILL}."
+msgstr ""
+
+#: gnu/system/mapped-devices.scm:134
+msgid "Map a device node using Linux's device mapper."
+msgstr ""
+
+#: gnu/system/mapped-devices.scm:163
+#, scheme-format
+msgid "you may need these modules in the initrd for ~a:~{ ~a~}"
+msgstr ""
+
+#: gnu/system/mapped-devices.scm:168
+#, scheme-format
+msgid ""
+"Try adding them to the\n"
+"@code{initrd-modules} field of your @code{operating-system} declaration, along\n"
+"these lines:\n"
+"\n"
+"@example\n"
+" (operating-system\n"
+"   ;; @dots{}\n"
+"   (initrd-modules (append (list~{ ~s~})\n"
+"                           %base-initrd-modules)))\n"
+"@end example\n"
+"\n"
+"If you think this diagnostic is inaccurate, use the @option{--skip-checks}\n"
+"option of @command{guix system}.\n"
+msgstr ""
+
+#: gnu/system/mapped-devices.scm:251
+#, scheme-format
+msgid "no LUKS partition with UUID '~a'"
+msgstr ""
+
+#: gnu/system/shadow.scm:254
+#, scheme-format
+msgid "the following accounts appear more than once:~{ ~a~}~%"
+msgstr ""
+
+#: gnu/system/shadow.scm:262
+#, scheme-format
+msgid "the following groups appear more than once:~{ ~a~}~%"
+msgstr ""
+
+#: gnu/system/shadow.scm:273
 #, scheme-format
 msgid "supplementary group '~a' of user '~a' is undeclared"
 msgstr ""
 
-#: gnu/system/shadow.scm:241
+#: gnu/system/shadow.scm:283
 #, scheme-format
 msgid "primary group '~a' of user '~a' is undeclared"
 msgstr ""
 
-#: guix/scripts.scm:56
+#: gnu/system/shadow.scm:425
+msgid ""
+"Ensure the specified user accounts and groups exist, as well\n"
+"as each account home directory."
+msgstr ""
+
+#: guix/import/opam.scm:166
+#, fuzzy, scheme-format
+#| msgid "~A: package not found for version ~a~%"
+msgid "Package not found in opam repository: ~a~%"
+msgstr "~A: 无法找到供版本 ~a~% 的软件包"
+
+#: guix/import/opam.scm:388
+msgid "Updater for OPAM packages"
+msgstr ""
+
+#: gnu/installer.scm:214
+msgid "Locale"
+msgstr "区域设置"
+
+#: gnu/installer.scm:230 gnu/installer/newt/timezone.scm:58
+msgid "Timezone"
+msgstr "时区"
+
+#: gnu/installer.scm:247
+msgid "Keyboard mapping selection"
+msgstr ""
+
+#: gnu/installer.scm:256 gnu/installer/newt/hostname.scm:26
+msgid "Hostname"
+msgstr "主机名"
+
+#: gnu/installer.scm:265
+msgid "Network selection"
+msgstr "选择网络"
+
+#: gnu/installer.scm:272
+msgid "Substitute server discovery"
+msgstr ""
+
+#: gnu/installer.scm:279 gnu/installer/newt/user.scm:68
+#: gnu/installer/newt/user.scm:205
+msgid "User creation"
+msgstr "创建用户"
+
+#: gnu/installer.scm:287
+msgid "Services"
+msgstr "服务"
+
+#: gnu/installer.scm:298
+msgid "Partitioning"
+msgstr "分区"
+
+#: gnu/installer.scm:305 gnu/installer/newt/final.scm:53
+msgid "Configuration file"
+msgstr "配置文件"
+
+#: gnu/installer/connman.scm:196
+msgid "Could not determine the state of connman."
+msgstr ""
+
+#: gnu/installer/connman.scm:322
+msgid "Unable to find expected regexp."
+msgstr ""
+
+#: gnu/installer/newt.scm:52
+msgid "Press <F1> for installation parameters."
+msgstr ""
+
+#: gnu/installer/newt.scm:65
+#, scheme-format
+msgid "The installer has encountered an unexpected problem. The backtrace is displayed below. Please report it by email to <~a>."
+msgstr ""
+
+#: gnu/installer/newt.scm:68
+msgid "Unexpected problem"
+msgstr ""
+
+#: gnu/installer/newt/ethernet.scm:66
+msgid "No ethernet service available, please try again."
+msgstr ""
+
+#: gnu/installer/newt/ethernet.scm:67
+msgid "No service"
+msgstr ""
+
+#: gnu/installer/newt/ethernet.scm:76
+msgid "Please select an ethernet network."
+msgstr ""
+
+#: gnu/installer/newt/ethernet.scm:77
+msgid "Ethernet connection"
+msgstr ""
+
+#: gnu/installer/newt/ethernet.scm:81 gnu/installer/newt/keymap.scm:56
+#: gnu/installer/newt/locale.scm:43 gnu/installer/newt/network.scm:63
+#: gnu/installer/newt/network.scm:84 gnu/installer/newt/page.scm:309
+#: gnu/installer/newt/page.scm:673 gnu/installer/newt/page.scm:758
+#: gnu/installer/newt/partition.scm:56 gnu/installer/newt/partition.scm:91
+#: gnu/installer/newt/partition.scm:123 gnu/installer/newt/partition.scm:134
+#: gnu/installer/newt/partition.scm:631 gnu/installer/newt/partition.scm:652
+#: gnu/installer/newt/partition.scm:698 gnu/installer/newt/partition.scm:749
+#: gnu/installer/newt/partition.scm:760 gnu/installer/newt/services.scm:88
+#: gnu/installer/newt/timezone.scm:63 gnu/installer/newt/user.scm:204
+#: gnu/installer/newt/wifi.scm:206
+msgid "Exit"
+msgstr "退出"
+
+#: gnu/installer/newt/final.scm:46
+#, scheme-format
+msgid "We're now ready to proceed with the installation! A system configuration file has been generated, it is displayed below.  This file will be available as '~a' on the installed system.  The new system will be created from this file once you've pressed OK.  This will take a few minutes."
+msgstr ""
+
+#: gnu/installer/newt/final.scm:70
+msgid "Installation complete"
+msgstr "安装完成"
+
+#: gnu/installer/newt/final.scm:71 gnu/installer/newt/parameters.scm:45
+#: gnu/installer/newt/welcome.scm:145
+msgid "Reboot"
+msgstr "重启"
+
+#: gnu/installer/newt/final.scm:72
+msgid "Congratulations!  Installation is now complete.  You may remove the device containing the installation image and press the button to reboot."
+msgstr ""
+
+#: gnu/installer/newt/final.scm:86
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: gnu/installer/newt/final.scm:87
+msgid "Resume"
+msgstr "继续"
+
+#: gnu/installer/newt/final.scm:88
+msgid "Restart the installer"
+msgstr ""
+
+#: gnu/installer/newt/final.scm:89
+msgid "The final system installation step failed.  You can resume from a specific step, or restart the installer."
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:31
+msgid "Please enter the HTTP proxy URL. If you enter an empty string, proxy usage will be disabled."
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:33
+msgid "HTTP proxy configuration"
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:43
+msgid "Change keyboard layout"
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:44
+msgid "Configure HTTP proxy"
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:48
+msgid "Please choose one of the following parameters or press ‘Back’ to go back to the installation process."
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:50
+msgid "Installation parameters"
+msgstr ""
+
+#: gnu/installer/newt/parameters.scm:55 gnu/installer/newt/keymap.scm:74
+#: gnu/installer/newt/locale.scm:63 gnu/installer/newt/locale.scm:78
+#: gnu/installer/newt/locale.scm:94 gnu/installer/newt/partition.scm:588
+#: gnu/installer/newt/timezone.scm:64
+msgid "Back"
+msgstr "返回"
+
+#: gnu/installer/newt/hostname.scm:25
+msgid "Please enter the system hostname."
+msgstr ""
+
+#: gnu/installer/newt/keymap.scm:38
+msgid "Layout"
+msgstr "布局"
+
+#: gnu/installer/newt/keymap.scm:43
+msgid "Please choose your keyboard layout. It will only be used during the installation process. Non-Latin layouts can be toggled with Alt+Shift."
+msgstr ""
+
+#: gnu/installer/newt/keymap.scm:46
+msgid "Please choose your keyboard layout. It will be used during the install process, and for the installed system. Non-Latin layouts can be toggled with Alt+Shift. You can switch to a different layout at any time from the parameters menu."
+msgstr ""
+
+#: gnu/installer/newt/keymap.scm:55 gnu/installer/newt/network.scm:62
+#: gnu/installer/newt/page.scm:308
+msgid "Continue"
+msgstr "连续"
+
+#: gnu/installer/newt/keymap.scm:67
+msgid "Variant"
+msgstr ""
+
+#: gnu/installer/newt/keymap.scm:70
+msgid "Please choose a variant for your keyboard layout."
+msgstr "请选择一个键盘布局的变体。"
+
+#: gnu/installer/newt/locale.scm:36
+msgid "Locale language"
+msgstr "本地语言"
+
+#: gnu/installer/newt/locale.scm:37
+msgid "Choose the language to use for the installation process and for the installed system."
+msgstr ""
+
+#: gnu/installer/newt/locale.scm:57
+#, fuzzy
+#| msgid "<unknown location>"
+msgid "Locale location"
+msgstr "<未知位置>"
+
+#: gnu/installer/newt/locale.scm:60
+msgid "Choose a territory for this language."
+msgstr "为这种语言选择一个地域。"
+
+#: gnu/installer/newt/locale.scm:71
+msgid "Locale codeset"
+msgstr ""
+
+#: gnu/installer/newt/locale.scm:74
+msgid "Choose the locale encoding."
+msgstr ""
+
+#: gnu/installer/newt/locale.scm:86
+msgid "Locale modifier"
+msgstr ""
+
+#: gnu/installer/newt/locale.scm:89
+msgid "Choose your locale's modifier. The most frequent modifier is euro. It indicates that you want to use Euro as the currency symbol."
+msgstr ""
+
+#: gnu/installer/newt/locale.scm:190
+#, fuzzy
+#| msgid "<unknown location>"
+msgid "No location"
+msgstr "<未知位置>"
+
+#: gnu/installer/newt/locale.scm:217
+msgid "No modifier"
+msgstr ""
+
+#: gnu/installer/newt/menu.scm:35
+msgid "Choose where you want to resume the install.  You can also abort the installation by pressing the Abort button."
+msgstr ""
+
+#: gnu/installer/newt/menu.scm:37
+msgid "Installation menu"
+msgstr ""
+
+#: gnu/installer/newt/menu.scm:41
+msgid "Abort"
+msgstr ""
+
+#: gnu/installer/newt/network.scm:61 gnu/installer/newt/network.scm:80
+msgid "Internet access"
+msgstr ""
+
+#: gnu/installer/newt/network.scm:64
+msgid "The install process requires Internet access but no network devices were found. Do you want to continue anyway?"
+msgstr ""
+
+#: gnu/installer/newt/network.scm:78
+msgid "The install process requires Internet access. Please select a network device."
+msgstr ""
+
+#: gnu/installer/newt/network.scm:103
+msgid "Powering technology"
+msgstr ""
+
+#: gnu/installer/newt/network.scm:104
+#, scheme-format
+msgid "Waiting for technology ~a to be powered."
+msgstr ""
+
+#: gnu/installer/newt/network.scm:128
+msgid "Checking connectivity"
+msgstr ""
+
+#: gnu/installer/newt/network.scm:129
+msgid "Waiting for Internet access establishment..."
+msgstr ""
+
+#: gnu/installer/newt/network.scm:139
+msgid "The selected network does not provide access to the Internet, please try again."
+msgstr ""
+
+#: gnu/installer/newt/network.scm:141 gnu/installer/newt/wifi.scm:108
+msgid "Connection error"
+msgstr "连接错误"
+
+#: gnu/installer/newt/page.scm:198
+#, scheme-format
+msgid "Connecting to ~a, please wait."
+msgstr ""
+
+#: gnu/installer/newt/page.scm:199
+msgid "Connection in progress"
+msgstr ""
+
+#: gnu/installer/newt/page.scm:218 gnu/installer/newt/user.scm:60
+msgid "Show"
+msgstr "显示"
+
+#: gnu/installer/newt/page.scm:225 gnu/installer/newt/page.scm:672
+#: gnu/installer/newt/page.scm:757 gnu/installer/newt/partition.scm:451
+#: gnu/installer/newt/partition.scm:630 gnu/installer/newt/partition.scm:651
+#: gnu/installer/newt/partition.scm:690 gnu/installer/newt/user.scm:66
+#: gnu/installer/newt/user.scm:203
+msgid "OK"
+msgstr "确定"
+
+#: gnu/installer/newt/page.scm:251
+msgid "Please enter a non empty input."
+msgstr ""
+
+#: gnu/installer/newt/page.scm:252 gnu/installer/newt/user.scm:123
+msgid "Empty input"
+msgstr ""
+
+#: gnu/installer/newt/page.scm:760
+msgid "Edit"
+msgstr "编辑"
+
+#: gnu/installer/newt/partition.scm:47
+msgid "Everything is one partition"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:48
+msgid "Separate /home partition"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:50
+msgid "Please select a partitioning scheme."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:51
+msgid "Partition scheme"
+msgstr ""
+
+#. TRANSLATORS: The ~{ and ~} format specifiers are used to iterate the list
+#. of device names of the user partitions that will be formatted.
+#: gnu/installer/newt/partition.scm:65
+#, scheme-format
+msgid "We are about to write the configured partition table to the disk and format the partitions listed below.  Their data will be lost.  Do you wish to continue?~%~%~{ - ~a~%~}"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:71
+msgid "Format disk?"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:74
+msgid "Partition formatting is in progress, please wait."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:75
+msgid "Preparing partitions"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:86
+msgid "Please select a disk."
+msgstr "请选择一个磁盘。"
+
+#: gnu/installer/newt/partition.scm:87
+msgid "Disk"
+msgstr "磁盘"
+
+#: gnu/installer/newt/partition.scm:99
+msgid "Select a new partition table type. Be careful, all data on the disk will be lost."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:101
+msgid "Partition table"
+msgstr "分区表"
+
+#: gnu/installer/newt/partition.scm:118
+msgid "Please select a partition type."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:119
+msgid "Partition type"
+msgstr "分区类型"
+
+#: gnu/installer/newt/partition.scm:129
+msgid "Please select the file-system type for this partition."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:130
+msgid "File-system type"
+msgstr "文件系统类型"
+
+#: gnu/installer/newt/partition.scm:143
+msgid "Primary partitions count exceeded."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:144 gnu/installer/newt/partition.scm:149
+#: gnu/installer/newt/partition.scm:154
+msgid "Creation error"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:148
+msgid "Extended partition creation error."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:153
+msgid "Logical partition creation error."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:167
+#, scheme-format
+msgid "Please enter the password for the encryption of partition ~a (label: ~a)."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:169 gnu/installer/newt/wifi.scm:92
+msgid "Password required"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:174
+#, scheme-format
+msgid "Please confirm the password for the encryption of partition ~a (label: ~a)."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:176 gnu/installer/newt/user.scm:160
+msgid "Password confirmation required"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:188 gnu/installer/newt/user.scm:168
+msgid "Password mismatch, please try again."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:189 gnu/installer/newt/user.scm:169
+msgid "Password error"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:275
+msgid "Please enter the partition gpt name."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:276
+msgid "Partition name"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:306
+msgid "Please enter the encrypted label"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:307
+msgid "Encryption label"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:324
+#, scheme-format
+msgid "Please enter the size of the partition. The maximum size is ~a."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:326
+msgid "Partition size"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:344
+msgid "The percentage can not be superior to 100."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:345 gnu/installer/newt/partition.scm:350
+#: gnu/installer/newt/partition.scm:355
+msgid "Size error"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:349
+msgid "The requested size is incorrectly formatted, or too large."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:354
+msgid "The request size is superior to the maximum size."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:374
+msgid "Please enter the desired mounting point for this partition. Leave this field empty if you don't want to set a mounting point."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:376
+msgid "Mounting point"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:440
+#, scheme-format
+msgid "Creating ~a partition starting at ~a of ~a."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:442
+#, scheme-format
+msgid "You are currently editing partition ~a."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:445
+msgid "Partition creation"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:446
+msgid "Partition edit"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:627
+#, scheme-format
+msgid "Are you sure you want to delete everything on disk ~a?"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:629
+msgid "Delete disk"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:643
+msgid "You cannot delete a free space area."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:644 gnu/installer/newt/partition.scm:650
+msgid "Delete partition"
+msgstr "删除分区"
+
+#: gnu/installer/newt/partition.scm:648
+#, scheme-format
+msgid "Are you sure you want to delete partition ~a?"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:665
+msgid ""
+"You can change a disk's partition table by selecting it and pressing ENTER. You can also edit a partition by selecting it and pressing ENTER, or remove it by pressing DELETE. To create a new partition, select a free space area and press ENTER.\n"
+"\n"
+"At least one partition must have its mounting point set to '/'."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:671
+#, scheme-format
+msgid "This is the proposed partitioning. It is still possible to edit it or to go back to install menu by pressing the Exit button.~%~%"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:681
+msgid "Guided partitioning"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:682
+msgid "Manual partitioning"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:707
+msgid "No root mount point found."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:708
+msgid "Missing mount point"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:739
+msgid "Guided - using the entire disk"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:740
+msgid "Guided - using the entire disk with encryption"
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:741
+msgid "Manual"
+msgstr "手动"
+
+#: gnu/installer/newt/partition.scm:743
+msgid "Please select a partitioning method."
+msgstr ""
+
+#: gnu/installer/newt/partition.scm:744
+msgid "Partitioning method"
+msgstr ""
+
+#: gnu/installer/newt/services.scm:38
+msgid "Please select the desktop environment(s) you wish to install.  If you select multiple desktop environments here, you will be able to choose from them later when you log in."
+msgstr ""
+
+#: gnu/installer/newt/services.scm:41
+msgid "Desktop environment"
+msgstr "桌面环境"
+
+#: gnu/installer/newt/services.scm:58
+msgid "You can now select networking services to run on your system."
+msgstr ""
+
+#: gnu/installer/newt/services.scm:60
+msgid "Network service"
+msgstr "网络服务"
+
+#: gnu/installer/newt/services.scm:73
+#, fuzzy
+#| msgid "too many arguments\n"
+msgid "Network management"
+msgstr "太多参数\n"
+
+#: gnu/installer/newt/services.scm:76
+msgid ""
+"Choose the method to manage network connections.\n"
+"\n"
+"We recommend NetworkManager or Connman for a WiFi-capable laptop; the DHCP client may be enough for a server."
+msgstr ""
+
+#: gnu/installer/newt/substitutes.scm:31
+msgid "Substitute server discovery."
+msgstr ""
+
+#: gnu/installer/newt/substitutes.scm:32
+msgid "Enable"
+msgstr "启用"
+
+#: gnu/installer/newt/substitutes.scm:32
+msgid "Disable"
+msgstr "禁用"
+
+#: gnu/installer/newt/substitutes.scm:33
+msgid ""
+" By turning this option on, you allow Guix to fetch substitutes (pre-built binaries) during installation from servers discovered on your local area network (LAN) in addition to the official server.  This can increase download throughput.\n"
+"\n"
+" There are no security risks: only genuine substitutes may be retrieved from those servers.  However, eavesdroppers on your LAN may be able to see what software you are installing."
+msgstr ""
+
+#: gnu/installer/newt/timezone.scm:59
+msgid "Please select a timezone."
+msgstr ""
+
+#: gnu/installer/newt/user.scm:45
+msgid "Name"
+msgstr "名称"
+
+#: gnu/installer/newt/user.scm:47
+msgid "Real name"
+msgstr "真名"
+
+#: gnu/installer/newt/user.scm:49
+msgid "Home directory"
+msgstr "主目录"
+
+#: gnu/installer/newt/user.scm:51
+msgid "Password"
+msgstr "密码"
+
+#: gnu/installer/newt/user.scm:122
+msgid "Empty inputs are not allowed."
+msgstr ""
+
+#: gnu/installer/newt/user.scm:159
+msgid "Please confirm the password."
+msgstr ""
+
+#. TRANSLATORS: Leave "root" untranslated: it refers to the name of the
+#. system administrator account.
+#: gnu/installer/newt/user.scm:176
+msgid "Please choose a password for the system administrator (\"root\")."
+msgstr ""
+
+#: gnu/installer/newt/user.scm:178
+msgid "System administrator password"
+msgstr ""
+
+#: gnu/installer/newt/user.scm:191
+msgid "Please add at least one user to system using the 'Add' button."
+msgstr ""
+
+#: gnu/installer/newt/user.scm:194
+msgid "Add"
+msgstr "添加"
+
+#: gnu/installer/newt/user.scm:195
+msgid "Delete"
+msgstr "删除"
+
+#: gnu/installer/newt/user.scm:255
+msgid "Please create at least one user."
+msgstr ""
+
+#: gnu/installer/newt/user.scm:256
+msgid "No user"
+msgstr ""
+
+#: gnu/installer/newt/welcome.scm:125
+msgid "GNU Guix install"
+msgstr ""
+
+#: gnu/installer/newt/welcome.scm:126
+msgid ""
+"Welcome to GNU Guix system installer!\n"
+"\n"
+"You will be guided through a graphical installation program.\n"
+"\n"
+"If you are familiar with GNU/Linux and you want tight control over the installation process, you can instead choose manual installation.  Documentation is accessible at any time by pressing Ctrl-Alt-F2."
+msgstr ""
+
+#: gnu/installer/newt/welcome.scm:135
+msgid "Graphical install using a terminal based interface"
+msgstr ""
+
+#: gnu/installer/newt/welcome.scm:138
+msgid "Install using the shell based process"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:82
+msgid "Unable to find a wifi technology"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:86
+msgid "Scanning wifi for available networks, please wait."
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:87
+msgid "Scan in progress"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:91
+msgid "Please enter the wifi password."
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:98
+#, scheme-format
+msgid "The password you entered for ~a is incorrect."
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:100
+msgid "Wrong password"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:106
+#, scheme-format
+msgid "An error occurred while trying to connect to ~a, please retry."
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:201
+msgid "Please select a wifi network."
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:207
+msgid "Scan"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:212
+msgid "No wifi detected"
+msgstr ""
+
+#: gnu/installer/newt/wifi.scm:227
+msgid "Wifi"
+msgstr ""
+
+#: gnu/installer/parted.scm:402 gnu/installer/parted.scm:439
+msgid "Free space"
+msgstr "空闲空间"
+
+#: gnu/installer/parted.scm:528
+#, scheme-format
+msgid "Name: ~a"
+msgstr ""
+
+#: gnu/installer/parted.scm:529 gnu/installer/parted.scm:575
+msgid "None"
+msgstr "无"
+
+#: gnu/installer/parted.scm:534
+#, scheme-format
+msgid "Type: ~a"
+msgstr ""
+
+#: gnu/installer/parted.scm:538
+#, scheme-format
+msgid "File system type: ~a"
+msgstr ""
+
+#: gnu/installer/parted.scm:544
+#, scheme-format
+msgid "Bootable flag: ~:[off~;on~]"
+msgstr ""
+
+#: gnu/installer/parted.scm:548
+#, scheme-format
+msgid "ESP flag: ~:[off~;on~]"
+msgstr ""
+
+#: gnu/installer/parted.scm:554
+#, scheme-format
+msgid "Size: ~a"
+msgstr ""
+
+#: gnu/installer/parted.scm:560
+#, scheme-format
+msgid "Encryption: ~:[No~a~;Yes (label '~a')~]"
+msgstr ""
+
+#: gnu/installer/parted.scm:566
+#, scheme-format
+msgid "Format the partition? ~:[No~;Yes~]"
+msgstr ""
+
+#: gnu/installer/parted.scm:572
+#, scheme-format
+msgid "Mount point: ~a"
+msgstr ""
+
+#: gnu/installer/parted.scm:1395
+#, scheme-format
+msgid "Device ~a is still in use."
+msgstr ""
+
+#: gnu/installer/services.scm:94
+msgid "OpenSSH secure shell daemon (sshd)"
+msgstr ""
+
+#: gnu/installer/services.scm:98
+msgid "Tor anonymous network router"
+msgstr ""
+
+#: gnu/installer/services.scm:102
+msgid "Mozilla NSS certificates, for HTTPS access"
+msgstr ""
+
+#: gnu/installer/services.scm:109
+msgid "NetworkManager network connection manager"
+msgstr ""
+
+#: gnu/installer/services.scm:114
+msgid "Connman network connection manager"
+msgstr ""
+
+#: gnu/installer/services.scm:119
+msgid "DHCP client (dynamic IP address assignment)"
+msgstr ""
+
+#: gnu/installer/timezone.scm:110
+#, scheme-format
+msgid "Unable to locate path: ~a."
+msgstr ""
+
+#: gnu/installer/utils.scm:83
+#, scheme-format
+msgid "Press Enter to continue.~%"
+msgstr ""
+
+#: gnu/installer/utils.scm:108
+#, scheme-format
+msgid "Command failed with exit code ~a.~%"
+msgstr ""
+
+#: gnu/machine/ssh.scm:114
+#, scheme-format
+msgid "<machine-ssh-configuration> without a 'host-key' is deprecated~%"
+msgstr ""
+
+#: gnu/machine/ssh.scm:189
+#, fuzzy, scheme-format
+#| msgid "guix: ~a: command not found~%"
+msgid "device '~a' not found: ~a"
+msgstr "guix：~a：未找到命令~%"
+
+#: gnu/machine/ssh.scm:204
+#, scheme-format
+msgid "no file system with label '~a'"
+msgstr ""
+
+#: gnu/machine/ssh.scm:223
+#, scheme-format
+msgid "no file system with UUID '~a'"
+msgstr ""
+
+#: gnu/machine/ssh.scm:273
+#, scheme-format
+msgid "missing modules for ~a:~{ ~a~}~%"
+msgstr ""
+
+#: gnu/machine/ssh.scm:308
+#, scheme-format
+msgid "incorrect target system ('~a' was given, while the system reports that it is '~a')~%"
+msgstr ""
+
+#: gnu/machine/ssh.scm:434
+#, scheme-format
+msgid "no signing key '~a'. have you run 'guix archive --generate-key?'"
+msgstr ""
+
+#: gnu/machine/ssh.scm:485
+msgid "could not roll-back machine"
+msgstr ""
+
+#: gnu/machine/ssh.scm:526
+msgid ""
+"Provisioning for machines that are accessible over SSH\n"
+"and have a known host-name. This entails little more than maintaining an SSH\n"
+"connection to the host."
+msgstr ""
+
+#: gnu/machine/ssh.scm:536
+#, scheme-format
+msgid ""
+"unsupported machine configuration '~a'\n"
+"for environment of type '~a'"
+msgstr ""
+
+#: gnu/packages/bootstrap.scm:165
+#, scheme-format
+msgid "could not find bootstrap binary '~a' for system '~a'"
+msgstr "无法找到引导二进制 '~a'，用于系统 '~a'"
+
+#: gnu/packages/bootstrap.scm:476
+msgid "Raw build system with direct store access"
+msgstr ""
+
+#: gnu/packages/bootstrap.scm:484
+msgid "Pre-built Guile for bootstrapping purposes."
+msgstr ""
+
+#: guix/build/utils.scm:715
+#, scheme-format
+msgid "'~a~{ ~a~}' exited with status ~a; output follows:~%~%~{  ~a~%~}"
+msgstr ""
+
+#: guix/scripts.scm:87
+msgid "main commands"
+msgstr "主要命令"
+
+#: guix/scripts.scm:88
+msgid "software development commands"
+msgstr "软件开发命令"
+
+#: guix/scripts.scm:89
+msgid "packaging commands"
+msgstr "打包命令"
+
+#: guix/scripts.scm:90
+msgid "plumbing commands"
+msgstr ""
+
+#: guix/scripts.scm:91
+msgid "internal commands"
+msgstr ""
+
+#: guix/scripts.scm:92
+msgid "extension commands"
+msgstr ""
+
+#: guix/scripts.scm:137
 #, scheme-format
 msgid "invalid argument: ~a~%"
 msgstr "无效参数: ~a~%"
 
-#: guix/scripts.scm:84 guix/scripts/download.scm:135
-#: guix/scripts/import/cran.scm:82 guix/scripts/import/elpa.scm:77
-#: guix/scripts/publish.scm:844 guix/scripts/edit.scm:81
+#: guix/scripts.scm:166 guix/scripts/import/cran.scm:91
+#: guix/scripts/import/elpa.scm:85 guix/scripts/import/cpan.scm:71
+#: guix/scripts/import/crate.scm:80 guix/scripts/import/gem.scm:78
+#: guix/scripts/import/gnu.scm:86 guix/scripts/import/go.scm:89
+#: guix/scripts/import/hackage.scm:110 guix/scripts/import/json.scm:79
+#: guix/scripts/import/nix.scm:71 guix/scripts/import/opam.scm:81
+#: guix/scripts/import/pypi.scm:77 guix/scripts/import/stackage.scm:94
+#: guix/scripts/import/texlive.scm:78
 #, scheme-format
 msgid "~A: unrecognized option~%"
 msgstr "~A: 无法识别的选项~%"
 
-#: guix/scripts.scm:179
+#: guix/scripts.scm:169
+#, scheme-format
+msgid "Did you mean @code{~a}?~%"
+msgstr ""
+
+#: guix/scripts.scm:253
 #, scheme-format
 msgid "Your Guix installation is ~a day old.\n"
 msgid_plural "Your Guix installation is ~a days old.\n"
 msgstr[0] ""
 
-#: guix/scripts.scm:184
+#: guix/scripts.scm:259
 #, scheme-format
 msgid ""
 "Consider running 'guix pull' followed by\n"
 "'~a' to get up-to-date packages and security updates.\n"
 msgstr ""
 
-#: guix/scripts/build.scm:124
+#: guix/scripts.scm:323
 #, scheme-format
-msgid "failed to create GC root `~a': ~a~%"
+msgid "only ~,1f GiB of free space available on ~a~%"
 msgstr ""
 
-#: guix/scripts/build.scm:206
-#, fuzzy, scheme-format
-#| msgid "ambiguous package specification `~a'~%"
-msgid "invalid replacement specification: ~s~%"
-msgstr "含糊的软件包规范 `~a'~%"
-
-#: guix/scripts/build.scm:263
+#: guix/scripts.scm:325
 msgid ""
+"Consider deleting old profile\n"
+"generations and collecting garbage, along these lines:\n"
 "\n"
-"      --with-source=SOURCE\n"
-"                         use SOURCE when building the corresponding package"
+"@example\n"
+"guix gc --delete-generations=1m\n"
+"@end example\n"
 msgstr ""
 
-#: guix/scripts/build.scm:266
-msgid ""
-"\n"
-"      --with-input=PACKAGE=REPLACEMENT\n"
-"                         replace dependency PACKAGE by REPLACEMENT"
-msgstr ""
-
-#: guix/scripts/build.scm:269
-msgid ""
-"\n"
-"      --with-graft=PACKAGE=REPLACEMENT\n"
-"                         graft REPLACEMENT on packages that refer to PACKAGE"
-msgstr ""
+#: guix/scripts/build.scm:85
+#, fuzzy, scheme-format
+#| msgid "cannot access `~a': ~a~%"
+msgid "cannot access build log at '~a':~%"
+msgstr "无法访问 `~a': ~a~%"
 
-#: guix/scripts/build.scm:294
+#: guix/scripts/build.scm:139
 #, scheme-format
-msgid "transformation '~a' had no effect on ~a~%"
+msgid "failed to create GC root `~a': ~a~%"
 msgstr ""
 
-#: guix/scripts/build.scm:312
+#: guix/scripts/build.scm:154 guix/scripts/search.scm:42
+#: guix/scripts/show.scm:41 guix/scripts/lint.scm:112 guix/scripts/edit.scm:48
+#: guix/scripts/size.scm:246 guix/scripts/graph.scm:547
+#: guix/scripts/repl.scm:80
 msgid ""
 "\n"
 "  -L, --load-path=DIR    prepend DIR to the package module search path"
@@ -225,7 +1318,7 @@ msgstr ""
 "\n"
 "  -L, --load-path=目录   将 <目录> 加入到软件包模块搜索目录之前"
 
-#: guix/scripts/build.scm:314
+#: guix/scripts/build.scm:156
 msgid ""
 "\n"
 "  -K, --keep-failed      keep build tree of failed builds"
@@ -233,7 +1326,7 @@ msgstr ""
 "\n"
 "  -K, --keep-failed      保留失败构建的构建树"
 
-#: guix/scripts/build.scm:316
+#: guix/scripts/build.scm:158
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -245,7 +1338,7 @@ msgstr ""
 "\n"
 "  -n, --dry-run          不要构建派生包"
 
-#: guix/scripts/build.scm:318
+#: guix/scripts/build.scm:160
 msgid ""
 "\n"
 "  -n, --dry-run          do not build the derivations"
@@ -253,7 +1346,7 @@ msgstr ""
 "\n"
 "  -n, --dry-run          不要构建派生包"
 
-#: guix/scripts/build.scm:320
+#: guix/scripts/build.scm:162
 msgid ""
 "\n"
 "      --fallback         fall back to building when the substituter fails"
@@ -261,7 +1354,7 @@ msgstr ""
 "\n"
 "      --fallback         如果替换器失败，回落到构建"
 
-#: guix/scripts/build.scm:322
+#: guix/scripts/build.scm:164
 msgid ""
 "\n"
 "      --no-substitutes   build instead of resorting to pre-built substitutes"
@@ -269,7 +1362,7 @@ msgstr ""
 "\n"
 "      --no-substitutes   构建而不使用预先构建的替代品"
 
-#: guix/scripts/build.scm:324 guix/scripts/size.scm:232
+#: guix/scripts/build.scm:166 guix/scripts/size.scm:235
 msgid ""
 "\n"
 "      --substitute-urls=URLS\n"
@@ -279,93 +1372,117 @@ msgstr ""
 "      --substitute-urls=URLS\n"
 "                         从 URLS 获取替代品，如果这些链接被授权的话"
 
-#: guix/scripts/build.scm:327
+#: guix/scripts/build.scm:169
 msgid ""
 "\n"
 "      --no-grafts        do not graft packages"
 msgstr ""
 
-#: guix/scripts/build.scm:329
+#: guix/scripts/build.scm:171
 msgid ""
 "\n"
-"      --no-build-hook    do not attempt to offload builds via the build hook"
+"      --no-offload       do not attempt to offload builds"
 msgstr ""
 
-#: guix/scripts/build.scm:331
+#: guix/scripts/build.scm:173
 msgid ""
 "\n"
 "      --max-silent-time=SECONDS\n"
 "                         mark the build as failed after SECONDS of silence"
 msgstr ""
 
-#: guix/scripts/build.scm:334
+#: guix/scripts/build.scm:176
 msgid ""
 "\n"
 "      --timeout=SECONDS  mark the build as failed after SECONDS of activity"
 msgstr ""
 
-#: guix/scripts/build.scm:336
+#: guix/scripts/build.scm:178
 msgid ""
 "\n"
-"      --verbosity=LEVEL  use the given verbosity LEVEL"
+"      --rounds=N         build N times in a row to detect non-determinism"
 msgstr ""
 
-#: guix/scripts/build.scm:338
+#: guix/scripts/build.scm:180
 msgid ""
 "\n"
-"      --rounds=N         build N times in a row to detect non-determinism"
+"  -c, --cores=N          allow the use of up to N CPU cores for the build"
 msgstr ""
 
-#: guix/scripts/build.scm:340
+#: guix/scripts/build.scm:182
 msgid ""
 "\n"
-"  -c, --cores=N          allow the use of up to N CPU cores for the build"
+"  -M, --max-jobs=N       allow at most N build jobs"
 msgstr ""
 
-#: guix/scripts/build.scm:342
+#: guix/scripts/build.scm:184
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --verbose          produce verbose output"
 msgid ""
 "\n"
-"  -M, --max-jobs=N       allow at most N build jobs"
+"      --debug=LEVEL      produce debugging output at LEVEL"
+msgstr ""
+"\n"
+"      --verbose          生成详细的输出"
+
+#: guix/scripts/build.scm:201
+msgid "'--keep-failed' ignored since you are talking to a remote daemon\n"
+msgstr ""
+
+#: guix/scripts/build.scm:282
+#, scheme-format
+msgid "'--no-build-hook' is deprecated; use '--no-offload' instead~%"
 msgstr ""
 
-#: guix/scripts/build.scm:448 guix/scripts/build.scm:455
+#: guix/scripts/build.scm:312 guix/scripts/build.scm:319
 #, scheme-format
 msgid "not a number: '~a' option argument: ~a~%"
 msgstr ""
 
-#: guix/scripts/build.scm:474
+#: guix/scripts/build.scm:340
 msgid ""
 "Usage: guix build [OPTION]... PACKAGE-OR-DERIVATION...\n"
 "Build the given PACKAGE-OR-DERIVATION and return their output paths.\n"
 msgstr ""
 
-#: guix/scripts/build.scm:476
+#: guix/scripts/build.scm:342 guix/scripts/archive.scm:91
 msgid ""
 "\n"
 "  -e, --expression=EXPR  build the package or derivation EXPR evaluates to"
 msgstr ""
 
-#: guix/scripts/build.scm:478
+#: guix/scripts/build.scm:344
 msgid ""
 "\n"
 "  -f, --file=FILE        build the package or derivation that the code within\n"
 "                         FILE evaluates to"
 msgstr ""
 
-#: guix/scripts/build.scm:481
+#: guix/scripts/build.scm:347
+msgid ""
+"\n"
+"  -m, --manifest=FILE    build the packages that the manifest given in FILE\n"
+"                         evaluates to"
+msgstr ""
+
+#: guix/scripts/build.scm:350 guix/scripts/archive.scm:93
 msgid ""
 "\n"
 "  -S, --source           build the packages' source derivations"
 msgstr ""
 
-#: guix/scripts/build.scm:483
+#: guix/scripts/build.scm:352
 msgid ""
 "\n"
 "      --sources[=TYPE]   build source derivations; TYPE may optionally be one\n"
 "                         of \"package\", \"all\" (default), or \"transitive\""
 msgstr ""
 
-#: guix/scripts/build.scm:486 guix/scripts/pack.scm:338
+#: guix/scripts/build.scm:355 guix/scripts/pull.scm:121
+#: guix/scripts/pack.scm:1086 guix/scripts/archive.scm:95
+#: guix/scripts/environment.scm:151
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    attempt to build for SYSTEM--e.g., \"i686-linux\""
@@ -373,38 +1490,51 @@ msgstr ""
 "\n"
 "  -s, --system=系统      尝试为 <系统> 构建包——比如，\"i686-linux\""
 
-#: guix/scripts/build.scm:488 guix/scripts/pack.scm:340
+#: guix/scripts/build.scm:357 guix/scripts/system.scm:1015
+#: guix/scripts/pack.scm:1088 guix/scripts/archive.scm:97
 msgid ""
 "\n"
 "      --target=TRIPLET   cross-build for TRIPLET--e.g., \"armel-linux-gnu\""
 msgstr ""
 
-#: guix/scripts/build.scm:490
+#: guix/scripts/build.scm:359
 msgid ""
 "\n"
 "  -d, --derivations      return the derivation paths of the given packages"
 msgstr ""
 
-#: guix/scripts/build.scm:492
+#: guix/scripts/build.scm:361
 msgid ""
 "\n"
 "      --check            rebuild items to check for non-determinism issues"
 msgstr ""
 
-#: guix/scripts/build.scm:494
+#: guix/scripts/build.scm:363
 msgid ""
 "\n"
 "      --repair           repair the specified items"
 msgstr ""
 
-#: guix/scripts/build.scm:496
+#: guix/scripts/build.scm:365 guix/scripts/pack.scm:1106
+#: guix/scripts/environment.scm:153
 msgid ""
 "\n"
 "  -r, --root=FILE        make FILE a symlink to the result, and register it\n"
 "                         as a garbage collector root"
 msgstr ""
 
-#: guix/scripts/build.scm:499
+#: guix/scripts/build.scm:368 guix/scripts/package.scm:480
+#: guix/scripts/install.scm:37 guix/scripts/remove.scm:36
+#: guix/scripts/upgrade.scm:39 guix/scripts/pull.scm:119
+#: guix/scripts/system.scm:1017 guix/scripts/copy.scm:115
+#: guix/scripts/pack.scm:1111 guix/scripts/deploy.scm:58
+#: guix/scripts/archive.scm:99 guix/scripts/environment.scm:177
+msgid ""
+"\n"
+"  -v, --verbosity=LEVEL  use the given verbosity LEVEL"
+msgstr ""
+
+#: guix/scripts/build.scm:370
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -416,23 +1546,35 @@ msgstr ""
 "\n"
 "  -n, --dry-run          不要构建派生包"
 
-#: guix/scripts/build.scm:501
+#: guix/scripts/build.scm:372
 msgid ""
 "\n"
 "      --log-file         return the log file names for the given derivations"
 msgstr ""
 
-#: guix/scripts/build.scm:508 guix/scripts/download.scm:83
-#: guix/scripts/package.scm:425 guix/scripts/gc.scm:74
-#: guix/scripts/hash.scm:59 guix/scripts/import.scm:92
-#: guix/scripts/import/cran.scm:47 guix/scripts/pull.scm:110
-#: guix/scripts/substitute.scm:889 guix/scripts/system.scm:870
-#: guix/scripts/lint.scm:1090 guix/scripts/publish.scm:94
-#: guix/scripts/edit.scm:44 guix/scripts/size.scm:243
-#: guix/scripts/graph.scm:432 guix/scripts/challenge.scm:241
-#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:349
-#: guix/scripts/weather.scm:156 guix/scripts/container.scm:33
-#: guix/scripts/container/exec.scm:43
+#: guix/scripts/build.scm:379 guix/scripts/download.scm:104
+#: guix/scripts/package.scm:498 guix/scripts/install.scm:44
+#: guix/scripts/remove.scm:41 guix/scripts/upgrade.scm:48
+#: guix/scripts/search.scm:37 guix/scripts/show.scm:36 guix/scripts/gc.scm:88
+#: guix/scripts/git.scm:34 guix/scripts/git/authenticate.scm:110
+#: guix/scripts/hash.scm:65 guix/scripts/import.scm:95
+#: guix/scripts/import/cran.scm:48 guix/scripts/pull.scm:127
+#: guix/scripts/substitute.scm:248 guix/scripts/system.scm:1024
+#: guix/scripts/lint.scm:115 guix/scripts/publish.scm:113
+#: guix/scripts/edit.scm:51 guix/scripts/size.scm:249
+#: guix/scripts/graph.scm:552 guix/scripts/challenge.scm:425
+#: guix/scripts/copy.scm:120 guix/scripts/pack.scm:1116
+#: guix/scripts/weather.scm:302 guix/scripts/describe.scm:96
+#: guix/scripts/processes.scm:301 guix/scripts/deploy.scm:53
+#: guix/scripts/container.scm:35 guix/scripts/container/exec.scm:43
+#: guix/scripts/archive.scm:106 guix/scripts/environment.scm:186
+#: guix/scripts/time-machine.scm:67 guix/scripts/import/cpan.scm:43
+#: guix/scripts/import/crate.scm:49 guix/scripts/import/gem.scm:44
+#: guix/scripts/import/gnu.scm:49 guix/scripts/import/go.scm:48
+#: guix/scripts/import/json.scm:51 guix/scripts/import/nix.scm:43
+#: guix/scripts/import/opam.scm:43 guix/scripts/import/pypi.scm:44
+#: guix/scripts/import/texlive.scm:46 guix/scripts/refresh.scm:186
+#: guix/scripts/repl.scm:83
 msgid ""
 "\n"
 "  -h, --help             display this help and exit"
@@ -440,189 +1582,639 @@ msgstr ""
 "\n"
 "  -h, --help                 显示这份说明然后离开"
 
-#: guix/scripts/build.scm:510 guix/scripts/download.scm:85
-#: guix/scripts/package.scm:427 guix/scripts/gc.scm:76
-#: guix/scripts/hash.scm:61 guix/scripts/import.scm:94
-#: guix/scripts/import/cran.scm:49 guix/scripts/pull.scm:112
-#: guix/scripts/substitute.scm:891 guix/scripts/system.scm:872
-#: guix/scripts/lint.scm:1094 guix/scripts/publish.scm:96
-#: guix/scripts/edit.scm:46 guix/scripts/size.scm:245
-#: guix/scripts/graph.scm:434 guix/scripts/challenge.scm:243
-#: guix/scripts/copy.scm:124 guix/scripts/pack.scm:351
-#: guix/scripts/weather.scm:158 guix/scripts/container.scm:35
-#: guix/scripts/container/exec.scm:45
+#: guix/scripts/build.scm:381 guix/scripts/download.scm:106
+#: guix/scripts/package.scm:500 guix/scripts/install.scm:46
+#: guix/scripts/remove.scm:43 guix/scripts/upgrade.scm:50
+#: guix/scripts/search.scm:39 guix/scripts/show.scm:38 guix/scripts/gc.scm:90
+#: guix/scripts/git.scm:36 guix/scripts/git/authenticate.scm:112
+#: guix/scripts/hash.scm:67 guix/scripts/import.scm:97
+#: guix/scripts/import/cran.scm:54 guix/scripts/pull.scm:129
+#: guix/scripts/substitute.scm:250 guix/scripts/system.scm:1026
+#: guix/scripts/lint.scm:119 guix/scripts/publish.scm:115
+#: guix/scripts/edit.scm:53 guix/scripts/size.scm:251
+#: guix/scripts/graph.scm:554 guix/scripts/challenge.scm:427
+#: guix/scripts/copy.scm:122 guix/scripts/pack.scm:1118
+#: guix/scripts/weather.scm:304 guix/scripts/describe.scm:98
+#: guix/scripts/processes.scm:303 guix/scripts/deploy.scm:55
+#: guix/scripts/container.scm:37 guix/scripts/container/exec.scm:45
+#: guix/scripts/archive.scm:108 guix/scripts/environment.scm:188
+#: guix/scripts/time-machine.scm:69 guix/scripts/import/cpan.scm:45
+#: guix/scripts/import/crate.scm:51 guix/scripts/import/gem.scm:46
+#: guix/scripts/import/gnu.scm:51 guix/scripts/import/json.scm:53
+#: guix/scripts/import/nix.scm:45 guix/scripts/import/opam.scm:49
+#: guix/scripts/import/pypi.scm:48 guix/scripts/import/texlive.scm:48
+#: guix/scripts/refresh.scm:188 guix/scripts/repl.scm:85
 msgid ""
 "\n"
 "  -V, --version          display version information and exit"
 msgstr ""
 "\n"
-"  -v, --version              显示程序版本然后离开"
+"  -V, --version              显示程序版本然后离开"
 
-#: guix/scripts/build.scm:537
+#: guix/scripts/build.scm:408
 #, scheme-format
 msgid ""
 "invalid argument: '~a' option argument: ~a, ~\n"
 "must be one of 'package', 'all', or 'transitive'~%"
 msgstr ""
 
-#: guix/scripts/build.scm:590
+#: guix/scripts/build.scm:470
 #, scheme-format
 msgid "~s: not something we can build~%"
 msgstr ""
 
-#: guix/scripts/build.scm:644
-#, scheme-format
-msgid "~a: warning: package '~a' has no source~%"
+#: guix/scripts/build.scm:475
+msgid ""
+"If you build from a file, make sure the last Scheme\n"
+"expression returns a package value.  @code{define-public} defines a variable,\n"
+"but returns @code{#<unspecified>}.  To fix this, add a Scheme expression at\n"
+"the end of the file that consists only of the package's variable name you\n"
+"defined, as in this example:\n"
+"\n"
+"@example\n"
+"(define-public my-package\n"
+"  (package\n"
+"    ...))\n"
+"\n"
+"my-package\n"
+"@end example"
+msgstr ""
+
+#: guix/scripts/build.scm:488
+msgid ""
+"If you build from a file, make sure the last\n"
+"Scheme expression returns a package, gexp, derivation or a list of such\n"
+"values."
 msgstr ""
 
-#: guix/scripts/build.scm:678
+#: guix/scripts/build.scm:574
+#, fuzzy, scheme-format
+#| msgid "package `~a' lacks output `~a'~%"
+msgid "package '~a' has no source~%"
+msgstr "包 `~a' 缺乏输出 `~a'~%"
+
+#: guix/scripts/build.scm:622
 #, scheme-format
 msgid "no build log for '~a'~%"
 msgstr ""
 
-#: guix/discovery.scm:88
+#: guix/discovery.scm:96
 #, scheme-format
 msgid "cannot access `~a': ~a~%"
 msgstr "无法访问 `~a': ~a~%"
 
-#: guix/scripts/download.scm:69
+#: guix/lint.scm:181
+msgid "name should be longer than a single character"
+msgstr ""
+
+#: guix/lint.scm:202
+msgid "description should not be empty"
+msgstr "描述不应为空"
+
+#: guix/lint.scm:213
+msgid "Texinfo markup in description is invalid"
+msgstr ""
+
+#: guix/lint.scm:223
+#, scheme-format
+msgid ""
+"description should not contain ~\n"
+"trademark sign '~a' at ~d"
+msgstr ""
+
+#. TRANSLATORS: '@code' is Texinfo markup and must be kept
+#. as is.
+#: guix/lint.scm:236
+msgid "use @code or similar ornament instead of quotes"
+msgstr ""
+
+#: guix/lint.scm:248
+msgid "description should start with an upper-case letter or digit"
+msgstr ""
+
+#: guix/lint.scm:266
+#, scheme-format
+msgid ""
+"sentences in description should be followed ~\n"
+"by two spaces; possible infraction~p at ~{~a~^, ~}"
+msgstr ""
+
+#: guix/lint.scm:287
+#, scheme-format
+msgid "invalid description: ~s"
+msgstr "无效的描述：~s"
+
+#: guix/lint.scm:357
+#, scheme-format
+msgid "'~a' should probably be a native input"
+msgstr ""
+
+#: guix/lint.scm:372
+#, scheme-format
+msgid "'~a' should probably not be an input at all"
+msgstr ""
+
+#: guix/lint.scm:393
+msgid "no period allowed at the end of the synopsis"
+msgstr ""
+
+#: guix/lint.scm:407
+msgid "no article allowed at the beginning of the synopsis"
+msgstr ""
+
+#: guix/lint.scm:416
+msgid "synopsis should be less than 80 characters long"
+msgstr ""
+
+#: guix/lint.scm:425
+msgid "synopsis should start with an upper-case letter or digit"
+msgstr ""
+
+#: guix/lint.scm:433
+msgid "synopsis should not start with the package name"
+msgstr ""
+
+#: guix/lint.scm:447
+msgid "Texinfo markup in synopsis is invalid"
+msgstr ""
+
+#: guix/lint.scm:462
+msgid "synopsis should not be empty"
+msgstr ""
+
+#: guix/lint.scm:472
+#, fuzzy, scheme-format
+#| msgid "invalid syntax: ~a~%"
+msgid "invalid synopsis: ~s"
+msgstr "无效语法: ~a~%"
+
+#: guix/lint.scm:590
+#, scheme-format
+msgid "URI ~a returned suspiciously small file (~a bytes)"
+msgstr ""
+
+#: guix/lint.scm:599
+#, scheme-format
+msgid "permanent redirect from ~a to ~a"
+msgstr ""
+
+#: guix/lint.scm:605
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "invalid permanent redirect from ~a"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/lint.scm:611 guix/lint.scm:621
+#, scheme-format
+msgid "URI ~a not reachable: ~a (~s)"
+msgstr ""
+
+#: guix/lint.scm:627
+#, scheme-format
+msgid "URI ~a domain not found: ~a"
+msgstr ""
+
+#: guix/lint.scm:633
+#, scheme-format
+msgid "URI ~a unreachable: ~a"
+msgstr ""
+
+#: guix/lint.scm:641
+#, scheme-format
+msgid "TLS certificate error: ~a"
+msgstr "TLS 证书错误：~a"
+
+#: guix/lint.scm:668
+msgid "invalid value for home page"
+msgstr "无效的主页值"
+
+#: guix/lint.scm:673
+#, scheme-format
+msgid "invalid home page URL: ~s"
+msgstr "无效的主页 URL：~s"
+
+#: guix/lint.scm:710
+msgid "file names of patches should start with the package name"
+msgstr ""
+
+#: guix/lint.scm:726
+#, scheme-format
+msgid "~a: file name is too long"
+msgstr ""
+
+#: guix/lint.scm:747
+#, scheme-format
+msgid "~a: empty patch"
+msgstr ""
+
+#: guix/lint.scm:755
+#, scheme-format
+msgid "~a: patch lacks comment and upstream status"
+msgstr ""
+
+#: guix/lint.scm:816
+#, fuzzy, scheme-format
+#| msgid "invalid syntax: ~a~%"
+msgid "proposed synopsis: ~s~%"
+msgstr "无效语法: ~a~%"
+
+#: guix/lint.scm:830
+#, scheme-format
+msgid "proposed description:~%     \"~a\"~%"
+msgstr ""
+
+#: guix/lint.scm:881
+msgid "all the source URIs are unreachable:"
+msgstr ""
+
+#: guix/lint.scm:910
+msgid "the source file name should contain the package name"
+msgstr ""
+
+#: guix/lint.scm:922
+msgid "the source URI should not be an autogenerated tarball"
+msgstr ""
+
+#: guix/lint.scm:946
+#, scheme-format
+msgid "URL should be 'mirror://~a/~a'"
+msgstr ""
+
+#: guix/lint.scm:991
+#, scheme-format
+msgid "URL should be '~a'"
+msgstr ""
+
+#: guix/lint.scm:1013 guix/lint.scm:1024 guix/lint.scm:1032
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to create ~a derivation: ~a"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/lint.scm:1018 guix/lint.scm:1046
+#, scheme-format
+msgid "failed to create ~a derivation: ~s"
+msgstr ""
+
+#: guix/lint.scm:1074
+#, scheme-format
+msgid "propagated inputs ~a and ~a collide"
+msgstr ""
+
+#: guix/lint.scm:1098
+msgid "invalid license field"
+msgstr "无效的许可证字段"
+
+#: guix/lint.scm:1105
+#, scheme-format
+msgid "~a: HTTP GET error for ~a: ~a (~s)~%"
+msgstr ""
+
+#: guix/lint.scm:1115
+#, scheme-format
+msgid "~a: host lookup failure: ~a~%"
+msgstr ""
+
+#: guix/lint.scm:1120
+#, scheme-format
+msgid "~a: TLS certificate error: ~a"
+msgstr "~a：TLS 证书错误：~a"
+
+#: guix/lint.scm:1131 guix/ui.scm:846 guix/scripts/offload.scm:191
+#, scheme-format
+msgid "~a: ~a~%"
+msgstr ""
+
+#: guix/lint.scm:1145
+msgid "while retrieving CVE vulnerabilities"
+msgstr ""
+
+#: guix/lint.scm:1188
+#, scheme-format
+msgid "probably vulnerable to ~a"
+msgstr ""
+
+#: guix/lint.scm:1196
+#, fuzzy, scheme-format
+#| msgid "invalid signature for '~a'~%"
+msgid "no updater for ~a"
+msgstr "'~a'~% 签名无效"
+
+#: guix/lint.scm:1201 guix/lint.scm:1319
+#, scheme-format
+msgid "while retrieving upstream info for '~a'"
+msgstr ""
+
+#: guix/lint.scm:1210
+#, scheme-format
+msgid "can be upgraded to ~a"
+msgstr "可升级至 ~a"
+
+#: guix/lint.scm:1216
+#, scheme-format
+msgid "updater '~a' failed to find upstream releases"
+msgstr ""
+
+#: guix/lint.scm:1233
+msgid "Software Heritage rate limit reached; try again later"
+msgstr ""
+
+#: guix/lint.scm:1237
+#, scheme-format
+msgid "'~a' returned ~a"
+msgstr ""
+
+#. TRANSLATORS: "Software Heritage" is a proper noun
+#. that must remain untranslated.  See
+#. <https://www.softwareheritage.org>.
+#: guix/lint.scm:1276
+msgid "scheduled Software Heritage archival"
+msgstr ""
+
+#: guix/lint.scm:1282
+msgid "archival rate limit exceeded; try again later"
+msgstr ""
+
+#: guix/lint.scm:1298
+msgid "source not archived on Software Heritage"
+msgstr ""
+
+#: guix/lint.scm:1311
+msgid "while connecting to Software Heritage"
+msgstr ""
+
+#: guix/lint.scm:1328
+#, scheme-format
+msgid "ahead of Stackage LTS version ~a"
+msgstr ""
+
+#: guix/lint.scm:1345
+#, scheme-format
+msgid "tabulation on line ~a, column ~a"
+msgstr ""
+
+#: guix/lint.scm:1357
+#, scheme-format
+msgid "trailing white space on line ~a"
+msgstr ""
+
+#: guix/lint.scm:1371
+#, scheme-format
+msgid "line ~a is way too long (~a characters)"
+msgstr ""
+
+#: guix/lint.scm:1385
+msgid "parentheses feel lonely, move to the previous or next line"
+msgstr ""
+
+#: guix/lint.scm:1462
+#, fuzzy
+#| msgid "module ~a not found"
+msgid "source file not found"
+msgstr "未找到模块 ~a"
+
+#: guix/lint.scm:1474
+msgid "Validate package names"
+msgstr ""
+
+#: guix/lint.scm:1478
+msgid "Validate package descriptions"
+msgstr ""
+
+#: guix/lint.scm:1482
+msgid "Identify inputs that should be native inputs"
+msgstr ""
+
+#: guix/lint.scm:1486
+msgid "Identify inputs that shouldn't be inputs at all"
+msgstr ""
+
+#. TRANSLATORS: <license> is the name of a data type and must not be
+#. translated.
+#: guix/lint.scm:1492
+msgid "Make sure the 'license' field is a <license> or a list thereof"
+msgstr ""
+
+#: guix/lint.scm:1497
+msgid "Suggest 'mirror://' URLs"
+msgstr ""
+
+#: guix/lint.scm:1501
+msgid "Validate file names of sources"
+msgstr ""
+
+#: guix/lint.scm:1505
+msgid "Check for autogenerated tarballs"
+msgstr ""
+
+#: guix/lint.scm:1509
+msgid "Report failure to compile a package to a derivation"
+msgstr ""
+
+#: guix/lint.scm:1514
+msgid "Report collisions that would occur due to propagated inputs"
+msgstr ""
+
+#: guix/lint.scm:1519
+msgid "Validate file names and availability of patches"
+msgstr ""
+
+#: guix/lint.scm:1523
+msgid "Validate patch headers"
+msgstr ""
+
+#: guix/lint.scm:1527
+msgid "Look for formatting issues in the source"
+msgstr ""
+
+#: guix/lint.scm:1534
+msgid "Validate package synopses"
+msgstr ""
+
+#: guix/lint.scm:1538
+msgid "Validate synopsis & description of GNU packages"
+msgstr ""
+
+#: guix/lint.scm:1542
+msgid "Validate home-page URLs"
+msgstr ""
+
+#: guix/lint.scm:1546
+msgid "Validate source URLs"
+msgstr ""
+
+#: guix/lint.scm:1550
+msgid "Suggest GitHub URLs"
+msgstr ""
+
+#: guix/lint.scm:1554
+msgid "Check the Common Vulnerabilities and Exposures (CVE) database"
+msgstr ""
+
+#: guix/lint.scm:1559
+msgid "Check the package for new upstream releases"
+msgstr ""
+
+#: guix/lint.scm:1563
+msgid "Ensure source code archival on Software Heritage"
+msgstr ""
+
+#: guix/lint.scm:1567
+msgid "Ensure Haskell packages use Stackage LTS versions"
+msgstr ""
+
+#: guix/scripts/download.scm:87
 msgid ""
 "Usage: guix download [OPTION] URL\n"
 "Download the file at URL to the store or to the given file, and print its\n"
 "file name and the hash of its contents.\n"
-"\n"
-"Supported formats: 'nix-base32' (default), 'base32', and 'base16'\n"
-"('hex' and 'hexadecimal' can be used as well).\n"
 msgstr ""
 
-#: guix/scripts/download.scm:75 guix/scripts/hash.scm:54
+#: guix/scripts/download.scm:91 guix/scripts/hash.scm:53
+msgid ""
+"Supported formats: 'base64', 'nix-base32' (default), 'base32',\n"
+"and 'base16' ('hex' and 'hexadecimal' can be used as well).\n"
+msgstr ""
+
+#: guix/scripts/download.scm:94 guix/scripts/hash.scm:60
 msgid ""
 "\n"
 "  -f, --format=FMT       write the hash in the given format"
 msgstr ""
 
-#: guix/scripts/download.scm:77
+#: guix/scripts/download.scm:96 guix/scripts/hash.scm:58
+msgid ""
+"\n"
+"  -H, --hash=ALGORITHM   use the given hash ALGORITHM"
+msgstr ""
+
+#: guix/scripts/download.scm:98
 msgid ""
 "\n"
 "      --no-check-certificate\n"
 "                         do not validate the certificate of HTTPS servers "
 msgstr ""
 
-#: guix/scripts/download.scm:80
+#: guix/scripts/download.scm:101
 msgid ""
 "\n"
 "  -o, --output=FILE      download to FILE"
 msgstr ""
 
-#: guix/scripts/download.scm:103 guix/scripts/hash.scm:82
+#: guix/scripts/download.scm:126 guix/scripts/hash.scm:97
 #, scheme-format
 msgid "unsupported hash format: ~a~%"
 msgstr ""
 
-#: guix/scripts/download.scm:138 guix/scripts/package.scm:906
-#: guix/scripts/publish.scm:846
+#: guix/scripts/download.scm:134 guix/scripts/hash.scm:81
+#, fuzzy, scheme-format
+#| msgid "~a: unknown action~%"
+msgid "~a: unknown hash algorithm~%"
+msgstr "~a：未知操作~%"
+
+#: guix/scripts/download.scm:171 guix/scripts/package.scm:1072
+#: guix/scripts/pull.scm:760 guix/scripts/publish.scm:1125
+#: guix/scripts/time-machine.scm:123
 #, scheme-format
 msgid "~A: extraneous argument~%"
 msgstr ""
 
-#: guix/scripts/download.scm:146
+#: guix/scripts/download.scm:177
 #, scheme-format
 msgid "no download URI was specified~%"
 msgstr ""
 
-#: guix/scripts/download.scm:151
+#: guix/scripts/download.scm:182
 #, scheme-format
 msgid "~a: failed to parse URI~%"
 msgstr ""
 
-#: guix/scripts/download.scm:161
+#: guix/scripts/download.scm:192
 #, scheme-format
 msgid "~a: download failed~%"
 msgstr "~a：下载失败~%"
 
-#: guix/scripts/package.scm:112
+#: guix/scripts/package.scm:128
 #, scheme-format
-msgid "Try \"info '(guix) Invoking guix package'\" for more information.~%"
+msgid "not removing generation ~a, which is current~%"
 msgstr ""
 
-#: guix/scripts/package.scm:134
+#: guix/scripts/package.scm:135
 #, scheme-format
-msgid "error: while creating directory `~a': ~a~%"
+msgid "no matching generation~%"
 msgstr ""
 
-#: guix/scripts/package.scm:138
+#: guix/scripts/package.scm:157
 #, scheme-format
-msgid "Please create the `~a' directory, with you as the owner.~%"
+msgid "nothing to be done~%"
 msgstr ""
 
-#: guix/scripts/package.scm:145
+#: guix/scripts/package.scm:258
 #, scheme-format
-msgid "error: directory `~a' is not owned by you~%"
-msgstr ""
+msgid "package '~a' no longer exists~%"
+msgstr "软件包“~a”已不再存在~%"
 
-#: guix/scripts/package.scm:148
+#: guix/scripts/package.scm:313
 #, scheme-format
-msgid "Please change the owner of `~a' to user ~s.~%"
+msgid ""
+"Consider setting the necessary environment\n"
+"variables by running:\n"
+"\n"
+"@example\n"
+"GUIX_PROFILE=\"~a\"\n"
+". \"$GUIX_PROFILE/etc/profile\"\n"
+"@end example\n"
+"\n"
+"Alternately, see @command{guix package --search-paths -p ~s}."
 msgstr ""
 
-#: guix/scripts/package.scm:183
-#, scheme-format
-msgid "not removing generation ~a, which is current~%"
+#: guix/scripts/package.scm:355
+msgid ""
+";; This \"manifest\" file can be passed to 'guix package -m' to reproduce\n"
+";; the content of your profile.  This is \"symbolic\": it only specifies\n"
+";; package names.  To reproduce the exact same profile, you also need to\n"
+";; capture the channels being used, as returned by \"guix describe\".\n"
+";; See the \"Replicating Guix\" section in the manual.\n"
 msgstr ""
 
-#: guix/scripts/package.scm:190
+#: guix/scripts/package.scm:387
 #, scheme-format
-msgid "no matching generation~%"
+msgid "no provenance information for this profile~%"
 msgstr ""
 
-#: guix/scripts/package.scm:193 guix/scripts/package.scm:716
-#: guix/scripts/system.scm:558
-#, scheme-format
-msgid "invalid syntax: ~a~%"
-msgstr "无效语法: ~a~%"
-
-#: guix/scripts/package.scm:219
-#, scheme-format
-msgid "nothing to be done~%"
+#: guix/scripts/package.scm:389
+msgid ""
+";; This channel file can be passed to 'guix pull -C' or to\n"
+";; 'guix time-machine -C' to obtain the Guix revision that was\n"
+";; used to populate this profile.\n"
 msgstr ""
 
-#: guix/scripts/package.scm:233
+#: guix/scripts/package.scm:401
 #, scheme-format
-msgid "~a package in profile~%"
-msgid_plural "~a packages in profile~%"
-msgstr[0] ""
-
-#: guix/scripts/package.scm:313
-#, scheme-format
-msgid "package '~a' no longer exists~%"
-msgstr "软件包“~a”已不再存在~%"
-
-#: guix/scripts/package.scm:351
-#, scheme-format
-msgid "The following environment variable definitions may be needed:~%"
+msgid ";; Note: these other commits were also used to install some of the packages in this profile:~%"
 msgstr ""
 
-#: guix/scripts/package.scm:366
+#: guix/scripts/package.scm:431
 msgid ""
 "Usage: guix package [OPTION]...\n"
 "Install, remove, or upgrade packages in a single transaction.\n"
 msgstr ""
 
-#: guix/scripts/package.scm:368
+#: guix/scripts/package.scm:433
 msgid ""
 "\n"
 "  -i, --install PACKAGE ...\n"
 "                         install PACKAGEs"
 msgstr ""
 
-#: guix/scripts/package.scm:371
+#: guix/scripts/package.scm:436
 msgid ""
 "\n"
 "  -e, --install-from-expression=EXP\n"
 "                         install the package EXP evaluates to"
 msgstr ""
 
-#: guix/scripts/package.scm:374
+#: guix/scripts/package.scm:439
 msgid ""
 "\n"
 "  -f, --install-from-file=FILE\n"
@@ -630,204 +2222,326 @@ msgid ""
 "                         evaluates to"
 msgstr ""
 
-#: guix/scripts/package.scm:378
+#: guix/scripts/package.scm:443
 msgid ""
 "\n"
 "  -r, --remove PACKAGE ...\n"
 "                         remove PACKAGEs"
 msgstr ""
 
-#: guix/scripts/package.scm:381
+#: guix/scripts/package.scm:446
 msgid ""
 "\n"
 "  -u, --upgrade[=REGEXP] upgrade all the installed packages matching REGEXP"
 msgstr ""
 
-#: guix/scripts/package.scm:383
+#: guix/scripts/package.scm:448
 msgid ""
 "\n"
 "  -m, --manifest=FILE    create a new profile generation with the manifest\n"
 "                         from FILE"
 msgstr ""
 
-#: guix/scripts/package.scm:386
+#: guix/scripts/package.scm:451 guix/scripts/upgrade.scm:41
 msgid ""
 "\n"
 "      --do-not-upgrade[=REGEXP] do not upgrade any packages matching REGEXP"
 msgstr ""
 
-#: guix/scripts/package.scm:388
+#: guix/scripts/package.scm:453 guix/scripts/pull.scm:109
 msgid ""
 "\n"
 "      --roll-back        roll back to the previous generation"
 msgstr ""
 
-#: guix/scripts/package.scm:390
+#: guix/scripts/package.scm:455
 msgid ""
 "\n"
 "      --search-paths[=KIND]\n"
 "                         display needed environment variable definitions"
 msgstr ""
 
-#: guix/scripts/package.scm:393
+#: guix/scripts/package.scm:458 guix/scripts/pull.scm:106
 msgid ""
 "\n"
 "  -l, --list-generations[=PATTERN]\n"
 "                         list generations matching PATTERN"
 msgstr ""
 
-#: guix/scripts/package.scm:396
+#: guix/scripts/package.scm:461 guix/scripts/pull.scm:111
 msgid ""
 "\n"
 "  -d, --delete-generations[=PATTERN]\n"
 "                         delete generations matching PATTERN"
 msgstr ""
 
-#: guix/scripts/package.scm:399
+#: guix/scripts/package.scm:464 guix/scripts/pull.scm:114
 msgid ""
 "\n"
 "  -S, --switch-generation=PATTERN\n"
 "                         switch to a generation matching PATTERN"
 msgstr ""
 
-#: guix/scripts/package.scm:402
+#: guix/scripts/package.scm:467
+msgid ""
+"\n"
+"      --export-manifest  print a manifest for the chosen profile"
+msgstr ""
+
+#: guix/scripts/package.scm:469
+msgid ""
+"\n"
+"      --export-channels  print channels for the chosen profile"
+msgstr ""
+
+#: guix/scripts/package.scm:471 guix/scripts/install.scm:34
+#: guix/scripts/remove.scm:33 guix/scripts/upgrade.scm:37
 msgid ""
 "\n"
 "  -p, --profile=PROFILE  use PROFILE instead of the user's default profile"
 msgstr ""
 
-#: guix/scripts/package.scm:405
+#: guix/scripts/package.scm:473
 msgid ""
 "\n"
-"      --bootstrap        use the bootstrap Guile to build the profile"
+"      --list-profiles    list the user's profiles"
 msgstr ""
 
-#: guix/scripts/package.scm:407 guix/scripts/pull.scm:98
+#: guix/scripts/package.scm:476
 msgid ""
 "\n"
-"      --verbose          produce verbose output"
+"      --allow-collisions do not treat collisions in the profile as an error"
 msgstr ""
+
+#: guix/scripts/package.scm:478
+msgid ""
 "\n"
-"      --verbose          生成详细的输出"
+"      --bootstrap        use the bootstrap Guile to build the profile"
+msgstr ""
 
-#: guix/scripts/package.scm:410
+#: guix/scripts/package.scm:483
 msgid ""
 "\n"
 "  -s, --search=REGEXP    search in synopsis and description using REGEXP"
 msgstr ""
 
-#: guix/scripts/package.scm:412
+#: guix/scripts/package.scm:485
 msgid ""
 "\n"
 "  -I, --list-installed[=REGEXP]\n"
 "                         list installed packages matching REGEXP"
 msgstr ""
 
-#: guix/scripts/package.scm:415
+#: guix/scripts/package.scm:488
 msgid ""
 "\n"
 "  -A, --list-available[=REGEXP]\n"
 "                         list available packages matching REGEXP"
 msgstr ""
 
-#: guix/scripts/package.scm:418
+#: guix/scripts/package.scm:491
 msgid ""
 "\n"
 "      --show=PACKAGE     show details about PACKAGE"
 msgstr ""
 
-#: guix/scripts/package.scm:470
+#: guix/scripts/package.scm:546
 #, scheme-format
 msgid "upgrade regexp '~a' looks like a command-line option~%"
 msgstr ""
 
-#: guix/scripts/package.scm:473
+#: guix/scripts/package.scm:549
 #, scheme-format
 msgid "is this intended?~%"
 msgstr ""
 
-#: guix/scripts/package.scm:518
+#: guix/scripts/package.scm:599
 #, scheme-format
 msgid "~a: unsupported kind of search path~%"
 msgstr ""
 
-#: guix/scripts/package.scm:815
+#: guix/scripts/package.scm:733
+#, scheme-format
+msgid "cannot install non-package object: ~s~%"
+msgstr ""
+
+#: guix/scripts/package.scm:914
+#, fuzzy, scheme-format
+#| msgid "~a: patch not found"
+msgid "~a~@[@~a~]: package not found~%"
+msgstr "~a: 未找到补丁"
+
+#: guix/scripts/package.scm:961 guix/scripts/pull.scm:689
 #, scheme-format
 msgid "cannot switch to generation '~a'~%"
 msgstr ""
 
-#: guix/scripts/package.scm:831
+#: guix/scripts/install.scm:31
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
+msgid ""
+"Usage: guix install [OPTION] PACKAGES...\n"
+"Install the given PACKAGES.\n"
+"This is an alias for 'guix package -i'.\n"
+msgstr ""
+"用法：guix size [选项]... 软件包\n"
+"报告 <软件包> 及其依赖的大小。\n"
+
+#: guix/scripts/remove.scm:30
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
+msgid ""
+"Usage: guix remove [OPTION] PACKAGES...\n"
+"Remove the given PACKAGES.\n"
+"This is an alias for 'guix package -r'.\n"
+msgstr ""
+"用法：guix size [选项]... 软件包\n"
+"报告 <软件包> 及其依赖的大小。\n"
+
+#: guix/scripts/upgrade.scm:34
+msgid ""
+"Usage: guix upgrade [OPTION] [REGEXP]\n"
+"Upgrade packages that match REGEXP.\n"
+"This is an alias for 'guix package -u'.\n"
+msgstr ""
+
+#: guix/scripts/search.scm:32
+msgid ""
+"Usage: guix search [OPTION] REGEXPS...\n"
+"Search for packages matching REGEXPS."
+msgstr ""
+
+#: guix/scripts/search.scm:34
+msgid ""
+"\n"
+"This is an alias for 'guix package -s'.\n"
+msgstr ""
+
+#: guix/scripts/search.scm:75
 #, scheme-format
-msgid "would install new manifest from '~a' with ~d entries~%"
+msgid "missing arguments: no regular expressions to search for~%"
 msgstr ""
 
-#: guix/scripts/package.scm:833
+#: guix/scripts/show.scm:31
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
+msgid ""
+"Usage: guix show [OPTION] PACKAGE...\n"
+"Show details about PACKAGE."
+msgstr ""
+"用法：guix size [选项]... 软件包\n"
+"报告 <软件包> 及其依赖的大小。\n"
+
+#: guix/scripts/show.scm:33
+msgid ""
+"\n"
+"This is an alias for 'guix package --show='.\n"
+msgstr ""
+
+#: guix/scripts/show.scm:74
 #, scheme-format
-msgid "installing new manifest from '~a' with ~d entries~%"
+msgid "missing arguments: no package to show~%"
 msgstr ""
 
-#: guix/scripts/gc.scm:42
+#: guix/scripts/gc.scm:47
 msgid ""
 "Usage: guix gc [OPTION]... PATHS...\n"
 "Invoke the garbage collector.\n"
 msgstr ""
 
-#: guix/scripts/gc.scm:44
+#: guix/scripts/gc.scm:49
 msgid ""
 "\n"
 "  -C, --collect-garbage[=MIN]\n"
 "                         collect at least MIN bytes of garbage"
 msgstr ""
 
-#: guix/scripts/gc.scm:47
+#: guix/scripts/gc.scm:52
 msgid ""
 "\n"
 "  -F, --free-space=FREE  attempt to reach FREE available space in the store"
 msgstr ""
 
-#: guix/scripts/gc.scm:49
+#: guix/scripts/gc.scm:54
+msgid ""
+"\n"
+"  -d, --delete-generations[=PATTERN]\n"
+"                         delete profile generations matching PATTERN"
+msgstr ""
+
+#: guix/scripts/gc.scm:57
 msgid ""
 "\n"
-"  -d, --delete           attempt to delete PATHS"
+"  -D, --delete           attempt to delete PATHS"
 msgstr ""
 
-#: guix/scripts/gc.scm:51
+#: guix/scripts/gc.scm:59
+msgid ""
+"\n"
+"      --list-roots       list the user's garbage collector roots"
+msgstr ""
+
+#: guix/scripts/gc.scm:61
+msgid ""
+"\n"
+"      --list-busy        list store items used by running processes"
+msgstr ""
+
+#: guix/scripts/gc.scm:63
 msgid ""
 "\n"
 "      --optimize         optimize the store by deduplicating identical files"
 msgstr ""
 
-#: guix/scripts/gc.scm:53
+#: guix/scripts/gc.scm:65
 msgid ""
 "\n"
 "      --list-dead        list dead paths"
 msgstr ""
 
-#: guix/scripts/gc.scm:55
+#: guix/scripts/gc.scm:67
 msgid ""
 "\n"
 "      --list-live        list live paths"
 msgstr ""
 
-#: guix/scripts/gc.scm:58
+#: guix/scripts/gc.scm:70
 msgid ""
 "\n"
 "      --references       list the references of PATHS"
 msgstr ""
 
-#: guix/scripts/gc.scm:60
+#: guix/scripts/gc.scm:72
 msgid ""
 "\n"
 "  -R, --requisites       list the requisites of PATHS"
 msgstr ""
 
-#: guix/scripts/gc.scm:62
+#: guix/scripts/gc.scm:74
 msgid ""
 "\n"
 "      --referrers        list the referrers of PATHS"
 msgstr ""
 
-#: guix/scripts/gc.scm:65
+#: guix/scripts/gc.scm:76
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --verbose          produce verbose output"
+msgid ""
+"\n"
+"      --derivers         list the derivers of PATHS"
+msgstr ""
+"\n"
+"      --verbose          生成详细的输出"
+
+#: guix/scripts/gc.scm:79
 msgid ""
 "\n"
 "      --verify[=OPTS]    verify the integrity of the store; OPTS is a\n"
@@ -835,139 +2549,276 @@ msgid ""
 "                         'contents'"
 msgstr ""
 
-#: guix/scripts/gc.scm:69
+#: guix/scripts/gc.scm:83
 msgid ""
 "\n"
 "      --list-failures    list cached build failures"
 msgstr ""
 
-#: guix/scripts/gc.scm:71
+#: guix/scripts/gc.scm:85
 msgid ""
 "\n"
 "      --clear-failures   remove PATHS from the set of cached failures"
 msgstr ""
 
-#: guix/scripts/gc.scm:100
+#: guix/scripts/gc.scm:99
+#, fuzzy, scheme-format
+#| msgid "~a: invalid number~%"
+msgid "~a: invalid '--verify' option~%"
+msgstr "~a: 无效的数字~%"
+
+#: guix/scripts/gc.scm:142
 #, scheme-format
 msgid "invalid amount of storage: ~a~%"
 msgstr ""
 
-#: guix/scripts/gc.scm:185
-msgid "already ~h bytes available on ~a, nothing to do~%"
+#: guix/scripts/gc.scm:156
+#, scheme-format
+msgid "'-d' as an alias for '--delete' is deprecated; use '-D'~%"
+msgstr ""
+
+#: guix/scripts/gc.scm:163
+#, scheme-format
+msgid "~s does not denote a duration~%"
 msgstr ""
 
-#: guix/scripts/gc.scm:188
-msgid "freeing ~h bytes~%"
+#: guix/scripts/gc.scm:251
+msgid "already ~h MiBs available on ~a, nothing to do~%"
 msgstr ""
 
-#: guix/scripts/gc.scm:200
+#: guix/scripts/gc.scm:254
+#, fuzzy
+#| msgid "deleting ~a~%"
+msgid "freeing ~h MiBs~%"
+msgstr "正删除 ~a~%"
+
+#: guix/scripts/gc.scm:293
 #, fuzzy, scheme-format
 #| msgid "invalid argument: ~a~%"
 msgid "extraneous arguments: ~{~a ~}~%"
 msgstr "无效参数: ~a~%"
 
-#: guix/scripts/gc.scm:220 guix/scripts/gc.scm:223
-msgid "freed ~h bytes~%"
+#: guix/scripts/gc.scm:317 guix/scripts/gc.scm:320
+msgid "freed ~h MiBs~%"
 msgstr ""
 
-#: guix/scripts/hash.scm:47
+#: guix/scripts/git.scm:26
+msgid ""
+"Usage: guix git COMMAND ARGS...\n"
+"Operate on Git repositories.\n"
+msgstr ""
+
+#: guix/scripts/git.scm:29 guix/scripts/system.scm:939
+#: guix/scripts/container.scm:30
+msgid "The valid values for ACTION are:\n"
+msgstr ""
+
+#: guix/scripts/git.scm:31
+msgid "   authenticate    verify commit signatures and authorizations\n"
+msgstr ""
+
+#: guix/scripts/git.scm:57
+#, scheme-format
+msgid "guix git: missing sub-command~%"
+msgstr ""
+
+#: guix/scripts/git.scm:67
+#, scheme-format
+msgid "guix git: invalid sub-command~%"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:81
+#, scheme-format
+msgid "Signing statistics:~%"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:94
+msgid ""
+"Usage: guix git authenticate COMMIT SIGNER [OPTIONS...]\n"
+"Authenticate the given Git checkout using COMMIT/SIGNER as its introduction.\n"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:96
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"  -r, --repository=DIRECTORY\n"
+"                         open the Git repository at DIRECTORY"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/scripts/git/authenticate.scm:99
+msgid ""
+"\n"
+"  -k, --keyring=REFERENCE\n"
+"                         load keyring from REFERENCE, a Git branch"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:102
+msgid ""
+"\n"
+"      --stats            display commit signing statistics upon completion"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:104
+msgid ""
+"\n"
+"      --cache-key=KEY    cache authenticated commits under KEY"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:106
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"      --historical-authorizations=FILE\n"
+"                         read historical authorizations from FILE"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/scripts/git/authenticate.scm:138
+msgid "Authenticating commits ~a to ~a (~h new commits)...~%"
+msgstr ""
+
+#: guix/scripts/git/authenticate.scm:178
+#, scheme-format
+msgid "wrong number of arguments; expected COMMIT and SIGNER~%"
+msgstr ""
+
+#: guix/scripts/hash.scm:50
 msgid ""
 "Usage: guix hash [OPTION] FILE\n"
 "Return the cryptographic hash of FILE.\n"
-"\n"
-"Supported formats: 'nix-base32' (default), 'base32', and 'base16' ('hex'\n"
-"and 'hexadecimal' can be used as well).\n"
 msgstr ""
 
-#: guix/scripts/hash.scm:52
+#: guix/scripts/hash.scm:56
 msgid ""
 "\n"
 "  -x, --exclude-vcs      exclude version control directories"
 msgstr ""
 
-#: guix/scripts/hash.scm:56
+#: guix/scripts/hash.scm:62
 msgid ""
 "\n"
 "  -r, --recursive        compute the hash on FILE recursively"
 msgstr ""
 
-#: guix/scripts/hash.scm:150 guix/ui.scm:326 guix/ui.scm:601 guix/ui.scm:654
+#: guix/scripts/hash.scm:172 guix/ui.scm:398 guix/ui.scm:429 guix/ui.scm:789
+#: guix/ui.scm:837 guix/ui.scm:893
 #, scheme-format
 msgid "~a~%"
 msgstr ""
 
-#: guix/scripts/hash.scm:153 guix/scripts/system.scm:1022
-#: guix/scripts/system.scm:1031 guix/scripts/system.scm:1038
+#: guix/scripts/hash.scm:175 guix/scripts/system.scm:1298
+#: guix/scripts/system.scm:1314 guix/scripts/system.scm:1321
+#: guix/scripts/system.scm:1327 guix/scripts/import/gnu.scm:103
+#: guix/scripts/import/nix.scm:90 guix/scripts/offload.scm:826
+#: guix/scripts/offload.scm:838
 #, scheme-format
 msgid "wrong number of arguments~%"
 msgstr ""
 
-#: guix/scripts/import.scm:86
+#: guix/scripts/import.scm:89
 msgid ""
 "Usage: guix import IMPORTER ARGS ...\n"
 "Run IMPORTER with ARGS.\n"
 msgstr ""
 
-#: guix/scripts/import.scm:89
+#: guix/scripts/import.scm:92
 msgid "IMPORTER must be one of the importers listed below:\n"
 msgstr ""
 
-#: guix/scripts/import.scm:103
+#: guix/scripts/import.scm:109
 #, scheme-format
 msgid "guix import: missing importer name~%"
 msgstr ""
 
-#: guix/scripts/import.scm:123
+#: guix/scripts/import.scm:131
 #, scheme-format
 msgid "'~a' import failed~%"
 msgstr ""
 
-#: guix/scripts/import.scm:124
+#: guix/scripts/import.scm:132
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid importer~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/scripts/import/cran.scm:43
+#: guix/scripts/import/cran.scm:44
 msgid ""
 "Usage: guix import cran PACKAGE-NAME\n"
 "Import and convert the CRAN package for PACKAGE-NAME.\n"
 msgstr ""
 
-#: guix/scripts/import/cran.scm:45
+#: guix/scripts/import/cran.scm:46 guix/scripts/import/texlive.scm:44
 msgid ""
 "\n"
 "  -a, --archive=ARCHIVE  specify the archive repository"
 msgstr ""
 
-#: guix/scripts/import/cran.scm:108
+#: guix/scripts/import/cran.scm:50 guix/scripts/import/crate.scm:46
+#: guix/scripts/import/opam.scm:45 guix/scripts/import/pypi.scm:46
+msgid ""
+"\n"
+"  -r, --recursive        import packages recursively"
+msgstr ""
+
+#: guix/scripts/import/cran.scm:52
+msgid ""
+"\n"
+"  -s, --style=STYLE      choose output style, either specification or variable"
+msgstr ""
+
+#: guix/scripts/import/cran.scm:116 guix/scripts/import/texlive.scm:95
 #, scheme-format
 msgid "failed to download description for package '~a'~%"
 msgstr ""
 
-#: guix/scripts/import/cran.scm:112 guix/scripts/import/elpa.scm:95
+#: guix/scripts/import/cran.scm:120 guix/scripts/import/elpa.scm:113
+#: guix/scripts/import/cpan.scm:90 guix/scripts/import/crate.scm:107
+#: guix/scripts/import/gem.scm:104 guix/scripts/import/go.scm:125
+#: guix/scripts/import/hackage.scm:161 guix/scripts/import/json.scm:100
+#: guix/scripts/import/opam.scm:110 guix/scripts/import/pypi.scm:105
+#: guix/scripts/import/stackage.scm:133 guix/scripts/import/texlive.scm:99
 #, scheme-format
 msgid "too few arguments~%"
 msgstr "太少参数~%"
 
-#: guix/scripts/import/cran.scm:114 guix/scripts/import/elpa.scm:97
+#: guix/scripts/import/cran.scm:122 guix/scripts/import/elpa.scm:115
+#: guix/scripts/import/cpan.scm:92 guix/scripts/import/crate.scm:109
+#: guix/scripts/import/gem.scm:106 guix/scripts/import/go.scm:127
+#: guix/scripts/import/hackage.scm:152 guix/scripts/import/hackage.scm:163
+#: guix/scripts/import/json.scm:102 guix/scripts/import/opam.scm:112
+#: guix/scripts/import/pypi.scm:107 guix/scripts/import/stackage.scm:135
+#: guix/scripts/import/texlive.scm:101
 #, scheme-format
 msgid "too many arguments~%"
 msgstr "太多参数~%"
 
-#: guix/scripts/import/elpa.scm:41
+#: guix/scripts/import/elpa.scm:44
 msgid ""
 "Usage: guix import elpa PACKAGE-NAME\n"
 "Import the latest package named PACKAGE-NAME from an ELPA repository.\n"
 msgstr ""
 
-#: guix/scripts/import/elpa.scm:43
+#: guix/scripts/import/elpa.scm:46
 msgid ""
 "\n"
 "  -a, --archive=ARCHIVE          specify the archive repository"
 msgstr ""
 
-#: guix/scripts/import/elpa.scm:45
+#: guix/scripts/import/elpa.scm:48
 msgid ""
 "\n"
 "  -h, --help                     display this help and exit"
@@ -975,225 +2826,228 @@ msgstr ""
 "\n"
 "  -h, --help                     显示这份说明然后离开"
 
-#: guix/scripts/import/elpa.scm:47
+#: guix/scripts/import/elpa.scm:50
+msgid ""
+"\n"
+"  -r, --recursive                generate package expressions for all Emacs packages that are not yet in Guix"
+msgstr ""
+
+#: guix/scripts/import/elpa.scm:52
 msgid ""
 "\n"
 "  -V, --version                  display version information and exit"
 msgstr ""
 "\n"
-"  -v, --version                  显示程序版本然后离开"
+"  -V, --version                  显示程序版本然后离开"
 
-#: guix/scripts/import/elpa.scm:92
+#: guix/scripts/import/elpa.scm:110
 #, scheme-format
 msgid "failed to download package '~a'~%"
 msgstr ""
 
-#: guix/scripts/pull.scm:60
-#, scheme-format
-msgid ""
-"Guile-Git is missing but it is now required by 'guix pull'.\n"
-"Install it by running:\n"
-"\n"
-"  guix package -i ~a\n"
-"  export GUILE_LOAD_PATH=$HOME/.guix-profile/share/guile/site/~a:$GUILE_LOAD_PATH\n"
-"  export GUILE_LOAD_COMPILED_PATH=$HOME/.guix-profile/lib/guile/~a/site-ccache:$GUILE_LOAD_COMPILED_PATH\n"
-"\n"
-msgstr ""
-
-#: guix/scripts/pull.scm:96
+#: guix/scripts/pull.scm:89
 msgid ""
 "Usage: guix pull [OPTION]...\n"
 "Download and deploy the latest version of Guix.\n"
 msgstr ""
 
-#: guix/scripts/pull.scm:100
+#: guix/scripts/pull.scm:91 guix/scripts/time-machine.scm:53
 msgid ""
 "\n"
-"      --url=URL          download from the Git repository at URL"
+"  -C, --channels=FILE    deploy the channels defined in FILE"
 msgstr ""
 
-#: guix/scripts/pull.scm:102
+#: guix/scripts/pull.scm:93
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
 msgid ""
 "\n"
-"      --commit=COMMIT    download the specified COMMIT"
+"      --url=URL          download \"guix\" channel from the Git repository at URL"
 msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
 
-#: guix/scripts/pull.scm:104
+#: guix/scripts/pull.scm:95
 msgid ""
 "\n"
-"      --branch=BRANCH    download the tip of the specified BRANCH"
+"      --commit=COMMIT    download the specified \"guix\" channel COMMIT"
 msgstr ""
 
-#: guix/scripts/pull.scm:106
+#: guix/scripts/pull.scm:97
 msgid ""
 "\n"
-"      --bootstrap        use the bootstrap Guile to build the new Guix"
+"      --branch=BRANCH    download the tip of the specified \"guix\" channel BRANCH"
 msgstr ""
 
-#: guix/scripts/pull.scm:192
-msgid "Guix already up to date\n"
+#: guix/scripts/pull.scm:99
+msgid ""
+"\n"
+"      --allow-downgrades allow downgrades to earlier channel revisions"
 msgstr ""
 
-#: guix/scripts/pull.scm:197
-#, scheme-format
-msgid "updated ~a successfully deployed under `~a'~%"
+#: guix/scripts/pull.scm:101 guix/scripts/time-machine.scm:61
+msgid ""
+"\n"
+"      --disable-authentication\n"
+"                         disable channel authentication"
 msgstr ""
 
-#: guix/scripts/pull.scm:200
-#, scheme-format
-msgid "failed to update Guix, check the build log~%"
+#: guix/scripts/pull.scm:104
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -h, --help             display this help and exit"
+msgid ""
+"\n"
+"  -N, --news             display news compared to the previous generation"
 msgstr ""
+"\n"
+"  -h, --help                 显示这份说明然后离开"
 
-#: guix/scripts/pull.scm:216
+#: guix/scripts/pull.scm:117
 #, scheme-format
-msgid "cannot enforce use of the Let's Encrypt certificates~%"
+msgid ""
+"\n"
+"  -p, --profile=PROFILE  use PROFILE instead of ~/.config/guix/current"
 msgstr ""
 
-#: guix/scripts/pull.scm:218
-#, scheme-format
-msgid "please upgrade Guile-Git~%"
-msgstr "请升级 Guile-Git~%"
-
-#: guix/scripts/pull.scm:226
-#, scheme-format
-msgid "Git error ~a~%"
-msgstr "Git 错误 ~a~%"
-
-#: guix/scripts/pull.scm:228
-#, scheme-format
-msgid "Git error: ~a~%"
-msgstr "Git 错误：~a~%"
-
-#: guix/scripts/pull.scm:262
-#, scheme-format
-msgid "Updating from Git repository at '~a'...~%"
+#: guix/scripts/pull.scm:123
+msgid ""
+"\n"
+"      --bootstrap        use the bootstrap Guile to build the new Guix"
 msgstr ""
 
-#: guix/scripts/pull.scm:271
+#: guix/scripts/pull.scm:212 guix/scripts/system/reconfigure.scm:328
 #, scheme-format
-msgid "Building from Git commit ~a...~%"
+msgid "rolling back channel '~a' from ~a to ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:125
+#: guix/scripts/pull.scm:215 guix/scripts/system/reconfigure.scm:331
 #, scheme-format
-msgid "authentication and authorization of substitutes disabled!~%"
+msgid "moving channel '~a' from ~a to unrelated commit ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:200
-#, scheme-format
-msgid "download from '~a' failed: ~a, ~s~%"
+#: guix/scripts/pull.scm:244
+msgid "New in this revision:\n"
 msgstr ""
 
-#: guix/scripts/substitute.scm:213
+#. TRANSLATORS: This describes a "channel"; the first placeholder is
+#. the channel name (e.g., "guix") and the second placeholder is its
+#. URL.
+#: guix/scripts/pull.scm:253
 #, scheme-format
-msgid "while fetching ~a: server is somewhat slow~%"
+msgid "    ~a at ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:215
+#: guix/scripts/pull.scm:291
 #, scheme-format
-msgid "try `--no-substitutes' if the problem persists~%"
+msgid "    commit ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:233
+#: guix/scripts/pull.scm:328
 #, scheme-format
-msgid "unsupported substitute URI scheme: ~a~%"
+msgid "News for channel '~a'~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:268
-#, fuzzy, scheme-format
-#| msgid "failed to connect to `~a': ~a~%"
-msgid "while fetching '~a': ~a (~s)~%"
-msgstr "连接到 `~a' 失败：~a~%"
-
-#: guix/scripts/substitute.scm:273
+#: guix/scripts/pull.scm:354
 #, scheme-format
-msgid "ignoring substitute server at '~s'~%"
-msgstr ""
+msgid "  ~a new channel:~%"
+msgid_plural "  ~a new channels:~%"
+msgstr[0] ""
 
-#: guix/scripts/substitute.scm:323
+#: guix/scripts/pull.scm:364
 #, scheme-format
-msgid "signature version must be a number: ~s~%"
-msgstr ""
+msgid "  ~a channel removed:~%"
+msgid_plural "  ~a channels removed:~%"
+msgstr[0] ""
 
-#: guix/scripts/substitute.scm:327
-#, scheme-format
-msgid "unsupported signature version: ~a~%"
+#: guix/scripts/pull.scm:440
+msgid "Run @command{guix pull --news} to read all the news."
 msgstr ""
 
-#: guix/scripts/substitute.scm:335
+#: guix/scripts/pull.scm:448
 #, scheme-format
-msgid "signature is not a valid s-expression: ~s~%"
+msgid ""
+"After setting @code{PATH}, run\n"
+"@command{hash guix} to make sure your shell refers to @file{~a}."
 msgstr ""
 
-#: guix/scripts/substitute.scm:339
+#: guix/scripts/pull.scm:483
 #, scheme-format
-msgid "invalid format of the signature field: ~a~%"
+msgid "Migrating profile generations to '~a'...~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:374
-#, scheme-format
-msgid "invalid signature for '~a'~%"
-msgstr "'~a'~% 签名无效"
-
-#: guix/scripts/substitute.scm:376
-#, scheme-format
-msgid "hash mismatch for '~a'~%"
-msgstr ""
+#: guix/scripts/pull.scm:527
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "while creating symlink '~a': ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
 
-#: guix/scripts/substitute.scm:378
-#, scheme-format
-msgid "'~a' is signed with an unauthorized key~%"
-msgstr ""
+#: guix/scripts/pull.scm:616
+#, fuzzy
+#| msgid "~A: unknown package~%"
+msgid "  ~h new package: ~a~%"
+msgid_plural "  ~h new packages: ~a~%"
+msgstr[0] "~A: 未知包~%"
 
-#: guix/scripts/substitute.scm:380
-#, scheme-format
-msgid "signature on '~a' is corrupt~%"
-msgstr ""
+#: guix/scripts/pull.scm:624
+#, fuzzy
+#| msgid "can be upgraded to ~a"
+msgid "  ~h package upgraded: ~a~%"
+msgid_plural "  ~h packages upgraded: ~a~%"
+msgstr[0] "可升级至 ~a"
 
-#: guix/scripts/substitute.scm:465
+#: guix/scripts/pull.scm:713
 #, scheme-format
-msgid "'~a' does not name a store item~%"
+msgid "'~a' did not return a list of channels~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:629
+#: guix/scripts/pull.scm:729
 #, scheme-format
-msgid "updating list of substitutes from '~a'... ~5,1f%"
+msgid ""
+"The 'GUIX_PULL_URL' environment variable is deprecated.\n"
+"Use '~/.config/guix/channels.scm' instead."
 msgstr ""
 
-#: guix/scripts/substitute.scm:693
+#: guix/scripts/pull.scm:802
 #, scheme-format
-msgid "~s: unsupported server URI scheme~%"
-msgstr ""
+msgid "Building from this channel:~%"
+msgid_plural "Building from these channels:~%"
+msgstr[0] ""
 
-#: guix/scripts/substitute.scm:703
+#: guix/scripts/substitute.scm:87
 #, scheme-format
-msgid "'~a' uses different store '~a'; ignoring it~%"
+msgid "authentication and authorization of substitutes disabled!~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:863
+#: guix/scripts/substitute.scm:222
 #, scheme-format
 msgid "host name lookup error: ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:868
+#: guix/scripts/substitute.scm:227
 #, scheme-format
 msgid "TLS error in procedure '~a': ~a~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:879
+#: guix/scripts/substitute.scm:238
 msgid ""
 "Usage: guix substitute [OPTION]...\n"
 "Internal tool to substitute a pre-built binary to a local build.\n"
 msgstr ""
 
-#: guix/scripts/substitute.scm:881
+#: guix/scripts/substitute.scm:240
 msgid ""
 "\n"
 "      --query            report on the availability of substitutes for the\n"
 "                         store file names passed on the standard input"
 msgstr ""
 
-#: guix/scripts/substitute.scm:884
+#: guix/scripts/substitute.scm:243
 msgid ""
 "\n"
 "      --substitute STORE-FILE DESTINATION\n"
@@ -1201,700 +3055,641 @@ msgid ""
 "                         DESTINATION"
 msgstr ""
 
-#: guix/scripts/substitute.scm:949
+#: guix/scripts/substitute.scm:323
+#, fuzzy, scheme-format
+#| msgid "invalid signature for '~a'~%"
+msgid "updating substitutes from '~a'... ~5,1f%"
+msgstr "'~a'~% 签名无效"
+
+#: guix/scripts/substitute.scm:462
+#, scheme-format
+msgid "download from '~a' failed: ~a, ~s~%"
+msgstr ""
+
+#: guix/scripts/substitute.scm:472
+#, scheme-format
+msgid "while fetching ~a: server is somewhat slow~%"
+msgstr ""
+
+#: guix/scripts/substitute.scm:474
+#, scheme-format
+msgid "try `--no-substitutes' if the problem persists~%"
+msgstr ""
+
+#: guix/scripts/substitute.scm:481
+#, scheme-format
+msgid "unsupported substitute URI scheme: ~a~%"
+msgstr ""
+
+#: guix/scripts/substitute.scm:485
 #, fuzzy, scheme-format
 #| msgid "invalid signature for '~a'~%"
 msgid "no valid substitute for '~a'~%"
 msgstr "'~a'~% 签名无效"
 
-#: guix/scripts/substitute.scm:956
+#: guix/scripts/substitute.scm:494
 #, scheme-format
 msgid "Downloading ~a...~%"
 msgstr ""
 
-#: guix/scripts/substitute.scm:1012
+#: guix/scripts/substitute.scm:598
 msgid "ACL for archive imports seems to be uninitialized, substitutes may be unavailable\n"
 msgstr ""
 
-#: guix/scripts/substitute.scm:1066
+#: guix/scripts/substitute.scm:683
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid URI~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/scripts/substitute.scm:1126
+#: guix/scripts/substitute.scm:770
 #, scheme-format
 msgid "~a: unrecognized options~%"
-msgstr ""
+msgstr "~a: 无法识别的选项~%"
 
-#: guix/scripts/authenticate.scm:59
-#, scheme-format
-msgid "cannot find public key for secret key '~a'~%"
-msgstr ""
+#: guix/scripts/authenticate.scm:64
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to load key pair at '~a': ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
 
-#: guix/scripts/authenticate.scm:79
-#, scheme-format
-msgid "error: invalid signature: ~a~%"
-msgstr ""
+#: guix/scripts/authenticate.scm:86
+#, fuzzy, scheme-format
+#| msgid "invalid signature"
+msgid "invalid signature: ~a"
+msgstr "无效签名"
 
-#: guix/scripts/authenticate.scm:81
-#, scheme-format
-msgid "error: unauthorized public key: ~a~%"
-msgstr ""
+#: guix/scripts/authenticate.scm:89
+#, fuzzy, scheme-format
+#| msgid "unauthorized public key"
+msgid "unauthorized public key: ~a"
+msgstr "公钥未被授权"
 
-#: guix/scripts/authenticate.scm:83
-#, scheme-format
-msgid "error: corrupt signature data: ~a~%"
-msgstr ""
+#: guix/scripts/authenticate.scm:92
+#, fuzzy, scheme-format
+#| msgid "corrupt signature data"
+msgid "corrupt signature data: ~a"
+msgstr "签名数据损坏"
 
-#: guix/scripts/authenticate.scm:121
+#: guix/scripts/authenticate.scm:184
 msgid ""
 "Usage: guix authenticate OPTION...\n"
-"Sign or verify the signature on the given file.  This tool is meant to\n"
-"be used internally by 'guix-daemon'.\n"
+"Sign data or verify signatures.  This tool is meant to be used internally by\n"
+"'guix-daemon'.\n"
 msgstr ""
 
-#: guix/scripts/authenticate.scm:127
-msgid "wrong arguments"
+#: guix/scripts/authenticate.scm:218
+#, fuzzy, scheme-format
+#| msgid "~a: invalid number~%"
+msgid "~s: invalid command; ignoring~%"
+msgstr "~a: 无效的数字~%"
+
+#: guix/scripts/authenticate.scm:223
+#, fuzzy, scheme-format
+#| msgid "wrong arguments"
+msgid "wrong arguments~%"
 msgstr "参数有误"
 
-#: guix/scripts/system.scm:135
+#: guix/scripts/system.scm:175
 #, scheme-format
-msgid "failed to register '~a' under '~a'~%"
+msgid "copying to '~a'..."
 msgstr ""
 
-#: guix/scripts/system.scm:174
-#, fuzzy, scheme-format
-#| msgid "failed to connect to `~a': ~a~%"
-msgid "failed to install bootloader ~a~%"
-msgstr "连接到 `~a' 失败：~a~%"
-
-#: guix/scripts/system.scm:194
+#: guix/scripts/system.scm:211
 #, scheme-format
 msgid "initializing the current root file system~%"
 msgstr ""
 
-#: guix/scripts/system.scm:208
+#: guix/scripts/system.scm:225
 #, scheme-format
 msgid "not running as 'root', so the ownership of '~a' may be incorrect!~%"
 msgstr ""
 
-#: guix/scripts/system.scm:253
+#: guix/scripts/system.scm:255 guix/scripts/system.scm:751
+#: guix/scripts/system.scm:857
+#, scheme-format
+msgid "bootloader successfully installed on '~a'~%"
+msgstr ""
+
+#: guix/scripts/system.scm:278
 #, scheme-format
 msgid "while talking to shepherd: ~a~%"
 msgstr ""
 
-#: guix/scripts/system.scm:260
+#: guix/scripts/system.scm:286
 #, fuzzy, scheme-format
 #| msgid "guix: ~a: command not found~%"
 msgid "service '~a' could not be found~%"
 msgstr "guix：~a：未找到命令~%"
 
-#: guix/scripts/system.scm:263
+#: guix/scripts/system.scm:289
 #, scheme-format
 msgid "service '~a' does not have an action '~a'~%"
 msgstr ""
 
-#: guix/scripts/system.scm:267
+#: guix/scripts/system.scm:293
 #, scheme-format
 msgid "exception caught while executing '~a' on service '~a':~%"
 msgstr ""
 
-#: guix/scripts/system.scm:275
+#: guix/scripts/system.scm:301
 #, scheme-format
 msgid "something went wrong: ~s~%"
 msgstr ""
 
-#: guix/scripts/system.scm:278
+#: guix/scripts/system.scm:304
 #, scheme-format
 msgid "shepherd error~%"
 msgstr ""
 
-#: guix/scripts/system.scm:295
-#, scheme-format
-msgid "failed to obtain list of shepherd services~%"
+#: guix/scripts/system.scm:308
+#, fuzzy, scheme-format
+#| msgid "guix: ~a: command not found~%"
+msgid "some services could not be upgraded~%"
+msgstr "guix：~a：未找到命令~%"
+
+#: guix/scripts/system.scm:309
+msgid ""
+"To allow changes to all the system services to take\n"
+"effect, you will need to reboot."
 msgstr ""
 
-#: guix/scripts/system.scm:315
+#: guix/scripts/system.scm:375
 #, scheme-format
-msgid "unloading service '~a'...~%"
+msgid "cannot switch to system generation '~a'~%"
 msgstr ""
 
-#: guix/scripts/system.scm:323
-#, scheme-format
-msgid "loading new services:~{ ~a~}...~%"
+#: guix/scripts/system.scm:451
+msgid "the DAG of services"
 msgstr ""
 
-#: guix/scripts/system.scm:347
-#, scheme-format
-msgid "activating system...~%"
+#: guix/scripts/system.scm:464
+msgid "the dependency graph of shepherd services"
 msgstr ""
 
-#: guix/scripts/system.scm:423
+#: guix/scripts/system.scm:479
 #, scheme-format
-msgid "cannot switch to system generation '~a'~%"
+msgid "      repository URL: ~a~%"
 msgstr ""
 
-#: guix/scripts/system.scm:494
-msgid "the DAG of services"
-msgstr ""
+#: guix/scripts/system.scm:481
+#, fuzzy, scheme-format
+#| msgid "  kernel: ~a~%"
+msgid "      branch: ~a~%"
+msgstr "  内核：~a~%"
 
-#: guix/scripts/system.scm:507
-msgid "the dependency graph of shepherd services"
+#: guix/scripts/system.scm:482
+#, scheme-format
+msgid "      commit: ~a~%"
 msgstr ""
 
-#: guix/scripts/system.scm:531
+#: guix/scripts/system.scm:502
 #, scheme-format
 msgid "  file name: ~a~%"
 msgstr "  文件名：~a~%"
 
-#: guix/scripts/system.scm:532
+#: guix/scripts/system.scm:503
 #, scheme-format
 msgid "  canonical file name: ~a~%"
 msgstr ""
 
 #. TRANSLATORS: Please preserve the two-space indentation.
-#: guix/scripts/system.scm:534
+#: guix/scripts/system.scm:505
 #, scheme-format
 msgid "  label: ~a~%"
 msgstr ""
 
-#: guix/scripts/system.scm:535
+#: guix/scripts/system.scm:506
 #, fuzzy, scheme-format
 #| msgid "  file name: ~a~%"
 msgid "  bootloader: ~a~%"
 msgstr "  文件名：~a~%"
 
-#: guix/scripts/system.scm:536
+#. TRANSLATORS: The '~[', '~;', and '~]' sequences in this string must
+#. be preserved.  They denote conditionals, such that the result will
+#. look like:
+#. root device: UUID: 12345-678
+#. or:
+#. root device: label: "my-root"
+#. or just:
+#. root device: /dev/sda3
+#: guix/scripts/system.scm:516
 #, scheme-format
-msgid "  root device: ~a~%"
+msgid "  root device: ~[UUID: ~a~;label: ~s~;~a~]~%"
 msgstr ""
 
-#: guix/scripts/system.scm:540
+#: guix/scripts/system.scm:522
 #, scheme-format
 msgid "  kernel: ~a~%"
 msgstr "  内核：~a~%"
 
-#: guix/scripts/system.scm:600
+#: guix/scripts/system.scm:527
+#, fuzzy, scheme-format
+#| msgid "  file name: ~a~%"
+msgid "  multiboot: ~a~%"
+msgstr "  文件名：~a~%"
+
+#. TRANSLATORS: Here "channel" is the same terminology as used in
+#. "guix describe" and "guix pull --channels".
+#: guix/scripts/system.scm:533
 #, scheme-format
-msgid "~a: error: file system with label '~a' not found~%"
+msgid "  channels:~%"
 msgstr ""
 
-#: guix/scripts/system.scm:606
+#: guix/scripts/system.scm:536
+#, fuzzy, scheme-format
+#| msgid "no configuration file specified~%"
+msgid "  configuration file: ~a~%"
+msgstr "未指定配置文件~%"
+
+#: guix/scripts/system.scm:609
+#, fuzzy, scheme-format
+#| msgid "guix: ~a: command not found~%"
+msgid "device '~a' not found: ~a~%"
+msgstr "guix：~a：未找到命令~%"
+
+#: guix/scripts/system.scm:612
 #, scheme-format
-msgid "~a: error: file system with UUID '~a' not found~%"
+msgid ""
+"If '~a' is a file system\n"
+"label, write @code{(file-system-label ~s)} in your @code{device} field."
+msgstr ""
+
+#: guix/scripts/system.scm:621
+#, scheme-format
+msgid "file system with label '~a' not found~%"
 msgstr ""
 
-#: guix/scripts/system.scm:658
+#: guix/scripts/system.scm:627
 #, scheme-format
-msgid "~a not found: 'guix pull' was never run~%"
+msgid "file system with UUID '~a' not found~%"
 msgstr ""
 
-#: guix/scripts/system.scm:659
+#: guix/scripts/system.scm:714
+#, scheme-format
+msgid "'disk-image' is deprecated: use 'image' instead~%"
+msgstr ""
+
+#: guix/scripts/system.scm:716
+#, scheme-format
+msgid "'vm-image' is deprecated: use 'image' instead~%"
+msgstr ""
+
+#: guix/scripts/system.scm:729
 #, scheme-format
 msgid "Consider running 'guix pull' before 'reconfigure'.~%"
 msgstr ""
 
-#: guix/scripts/system.scm:660
+#: guix/scripts/system.scm:730
 #, scheme-format
 msgid "Failing to do that may downgrade your system!~%"
 msgstr ""
 
-#: guix/scripts/system.scm:767
+#: guix/scripts/system.scm:850
+#, scheme-format
+msgid "activating system...~%"
+msgstr ""
+
+#: guix/scripts/system.scm:861
+msgid ""
+"To complete the upgrade, run 'herd restart SERVICE' to stop,\n"
+"upgrade, and restart each service that was not automatically restarted.\n"
+msgstr ""
+
+#: guix/scripts/system.scm:864
+msgid "Run 'herd status' to view the list of services on your system.\n"
+msgstr ""
+
+#: guix/scripts/system.scm:868
 #, scheme-format
 msgid "initializing operating system under '~a'...~%"
 msgstr ""
 
-#: guix/scripts/system.scm:812
+#: guix/scripts/system.scm:888 guix/scripts/graph.scm:437
+#, scheme-format
+msgid "~a: unknown backend~%"
+msgstr "~a：未知后端~%"
+
+#: guix/scripts/system.scm:925
+msgid "The available image types are:\n"
+msgstr ""
+
+#: guix/scripts/system.scm:935
 msgid ""
 "Usage: guix system [OPTION ...] ACTION [ARG ...] [FILE]\n"
 "Build the operating system declared in FILE according to ACTION.\n"
 "Some ACTIONS support additional ARGS.\n"
 msgstr ""
 
-#: guix/scripts/system.scm:816 guix/scripts/container.scm:28
-msgid "The valid values for ACTION are:\n"
-msgstr ""
-
-#: guix/scripts/system.scm:818
+#: guix/scripts/system.scm:941
 msgid "   search           search for existing service types\n"
 msgstr ""
 
-#: guix/scripts/system.scm:820
+#: guix/scripts/system.scm:943
 msgid "   reconfigure      switch to a new operating system configuration\n"
 msgstr ""
 
-#: guix/scripts/system.scm:822
+#: guix/scripts/system.scm:945
 msgid "   roll-back        switch to the previous operating system configuration\n"
 msgstr ""
 
-#: guix/scripts/system.scm:824
-msgid "   switch-generation switch to an existing operating system configuration\n"
+#: guix/scripts/system.scm:947
+msgid "   describe         describe the current system\n"
 msgstr ""
 
-#: guix/scripts/system.scm:826
+#: guix/scripts/system.scm:949
 msgid "   list-generations list the system generations\n"
 msgstr ""
 
-#: guix/scripts/system.scm:828
+#: guix/scripts/system.scm:951
+msgid "   switch-generation switch to an existing operating system configuration\n"
+msgstr ""
+
+#: guix/scripts/system.scm:953
+msgid "   delete-generations delete old system generations\n"
+msgstr ""
+
+#: guix/scripts/system.scm:955
 msgid "   build            build the operating system without installing anything\n"
 msgstr ""
 
-#: guix/scripts/system.scm:830
+#: guix/scripts/system.scm:957
 msgid "   container        build a container that shares the host's store\n"
 msgstr ""
 
-#: guix/scripts/system.scm:832
+#: guix/scripts/system.scm:959
 msgid "   vm               build a virtual machine image that shares the host's store\n"
 msgstr ""
 
-#: guix/scripts/system.scm:834
-msgid "   vm-image         build a freestanding virtual machine image\n"
+#: guix/scripts/system.scm:961
+msgid "   image            build a Guix System image\n"
 msgstr ""
 
-#: guix/scripts/system.scm:836
-msgid "   disk-image       build a disk image, suitable for a USB stick\n"
+#: guix/scripts/system.scm:963
+msgid "   docker-image     build a Docker image\n"
 msgstr ""
 
-#: guix/scripts/system.scm:838
+#: guix/scripts/system.scm:965
 msgid "   init             initialize a root file system to run GNU\n"
 msgstr ""
 
-#: guix/scripts/system.scm:840
+#: guix/scripts/system.scm:967
 msgid "   extension-graph  emit the service extension graph in Dot format\n"
 msgstr ""
 
-#: guix/scripts/system.scm:842
+#: guix/scripts/system.scm:969
 msgid "   shepherd-graph   emit the graph of shepherd services in Dot format\n"
 msgstr ""
 
-#: guix/scripts/system.scm:846
+#: guix/scripts/system.scm:973
 msgid ""
 "\n"
 "  -d, --derivation       return the derivation of the given system"
 msgstr ""
 
-#: guix/scripts/system.scm:848
+#: guix/scripts/system.scm:975
 msgid ""
 "\n"
-"      --on-error=STRATEGY\n"
-"                         apply STRATEGY when an error occurs while reading FILE"
+"  -e, --expression=EXPR  consider the operating-system EXPR evaluates to\n"
+"                         instead of reading FILE, when applicable"
 msgstr ""
 
-#: guix/scripts/system.scm:851
+#: guix/scripts/system.scm:978
 msgid ""
 "\n"
-"      --file-system-type=TYPE\n"
-"                         for 'disk-image', produce a root file system of TYPE\n"
-"                         (one of 'ext4', 'iso9660')"
+"      --allow-downgrades for 'reconfigure', allow downgrades to earlier\n"
+"                         channel revisions"
 msgstr ""
 
-#: guix/scripts/system.scm:855
+#: guix/scripts/system.scm:981
 msgid ""
 "\n"
-"      --image-size=SIZE  for 'vm-image', produce an image of SIZE"
+"      --on-error=STRATEGY\n"
+"                         apply STRATEGY (one of nothing-special, backtrace,\n"
+"                         or debug) when an error occurs while reading FILE"
 msgstr ""
 
-#: guix/scripts/system.scm:857
+#: guix/scripts/system.scm:985
 msgid ""
 "\n"
-"      --no-bootloader    for 'init', do not install a bootloader"
+"      --list-image-types list available image types"
 msgstr ""
 
-#: guix/scripts/system.scm:859
+#: guix/scripts/system.scm:987
 msgid ""
 "\n"
-"      --share=SPEC       for 'vm', share host file system according to SPEC"
+"  -t, --image-type=TYPE  for 'image', produce an image of TYPE"
 msgstr ""
 
-#: guix/scripts/system.scm:861
+#: guix/scripts/system.scm:989
 msgid ""
 "\n"
-"  -r, --root=FILE        for 'vm', 'vm-image', 'disk-image', 'container',\n"
-"                         and 'build', make FILE a symlink to the result, and\n"
-"                         register it as a garbage collector root"
+"      --image-size=SIZE  for 'image', produce an image of SIZE"
 msgstr ""
 
-#: guix/scripts/system.scm:865
+#: guix/scripts/system.scm:991
 msgid ""
 "\n"
-"      --expose=SPEC      for 'vm', expose host file system according to SPEC"
+"      --no-bootloader    for 'init', do not install a bootloader"
 msgstr ""
 
-#: guix/scripts/system.scm:867
+#: guix/scripts/system.scm:993
 msgid ""
 "\n"
-"      --full-boot        for 'vm', make a full boot sequence"
-msgstr ""
-
-#: guix/scripts/system.scm:959
-#, scheme-format
-msgid "no configuration file specified~%"
-msgstr "未指定配置文件~%"
-
-#: guix/scripts/system.scm:1057
-#, scheme-format
-msgid "~a: unknown action~%"
-msgstr "~a：未知操作~%"
-
-#: guix/scripts/system.scm:1072
-#, scheme-format
-msgid "wrong number of arguments for action '~a'~%"
+"      --volatile         for 'image', make the root file system volatile"
 msgstr ""
 
-#: guix/scripts/system.scm:1077
-#, scheme-format
-msgid "guix system: missing command name~%"
-msgstr ""
-
-#: guix/scripts/system.scm:1079
-#, scheme-format
-msgid "Try 'guix system --help' for more information.~%"
-msgstr ""
-
-#: guix/scripts/system/search.scm:64 guix/ui.scm:1057 guix/ui.scm:1071
-msgid "unknown"
-msgstr "未知"
-
-#: guix/scripts/lint.scm:138
-#, scheme-format
-msgid "Available checkers:~%"
-msgstr ""
-
-#: guix/scripts/lint.scm:162
-msgid "description should not be empty"
-msgstr "描述不应为空"
-
-#: guix/scripts/lint.scm:172
-msgid "Texinfo markup in description is invalid"
-msgstr ""
-
-#: guix/scripts/lint.scm:182
-#, scheme-format
+#: guix/scripts/system.scm:995
 msgid ""
-"description should not contain ~\n"
-"trademark sign '~a' at ~d"
-msgstr ""
-
-#. TRANSLATORS: '@code' is Texinfo markup and must be kept
-#. as is.
-#: guix/scripts/lint.scm:195
-msgid "use @code or similar ornament instead of quotes"
-msgstr ""
-
-#: guix/scripts/lint.scm:202
-msgid "description should start with an upper-case letter or digit"
+"\n"
+"      --label=LABEL      for 'image', label disk image with LABEL"
 msgstr ""
 
-#: guix/scripts/lint.scm:218
-#, scheme-format
+#: guix/scripts/system.scm:997 guix/scripts/pack.scm:1099
 msgid ""
-"sentences in description should be followed ~\n"
-"by two spaces; possible infraction~p at ~{~a~^, ~}"
-msgstr ""
-
-#: guix/scripts/lint.scm:236
-#, scheme-format
-msgid "invalid description: ~s"
-msgstr "无效的描述：~s"
-
-#: guix/scripts/lint.scm:281
-#, scheme-format
-msgid "'~a' should probably be a native input"
-msgstr ""
-
-#: guix/scripts/lint.scm:297
-#, scheme-format
-msgid "'~a' should probably not be an input at all"
+"\n"
+"      --save-provenance  save provenance information"
 msgstr ""
 
-#: guix/scripts/lint.scm:314
-msgid "synopsis should not be empty"
+#: guix/scripts/system.scm:999
+msgid ""
+"\n"
+"      --share=SPEC       for 'vm' and 'container', share host file system with\n"
+"                         read/write access according to SPEC"
 msgstr ""
 
-#: guix/scripts/lint.scm:322
-msgid "no period allowed at the end of the synopsis"
+#: guix/scripts/system.scm:1002
+msgid ""
+"\n"
+"      --expose=SPEC      for 'vm' and 'container', expose host file system\n"
+"                         directory as read-only according to SPEC"
 msgstr ""
 
-#: guix/scripts/lint.scm:334
-msgid "no article allowed at the beginning of the synopsis"
+#: guix/scripts/system.scm:1005
+msgid ""
+"\n"
+"  -N, --network          for 'container', allow containers to access the network"
 msgstr ""
 
-#: guix/scripts/lint.scm:341
-msgid "synopsis should be less than 80 characters long"
+#: guix/scripts/system.scm:1007
+msgid ""
+"\n"
+"  -r, --root=FILE        for 'vm', 'image', 'container' and 'build',\n"
+"                         make FILE a symlink to the result, and\n"
+"                         register it as a garbage collector root"
 msgstr ""
 
-#: guix/scripts/lint.scm:347
-msgid "synopsis should start with an upper-case letter or digit"
+#: guix/scripts/system.scm:1011
+msgid ""
+"\n"
+"      --full-boot        for 'vm', make a full boot sequence"
 msgstr ""
 
-#: guix/scripts/lint.scm:354
-msgid "synopsis should not start with the package name"
+#: guix/scripts/system.scm:1013
+msgid ""
+"\n"
+"      --skip-checks      skip file system and initrd module safety checks"
 msgstr ""
 
-#: guix/scripts/lint.scm:364
-msgid "Texinfo markup in synopsis is invalid"
+#: guix/scripts/system.scm:1020
+msgid ""
+"\n"
+"      --graph-backend=BACKEND\n"
+"                         use BACKEND for 'extension-graphs' and 'shepherd-graph'"
 msgstr ""
 
-#: guix/scripts/lint.scm:383
-#, fuzzy, scheme-format
-#| msgid "invalid syntax: ~a~%"
-msgid "invalid synopsis: ~s"
-msgstr "无效语法: ~a~%"
-
-#: guix/scripts/lint.scm:502
+#: guix/scripts/system.scm:1162
 #, scheme-format
-msgid "URI ~a returned suspiciously small file (~a bytes)"
+msgid "'~a' does not return an operating system or an image~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:512
+#: guix/scripts/system.scm:1186
 #, scheme-format
-msgid "permanent redirect from ~a to ~a"
+msgid "both file and expression cannot be specified~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:519
+#: guix/scripts/system.scm:1193
 #, fuzzy, scheme-format
-#| msgid "ambiguous package specification `~a'~%"
-msgid "invalid permanent redirect from ~a"
-msgstr "含糊的软件包规范 `~a'~%"
-
-#: guix/scripts/lint.scm:526 guix/scripts/lint.scm:538
-#, scheme-format
-msgid "URI ~a not reachable: ~a (~s)"
-msgstr ""
-
-#: guix/scripts/lint.scm:545
-#, scheme-format
-msgid "URI ~a domain not found: ~a"
-msgstr ""
-
-#: guix/scripts/lint.scm:553
-#, scheme-format
-msgid "URI ~a unreachable: ~a"
-msgstr ""
-
-#: guix/scripts/lint.scm:562
-#, scheme-format
-msgid "TLS certificate error: ~a"
-msgstr "TLS 证书错误：~a"
-
-#: guix/scripts/lint.scm:583
-msgid "invalid value for home page"
-msgstr "无效的主页值"
-
-#: guix/scripts/lint.scm:586
-#, scheme-format
-msgid "invalid home page URL: ~s"
-msgstr "无效的主页 URL：~s"
-
-#: guix/scripts/lint.scm:606
-msgid "file names of patches should start with the package name"
-msgstr ""
-
-#: guix/scripts/lint.scm:644
-#, scheme-format
-msgid "~a: ~a: proposed synopsis: ~s~%"
-msgstr ""
-
-#: guix/scripts/lint.scm:657
-#, scheme-format
-msgid "~a: ~a: proposed description:~%     \"~a\"~%"
-msgstr ""
-
-#: guix/scripts/lint.scm:699
-msgid "all the source URIs are unreachable:"
-msgstr ""
-
-#: guix/scripts/lint.scm:721
-msgid "the source file name should contain the package name"
-msgstr ""
-
-#: guix/scripts/lint.scm:737
-#, scheme-format
-msgid "URL should be 'mirror://~a/~a'"
-msgstr ""
-
-#: guix/scripts/lint.scm:755 guix/scripts/lint.scm:759
-#, scheme-format
-msgid "failed to create derivation: ~a"
-msgstr ""
-
-#: guix/scripts/lint.scm:773
-#, scheme-format
-msgid "failed to create derivation: ~s~%"
-msgstr ""
-
-#: guix/scripts/lint.scm:783
-msgid "invalid license field"
-msgstr "无效的许可证字段"
-
-#: guix/scripts/lint.scm:799
-#, scheme-format
-msgid "~a: HTTP GET error for ~a: ~a (~s)~%"
-msgstr ""
+#| msgid "no configuration file specified~%"
+msgid "no configuration specified~%"
+msgstr "未指定配置文件~%"
 
-#: guix/scripts/lint.scm:809
+#: guix/scripts/system.scm:1303
 #, scheme-format
-msgid "~a: host lookup failure: ~a~%"
+msgid "no system generation, nothing to describe~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:814
+#: guix/scripts/system.scm:1349
 #, scheme-format
-msgid "~a: TLS certificate error: ~a"
-msgstr "~a：TLS 证书错误：~a"
-
-#: guix/scripts/lint.scm:829
-msgid "while retrieving CVE vulnerabilities"
-msgstr ""
+msgid "~a: unknown action~%"
+msgstr "~a：未知操作~%"
 
-#: guix/scripts/lint.scm:866
+#: guix/scripts/system.scm:1365
 #, scheme-format
-msgid "probably vulnerable to ~a"
+msgid "wrong number of arguments for action '~a'~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:873
+#: guix/scripts/system.scm:1370
 #, scheme-format
-msgid "while retrieving upstream info for '~a'"
+msgid "guix system: missing command name~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:881
-#, scheme-format
-msgid "can be upgraded to ~a"
-msgstr "可升级至 ~a"
-
-#: guix/scripts/lint.scm:896
+#: guix/scripts/system.scm:1372
 #, scheme-format
-msgid "tabulation on line ~a, column ~a"
-msgstr ""
+msgid "Try 'guix system --help' for more information.~%"
+msgstr "尝试 'guix --help' 以获取更多信息。~%"
 
-#: guix/scripts/lint.scm:905
-#, scheme-format
-msgid "trailing white space on line ~a"
-msgstr ""
+#: guix/scripts/system/search.scm:93 guix/ui.scm:1544 guix/ui.scm:1562
+msgid "unknown"
+msgstr "未知"
 
-#: guix/scripts/lint.scm:915
-#, scheme-format
-msgid "line ~a is way too long (~a characters)"
-msgstr ""
+#: guix/scripts/lint.scm:58
+#, fuzzy, scheme-format
+#| msgid "~a: error: ~a~%"
+msgid "~a@~a: ~a~%"
+msgstr "~a：错误：~a~%"
 
-#: guix/scripts/lint.scm:926
+#: guix/scripts/lint.scm:82
 #, scheme-format
-msgid "line ~a: parentheses feel lonely, move to the previous or next line"
-msgstr ""
-
-#: guix/scripts/lint.scm:996
-msgid "Validate package descriptions"
-msgstr ""
-
-#: guix/scripts/lint.scm:1000
-msgid "Validate synopsis & description of GNU packages"
-msgstr ""
-
-#: guix/scripts/lint.scm:1004
-msgid "Identify inputs that should be native inputs"
-msgstr ""
-
-#: guix/scripts/lint.scm:1008
-msgid "Identify inputs that should be inputs at all"
-msgstr ""
-
-#: guix/scripts/lint.scm:1012
-msgid "Validate file names and availability of patches"
-msgstr ""
-
-#: guix/scripts/lint.scm:1016
-msgid "Validate home-page URLs"
-msgstr ""
-
-#. TRANSLATORS: <license> is the name of a data type and must not be
-#. translated.
-#: guix/scripts/lint.scm:1022
-msgid "Make sure the 'license' field is a <license> or a list thereof"
-msgstr ""
-
-#: guix/scripts/lint.scm:1027
-msgid "Validate source URLs"
-msgstr ""
-
-#: guix/scripts/lint.scm:1031
-msgid "Suggest 'mirror://' URLs"
-msgstr ""
-
-#: guix/scripts/lint.scm:1035
-msgid "Validate file names of sources"
-msgstr ""
-
-#: guix/scripts/lint.scm:1039
-msgid "Report failure to compile a package to a derivation"
-msgstr ""
-
-#: guix/scripts/lint.scm:1043
-msgid "Validate package synopses"
-msgstr ""
-
-#: guix/scripts/lint.scm:1047
-msgid "Check the Common Vulnerabilities and Exposures (CVE) database"
-msgstr ""
-
-#: guix/scripts/lint.scm:1052
-msgid "Check the package for new upstream releases"
-msgstr ""
-
-#: guix/scripts/lint.scm:1056
-msgid "Look for formatting issues in the source"
+msgid "Available checkers:~%"
 msgstr ""
 
-#: guix/scripts/lint.scm:1084
+#: guix/scripts/lint.scm:100
 msgid ""
 "Usage: guix lint [OPTION]... [PACKAGE]...\n"
 "Run a set of checkers on the specified package; if none is specified,\n"
 "run the checkers on all packages.\n"
 msgstr ""
 
-#: guix/scripts/lint.scm:1087
+#: guix/scripts/lint.scm:103
 msgid ""
 "\n"
 "  -c, --checkers=CHECKER1,CHECKER2...\n"
 "                         only run the specified checkers"
 msgstr ""
 
-#: guix/scripts/lint.scm:1092
+#: guix/scripts/lint.scm:106
+msgid ""
+"\n"
+"  -x, --exclude=CHECKER1,CHECKER2...\n"
+"                         exclude the specified checkers"
+msgstr ""
+
+#: guix/scripts/lint.scm:109
+msgid ""
+"\n"
+"  -n, --no-network       only run checkers that do not access the network"
+msgstr ""
+
+#: guix/scripts/lint.scm:117
 msgid ""
 "\n"
 "  -l, --list-checkers    display the list of available lint checkers"
 msgstr ""
 
-#: guix/scripts/lint.scm:1112
+#: guix/scripts/lint.scm:136
 #, scheme-format
 msgid "~a: invalid checker~%"
 msgstr ""
 
-#: guix/scripts/publish.scm:68
+#: guix/scripts/publish.scm:82
 #, scheme-format
 msgid ""
 "Usage: guix publish [OPTION]...\n"
 "Publish ~a over HTTP.\n"
 msgstr ""
 
-#: guix/scripts/publish.scm:70
+#: guix/scripts/publish.scm:84
 msgid ""
 "\n"
 "  -p, --port=PORT        listen on PORT"
 msgstr ""
 
-#: guix/scripts/publish.scm:72
+#: guix/scripts/publish.scm:86
 msgid ""
 "\n"
 "      --listen=HOST      listen on the network interface for HOST"
 msgstr ""
 
-#: guix/scripts/publish.scm:74
+#: guix/scripts/publish.scm:88
 msgid ""
 "\n"
 "  -u, --user=USER        change privileges to USER as soon as possible"
 msgstr ""
 
-#: guix/scripts/publish.scm:76
+#: guix/scripts/publish.scm:90
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -n, --dry-run          do not build the derivations"
+msgid ""
+"\n"
+"  -a, --advertise        advertise on the local network"
+msgstr ""
+"\n"
+"  -n, --dry-run          不要构建派生包"
+
+#: guix/scripts/publish.scm:92
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -1902,131 +3697,144 @@ msgstr ""
 #| "                         compare build results with those at URLS"
 msgid ""
 "\n"
-"  -C, --compression[=LEVEL]\n"
-"                         compress archives at LEVEL"
+"  -C, --compression[=METHOD:LEVEL]\n"
+"                         compress archives with METHOD at LEVEL"
 msgstr ""
 "\n"
 "      --substitute-urls=URLS\n"
 "                         与 URLS 的构建结果对比"
 
-#: guix/scripts/publish.scm:79
+#: guix/scripts/publish.scm:95
 msgid ""
 "\n"
 "  -c, --cache=DIRECTORY  cache published items to DIRECTORY"
 msgstr ""
 
-#: guix/scripts/publish.scm:81
+#: guix/scripts/publish.scm:97
+msgid ""
+"\n"
+"      --cache-bypass-threshold=SIZE\n"
+"                         serve store items below SIZE even when not cached"
+msgstr ""
+
+#: guix/scripts/publish.scm:100
 msgid ""
 "\n"
 "      --workers=N        use N workers to bake items"
 msgstr ""
 
-#: guix/scripts/publish.scm:83
+#: guix/scripts/publish.scm:102
 msgid ""
 "\n"
 "      --ttl=TTL          announce narinfos can be cached for TTL seconds"
 msgstr ""
 
-#: guix/scripts/publish.scm:85
+#: guix/scripts/publish.scm:104
 msgid ""
 "\n"
 "      --nar-path=PATH    use PATH as the prefix for nar URLs"
 msgstr ""
 
-#: guix/scripts/publish.scm:87
+#: guix/scripts/publish.scm:106
 msgid ""
 "\n"
 "      --public-key=FILE  use FILE as the public key for signatures"
 msgstr ""
 
-#: guix/scripts/publish.scm:89
+#: guix/scripts/publish.scm:108
 msgid ""
 "\n"
 "      --private-key=FILE use FILE as the private key for signatures"
 msgstr ""
 
-#: guix/scripts/publish.scm:91
+#: guix/scripts/publish.scm:110
 msgid ""
 "\n"
 "  -r, --repl[=PORT]      spawn REPL server on PORT"
 msgstr ""
 
-#: guix/scripts/publish.scm:107
+#: guix/scripts/publish.scm:126
 #, scheme-format
 msgid "lookup of host '~a' failed: ~a~%"
 msgstr ""
 
-#: guix/scripts/publish.scm:152
+#: guix/scripts/publish.scm:183
 #, scheme-format
 msgid "lookup of host '~a' returned nothing"
 msgstr ""
 
-#: guix/scripts/publish.scm:165
+#: guix/scripts/publish.scm:206
 #, scheme-format
-msgid "zlib support is missing; compression disabled~%"
+msgid "~a: unsupported compression type~%"
 msgstr ""
 
-#: guix/scripts/publish.scm:179
+#: guix/scripts/publish.scm:224
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid duration~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/scripts/publish.scm:832
+#: guix/scripts/publish.scm:1077
+#, fuzzy, scheme-format
+#| msgid "deleting ~a~%"
+msgid "Advertising ~a~%."
+msgstr "正删除 ~a~%"
+
+#: guix/scripts/publish.scm:1108
 #, scheme-format
 msgid "user '~a' not found: ~a~%"
 msgstr ""
 
-#: guix/scripts/publish.scm:873
+#: guix/scripts/publish.scm:1160
 #, scheme-format
 msgid "server running as root; consider using the '--user' option!~%"
 msgstr ""
 
-#: guix/scripts/publish.scm:878
+#: guix/scripts/publish.scm:1168
 #, scheme-format
 msgid "publishing ~a on ~a, port ~d~%"
 msgstr ""
 
-#: guix/scripts/edit.scm:41
+#: guix/scripts/publish.scm:1174
+#, scheme-format
+msgid "using '~a' compression method, level ~a~%"
+msgstr ""
+
+#: guix/scripts/edit.scm:45
 msgid ""
 "Usage: guix edit PACKAGE...\n"
 "Start $VISUAL or $EDITOR to edit the definitions of PACKAGE...\n"
 msgstr ""
 
-#: guix/scripts/edit.scm:62
+#: guix/scripts/edit.scm:68
 #, scheme-format
 msgid "file '~a' not found in search path ~s~%"
 msgstr ""
 
-#: guix/scripts/edit.scm:90
-#, scheme-format
-msgid "source location of package '~a' is unknown~%"
-msgstr ""
-
-#: guix/scripts/edit.scm:103
+#: guix/scripts/edit.scm:104
 #, fuzzy, scheme-format
 #| msgid "failed to connect to `~a': ~a~%"
 msgid "failed to launch '~a': ~a~%"
 msgstr "连接到 `~a' 失败：~a~%"
 
-#: guix/scripts/size.scm:77
+#: guix/scripts/size.scm:71
 #, scheme-format
 msgid "no available substitute information for '~a'~%"
 msgstr ""
 
-#: guix/scripts/size.scm:99
+#: guix/scripts/size.scm:93
 msgid "store item"
 msgstr ""
 
-#: guix/scripts/size.scm:99
+#: guix/scripts/size.scm:93
 msgid "total"
 msgstr "总用量"
 
-#: guix/scripts/size.scm:99
+#: guix/scripts/size.scm:93
 msgid "self"
 msgstr ""
 
-#: guix/scripts/size.scm:107
+#: guix/scripts/size.scm:101
 #, scheme-format
 msgid "total: ~,1f MiB~%"
 msgstr ""
@@ -2034,19 +3842,23 @@ msgstr ""
 #. TRANSLATORS: This is the title of a graph, meaning that the graph
 #. represents a profile of the store (the "store" being the place where
 #. packages are stored.)
-#: guix/scripts/size.scm:221
+#: guix/scripts/size.scm:224
 msgid "store profile"
 msgstr ""
 
-#: guix/scripts/size.scm:230
+#: guix/scripts/size.scm:233
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
 msgid ""
-"Usage: guix size [OPTION]... PACKAGE\n"
-"Report the size of PACKAGE and its dependencies.\n"
+"Usage: guix size [OPTION]... PACKAGE|STORE-ITEM\n"
+"Report the size of the PACKAGE or STORE-ITEM, with its dependencies.\n"
 msgstr ""
 "用法：guix size [选项]... 软件包\n"
 "报告 <软件包> 及其依赖的大小。\n"
 
-#: guix/scripts/size.scm:235
+#: guix/scripts/size.scm:238
 msgid ""
 "\n"
 "  -s, --system=SYSTEM    consider packages for SYSTEM--e.g., \"i686-linux\""
@@ -2055,192 +3867,236 @@ msgstr ""
 "  -s, --system=系统      为 <系统> 考虑包——比如，\"i686-linux\""
 
 #. TRANSLATORS: "closure" and "self" must not be translated.
-#: guix/scripts/size.scm:238
+#: guix/scripts/size.scm:241
 msgid ""
 "\n"
 "      --sort=KEY         sort according to KEY--\"closure\" or \"self\""
 msgstr ""
 
-#: guix/scripts/size.scm:240
+#: guix/scripts/size.scm:243
 msgid ""
 "\n"
 "  -m, --map-file=FILE    write to FILE a graphical map of disk usage"
 msgstr ""
 
-#: guix/scripts/size.scm:271
+#: guix/scripts/size.scm:277
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid sorting key~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/scripts/size.scm:306
+#: guix/scripts/size.scm:318
 msgid "missing store item argument\n"
 msgstr ""
 
-#: guix/scripts/graph.scm:84
+#: guix/scripts/graph.scm:95
 #, scheme-format
 msgid "~a: invalid argument (package name expected)"
 msgstr ""
 
-#: guix/scripts/graph.scm:95
+#: guix/scripts/graph.scm:106
 msgid "the DAG of packages, excluding implicit inputs"
 msgstr ""
 
-#: guix/scripts/graph.scm:121
+#: guix/scripts/graph.scm:142
 msgid "the reverse DAG of packages"
 msgstr ""
 
-#: guix/scripts/graph.scm:171
+#: guix/scripts/graph.scm:192
 msgid "the DAG of packages, including implicit inputs"
 msgstr ""
 
-#: guix/scripts/graph.scm:181
+#: guix/scripts/graph.scm:202
 msgid "the DAG of packages and origins, including implicit inputs"
 msgstr ""
 
-#: guix/scripts/graph.scm:211
+#: guix/scripts/graph.scm:232
 msgid "same as 'bag', but without the bootstrap nodes"
 msgstr ""
 
-#: guix/scripts/graph.scm:253
+#: guix/scripts/graph.scm:249
+msgid "the reverse DAG of packages, including implicit inputs"
+msgstr ""
+
+#: guix/scripts/graph.scm:288
 msgid "the DAG of derivations"
 msgstr ""
 
-#: guix/scripts/graph.scm:265
+#: guix/scripts/graph.scm:300
 msgid "unsupported argument for derivation graph"
 msgstr ""
 
-#: guix/scripts/graph.scm:291
+#: guix/scripts/graph.scm:334
 msgid "unsupported argument for this type of graph"
 msgstr ""
 
-#: guix/scripts/graph.scm:304
+#: guix/scripts/graph.scm:348
 #, scheme-format
 msgid "references for '~a' are not known~%"
 msgstr ""
 
-#: guix/scripts/graph.scm:311
+#: guix/scripts/graph.scm:355
 msgid "the DAG of run-time dependencies (store references)"
 msgstr ""
 
-#: guix/scripts/graph.scm:327
+#: guix/scripts/graph.scm:371
 msgid "the DAG of referrers in the store"
 msgstr ""
 
-#: guix/scripts/graph.scm:354
+#: guix/scripts/graph.scm:401
+msgid "the graph of package modules"
+msgstr ""
+
+#: guix/scripts/graph.scm:430
 #, scheme-format
 msgid "~a: unknown node type~%"
 msgstr "~a: 未知节点类型~%"
 
-#: guix/scripts/graph.scm:361
-#, scheme-format
-msgid "~a: unknown backend~%"
-msgstr "~a：未知后端~%"
-
-#: guix/scripts/graph.scm:365
+#: guix/scripts/graph.scm:441
 msgid "The available node types are:\n"
 msgstr ""
 
-#: guix/scripts/graph.scm:375
+#: guix/scripts/graph.scm:451
 msgid "The available backend types are:\n"
 msgstr ""
 
+#: guix/scripts/graph.scm:478
+#, scheme-format
+msgid "no path from '~a' to '~a'~%"
+msgstr ""
+
 #. TRANSLATORS: Here 'dot' is the name of a program; it must not be
 #. translated.
-#: guix/scripts/graph.scm:419
+#: guix/scripts/graph.scm:530
 msgid ""
 "Usage: guix graph PACKAGE...\n"
 "Emit a representation of the dependency graph of PACKAGE...\n"
 msgstr ""
 
-#: guix/scripts/graph.scm:421
+#: guix/scripts/graph.scm:532
 msgid ""
 "\n"
 "  -b, --backend=TYPE     produce a graph with the given backend TYPE"
 msgstr ""
 
-#: guix/scripts/graph.scm:423
+#: guix/scripts/graph.scm:534
 msgid ""
 "\n"
 "      --list-backends    list the available graph backends"
 msgstr ""
 
-#: guix/scripts/graph.scm:425
+#: guix/scripts/graph.scm:536
 msgid ""
 "\n"
 "  -t, --type=TYPE        represent nodes of the given TYPE"
 msgstr ""
 
-#: guix/scripts/graph.scm:427
+#: guix/scripts/graph.scm:538
 msgid ""
 "\n"
 "      --list-types       list the available graph types"
 msgstr ""
 
-#: guix/scripts/graph.scm:429 guix/scripts/pack.scm:336
+#: guix/scripts/graph.scm:540
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -h, --help             display this help and exit"
+msgid ""
+"\n"
+"      --path             display the shortest path between the given nodes"
+msgstr ""
+"\n"
+"  -h, --help                 显示这份说明然后离开"
+
+#: guix/scripts/graph.scm:542 guix/scripts/pack.scm:1084
+#: guix/scripts/refresh.scm:149
 msgid ""
 "\n"
 "  -e, --expression=EXPR  consider the package EXPR evaluates to"
 msgstr ""
 
-#: guix/scripts/challenge.scm:191
+#: guix/scripts/graph.scm:544
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -s, --system=SYSTEM    consider packages for SYSTEM--e.g., \"i686-linux\""
+msgid ""
+"\n"
+"  -s, --system=SYSTEM    consider the graph for SYSTEM--e.g., \"i686-linux\""
+msgstr ""
+"\n"
+"  -s, --system=系统      为 <系统> 考虑包——比如，\"i686-linux\""
+
+#: guix/scripts/graph.scm:607
+#, scheme-format
+msgid "'--path' option requires exactly two nodes (given ~a)~%"
+msgstr ""
+
+#: guix/scripts/challenge.scm:303
+#, scheme-format
+msgid "  differing file:~%"
+msgid_plural "  differing files:~%"
+msgstr[0] ""
+
+#: guix/scripts/challenge.scm:372
 #, scheme-format
 msgid "  local hash: ~a~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:192
+#: guix/scripts/challenge.scm:373
 #, scheme-format
 msgid "  no local build for '~a'~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:194
+#: guix/scripts/challenge.scm:375
 #, scheme-format
 msgid "  ~50a: ~a~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:202
+#: guix/scripts/challenge.scm:383
 #, scheme-format
 msgid "~a contents differ:~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:205
+#: guix/scripts/challenge.scm:387
 #, scheme-format
 msgid "could not challenge '~a': no local build~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:207
+#: guix/scripts/challenge.scm:389
 #, scheme-format
 msgid "could not challenge '~a': no substitutes~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:210
+#: guix/scripts/challenge.scm:392
 #, scheme-format
 msgid "~a contents match:~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:219
+#: guix/scripts/challenge.scm:401
 msgid "~h store items were analyzed:~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:220
+#: guix/scripts/challenge.scm:402
 msgid "  - ~h (~,1f%) were identical~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:222
+#: guix/scripts/challenge.scm:404
 msgid "  - ~h (~,1f%) differed~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:224
+#: guix/scripts/challenge.scm:406
 msgid "  - ~h (~,1f%) were inconclusive~%"
 msgstr ""
 
-#: guix/scripts/challenge.scm:233
+#: guix/scripts/challenge.scm:415
 msgid ""
 "Usage: guix challenge [PACKAGE...]\n"
 "Challenge the substitutes for PACKAGE... provided by one or more servers.\n"
 msgstr ""
 
-#: guix/scripts/challenge.scm:235
+#: guix/scripts/challenge.scm:417
 msgid ""
 "\n"
 "      --substitute-urls=URLS\n"
@@ -2250,60 +4106,111 @@ msgstr ""
 "      --substitute-urls=URLS\n"
 "                         与 URLS 的构建结果对比"
 
-#: guix/scripts/challenge.scm:238
+#: guix/scripts/challenge.scm:420
 msgid ""
 "\n"
-"      -v, --verbose      show details about successful comparisons"
+"  -v, --verbose          show details about successful comparisons"
 msgstr ""
 
-#: guix/scripts/copy.scm:59
+#: guix/scripts/challenge.scm:422
+msgid ""
+"\n"
+"      --diff=MODE        show differences according to MODE"
+msgstr ""
+
+#: guix/scripts/challenge.scm:451
+#, fuzzy, scheme-format
+#| msgid "~a: unknown action~%"
+msgid "~a: unknown diff mode~%"
+msgstr "~a：未知操作~%"
+
+#: guix/scripts/copy.scm:61
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid TCP port number~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/scripts/copy.scm:61
+#: guix/scripts/copy.scm:63
 #, fuzzy, scheme-format
 #| msgid "ambiguous package specification `~a'~%"
 msgid "~a: invalid SSH specification~%"
 msgstr "含糊的软件包规范 `~a'~%"
 
-#: guix/scripts/copy.scm:113
+#: guix/scripts/copy.scm:109
 msgid ""
 "Usage: guix copy [OPTION]... ITEMS...\n"
 "Copy ITEMS to or from the specified host over SSH.\n"
 msgstr ""
 
-#: guix/scripts/copy.scm:115
+#: guix/scripts/copy.scm:111
 msgid ""
 "\n"
 "      --to=HOST          send ITEMS to HOST"
 msgstr ""
 
-#: guix/scripts/copy.scm:117
+#: guix/scripts/copy.scm:113
 msgid ""
 "\n"
 "      --from=HOST        receive ITEMS from HOST"
 msgstr ""
 
-#: guix/scripts/copy.scm:168
+#: guix/scripts/copy.scm:192
 #, scheme-format
 msgid "use '--to' or '--from'~%"
 msgstr ""
 
-#: guix/scripts/pack.scm:76
+#: guix/scripts/pack.scm:111
 #, fuzzy, scheme-format
 #| msgid "~a: package not found~%"
 msgid "~a: compressor not found~%"
 msgstr "~a: 包未找到~%"
 
-#: guix/scripts/pack.scm:318
+#: guix/scripts/pack.scm:323
+#, scheme-format
+msgid "entry point not supported in the '~a' format~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:705
+#, scheme-format
+msgid ""
+"cross-compilation not implemented here;\n"
+"please email '~a'~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:965
+msgid "The supported formats for 'guix pack' are:"
+msgstr ""
+
+#: guix/scripts/pack.scm:967
+msgid ""
+"\n"
+"  tarball       Self-contained tarball, ready to run on another machine"
+msgstr ""
+
+#: guix/scripts/pack.scm:969
+msgid ""
+"\n"
+"  squashfs      Squashfs image suitable for Singularity"
+msgstr ""
+
+#: guix/scripts/pack.scm:971
+msgid ""
+"\n"
+"  docker        Tarball ready for 'docker load'"
+msgstr ""
+
+#: guix/scripts/pack.scm:1040
 #, fuzzy, scheme-format
 #| msgid "ambiguous package specification `~a'~%"
 msgid "~a: invalid symlink specification~%"
 msgstr "含糊的软件包规范 `~a'~%"
 
-#: guix/scripts/pack.scm:328
+#: guix/scripts/pack.scm:1054
+#, scheme-format
+msgid "~a: unsupported profile name~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:1072
 #, fuzzy
 #| msgid ""
 #| "Usage: guix size [OPTION]... PACKAGE\n"
@@ -2315,81 +4222,204 @@ msgstr ""
 "用法：guix size [选项]... 软件包\n"
 "报告 <软件包> 及其依赖的大小。\n"
 
-#: guix/scripts/pack.scm:334
+#: guix/scripts/pack.scm:1078
 msgid ""
 "\n"
 "  -f, --format=FORMAT    build a pack in the given FORMAT"
 msgstr ""
 
-#: guix/scripts/pack.scm:342
+#: guix/scripts/pack.scm:1080
+msgid ""
+"\n"
+"      --list-formats     list the formats available"
+msgstr ""
+
+#: guix/scripts/pack.scm:1082
+msgid ""
+"\n"
+"  -R, --relocatable      produce relocatable executables"
+msgstr ""
+
+#: guix/scripts/pack.scm:1090
 msgid ""
 "\n"
 "  -C, --compression=TOOL compress using TOOL--e.g., \"lzip\""
 msgstr ""
 
-#: guix/scripts/pack.scm:344
+#: guix/scripts/pack.scm:1092
 msgid ""
 "\n"
 "  -S, --symlink=SPEC     create symlinks to the profile according to SPEC"
 msgstr ""
 
-#: guix/scripts/pack.scm:346
+#: guix/scripts/pack.scm:1094
+msgid ""
+"\n"
+"  -m, --manifest=FILE    create a pack with the manifest from FILE"
+msgstr ""
+
+#: guix/scripts/pack.scm:1096
+msgid ""
+"\n"
+"      --entry-point=PROGRAM\n"
+"                         use PROGRAM as the entry point of the pack"
+msgstr ""
+
+#: guix/scripts/pack.scm:1101
 msgid ""
 "\n"
 "      --localstatedir    include /var/guix in the resulting pack"
 msgstr ""
 
-#: guix/scripts/pack.scm:390
+#: guix/scripts/pack.scm:1103
+msgid ""
+"\n"
+"      --profile-name=NAME\n"
+"                         populate /var/guix/profiles/.../NAME"
+msgstr ""
+
+#: guix/scripts/pack.scm:1109
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -n, --dry-run          do not build the derivations"
+msgid ""
+"\n"
+"  -d, --derivation       return the derivation of the pack"
+msgstr ""
+"\n"
+"  -n, --dry-run          不要构建派生包"
+
+#: guix/scripts/pack.scm:1113
+msgid ""
+"\n"
+"      --bootstrap        use the bootstrap binaries to build the pack"
+msgstr ""
+
+#: guix/scripts/pack.scm:1167
+#, scheme-format
+msgid "could not determine provenance of package ~a~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:1176
 #, scheme-format
-msgid "~a: unknown pack format"
+msgid "both a manifest and a package list were given~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:74
+#: guix/scripts/pack.scm:1235
+#, fuzzy, scheme-format
+#| msgid "~A: unknown package~%"
+msgid "~a: unknown pack format~%"
+msgstr "~A: 未知包~%"
+
+#: guix/scripts/pack.scm:1259
+#, scheme-format
+msgid "no packages specified; building an empty pack~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:1263
+#, scheme-format
+msgid "Singularity requires you to provide a shell~%"
+msgstr ""
+
+#: guix/scripts/pack.scm:1264
+msgid "Add @code{bash} or @code{bash-minimal} to your package list."
+msgstr ""
+
+#: guix/scripts/weather.scm:93
 msgid "computing ~h package derivations for ~a...~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:110
+#: guix/scripts/weather.scm:181
 #, fuzzy
 #| msgid "looking for the latest release of GNU ~a..."
 msgid "looking for ~h store items on ~a...~%"
 msgstr "寻找最新版的 GNU~a..."
 
-#: guix/scripts/weather.scm:120
-msgid "  ~2,1f% substitutes available (~h out of ~h)~%"
+#: guix/scripts/weather.scm:201
+msgid "  ~,1f% substitutes available (~h out of ~h)~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:126
+#: guix/scripts/weather.scm:207
 #, scheme-format
 msgid "  unknown substitute sizes~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:129
+#: guix/scripts/weather.scm:210
 msgid "  ~,1h MiB of nars (compressed)~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:130
+#: guix/scripts/weather.scm:211
 msgid "  at least ~,1h MiB of nars (compressed)~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:132
+#: guix/scripts/weather.scm:213
 msgid "  ~,1h MiB on disk (uncompressed)~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:134
+#: guix/scripts/weather.scm:216
 msgid "  ~,3h seconds per request (~,1h seconds in total)~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:136
+#: guix/scripts/weather.scm:218
 msgid "  ~,1h requests per second~%"
 msgstr ""
 
-#: guix/scripts/weather.scm:145
+#: guix/scripts/weather.scm:224
+#, scheme-format
+msgid "  (continuous integration information unavailable)~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:227
+#, scheme-format
+msgid "  '~a' returned ~a (~s)~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:244
+msgid "  ~,1f% (~h out of ~h) of the missing items are queued~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:250
+msgid "  at least ~h queued builds~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:251
+msgid "  ~h queued builds~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:254
+#, scheme-format
+msgid "      ~a: ~a (~0,1f%)~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:260
+#, scheme-format
+msgid "  build rate: ~1,2f builds per hour~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:264
+#, scheme-format
+msgid "      ~a: ~,2f builds per hour~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:272
+#, scheme-format
+msgid "Substitutes are missing for the following items:~%"
+msgstr ""
+
+#: guix/scripts/weather.scm:285
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
 msgid ""
-"Usage: guix weather [OPTIONS]\n"
+"Usage: guix weather [OPTIONS] [PACKAGES ...]\n"
 "Report the availability of substitutes.\n"
 msgstr ""
+"用法：guix size [选项]... 软件包\n"
+"报告 <软件包> 及其依赖的大小。\n"
 
-#: guix/scripts/weather.scm:147
+#: guix/scripts/weather.scm:287
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2404,14 +4434,28 @@ msgstr ""
 "      --substitute-urls=URLS\n"
 "                         与 URLS 的构建结果对比"
 
-#: guix/scripts/weather.scm:150
+#: guix/scripts/weather.scm:290
 msgid ""
 "\n"
 "  -m, --manifest=MANIFEST\n"
 "                         look up substitutes for packages specified in MANIFEST"
 msgstr ""
 
-#: guix/scripts/weather.scm:153
+#: guix/scripts/weather.scm:293
+msgid ""
+"\n"
+"  -c, --coverage[=COUNT]\n"
+"                         show substitute coverage for packages with at least\n"
+"                         COUNT dependents"
+msgstr ""
+
+#: guix/scripts/weather.scm:297
+msgid ""
+"\n"
+"      --display-missing  display the list of missing substitutes"
+msgstr ""
+
+#: guix/scripts/weather.scm:299
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2423,48 +4467,222 @@ msgstr ""
 "\n"
 "  -s, --system=系统      为 <系统> 考虑包——比如，\"i686-linux\""
 
-#: guix/scripts/weather.scm:177
+#: guix/scripts/weather.scm:323
 #, fuzzy, scheme-format
 #| msgid "~a: invalid number~%"
 msgid "~a: invalid URL~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/gnu-maintenance.scm:567
+#: guix/scripts/weather.scm:456
+#, scheme-format
+msgid "The following ~a package is missing from '~a' for '~a':~%"
+msgid_plural "The following ~a packages are missing from '~a' for '~a':~%"
+msgstr[0] ""
+
+#: guix/scripts/weather.scm:462
+#, scheme-format
+msgid "~a package is missing from '~a' for '~a':~%"
+msgid_plural "~a packages are missing from '~a' for '~a', among which:~%"
+msgstr[0] ""
+
+#: guix/scripts/describe.scm:53 guix/scripts/processes.scm:291
+msgid "The available formats are:\n"
+msgstr ""
+
+#: guix/scripts/describe.scm:64 guix/scripts/processes.scm:324
+#, scheme-format
+msgid "~a: unsupported output format~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:87
+msgid ""
+"Usage: guix describe [OPTION]...\n"
+"Display information about the channels currently in use.\n"
+msgstr ""
+
+#: guix/scripts/describe.scm:89
+msgid ""
+"\n"
+"  -f, --format=FORMAT    display information in the given FORMAT"
+msgstr ""
+
+#: guix/scripts/describe.scm:91 guix/scripts/processes.scm:308
+msgid ""
+"\n"
+"      --list-formats     display available formats"
+msgstr ""
+
+#: guix/scripts/describe.scm:93
+msgid ""
+"\n"
+"  -p, --profile=PROFILE  display information about PROFILE"
+msgstr ""
+
+#: guix/scripts/describe.scm:112
+#, scheme-format
+msgid "~%;; warning: GUIX_PACKAGE_PATH=\"~a\"~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:115
+#, scheme-format
+msgid "'GUIX_PACKAGE_PATH' is set but it is not captured~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:155
+#, scheme-format
+msgid "failed to determine origin~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:156
+#, scheme-format
+msgid ""
+"Perhaps this\n"
+"@command{guix} command was not obtained with @command{guix pull}?  Its version\n"
+"string is ~a.~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:166
+#, fuzzy, scheme-format
+#| msgid "Git error: ~a~%"
+msgid "Git checkout:~%"
+msgstr "Git 错误：~a~%"
+
+#: guix/scripts/describe.scm:167
+#, fuzzy, scheme-format
+#| msgid "  file name: ~a~%"
+msgid "  repository: ~a~%"
+msgstr "  文件名：~a~%"
+
+#: guix/scripts/describe.scm:168
+#, fuzzy, scheme-format
+#| msgid "  kernel: ~a~%"
+msgid "  branch: ~a~%"
+msgstr "  内核：~a~%"
+
+#: guix/scripts/describe.scm:169
+#, fuzzy, scheme-format
+#| msgid "deleting ~a~%"
+msgid "  commit: ~a~%"
+msgstr "正删除 ~a~%"
+
+#: guix/scripts/describe.scm:236
+#, scheme-format
+msgid "    repository URL: ~a~%"
+msgstr ""
+
+#: guix/scripts/describe.scm:239
+#, fuzzy, scheme-format
+#| msgid "  kernel: ~a~%"
+msgid "    branch: ~a~%"
+msgstr "  内核：~a~%"
+
+#: guix/scripts/describe.scm:241
+#, fuzzy, scheme-format
+#| msgid "deleting ~a~%"
+msgid "    commit: ~a~%"
+msgstr "正删除 ~a~%"
+
+#: guix/scripts/processes.scm:298
+msgid ""
+"Usage: guix processes\n"
+"List the current Guix sessions and their processes."
+msgstr ""
+
+#: guix/scripts/processes.scm:306
+msgid ""
+"\n"
+"  -f, --format=FORMAT    display results as normalized record sets"
+msgstr ""
+
+#: guix/scripts/deploy.scm:49
+msgid ""
+"Usage: guix deploy [OPTION] FILE...\n"
+"Perform the deployment specified by FILE.\n"
+msgstr ""
+
+#: guix/scripts/deploy.scm:106
+#, scheme-format
+msgid "The following ~d machine will be deployed:~%"
+msgid_plural "The following ~d machines will be deployed:~%"
+msgstr[0] ""
+
+#: guix/scripts/deploy.scm:120
+#, fuzzy, scheme-format
+#| msgid "deleting ~a~%"
+msgid "deploying to ~a...~%"
+msgstr "正删除 ~a~%"
+
+#: guix/scripts/deploy.scm:135
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to deploy ~a: ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/deploy.scm:140
+#, scheme-format
+msgid "rolling back ~a...~%"
+msgstr ""
+
+#: guix/scripts/deploy.scm:146
+#, scheme-format
+msgid "successfully deployed ~a~%"
+msgstr "成功部署 ~a~%"
+
+#: guix/gexp.scm:423
+#, scheme-format
+msgid "resolving '~a' relative to current directory~%"
+msgstr ""
+
+#: guix/gexp.scm:815
+#, scheme-format
+msgid "importing module~{ ~a~} from the host~%"
+msgid_plural "importing modules~{ ~a~} from the host~%"
+msgstr[0] ""
+
+#: guix/gnu-maintenance.scm:809
 msgid "Updater for GNU packages"
 msgstr ""
 
-#: guix/gnu-maintenance.scm:576
+#: guix/gnu-maintenance.scm:818
 msgid "Updater for GNU packages only available via FTP"
 msgstr ""
 
-#: guix/gnu-maintenance.scm:585
-msgid "Updater for KDE packages"
+#: guix/gnu-maintenance.scm:827
+msgid "Updater for packages hosted on savannah.gnu.org"
+msgstr ""
+
+#: guix/gnu-maintenance.scm:834
+msgid "Updater for packages hosted on sourceforge.net"
 msgstr ""
 
-#: guix/gnu-maintenance.scm:592
+#: guix/gnu-maintenance.scm:841
 msgid "Updater for X.org packages"
 msgstr ""
 
-#: guix/gnu-maintenance.scm:599
+#: guix/gnu-maintenance.scm:848
 msgid "Updater for packages hosted on kernel.org"
 msgstr ""
 
-#: guix/scripts/container.scm:25
+#: guix/gnu-maintenance.scm:855
+msgid "Updater that crawls HTML pages."
+msgstr ""
+
+#: guix/scripts/container.scm:27
 msgid ""
 "Usage: guix container ACTION ARGS...\n"
 "Build and manipulate Linux containers.\n"
 msgstr ""
 
-#: guix/scripts/container.scm:30
+#: guix/scripts/container.scm:32
 msgid "   exec            execute a command inside of an existing container\n"
 msgstr ""
 
-#: guix/scripts/container.scm:53
+#: guix/scripts/container.scm:58
 #, scheme-format
 msgid "guix container: missing action~%"
 msgstr ""
 
-#: guix/scripts/container.scm:63
+#: guix/scripts/container.scm:68
 #, scheme-format
 msgid "guix container: invalid action~%"
 msgstr ""
@@ -2472,7 +4690,7 @@ msgstr ""
 #: guix/scripts/container/exec.scm:40
 msgid ""
 "Usage: guix container exec PID COMMAND [ARGS...]\n"
-"Execute COMMMAND within the container process PID.\n"
+"Execute COMMAND within the container process PID.\n"
 msgstr ""
 
 #: guix/scripts/container/exec.scm:69
@@ -2501,102 +4719,308 @@ msgstr ""
 msgid "exec failed with status ~d~%"
 msgstr ""
 
-#: guix/upstream.scm:249
+#: guix/transformations.scm:178 guix/transformations.scm:246
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "invalid replacement specification: ~s"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/transformations.scm:227
 #, scheme-format
-msgid "signature verification failed for `~a'~%"
+msgid "the source of ~a is not a Git reference"
 msgstr ""
 
-#: guix/upstream.scm:251
+#: guix/transformations.scm:319
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "~a: invalid Git URL replacement specification"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/transformations.scm:397
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "~a: invalid toolchain replacement specification"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/transformations.scm:501
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "~a: invalid package patch specification"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/transformations.scm:524
 #, scheme-format
-msgid "(could be because the public key is not in your keyring)~%"
+msgid "could not determine latest upstream release of '~a'~%"
 msgstr ""
 
-#: guix/upstream.scm:330
+#: guix/transformations.scm:532
+#, scheme-format
+msgid "cannot authenticate source of '~a', version ~a~%"
+msgstr ""
+
+#: guix/transformations.scm:616
+#, scheme-format
+msgid "Available package transformation options:~%"
+msgstr ""
+
+#: guix/transformations.scm:622
+msgid ""
+"\n"
+"      --with-source=[PACKAGE=]SOURCE\n"
+"                         use SOURCE when building the corresponding package"
+msgstr ""
+
+#: guix/transformations.scm:625
+msgid ""
+"\n"
+"      --with-input=PACKAGE=REPLACEMENT\n"
+"                         replace dependency PACKAGE by REPLACEMENT"
+msgstr ""
+
+#: guix/transformations.scm:628
+msgid ""
+"\n"
+"      --with-graft=PACKAGE=REPLACEMENT\n"
+"                         graft REPLACEMENT on packages that refer to PACKAGE"
+msgstr ""
+
+#: guix/transformations.scm:631
+msgid ""
+"\n"
+"      --with-branch=PACKAGE=BRANCH\n"
+"                         build PACKAGE from the latest commit of BRANCH"
+msgstr ""
+
+#: guix/transformations.scm:634
+msgid ""
+"\n"
+"      --with-commit=PACKAGE=COMMIT\n"
+"                         build PACKAGE from COMMIT"
+msgstr ""
+
+#: guix/transformations.scm:637
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"      --with-git-url=PACKAGE=URL\n"
+"                         build PACKAGE from the repository at URL"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/transformations.scm:640
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"      --with-patch=PACKAGE=FILE\n"
+"                         add FILE to the list of patches of PACKAGE"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/transformations.scm:643
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"      --with-latest=PACKAGE\n"
+"                         use the latest upstream release of PACKAGE"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/transformations.scm:646
+msgid ""
+"\n"
+"      --with-c-toolchain=PACKAGE=TOOLCHAIN\n"
+"                         build PACKAGE and its dependents with TOOLCHAIN"
+msgstr ""
+
+#: guix/transformations.scm:649
+msgid ""
+"\n"
+"      --with-debug-info=PACKAGE\n"
+"                         build PACKAGE and preserve its debug info"
+msgstr ""
+
+#: guix/transformations.scm:652
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "      --substitute-urls=URLS\n"
+#| "                         compare build results with those at URLS"
+msgid ""
+"\n"
+"      --without-tests=PACKAGE\n"
+"                         build PACKAGE without running its tests"
+msgstr ""
+"\n"
+"      --substitute-urls=URLS\n"
+"                         与 URLS 的构建结果对比"
+
+#: guix/transformations.scm:658
+msgid ""
+"\n"
+"      --help-transform   list package transformation options not shown here"
+msgstr ""
+
+#: guix/transformations.scm:707
+#, scheme-format
+msgid "transformation '~a' had no effect on ~a~%"
+msgstr ""
+
+#: guix/upstream.scm:348
+#, scheme-format
+msgid "failed to download detached signature from ~a~%"
+msgstr ""
+
+#: guix/upstream.scm:352
+#, scheme-format
+msgid "signature verification failed for '~a' (key: ~a)~%"
+msgstr ""
+
+#: guix/upstream.scm:356
+#, scheme-format
+msgid "missing public key ~a for '~a'~%"
+msgstr ""
+
+#: guix/upstream.scm:370
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to fetch source from '~a'"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/upstream.scm:454
+#, scheme-format
+msgid "cannot download for this method: ~s"
+msgstr ""
+
+#: guix/upstream.scm:519
 #, scheme-format
 msgid "~a: could not locate source file"
 msgstr ""
 
-#: guix/upstream.scm:335
+#: guix/upstream.scm:523
 #, scheme-format
-msgid "~a: ~a: no `version' field in source; skipping~%"
+msgid "~a: no `version' field in source; skipping~%"
 msgstr ""
 
-#: guix/ui.scm:159
+#: guix/ui.scm:162
 #, scheme-format
-msgid "~a: unbound variable"
+msgid "error: ~a: unbound variable"
 msgstr ""
 
-#: guix/ui.scm:235
+#: guix/ui.scm:262
 msgid "entering debugger; type ',bt' for a backtrace\n"
 msgstr ""
 
-#: guix/ui.scm:284
-#, fuzzy, scheme-format
+#: guix/ui.scm:320
+#, fuzzy
 #| msgid "deleting ~a~%"
-msgid "hint: ~a~%"
+msgid "hint: "
 msgstr "正删除 ~a~%"
 
-#: guix/ui.scm:294 guix/ui.scm:342 guix/ui.scm:349
-#, scheme-format
-msgid "failed to load '~a': ~a~%"
+#: guix/ui.scm:337
+msgid "Did you forget a @code{use-modules} form?"
 msgstr ""
 
-#: guix/ui.scm:301
+#: guix/ui.scm:339
 #, scheme-format
-msgid "~amissing closing parenthesis~%"
+msgid "Did you forget @code{(use-modules ~a)}?"
 msgstr ""
 
-#: guix/ui.scm:306 guix/ui.scm:322 guix/ui.scm:596
+#: guix/ui.scm:349
 #, scheme-format
-msgid "~a: error: ~a~%"
-msgstr "~a：错误：~a~%"
+msgid ""
+"File @file{~a} should probably start with:\n"
+"\n"
+"@example\n"
+"(define-module ~a)\n"
+"@end example"
+msgstr ""
 
-#: guix/ui.scm:314
-msgid "Did you forget a @code{use-modules} form?"
+#: guix/ui.scm:363
+#, scheme-format
+msgid "module name ~a does not match file name '~a'~%"
 msgstr ""
 
-#: guix/ui.scm:316
+#: guix/ui.scm:367
+#, fuzzy, scheme-format
+#| msgid "~a: invalid number~%"
+msgid "~a: file is empty~%"
+msgstr "~a: 无效的数字~%"
+
+#: guix/ui.scm:378 guix/ui.scm:426 guix/ui.scm:434 guix/ui.scm:438
 #, scheme-format
-msgid "Try adding @code{(use-modules ~a)}."
+msgid "failed to load '~a': ~a~%"
 msgstr ""
 
-#: guix/ui.scm:329 guix/ui.scm:657
+#: guix/ui.scm:385
 #, scheme-format
-msgid "exception thrown: ~s~%"
+msgid "~amissing closing parenthesis~%"
 msgstr ""
 
-#: guix/ui.scm:333 guix/ui.scm:355
+#: guix/ui.scm:390
+#, fuzzy, scheme-format
+#| msgid "deleting ~a~%"
+msgid "~s: ~a~%"
+msgstr "正删除 ~a~%"
+
+#: guix/ui.scm:406 guix/ui.scm:902
 #, scheme-format
-msgid "failed to load '~a':~%"
+msgid "exception thrown: ~s~%"
 msgstr ""
 
-#: guix/ui.scm:345
+#: guix/ui.scm:410 guix/ui.scm:448
 #, scheme-format
-msgid "~a: warning: ~a~%"
+msgid "failed to load '~a':~%"
 msgstr ""
 
-#: guix/ui.scm:352
+#: guix/ui.scm:445
 #, scheme-format
 msgid "failed to load '~a': exception thrown: ~s~%"
 msgstr ""
 
-#: guix/ui.scm:364
-#, scheme-format
-msgid "failed to install locale: ~a~%"
+#: guix/ui.scm:493
+msgid ""
+"Consider installing the @code{glibc-utf8-locales} or\n"
+"@code{glibc-locales} package and defining @code{GUIX_LOCPATH}, along these\n"
+"lines:\n"
+"\n"
+"@example\n"
+"guix install glibc-utf8-locales\n"
+"export GUIX_LOCPATH=\"$HOME/.guix-profile/lib/locale\"\n"
+"@end example\n"
+"\n"
+"See the \"Application Setup\" section in the manual, for more info.\n"
 msgstr ""
 
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.  */
-#: guix/ui.scm:394
+#: guix/ui.scm:535
 msgid "(C)"
 msgstr ""
 
-#: guix/ui.scm:395
+#: guix/ui.scm:536
 msgid "the Guix authors\n"
 msgstr "Guix 作者\n"
 
-#: guix/ui.scm:396
+#: guix/ui.scm:537
 #, fuzzy
 #| msgid ""
 #| "Copyright (C) 2016 the Guix authors\n"
@@ -2617,7 +5041,7 @@ msgstr ""
 #. package.  Please add another line saying "Report translation bugs to
 #. ...\n" with the address for translation bugs (typically your translation
 #. team's web or email address).
-#: guix/ui.scm:408
+#: guix/ui.scm:549
 #, scheme-format
 msgid ""
 "\n"
@@ -2627,7 +5051,7 @@ msgstr ""
 "报告程序缺陷到：~a。\n"
 "报告简体中文翻译错误到：https://translationproject.org/team/zh_CN.html ."
 
-#: guix/ui.scm:410
+#: guix/ui.scm:551
 #, scheme-format
 msgid ""
 "\n"
@@ -2636,140 +5060,164 @@ msgstr ""
 "\n"
 "~a 项目首页:<~a>"
 
-#: guix/ui.scm:412
+#: guix/ui.scm:553
+#, fuzzy, scheme-format
+#| msgid ""
+#| "\n"
+#| "General help using GNU software: <http://www.gnu.org/gethelp/>"
 msgid ""
 "\n"
-"General help using GNU software: <http://www.gnu.org/gethelp/>"
+"General help using Guix and GNU software: <~a>"
 msgstr ""
 "\n"
 "使用 GNU 软件的一般性帮助：<http://www.gnu.org/gethelp/>"
 
-#: guix/ui.scm:457
+#. TRANSLATORS: Change the "/en" bit of this URL appropriately if
+#. the web site is translated in your language.
+#: guix/ui.scm:557
+msgid "https://guix.gnu.org/en/help/"
+msgstr ""
+
+#: guix/ui.scm:611
 #, scheme-format
 msgid "'~a' is not a valid regular expression: ~a~%"
 msgstr ""
 
-#: guix/ui.scm:463
+#: guix/ui.scm:617
 #, scheme-format
 msgid "~a: invalid number~%"
 msgstr "~a: 无效的数字~%"
 
-#: guix/ui.scm:480
+#: guix/ui.scm:635
 #, scheme-format
 msgid "invalid number: ~a~%"
 msgstr "无效的数字：~a~%"
 
-#: guix/ui.scm:503
+#: guix/ui.scm:658
 #, scheme-format
 msgid "unknown unit: ~a~%"
 msgstr ""
 
-#: guix/ui.scm:520
+#: guix/ui.scm:673
+#, scheme-format
+msgid ""
+"You cannot have two different versions\n"
+"or variants of @code{~a} in the same profile."
+msgstr ""
+
+#: guix/ui.scm:676
+#, scheme-format
+msgid ""
+"Try upgrading both @code{~a} and @code{~a},\n"
+"or remove one of them from the profile."
+msgstr ""
+
+#: guix/ui.scm:712
 #, scheme-format
 msgid "~a:~a:~a: package `~a' has an invalid input: ~s~%"
 msgstr ""
 
-#: guix/ui.scm:527
+#: guix/ui.scm:719
 #, scheme-format
 msgid "~a: ~a: build system `~a' does not support cross builds~%"
 msgstr ""
 
-#: guix/ui.scm:533
+#: guix/ui.scm:725
 #, fuzzy, scheme-format
 #| msgid "signature is not a valid s-expression"
 msgid "~s: invalid G-expression input~%"
 msgstr "签名不是有效的 S-表达式"
 
-#: guix/ui.scm:536
+#: guix/ui.scm:728
 #, scheme-format
 msgid "profile '~a' does not exist~%"
 msgstr ""
 
-#: guix/ui.scm:539
+#: guix/ui.scm:731
 #, scheme-format
 msgid "generation ~a of profile '~a' does not exist~%"
 msgstr ""
 
-#: guix/ui.scm:548
+#: guix/ui.scm:736
+#, scheme-format
+msgid "package '~a~@[@~a~]~@[:~a~]' not found in profile~%"
+msgstr ""
+
+#: guix/ui.scm:748
 #, scheme-format
 msgid "   ... propagated from ~a@~a~%"
 msgstr ""
 
-#: guix/ui.scm:553
+#: guix/ui.scm:758
 #, scheme-format
-msgid "profile contains conflicting entries for ~a:~a~%"
+msgid "profile contains conflicting entries for ~a~a~%"
 msgstr ""
 
-#: guix/ui.scm:556
+#: guix/ui.scm:761
 #, scheme-format
-msgid "  first entry: ~a@~a:~a ~a~%"
+msgid "  first entry: ~a@~a~a ~a~%"
 msgstr ""
 
-#: guix/ui.scm:562
+#: guix/ui.scm:767
 #, scheme-format
-msgid "  second entry: ~a@~a:~a ~a~%"
+msgid "  second entry: ~a@~a~a ~a~%"
 msgstr ""
 
-#: guix/ui.scm:573
+#: guix/ui.scm:779
 #, scheme-format
 msgid "corrupt input while restoring '~a' from ~s~%"
 msgstr ""
 
-#: guix/ui.scm:575
+#: guix/ui.scm:781
 #, scheme-format
 msgid "corrupt input while restoring archive from ~s~%"
 msgstr ""
 
-#: guix/ui.scm:578
+#: guix/ui.scm:784
 #, scheme-format
 msgid "failed to connect to `~a': ~a~%"
 msgstr "连接到 `~a' 失败：~a~%"
 
-#: guix/ui.scm:583
-#, scheme-format
-msgid "build failed: ~a~%"
-msgstr ""
-
-#: guix/ui.scm:586
+#: guix/ui.scm:792
 #, scheme-format
 msgid "reference to invalid output '~a' of derivation '~a'~%"
 msgstr ""
 
-#: guix/ui.scm:590
+#: guix/ui.scm:796
 #, scheme-format
 msgid "file '~a' could not be found in these directories:~{ ~a~}~%"
 msgstr ""
 
-#: guix/ui.scm:607
+#: guix/ui.scm:801
 #, scheme-format
-msgid "~a: ~a~%"
+msgid "program exited~@[ with non-zero exit status ~a~]~@[ terminated by signal ~a~]~@[ stopped by signal ~a~]: ~s~%"
 msgstr ""
 
-#: guix/ui.scm:642
+#: guix/ui.scm:881
 #, scheme-format
 msgid "failed to read expression ~s: ~s~%"
 msgstr ""
 
-#: guix/ui.scm:648
+#: guix/ui.scm:887
 #, scheme-format
 msgid "failed to evaluate expression '~a':~%"
 msgstr ""
 
-#: guix/ui.scm:651
+#: guix/ui.scm:890
 #, scheme-format
 msgid "syntax error: ~a~%"
 msgstr "语法错误：~a~%"
 
-#: guix/ui.scm:669
+#: guix/ui.scm:914
 #, scheme-format
 msgid "expression ~s does not evaluate to a package~%"
 msgstr ""
 
-#: guix/ui.scm:688
+#: guix/ui.scm:941
 msgid "at least ~,1h MB needed but only ~,1h MB available in ~a~%"
 msgstr ""
 
-#: guix/ui.scm:756
+#: guix/ui.scm:1050
 #, scheme-format
 msgid "~:[The following derivation would be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations would be built:~%~{   ~a~%~}~;~]"
@@ -2777,17 +5225,40 @@ msgstr[0] ""
 
 #. TRANSLATORS: "MB" is for "megabyte"; it should be
 #. translated to the corresponding abbreviation.
-#: guix/ui.scm:764
+#: guix/ui.scm:1059
 msgid "~:[~,1h MB would be downloaded:~%~{   ~a~%~}~;~]"
 msgstr ""
 
-#: guix/ui.scm:769
+#: guix/ui.scm:1065
 #, scheme-format
 msgid "~:[The following file would be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files would be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] ""
 
-#: guix/ui.scm:776
+#: guix/ui.scm:1072
+#, scheme-format
+msgid "~:[The following graft would be made:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following grafts would be made:~%~{   ~a~%~}~;~]"
+msgstr[0] ""
+
+#: guix/ui.scm:1077
+#, scheme-format
+msgid "~:[The following profile hook would be built:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following profile hooks would be built:~%~{   ~a~%~}~;~]"
+msgstr[0] ""
+
+#. TRANSLATORS: "MB" is for "megabyte"; it should be
+#. translated to the corresponding abbreviation.
+#: guix/ui.scm:1089
+msgid "~:[~,1h MB would be downloaded~%~;~]"
+msgstr ""
+
+#: guix/ui.scm:1093
+msgid "~:[~h item would be downloaded~%~;~]"
+msgid_plural "~:[~h items would be downloaded~%~;~]"
+msgstr[0] ""
+
+#: guix/ui.scm:1101
 #, scheme-format
 msgid "~:[The following derivation will be built:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following derivations will be built:~%~{   ~a~%~}~;~]"
@@ -2795,175 +5266,1597 @@ msgstr[0] ""
 
 #. TRANSLATORS: "MB" is for "megabyte"; it should be
 #. translated to the corresponding abbreviation.
-#: guix/ui.scm:784
+#: guix/ui.scm:1110
 msgid "~:[~,1h MB will be downloaded:~%~{   ~a~%~}~;~]"
 msgstr ""
 
-#: guix/ui.scm:789
+#: guix/ui.scm:1116
 #, scheme-format
 msgid "~:[The following file will be downloaded:~%~{   ~a~%~}~;~]"
 msgid_plural "~:[The following files will be downloaded:~%~{   ~a~%~}~;~]"
 msgstr[0] ""
 
-#: guix/ui.scm:849
+#: guix/ui.scm:1123
+#, scheme-format
+msgid "~:[The following graft will be made:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following grafts will be made:~%~{   ~a~%~}~;~]"
+msgstr[0] ""
+
+#: guix/ui.scm:1128
+#, scheme-format
+msgid "~:[The following profile hook will be built:~%~{   ~a~%~}~;~]"
+msgid_plural "~:[The following profile hooks will be built:~%~{   ~a~%~}~;~]"
+msgstr[0] ""
+
+#. TRANSLATORS: "MB" is for "megabyte"; it should be
+#. translated to the corresponding abbreviation.
+#: guix/ui.scm:1140
+msgid "~:[~,1h MB will be downloaded~%~;~]"
+msgstr ""
+
+#: guix/ui.scm:1144
+msgid "~:[~h item will be downloaded~%~;~]"
+msgid_plural "~:[~h items will be downloaded~%~;~]"
+msgstr[0] ""
+
+#: guix/ui.scm:1263
+msgid "(dependencies or package changed)"
+msgstr ""
+
+#: guix/ui.scm:1282
 #, scheme-format
 msgid "The following package would be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be removed:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:854
+#: guix/ui.scm:1287
 #, scheme-format
 msgid "The following package will be removed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be removed:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:867
+#: guix/ui.scm:1300
 #, scheme-format
 msgid "The following package would be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be downgraded:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:872
+#: guix/ui.scm:1305
 #, scheme-format
 msgid "The following package will be downgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be downgraded:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:885
+#: guix/ui.scm:1318
 #, scheme-format
 msgid "The following package would be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages would be upgraded:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:890
+#: guix/ui.scm:1323
 #, scheme-format
 msgid "The following package will be upgraded:~%~{~a~%~}~%"
 msgid_plural "The following packages will be upgraded:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:901
+#: guix/ui.scm:1334
 #, scheme-format
 msgid "The following package would be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages would be installed:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:906
+#: guix/ui.scm:1339
 #, scheme-format
 msgid "The following package will be installed:~%~{~a~%~}~%"
 msgid_plural "The following packages will be installed:~%~{~a~%~}~%"
 msgstr[0] ""
 
-#: guix/ui.scm:923
-msgid "<unknown location>"
-msgstr "<未知位置>"
+#: guix/ui.scm:1875
+#, scheme-format
+msgid "invalid syntax: ~a~%"
+msgstr "无效语法: ~a~%"
 
-#: guix/ui.scm:1285
+#: guix/ui.scm:1884
 #, scheme-format
 msgid "Generation ~a\t~a"
 msgstr ""
 
+#. TRANSLATORS: This is a format-string for date->string.
+#. Please choose a format that corresponds to the
+#. usual way of presenting dates in your locale.
+#. See https://www.gnu.org/software/guile/manual/html_node/SRFI_002d19-Date-to-string.html
+#. for details.
+#: guix/ui.scm:1894
+#, scheme-format
+msgid "~b ~d ~Y ~T"
+msgstr ""
+
 #. TRANSLATORS: The word "current" here is an adjective for
 #. "Generation", as in "current generation".  Use the appropriate
 #. gender where applicable.
-#: guix/ui.scm:1295
+#: guix/ui.scm:1900
 #, scheme-format
 msgid "~a\t(current)~%"
 msgstr "~a\t(当前)~%"
 
-#: guix/ui.scm:1338
+#: guix/ui.scm:1934
+#, fuzzy, scheme-format
+#| msgid "cannot access `~a': ~a~%"
+msgid "cannot lock profile ~a: ~a~%"
+msgstr "无法访问 `~a': ~a~%"
+
+#: guix/ui.scm:1936
+#, scheme-format
+msgid "profile ~a is locked by another process~%"
+msgstr ""
+
+#: guix/ui.scm:1963
 #, scheme-format
 msgid "switched from generation ~a to ~a~%"
 msgstr ""
 
-#: guix/ui.scm:1354
+#: guix/ui.scm:1979
 #, scheme-format
 msgid "deleting ~a~%"
 msgstr "正删除 ~a~%"
 
-#: guix/ui.scm:1385
+#: guix/ui.scm:2010
 #, scheme-format
 msgid "Try `guix --help' for more information.~%"
 msgstr "请尝试 “guix --help”，以获取更多信息。~%"
 
-#: guix/ui.scm:1413
+#: guix/ui.scm:2102
 msgid ""
 "Usage: guix COMMAND ARGS...\n"
 "Run COMMAND with ARGS.\n"
 msgstr ""
 
-#: guix/ui.scm:1416
+#: guix/ui.scm:2105
 msgid "COMMAND must be one of the sub-commands listed below:\n"
 msgstr ""
 
-#: guix/ui.scm:1436
+#: guix/ui.scm:2147
 #, scheme-format
 msgid "guix: ~a: command not found~%"
 msgstr "guix：~a：未找到命令~%"
 
-#: guix/ui.scm:1466
+#: guix/ui.scm:2149
+#, scheme-format
+msgid "Did you mean @code{~a}?"
+msgstr ""
+
+#: guix/ui.scm:2183
 #, scheme-format
 msgid "guix: missing command name~%"
 msgstr ""
 
-#: guix/ui.scm:1474
+#: guix/ui.scm:2191
 #, scheme-format
 msgid "guix: unrecognized option '~a'~%"
 msgstr "guix: 无法识别的选项“~a”~%"
 
-#: guix/http-client.scm:269
+#. TRANSLATORS: The word "phase" here denotes a "build phase";
+#. "~a" is a placeholder for the untranslated name of the current
+#. build phase--e.g., 'configure' or 'build'.
+#: guix/status.scm:357
+#, scheme-format
+msgid "'~a' phase"
+msgstr ""
+
+#: guix/status.scm:377
+msgid "building directory of Info manuals..."
+msgstr ""
+
+#: guix/status.scm:379
+msgid "building GHC package cache..."
+msgstr ""
+
+#: guix/status.scm:381
+msgid "building CA certificate bundle..."
+msgstr ""
+
+#: guix/status.scm:383
+msgid "generating GLib schema cache..."
+msgstr ""
+
+#: guix/status.scm:385
+msgid "creating GTK+ icon theme cache..."
+msgstr ""
+
+#: guix/status.scm:387
+msgid "building cache files for GTK+ input methods..."
+msgstr ""
+
+#: guix/status.scm:389
+msgid "building XDG desktop file cache..."
+msgstr ""
+
+#: guix/status.scm:391
+msgid "building XDG MIME database..."
+msgstr ""
+
+#: guix/status.scm:393
+msgid "building fonts directory..."
+msgstr ""
+
+#: guix/status.scm:395
+msgid "building TeX Live configuration..."
+msgstr ""
+
+#: guix/status.scm:397
+msgid "building database for manual pages..."
+msgstr ""
+
+#: guix/status.scm:399
+msgid "building package cache..."
+msgstr ""
+
+#: guix/status.scm:479
+#, scheme-format
+msgid "applying ~a graft for ~a ..."
+msgid_plural "applying ~a grafts for ~a ..."
+msgstr[0] ""
+
+#: guix/status.scm:487
+#, scheme-format
+msgid "building profile with ~a package..."
+msgid_plural "building profile with ~a packages..."
+msgstr[0] ""
+
+#: guix/status.scm:496
+#, scheme-format
+msgid "running profile hook of type '~a'..."
+msgstr ""
+
+#: guix/status.scm:499
+#, scheme-format
+msgid "building ~a..."
+msgstr ""
+
+#: guix/status.scm:504
+#, scheme-format
+msgid "successfully built ~a"
+msgstr ""
+
+#: guix/status.scm:510
+#, scheme-format
+msgid "The following build is still in progress:~%~{  ~a~%~}~%"
+msgid_plural "The following builds are still in progress:~%~{  ~a~%~}~%"
+msgstr[0] ""
+
+#: guix/status.scm:516
+#, scheme-format
+msgid "build of ~a failed"
+msgstr ""
+
+#: guix/status.scm:520
+#, fuzzy, scheme-format
+#| msgid "could not find bootstrap binary '~a' for system '~a'"
+msgid "Could not find build log for '~a'."
+msgstr "无法找到引导二进制 '~a'，用于系统 '~a'"
+
+#: guix/status.scm:523
+#, scheme-format
+msgid "View build log at '~a'."
+msgstr ""
+
+#: guix/status.scm:528
+#, scheme-format
+msgid "substituting ~a..."
+msgstr ""
+
+#: guix/status.scm:533
+#, scheme-format
+msgid "downloading from ~a ..."
+msgstr ""
+
+#: guix/status.scm:559
+#, scheme-format
+msgid "substitution of ~a complete"
+msgstr ""
+
+#: guix/status.scm:562
+#, scheme-format
+msgid "substitution of ~a failed"
+msgstr ""
+
+#. TRANSLATORS: The final string looks like "sha256 hash mismatch for
+#. /gnu/store/…-sth:", where "sha256" is the hash algorithm.
+#: guix/status.scm:567
+#, scheme-format
+msgid "~a hash mismatch for ~a:"
+msgstr ""
+
+#: guix/status.scm:569
+#, scheme-format
+msgid ""
+"  expected hash: ~a\n"
+"  actual hash:   ~a~%"
+msgstr ""
+
+#: guix/status.scm:574
+#, scheme-format
+msgid "offloading build of ~a to '~a'"
+msgstr ""
+
+#: guix/http-client.scm:134
 #, scheme-format
 msgid "following redirection to `~a'...~%"
 msgstr ""
 
-#: guix/http-client.scm:281
+#: guix/http-client.scm:146
 #, fuzzy, scheme-format
 #| msgid "download failed"
 msgid "~a: HTTP download failed: ~a (~s)"
 msgstr "下载失败"
 
-#: guix/nar.scm:155
+#: guix/nar.scm:173
 msgid "signature is not a valid s-expression"
 msgstr "签名不是有效的 S-表达式"
 
-#: guix/nar.scm:164
+#: guix/nar.scm:182
 msgid "invalid signature"
 msgstr "无效签名"
 
-#: guix/nar.scm:168
+#: guix/nar.scm:186
 msgid "invalid hash"
 msgstr "无效哈希"
 
-#: guix/nar.scm:176
+#: guix/nar.scm:194
 msgid "unauthorized public key"
 msgstr "公钥未被授权"
 
-#: guix/nar.scm:181
+#: guix/nar.scm:199
 msgid "corrupt signature data"
 msgstr "签名数据损坏"
 
-#: guix/nar.scm:201
+#: guix/nar.scm:220
 #, fuzzy
 msgid "corrupt file set archive"
 msgstr "现用文件损坏 - %s"
 
-#: guix/nar.scm:211
+#: guix/nar.scm:230
 #, scheme-format
 msgid "importing file or directory '~a'...~%"
 msgstr ""
 
-#: guix/nar.scm:222
+#: guix/nar.scm:241
 #, scheme-format
 msgid "found valid signature for '~a'~%"
 msgstr ""
 
-#: guix/nar.scm:229
+#: guix/nar.scm:248
 msgid "imported file lacks a signature"
 msgstr ""
 
-#: guix/nar.scm:268
+#: guix/nar.scm:287
 msgid "invalid inter-file archive mark"
 msgstr ""
 
+#: guix/narinfo.scm:102
+#, fuzzy, scheme-format
+#| msgid "invalid syntax: ~a~%"
+msgid "invalid narinfo hash: ~s"
+msgstr "无效语法: ~a~%"
+
+#: guix/narinfo.scm:116
+#, scheme-format
+msgid "signature version must be a number: ~s~%"
+msgstr ""
+
+#: guix/narinfo.scm:120
+#, scheme-format
+msgid "unsupported signature version: ~a~%"
+msgstr ""
+
+#: guix/narinfo.scm:128
+#, scheme-format
+msgid "signature is not a valid s-expression: ~s~%"
+msgstr ""
+
+#: guix/narinfo.scm:132
+#, scheme-format
+msgid "invalid format of the signature field: ~a~%"
+msgstr ""
+
+#: guix/channels.scm:275
+msgid "unsupported '.guix-channel' version"
+msgstr ""
+
+#: guix/channels.scm:281
+#, fuzzy
+#| msgid "invalid license field"
+msgid "invalid '.guix-channel' file"
+msgstr "无效的许可证字段"
+
+#: guix/channels.scm:340
+msgid "Authenticating channel '~a', commits ~a to ~a (~h new commits)...~%"
+msgstr ""
+
+#: guix/channels.scm:404
+#, scheme-format
+msgid "channel '~a' lacks an introduction and cannot be authenticated~%"
+msgstr ""
+
+#: guix/channels.scm:409
+msgid ""
+"Add the missing introduction to your\n"
+"channels file to address the issue.  Alternatively, you can pass\n"
+"@option{--disable-authentication}, at the risk of running unauthenticated and\n"
+"thus potentially malicious code."
+msgstr ""
+
+#: guix/channels.scm:413
+#, scheme-format
+msgid "channel authentication disabled~%"
+msgstr ""
+
+#: guix/channels.scm:438
+#, scheme-format
+msgid "aborting update of channel '~a' to commit ~a, which is not a descendant of ~a"
+msgstr ""
+
+#: guix/channels.scm:449 guix/scripts/system/reconfigure.scm:318
+msgid ""
+"Use @option{--allow-downgrades} to force\n"
+"this downgrade."
+msgstr ""
+
+#: guix/channels.scm:453
+msgid ""
+"This could indicate that the channel has\n"
+"been tampered with and is trying to force a roll-back, preventing you from\n"
+"getting the latest updates.  If you think this is not the case, explicitly\n"
+"allow non-forward updates."
+msgstr ""
+
+#: guix/channels.scm:506
+#, scheme-format
+msgid "Updating channel '~a' from Git repository at '~a'...~%"
+msgstr ""
+
+#: guix/channels.scm:527
+#, scheme-format
+msgid "pulled channel '~a' from a mirror of ~a, which might be stale~%"
+msgstr ""
+
+#: guix/channels.scm:776
+msgid "'guix' channel is lacking"
+msgstr ""
+
+#: guix/channels.scm:778
+msgid ""
+"Make sure your list of channels\n"
+"contains one channel named @code{guix} providing the core of Guix."
+msgstr ""
+
+#: guix/channels.scm:1053
+msgid "invalid channel news entry"
+msgstr ""
+
+#: guix/channels.scm:1071
+msgid "syntactically invalid channel news file"
+msgstr ""
+
+#: guix/channels.scm:1074
+#, fuzzy
+#| msgid "invalid license field"
+msgid "invalid channel news file"
+msgstr "无效的许可证字段"
+
+#: guix/profiles.scm:585
+msgid "unsupported manifest format"
+msgstr ""
+
+#: guix/profiles.scm:2042
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "while creating directory `~a': ~a"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/profiles.scm:2047
+#, scheme-format
+msgid "Please create the @file{~a} directory, with you as the owner."
+msgstr ""
+
+#: guix/profiles.scm:2056
+#, scheme-format
+msgid "directory `~a' is not owned by you"
+msgstr ""
+
+#: guix/profiles.scm:2060
+#, scheme-format
+msgid "Please change the owner of @file{~a} to user ~s."
+msgstr ""
+
+#: guix/git.scm:140
+msgid "receiving objects"
+msgstr ""
+
+#: guix/git.scm:142
+msgid "indexing objects"
+msgstr ""
+
+#: guix/git.scm:274
+#, scheme-format
+msgid "Git error ~a~%"
+msgstr "Git 错误 ~a~%"
+
+#: guix/git.scm:276 guix/git.scm:487
+#, scheme-format
+msgid "Git error: ~a~%"
+msgstr "Git 错误：~a~%"
+
+#: guix/git.scm:290
+#, scheme-format
+msgid "updating submodule '~a'...~%"
+msgstr ""
+
+#: guix/git.scm:581
+#, scheme-format
+msgid "cannot fetch commit ~a from ~a: ~a"
+msgstr ""
+
+#: guix/git.scm:584
+#, scheme-format
+msgid "cannot fetch branch '~a' from ~a: ~a"
+msgstr ""
+
+#: guix/git.scm:587
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "Git failure while fetching ~a: ~a"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/deprecation.scm:37
+#, scheme-format
+msgid "'~a' is deprecated, use '~a' instead~%"
+msgstr ""
+
+#: guix/deprecation.scm:39
+#, scheme-format
+msgid "'~a' is deprecated~%"
+msgstr ""
+
+#. TRANSLATORS: 'derivation' must not be translated; it refers to the
+#. 'derivation' procedure.
+#: guix/derivations.scm:775
+#, scheme-format
+msgid "in '~a': deprecated 'derivation' calling convention used~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:70
+msgid ""
+"Usage: guix archive [OPTION]... PACKAGE...\n"
+"Export/import one or more packages from/to the store.\n"
+msgstr ""
+
+#: guix/scripts/archive.scm:72
+msgid ""
+"\n"
+"      --export           export the specified files/packages to stdout"
+msgstr ""
+
+#: guix/scripts/archive.scm:74
+msgid ""
+"\n"
+"  -r, --recursive        combined with '--export', include dependencies"
+msgstr ""
+
+#: guix/scripts/archive.scm:76
+msgid ""
+"\n"
+"      --import           import from the archive passed on stdin"
+msgstr ""
+
+#: guix/scripts/archive.scm:78
+msgid ""
+"\n"
+"      --missing          print the files from stdin that are missing"
+msgstr ""
+
+#: guix/scripts/archive.scm:80
+msgid ""
+"\n"
+"  -x, --extract=DIR      extract the archive on stdin to DIR"
+msgstr ""
+
+#: guix/scripts/archive.scm:82
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -h, --help             display this help and exit"
+msgid ""
+"\n"
+"  -t, --list             list the files in the archive on stdin"
+msgstr ""
+"\n"
+"  -h, --help                 显示这份说明然后离开"
+
+#: guix/scripts/archive.scm:85
+msgid ""
+"\n"
+"      --generate-key[=PARAMETERS]\n"
+"                         generate a key pair with the given parameters"
+msgstr ""
+
+#: guix/scripts/archive.scm:88
+msgid ""
+"\n"
+"      --authorize        authorize imports signed by the public key on stdin"
+msgstr ""
+
+#: guix/scripts/archive.scm:159
+#, scheme-format
+msgid "invalid key generation parameters: ~a: ~a~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:203
+#, fuzzy, scheme-format
+#| msgid "package `~a' lacks output `~a'~%"
+msgid "package `~a' has no source~%"
+msgstr "包 `~a' 缺乏输出 `~a'~%"
+
+#: guix/scripts/archive.scm:266
+#, scheme-format
+msgid "unable to export the given packages~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:273
+#, scheme-format
+msgid "key pair exists under '~a'; remove it first~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:277
+#, scheme-format
+msgid ""
+"Please wait while gathering entropy to generate the key pair;\n"
+"this may take time...~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:284
+#, scheme-format
+msgid "key generation failed: ~a: ~a~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:311
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to read public key: ~a: ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/archive.scm:318
+#, scheme-format
+msgid "replacing symbolic link ~a with a regular file~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:321
+msgid ""
+"On Guix System, add all @code{authorized-keys} to the\n"
+"@code{guix-service-type} service of your @code{operating-system} instead."
+msgstr ""
+
+#: guix/scripts/archive.scm:327
+#, scheme-format
+msgid "s-expression does not denote a public key~%"
+msgstr ""
+
+#: guix/scripts/archive.scm:420
+#, scheme-format
+msgid "either '--export' or '--import' must be specified~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:129
+msgid ""
+"Usage: guix environment [OPTION]... PACKAGE... [-- COMMAND...]\n"
+"Build an environment that includes the dependencies of PACKAGE and execute\n"
+"COMMAND or an interactive shell in that environment.\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:132
+msgid ""
+"\n"
+"  -e, --expression=EXPR  create environment for the package that EXPR\n"
+"                         evaluates to"
+msgstr ""
+
+#: guix/scripts/environment.scm:135
+msgid ""
+"\n"
+"  -l, --load=FILE        create environment for the package that the code within\n"
+"                         FILE evaluates to"
+msgstr ""
+
+#: guix/scripts/environment.scm:138
+msgid ""
+"\n"
+"  -m, --manifest=FILE    create environment with the manifest from FILE"
+msgstr ""
+
+#: guix/scripts/environment.scm:140
+msgid ""
+"\n"
+"  -p, --profile=PATH     create environment from profile at PATH"
+msgstr ""
+
+#: guix/scripts/environment.scm:142
+msgid ""
+"\n"
+"      --ad-hoc           include all specified packages in the environment instead\n"
+"                         of only their inputs"
+msgstr ""
+
+#: guix/scripts/environment.scm:145
+msgid ""
+"\n"
+"      --pure             unset existing environment variables"
+msgstr ""
+
+#: guix/scripts/environment.scm:147
+msgid ""
+"\n"
+"  -E, --preserve=REGEXP  preserve environment variables that match REGEXP"
+msgstr ""
+
+#: guix/scripts/environment.scm:149
+msgid ""
+"\n"
+"      --search-paths     display needed environment variable definitions"
+msgstr ""
+
+#: guix/scripts/environment.scm:156
+msgid ""
+"\n"
+"  -C, --container        run command within an isolated container"
+msgstr ""
+
+#: guix/scripts/environment.scm:158
+msgid ""
+"\n"
+"  -N, --network          allow containers to access the network"
+msgstr ""
+
+#: guix/scripts/environment.scm:160
+#, scheme-format
+msgid ""
+"\n"
+"  -P, --link-profile     link environment profile to ~/.guix-profile within\n"
+"                         an isolated container"
+msgstr ""
+
+#: guix/scripts/environment.scm:163
+msgid ""
+"\n"
+"  -u, --user=USER        instead of copying the name and home of the current\n"
+"                         user into an isolated container, use the name USER\n"
+"                         with home directory /home/USER"
+msgstr ""
+
+#: guix/scripts/environment.scm:167
+msgid ""
+"\n"
+"      --no-cwd           do not share current working directory with an\n"
+"                         isolated container"
+msgstr ""
+
+#: guix/scripts/environment.scm:171
+msgid ""
+"\n"
+"      --share=SPEC       for containers, share writable host file system\n"
+"                         according to SPEC"
+msgstr ""
+
+#: guix/scripts/environment.scm:174
+msgid ""
+"\n"
+"      --expose=SPEC      for containers, expose read-only host file system\n"
+"                         according to SPEC"
+msgstr ""
+
+#: guix/scripts/environment.scm:179
+msgid ""
+"\n"
+"      --bootstrap        use bootstrap binaries to build the environment"
+msgstr ""
+
+#: guix/scripts/environment.scm:233
+#, scheme-format
+msgid "'--inherit' is deprecated, use '--preserve' instead~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:631
+#, scheme-format
+msgid "cannot link profile: '~a' already exists within container~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:669
+msgid "cannot create container: user namespaces unavailable\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:670
+msgid "is your kernel version < 3.10?\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:673
+msgid "cannot create container: unprivileged user cannot create user namespaces\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:674
+msgid "please set /proc/sys/kernel/unprivileged_userns_clone to \"1\"\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:677
+msgid "cannot create container: /proc/self/setgroups does not exist\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:678
+msgid "is your kernel version < 3.19?\n"
+msgstr ""
+
+#: guix/scripts/environment.scm:731
+#, scheme-format
+msgid "'--link-profile' cannot be used without '--container'~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:733
+#, scheme-format
+msgid "'--user' cannot be used without '--container'~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:735
+#, scheme-format
+msgid "--no-cwd cannot be used without --container~%"
+msgstr ""
+
+#: guix/scripts/environment.scm:756
+#, scheme-format
+msgid "'--profile' cannot be used with package options~%"
+msgstr ""
+
+#: guix/scripts/time-machine.scm:51
+msgid ""
+"Usage: guix time-machine [OPTION] -- COMMAND ARGS...\n"
+"Execute COMMAND ARGS... in an older version of Guix.\n"
+msgstr ""
+
+#: guix/scripts/time-machine.scm:55
+msgid ""
+"\n"
+"      --url=URL          use the Git repository at URL"
+msgstr ""
+
+#: guix/scripts/time-machine.scm:57
+msgid ""
+"\n"
+"      --commit=COMMIT    use the specified COMMIT"
+msgstr ""
+
+#: guix/scripts/time-machine.scm:59
+msgid ""
+"\n"
+"      --branch=BRANCH    use the tip of the specified BRANCH"
+msgstr ""
+
+#: guix/scripts/import/cpan.scm:41
+msgid ""
+"Usage: guix import cpan PACKAGE-NAME\n"
+"Import and convert the CPAN package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/cpan.scm:86 guix/scripts/import/crate.scm:101
+#: guix/scripts/import/gem.scm:100 guix/scripts/import/opam.scm:106
+#: guix/scripts/import/pypi.scm:101
+#, scheme-format
+msgid "failed to download meta-data for package '~a'~%"
+msgstr ""
+
+#: guix/scripts/import/crate.scm:44
+msgid ""
+"Usage: guix import crate PACKAGE-NAME\n"
+"Import and convert the crates.io package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/gem.scm:42
+msgid ""
+"Usage: guix import gem PACKAGE-NAME\n"
+"Import and convert the RubyGems package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/gem.scm:48
+msgid ""
+"\n"
+"  -r, --recursive        generate package expressions for all Gem packages that are not yet in Guix"
+msgstr ""
+
+#: guix/scripts/import/gnu.scm:40
+#, fuzzy
+#| msgid ""
+#| "Usage: guix size [OPTION]... PACKAGE\n"
+#| "Report the size of PACKAGE and its dependencies.\n"
+msgid ""
+"Usage: guix import gnu [OPTION...] PACKAGE\n"
+"Return a package declaration template for PACKAGE, a GNU package.\n"
+msgstr ""
+"用法：guix size [选项]... 软件包\n"
+"报告 <软件包> 及其依赖的大小。\n"
+
+#: guix/scripts/import/gnu.scm:43 guix/scripts/refresh.scm:177
+msgid ""
+"\n"
+"      --key-download=POLICY\n"
+"                         handle missing OpenPGP keys according to POLICY:\n"
+"                         'always', 'never', and 'interactive', which is also\n"
+"                         used when 'key-download' is not specified"
+msgstr ""
+
+#: guix/scripts/import/gnu.scm:72 guix/scripts/refresh.scm:118
+#, scheme-format
+msgid "unsupported policy: ~a~%"
+msgstr ""
+
+#: guix/scripts/import/go.scm:45
+msgid ""
+"Usage: guix import go PACKAGE-PATH[@VERSION]\n"
+"Import and convert the Go module for PACKAGE-PATH.  Optionally, a version\n"
+"can be specified after the arobas (@) character.\n"
+msgstr ""
+
+#: guix/scripts/import/go.scm:50
+msgid ""
+"\n"
+"  -r, --recursive        generate package expressions for all Go modules\n"
+"that are not yet in Guix"
+msgstr ""
+
+#: guix/scripts/import/go.scm:53
+msgid ""
+"\n"
+"  -p, --goproxy=GOPROXY  specify which goproxy server to use"
+msgstr ""
+
+#: guix/scripts/import/go.scm:55
+msgid ""
+"\n"
+"  --pin-versions         use the exact versions of a module's dependencies"
+msgstr ""
+
+#: guix/scripts/import/go.scm:121
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to download meta-data for module '~a'~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/import/hackage.scm:48
+msgid ""
+"Usage: guix import hackage PACKAGE-NAME\n"
+"Import and convert the Hackage package for PACKAGE-NAME.  If PACKAGE-NAME\n"
+"includes a suffix constituted by a at-sign followed by a numerical version (as\n"
+"used with Guix packages), then a definition for the specified version of the\n"
+"package will be generated.  If no version suffix is specified, then the\n"
+"generated package definition will correspond to the latest available\n"
+"version.\n"
+msgstr ""
+
+#: guix/scripts/import/hackage.scm:55
+msgid ""
+"\n"
+"  -e ALIST, --cabal-environment=ALIST\n"
+"                               specify environment for Cabal evaluation"
+msgstr ""
+
+#: guix/scripts/import/hackage.scm:58 guix/scripts/import/stackage.scm:49
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -h, --help                     display this help and exit"
+msgid ""
+"\n"
+"  -h, --help                   display this help and exit"
+msgstr ""
+"\n"
+"  -h, --help                     显示这份说明然后离开"
+
+#: guix/scripts/import/hackage.scm:60 guix/scripts/import/stackage.scm:51
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -n, --dry-run          do not build the derivations"
+msgid ""
+"\n"
+"  -r, --recursive              import packages recursively"
+msgstr ""
+"\n"
+"  -n, --dry-run          不要构建派生包"
+
+#: guix/scripts/import/hackage.scm:62
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -V, --version                  display version information and exit"
+msgid ""
+"\n"
+"  -s, --stdin                  read from standard input"
+msgstr ""
+"\n"
+"  -v, --version                  显示程序版本然后离开"
+
+#: guix/scripts/import/hackage.scm:64 guix/scripts/import/stackage.scm:53
+msgid ""
+"\n"
+"  -t, --no-test-dependencies   don't include test-only dependencies"
+msgstr ""
+
+#: guix/scripts/import/hackage.scm:66 guix/scripts/import/stackage.scm:55
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -V, --version                  display version information and exit"
+msgid ""
+"\n"
+"  -V, --version                display version information and exit"
+msgstr ""
+"\n"
+"  -v, --version                  显示程序版本然后离开"
+
+#: guix/scripts/import/hackage.scm:149
+#, scheme-format
+msgid "failed to import cabal file from standard input~%"
+msgstr ""
+
+#: guix/scripts/import/hackage.scm:157 guix/scripts/import/stackage.scm:129
+#, scheme-format
+msgid "failed to download cabal file for package '~a'~%"
+msgstr ""
+
+#: guix/scripts/import/json.scm:49
+msgid ""
+"Usage: guix import json PACKAGE-FILE\n"
+"Import and convert the JSON package definition in PACKAGE-FILE.\n"
+msgstr ""
+
+#: guix/scripts/import/json.scm:95
+#, fuzzy, scheme-format
+#| msgid "invalid signature for '~a'~%"
+msgid "invalid JSON in file '~a'~%"
+msgstr "'~a'~% 签名无效"
+
+#: guix/scripts/import/json.scm:97
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to access '~a': ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/import/nix.scm:41
+msgid ""
+"Usage: guix import nix NIXPKGS ATTRIBUTE\n"
+"Import and convert the Nix expression ATTRIBUTE of NIXPKGS.\n"
+msgstr ""
+
+#: guix/scripts/import/opam.scm:41
+msgid ""
+"Usage: guix import opam PACKAGE-NAME\n"
+"Import and convert the opam package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/opam.scm:47
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -n, --dry-run          do not build the derivations"
+msgid ""
+"\n"
+"      --repo             import packages from this opam repository"
+msgstr ""
+"\n"
+"  -n, --dry-run          不要构建派生包"
+
+#: guix/scripts/import/pypi.scm:42
+msgid ""
+"Usage: guix import pypi PACKAGE-NAME\n"
+"Import and convert the PyPI package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/stackage.scm:44
+msgid ""
+"Usage: guix import stackage PACKAGE-NAME\n"
+"Import and convert the LTS Stackage package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/import/stackage.scm:46
+msgid ""
+"\n"
+"  -l VERSION, --lts-version=VERSION\n"
+"                               specify the LTS version to use"
+msgstr ""
+
+#: guix/scripts/import/texlive.scm:42
+msgid ""
+"Usage: guix import texlive PACKAGE-NAME\n"
+"Import and convert the Texlive package for PACKAGE-NAME.\n"
+msgstr ""
+
+#: guix/scripts/offload.scm:127
+#, scheme-format
+msgid "The 'system' field is deprecated, please use 'systems' instead.~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:135
+msgid ""
+"The build-machine object lacks a value for its 'systems'\n"
+"field."
+msgstr ""
+
+#: guix/scripts/offload.scm:176
+#, scheme-format
+msgid "'~a' did not return a list of build machines; ignoring it~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:187
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to open machine file '~a': ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:194
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to load machine file '~a': ~s~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:204
+#, scheme-format
+msgid "failed to load SSH private key from '~a': ~a"
+msgstr ""
+
+#: guix/scripts/offload.scm:245
+#, scheme-format
+msgid "SSH public key authentication failed for '~a': ~a~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:256
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to connect to '~a': ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:365
+#, scheme-format
+msgid "derivation '~a' offloaded to '~a' failed: ~a~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:381
+#, scheme-format
+msgid "build failure may have been caused by lack of free disk space on '~a'~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:550
+#, scheme-format
+msgid "timeout expired while offloading '~a'~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:623
+#, scheme-format
+msgid "'~a' is running GNU Guile ~a~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:630
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to run 'guix repl' on '~a'~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:637
+#, scheme-format
+msgid "(guix) module not usable on remote host '~a'"
+msgstr ""
+
+#: guix/scripts/offload.scm:647
+#, scheme-format
+msgid "Guix is usable on '~a' (test returned ~s)~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:650
+#, scheme-format
+msgid "failed to talk to guix-daemon on '~a' (test returned ~s)~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:670
+#, scheme-format
+msgid "'~a' successfully imported '~a'~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:672
+#, scheme-format
+msgid "'~a' was not properly imported on '~a'~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:682
+#, scheme-format
+msgid "successfully imported '~a' from '~a'~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:684
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to import '~a' from '~a'~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:699
+#, scheme-format
+msgid "testing ~a build machines defined in '~a'...~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:723
+#, scheme-format
+msgid "getting status of ~a build machines defined in '~a'...~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:731
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "failed to run 'guix repl' on machine '~a'~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/offload.scm:742
+#, scheme-format
+msgid "machine '~a' is ~a seconds behind~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:788
+msgid "Guile-SSH lacks zlib support"
+msgstr ""
+
+#: guix/scripts/offload.scm:789
+msgid "data transfers will *not* be compressed!"
+msgstr ""
+
+#: guix/scripts/offload.scm:814
+#, fuzzy, scheme-format
+#| msgid "invalid argument: ~a~%"
+msgid "invalid request line: ~s~%"
+msgstr "无效参数: ~a~%"
+
+#: guix/scripts/offload.scm:843
+#, scheme-format
+msgid ""
+"Usage: guix offload SYSTEM MAX-SILENT-TIME PRINT-BUILD-TRACE? BUILD-TIMEOUT\n"
+"Process build offload requests written on the standard input, possibly\n"
+"offloading builds to the machines listed in '~a'.~%"
+msgstr ""
+
+#: guix/scripts/offload.scm:848
+msgid ""
+"\n"
+"This tool is meant to be used internally by 'guix-daemon'.\n"
+msgstr ""
+
+#: guix/scripts/offload.scm:852
+#, fuzzy, scheme-format
+#| msgid "invalid argument: ~a~%"
+msgid "invalid arguments: ~{~s ~}~%"
+msgstr "无效参数: ~a~%"
+
+#: guix/scripts/perform-download.scm:59
+#, fuzzy, scheme-format
+#| msgid "~a: invalid number~%"
+msgid "~a: missing URL~%"
+msgstr "~a: 无效的数字~%"
+
+#: guix/scripts/perform-download.scm:67
+#, fuzzy, scheme-format
+#| msgid "~a: invalid number~%"
+msgid "~a is not a fixed-output derivation~%"
+msgstr "~a: 无效的数字~%"
+
+#: guix/scripts/perform-download.scm:92
+#, scheme-format
+msgid "refusing to run with elevated privileges (UID ~a)~%"
+msgstr ""
+
+#: guix/scripts/perform-download.scm:129
+#, scheme-format
+msgid "fixed-output derivation and output file name expected~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:75
+#, scheme-format
+msgid "~a: invalid selection; expected `core' or `non-core'~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:143
+msgid ""
+"Usage: guix refresh [OPTION]... [PACKAGE]...\n"
+"Update package definitions to match the latest upstream version.\n"
+"\n"
+"When PACKAGE... is given, update only the specified packages.  Otherwise\n"
+"update all the packages of the distribution, or the subset thereof\n"
+"specified with `--select'.\n"
+msgstr ""
+
+#: guix/scripts/refresh.scm:151
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -n, --dry-run          do not build the derivations"
+msgid ""
+"\n"
+"  -u, --update           update source files in place"
+msgstr ""
+"\n"
+"  -n, --dry-run          不要构建派生包"
+
+#: guix/scripts/refresh.scm:153
+msgid ""
+"\n"
+"  -s, --select=SUBSET    select all the packages in SUBSET, one of\n"
+"                         `core' or `non-core'"
+msgstr ""
+
+#: guix/scripts/refresh.scm:156
+msgid ""
+"\n"
+"  -m, --manifest=FILE    select all the packages from the manifest in FILE"
+msgstr ""
+
+#: guix/scripts/refresh.scm:158
+msgid ""
+"\n"
+"  -t, --type=UPDATER,... restrict to updates from the specified updaters\n"
+"                         (e.g., 'gnu')"
+msgstr ""
+
+#: guix/scripts/refresh.scm:161
+msgid ""
+"\n"
+"  -L, --list-updaters    list available updaters and exit"
+msgstr ""
+
+#: guix/scripts/refresh.scm:163
+msgid ""
+"\n"
+"  -l, --list-dependent   list top-level dependent packages that would need to\n"
+"                         be rebuilt as a result of upgrading PACKAGE..."
+msgstr ""
+
+#: guix/scripts/refresh.scm:166
+msgid ""
+"\n"
+"  -r, --recursive        check the PACKAGE and its inputs for upgrades"
+msgstr ""
+
+#: guix/scripts/refresh.scm:168
+msgid ""
+"\n"
+"      --list-transitive  list all the packages that PACKAGE depends on"
+msgstr ""
+
+#: guix/scripts/refresh.scm:171
+msgid ""
+"\n"
+"      --keyring=FILE     use FILE as the keyring of upstream OpenPGP keys"
+msgstr ""
+
+#: guix/scripts/refresh.scm:173
+msgid ""
+"\n"
+"      --key-server=HOST  use HOST as the OpenPGP key server"
+msgstr ""
+
+#: guix/scripts/refresh.scm:175
+msgid ""
+"\n"
+"      --gpg=COMMAND      use COMMAND as the GnuPG 2.x command"
+msgstr ""
+
+#: guix/scripts/refresh.scm:183
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "  -L, --load-path=DIR    prepend DIR to the package module search path"
+msgid ""
+"\n"
+"      --load-path=DIR    prepend DIR to the package module search path"
+msgstr ""
+"\n"
+"  -L, --load-path=目录   将 <目录> 加入到软件包模块搜索目录之前"
+
+#: guix/scripts/refresh.scm:276
+#, scheme-format
+msgid "~a: no such updater~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:280
+#, scheme-format
+msgid "Available updaters:~%"
+msgstr ""
+
+#. TRANSLATORS: The parenthetical expression here is rendered
+#. like "(42% coverage)" and denotes the fraction of packages
+#. covered by the given updater.
+#: guix/scripts/refresh.scm:292
+#, scheme-format
+msgid "  - ~a: ~a (~2,1f% coverage)~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:301
+#, scheme-format
+msgid "~2,1f% of the packages are covered by these updaters.~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:307
+#, fuzzy, scheme-format
+#| msgid "invalid signature for '~a'~%"
+msgid "no updater for ~a~%"
+msgstr "'~a'~% 签名无效"
+
+#: guix/scripts/refresh.scm:327
+#, fuzzy, scheme-format
+#| msgid "~A: package not found for version ~a~%"
+msgid "~a: updating from version ~a to version ~a...~%"
+msgstr "~A: 无法找到供版本 ~a~% 的软件包"
+
+#: guix/scripts/refresh.scm:336
+#, scheme-format
+msgid "~a: consider adding this input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:338
+#, scheme-format
+msgid "~a: consider adding this native input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:340
+#, scheme-format
+msgid "~a: consider adding this propagated input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:342
+#, scheme-format
+msgid "~a: consider removing this input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:344
+#, scheme-format
+msgid "~a: consider removing this native input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:346
+#, scheme-format
+msgid "~a: consider removing this propagated input: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:353
+#, scheme-format
+msgid "~a: version ~a could not be downloaded and authenticated; not updating~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:370
+#, fuzzy, scheme-format
+#| msgid "can be upgraded to ~a"
+msgid "~a would be upgraded from ~a to ~a~%"
+msgstr "可升级至 ~a"
+
+#: guix/scripts/refresh.scm:376
+#, scheme-format
+msgid "~a is already the latest version of ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:382
+#, scheme-format
+msgid "~a is greater than the latest known version of ~a (~a)~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:393
+#, scheme-format
+msgid "'~a' updater failed to determine available releases for ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:432
+#, scheme-format
+msgid "No dependents other than itself: ~{~a~}~%"
+msgid_plural "No dependents other than themselves: ~{~a~^ ~}~%"
+msgstr[0] ""
+
+#: guix/scripts/refresh.scm:439
+#, scheme-format
+msgid "A single dependent package: ~a~%"
+msgstr ""
+
+#: guix/scripts/refresh.scm:443
+#, scheme-format
+msgid "Building the following ~d package would ensure ~d dependent packages are rebuilt: ~{~a~^ ~}~%"
+msgid_plural "Building the following ~d packages would ensure ~d dependent packages are rebuilt: ~{~a~^ ~}~%"
+msgstr[0] ""
+
+#: guix/scripts/refresh.scm:467
+#, scheme-format
+msgid "~a depends on the following ~d packages: ~{~a~^ ~}~%."
+msgstr ""
+
+#: guix/scripts/refresh.scm:471
+#, scheme-format
+msgid "The following ~d packages all are dependent packages: ~{~a~^ ~}~%"
+msgstr ""
+
+#: guix/scripts/repl.scm:70
+msgid ""
+"Usage: guix repl [OPTIONS...] [-- FILE ARGS...]\n"
+"In the Guix execution environment, run FILE as a Guile script with\n"
+"command-line arguments ARGS.  If no FILE is given, start a Guile REPL.\n"
+msgstr ""
+
+#: guix/scripts/repl.scm:73
+msgid ""
+"\n"
+"  -t, --type=TYPE        start a REPL of the given TYPE"
+msgstr ""
+
+#: guix/scripts/repl.scm:75
+msgid ""
+"\n"
+"      --listen=ENDPOINT  listen to ENDPOINT instead of standard input"
+msgstr ""
+
+#: guix/scripts/repl.scm:77
+#, fuzzy, scheme-format
+#| msgid ""
+#| "\n"
+#| "  -h, --help                     display this help and exit"
+msgid ""
+"\n"
+"  -q                     inhibit loading of ~/.guile"
+msgstr ""
+"\n"
+"  -h, --help                     显示这份说明然后离开"
+
+#: guix/scripts/repl.scm:106
+#, fuzzy, scheme-format
+#| msgid "ambiguous package specification `~a'~%"
+msgid "~A: invalid listen specification~%"
+msgstr "含糊的软件包规范 `~a'~%"
+
+#: guix/scripts/repl.scm:117
+#, scheme-format
+msgid "~A: unsupported protocol family~%"
+msgstr ""
+
+#: guix/scripts/repl.scm:125
+#, scheme-format
+msgid "accepted connection~%"
+msgstr ""
+
+#: guix/scripts/repl.scm:126
+#, fuzzy, scheme-format
+#| msgid "failed to connect to `~a': ~a~%"
+msgid "accepted connection from ~a~%"
+msgstr "连接到 `~a' 失败：~a~%"
+
+#: guix/scripts/repl.scm:137
+#, scheme-format
+msgid "connection closed~%"
+msgstr ""
+
+#: guix/scripts/repl.scm:210
+#, fuzzy, scheme-format
+#| msgid "~a: unknown node type~%"
+msgid "~a: unknown type of REPL~%"
+msgstr "~a: 未知节点类型~%"
+
+#: guix/scripts/system/reconfigure.scm:313
+#, scheme-format
+msgid "aborting reconfiguration because commit ~a of channel '~a' is not a descendant of ~a"
+msgstr ""
+
+#: guix/scripts/system/reconfigure.scm:372
+#, scheme-format
+msgid "cannot determine provenance for current system~%"
+msgstr ""
+
+#: guix/scripts/system/reconfigure.scm:374
+#, scheme-format
+msgid "cannot determine provenance of ~a~%"
+msgstr ""
+
 #: nix/nix-daemon/guix-daemon.cc:66
 msgid "guix-daemon -- perform derivation builds and store accesses"
 msgstr ""
@@ -2972,120 +6865,145 @@ msgstr ""
 msgid "This program is a daemon meant to run in the background.  It serves requests sent over a Unix-domain socket.  It accesses the store, and builds derivations on behalf of its clients."
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:94
+#: nix/nix-daemon/guix-daemon.cc:96
 msgid "SYSTEM"
 msgstr "系统"
 
-#: nix/nix-daemon/guix-daemon.cc:95
+#: nix/nix-daemon/guix-daemon.cc:97
 msgid "assume SYSTEM as the current system type"
-msgstr ""
+msgstr "假设 <系统> 为当前系统类型"
 
-#: nix/nix-daemon/guix-daemon.cc:96 nix/nix-daemon/guix-daemon.cc:99
+#: nix/nix-daemon/guix-daemon.cc:98 nix/nix-daemon/guix-daemon.cc:101
 msgid "N"
 msgstr "N"
 
-#: nix/nix-daemon/guix-daemon.cc:97
+#: nix/nix-daemon/guix-daemon.cc:99
 msgid "use N CPU cores to build each derivation; 0 means as many as available"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:100
+#: nix/nix-daemon/guix-daemon.cc:102
 msgid "allow at most N build jobs"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:101 nix/nix-daemon/guix-daemon.cc:103
+#: nix/nix-daemon/guix-daemon.cc:103 nix/nix-daemon/guix-daemon.cc:105
 msgid "SECONDS"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:102
+#: nix/nix-daemon/guix-daemon.cc:104
 msgid "mark builds as failed after SECONDS of activity"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:104
+#: nix/nix-daemon/guix-daemon.cc:106
 msgid "mark builds as failed after SECONDS of silence"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:106
+#: nix/nix-daemon/guix-daemon.cc:108
 msgid "disable chroot builds"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:107
+#: nix/nix-daemon/guix-daemon.cc:109
 msgid "DIR"
 msgstr "目录"
 
-#: nix/nix-daemon/guix-daemon.cc:108
+#: nix/nix-daemon/guix-daemon.cc:110
 msgid "add DIR to the build chroot"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:109
+#: nix/nix-daemon/guix-daemon.cc:111
 msgid "GROUP"
 msgstr "组"
 
-#: nix/nix-daemon/guix-daemon.cc:110
+#: nix/nix-daemon/guix-daemon.cc:112
 msgid "perform builds as a user of GROUP"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:112
+#: nix/nix-daemon/guix-daemon.cc:114
 msgid "do not use substitutes"
-msgstr ""
+msgstr "不使用替代品"
 
-#: nix/nix-daemon/guix-daemon.cc:113
+#: nix/nix-daemon/guix-daemon.cc:115
 msgid "URLS"
 msgstr "网址"
 
-#: nix/nix-daemon/guix-daemon.cc:114
+#: nix/nix-daemon/guix-daemon.cc:116
 msgid "use URLS as the default list of substitute providers"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:116
-msgid "do not use the 'build hook'"
+#: nix/nix-daemon/guix-daemon.cc:118 nix/nix-daemon/guix-daemon.cc:121
+msgid "do not attempt to offload builds"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:118
+#: nix/nix-daemon/guix-daemon.cc:123
 msgid "cache build failures"
 msgstr "对构建失败进行缓存"
 
-#: nix/nix-daemon/guix-daemon.cc:120
+#: nix/nix-daemon/guix-daemon.cc:125
 msgid "build each derivation N times in a row"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:122
+#: nix/nix-daemon/guix-daemon.cc:127
 msgid "do not keep build logs"
 msgstr "不要保留构建日志"
 
-#: nix/nix-daemon/guix-daemon.cc:124
+#: nix/nix-daemon/guix-daemon.cc:130
 msgid "disable compression of the build logs"
 msgstr "禁用构建日志压缩"
 
-#: nix/nix-daemon/guix-daemon.cc:129
-msgid "disable automatic file \"deduplication\" in the store"
+#: nix/nix-daemon/guix-daemon.cc:132
+#, fuzzy
+#| msgid "disable compression of the build logs"
+msgid "use the specified compression type for build logs"
+msgstr "禁用构建日志压缩"
+
+#: nix/nix-daemon/guix-daemon.cc:134
+msgid "use substitute servers discovered on the local network"
 msgstr ""
 
 #: nix/nix-daemon/guix-daemon.cc:139
+msgid "disable automatic file \"deduplication\" in the store"
+msgstr ""
+
+#: nix/nix-daemon/guix-daemon.cc:149
 msgid "impersonate Linux 2.6"
 msgstr "模拟 Linux 2.6"
 
-#: nix/nix-daemon/guix-daemon.cc:143
+#: nix/nix-daemon/guix-daemon.cc:153
 msgid "tell whether the GC must keep outputs of live derivations"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:146
+#: nix/nix-daemon/guix-daemon.cc:156
 msgid "tell whether the GC must keep derivations corresponding to live outputs"
 msgstr ""
 
-#: nix/nix-daemon/guix-daemon.cc:149
+#: nix/nix-daemon/guix-daemon.cc:159
 msgid "SOCKET"
 msgstr "套接字"
 
-#: nix/nix-daemon/guix-daemon.cc:150
+#: nix/nix-daemon/guix-daemon.cc:160
 msgid "listen for connections on SOCKET"
 msgstr "侦听 <套接字> 上的链接"
 
-#: nix/nix-daemon/guix-daemon.cc:152
+#: nix/nix-daemon/guix-daemon.cc:162
 msgid "produce debugging output"
 msgstr "生成调试输出"
 
-#~ msgid "unrecognized option: ~a~%"
-#~ msgstr "无法识别的选项: ~a~%"
+#, fuzzy
+#~| msgid "~a: package not found~%"
+#~ msgid "~a: host not found: ~a~%"
+#~ msgstr "~a: 包未找到~%"
+
+#, fuzzy
+#~| msgid "~a: download failed~%"
+#~ msgid "~a: connection failed: ~a~%"
+#~ msgstr "~a：下载失败~%"
+
+#~ msgid "please upgrade Guile-Git~%"
+#~ msgstr "请升级 Guile-Git~%"
+
+#, fuzzy
+#~| msgid "failed to connect to `~a': ~a~%"
+#~ msgid "failed to install bootloader ~a~%"
+#~ msgstr "连接到 `~a' 失败：~a~%"
 
 #~ msgid "~A: unexpected argument~%"
 #~ msgstr "~A: 未预期的参数~%"
@@ -3095,9 +7013,6 @@ msgstr "生成调试输出"
 #~ msgid "failed to lookup NIST host: ~a~%"
 #~ msgstr "连接到 `~a' 失败：~a~%"
 
-#~ msgid "too many arguments\n"
-#~ msgstr "太多参数\n"
-
 #~ msgid "error: %s\n"
 #~ msgstr "错误：%s\n"
 
diff --git a/po/packages/zh_CN.po b/po/packages/zh_CN.po
index 82370ad795..06002782f6 100644
--- a/po/packages/zh_CN.po
+++ b/po/packages/zh_CN.po
@@ -1,32 +1,29 @@
 # Simplified Chinese translation for guix-packages.
-# Copyright (C) 2018 Ludovic Courtès
+# Copyright (C) 2018 the authors of Guix (msgids)
 # This file is distributed under the same license as the guix package.
 # Boyuan Yang <073plan@gmail.com>, 2018.
-#
+# Liu Tao <lyuutau@outlook.com>, 2021.
 msgid ""
 msgstr ""
 "Project-Id-Version: guix-packages 0.14.0\n"
-"Report-Msgid-Bugs-To: ludo@gnu.org\n"
-"POT-Creation-Date: 2017-11-28 08:56+0100\n"
-"PO-Revision-Date: 2018-03-05 00:15+0800\n"
-"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: bug-guix@gnu.org\n"
+"POT-Creation-Date: 2021-04-13 01:18+0200\n"
+"PO-Revision-Date: 2021-03-23 18:26+0000\n"
+"Last-Translator: Liu Tao <lyuutau@outlook.com>\n"
+"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/projects/guix/packages/zh_CN/>\n"
 "Language: zh_CN\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
-
-#: gnu/packages/abiword.scm:114
-msgid "Word processing program"
-msgstr "文字处理程序"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 4.5.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. TRANSLATORS: Dear translator, We would like to inform you that package
 #. descriptions may occasionally include Texinfo markup.  Texinfo markup
 #. looks like "@code{rm -rf}", "@emph{important}", etc.  When translating,
 #. please leave markup as is.
-#: gnu/packages/abiword.scm:123
+#: gnu/packages/abiword.scm:124
 msgid ""
 "AbiWord is a word processing program.  It is rapidly\n"
 "becoming a state of the art word processor, with lots of features useful for\n"
@@ -35,11 +32,7 @@ msgstr ""
 "AbiWord 是一款文字处理程序。  它正迅速成为最先进的文字处理软件，\n"
 "所提供的诸多功能既能应对日常工作，也可满足个人需求。"
 
-#: gnu/packages/aspell.scm:70 gnu/packages/libreoffice.scm:715
-msgid "Spell checker"
-msgstr "拼写检查器"
-
-#: gnu/packages/aspell.scm:72
+#: gnu/packages/aspell.scm:88
 msgid ""
 "Aspell is a spell-checker which can be used either as a library or as\n"
 "a standalone program.  Notable features of Aspell include its full support of\n"
@@ -49,45 +42,95 @@ msgstr ""
 "Aspell 是一款拼写检查器，它既可作为库使用，也可作为独立程序运行。  其重要\n"
 "功能包括对 UTF-8 编写的文档的完整支持以及对多个词典，包括自定义词典在内的支持。"
 
-#: gnu/packages/aspell.scm:114
+#: gnu/packages/aspell.scm:137
 msgid "This package provides a dictionary for the GNU Aspell spell checker."
 msgstr ""
 
-#: gnu/packages/aspell.scm:285 gnu/packages/libreoffice.scm:765
+#: gnu/packages/aspell.scm:436 gnu/packages/libreoffice.scm:897
+#: gnu/packages/libreoffice.scm:970
 msgid ""
 "This package provides a dictionary for the Hunspell spell-checking\n"
 "library."
 msgstr ""
 
-#: gnu/packages/aspell.scm:303
-msgid "Hunspell dictionary for English"
-msgstr "英语的 Hunspell 词典"
+#: gnu/packages/aspell.scm:517
+msgid ""
+"Ispell is an interactive spell-checking tool supporting many\n"
+"European languages."
+msgstr ""
+
+#: gnu/packages/audio.scm:188
+msgid ""
+"OpenSLES is a royalty-free, cross-platform,\n"
+"hardware-accelerated audio API tuned for embedded systems.  It provides a\n"
+"standardized, high-performance, low-latency method to access audio\n"
+"functionality for developers of native applications on embedded mobile\n"
+"multimedia devices, enabling straightforward cross-platform deployment of\n"
+"hardware and software audio capabilities, reducing implementation effort, and\n"
+"promoting the market for advanced audio."
+msgstr ""
+
+#: gnu/packages/audio.scm:224
+msgid ""
+"WildMIDI is a simple software midi player which has a core\n"
+"softsynth library that can be use with other applications."
+msgstr ""
 
-#: gnu/packages/aspell.scm:307
-msgid "Hunspell dictionary for Australian English"
-msgstr "澳大利亚英语的 Hunspell 词典"
+#: gnu/packages/audio.scm:248
+msgid ""
+"WebRTC-Audio-Processing library based on Google's\n"
+"implementation of WebRTC."
+msgstr ""
+
+#: gnu/packages/audio.scm:268
+msgid ""
+"VO-AACENC is the VisualOn implementation of Advanced Audio\n"
+"Coding (AAC) encoder."
+msgstr ""
+
+#: gnu/packages/audio.scm:297
+msgid ""
+"TinyALSA is a small library to interface with ALSA in the\n"
+"Linux kernel."
+msgstr ""
+
+#: gnu/packages/audio.scm:342
+msgid ""
+"LibOpenMPT is a cross-platform C++ and C module playback\n"
+"library.  It is based on the player code of the Open ModPlug Tracker project."
+msgstr ""
 
-#: gnu/packages/aspell.scm:311
-msgid "Hunspell dictionary for Canadian English"
+#: gnu/packages/audio.scm:374
+msgid ""
+"LibOFA is an audio fingerprint library, created and provided\n"
+"by MusicIP."
 msgstr ""
 
-#: gnu/packages/aspell.scm:315
-msgid "Hunspell dictionary for British English, with -ise endings"
+#: gnu/packages/audio.scm:398
+msgid "FAAC is an MPEG-4 and MPEG-2 AAC encoder."
 msgstr ""
 
-#: gnu/packages/aspell.scm:319
-msgid "Hunspell dictionary for British English, with -ize endings"
+#: gnu/packages/audio.scm:427
+msgid ""
+"LibTiMidity is a MIDI to WAVE converter library that uses\n"
+"Gravis Ultrasound-compatible patch files to generate digital audio data from\n"
+"General MIDI files."
 msgstr ""
 
-#: gnu/packages/aspell.scm:323
-msgid "Hunspell dictionary for United States English"
+#: gnu/packages/audio.scm:452
+msgid ""
+"VO-AMR is a library of VisualOn implementation of\n"
+"Adaptive Multi Rate Narrowband and Wideband (AMR-NB and AMR-WB) speech codec."
 msgstr ""
 
-#: gnu/packages/audio.scm:128
-msgid "Realtime modular synthesizer and effect processor"
+#: gnu/packages/audio.scm:471
+msgid ""
+"OpenCore-AMR is a library of OpenCORE Framework\n"
+"implementation of Adaptive Multi Rate Narrowband and Wideband\n"
+"(AMR-NB and AMR-WB) speech codec."
 msgstr ""
 
-#: gnu/packages/audio.scm:130
+#: gnu/packages/audio.scm:505
 msgid ""
 "AlsaModularSynth is a digital implementation of a classical analog\n"
 "modular synthesizer system.  It uses virtual control voltages to control the\n"
@@ -96,11 +139,7 @@ msgid ""
 "Filter) modules follow the convention of 1V / Octave."
 msgstr ""
 
-#: gnu/packages/audio.scm:167
-msgid "Library for audio labelling"
-msgstr ""
-
-#: gnu/packages/audio.scm:169
+#: gnu/packages/audio.scm:546
 msgid ""
 "aubio is a tool designed for the extraction of annotations from audio\n"
 "signals.  Its features include segmenting a sound file before each of its\n"
@@ -108,33 +147,39 @@ msgid ""
 "streams from live audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:270
-msgid "Digital audio workstation"
-msgstr ""
-
-#: gnu/packages/audio.scm:272
+#: gnu/packages/audio.scm:677
 msgid ""
 "Ardour is a multi-channel digital audio workstation, allowing users to\n"
 "record, edit, mix and master audio and MIDI projects.  It is targeted at audio\n"
 "engineers, musicians, soundtrack editors and composers."
 msgstr ""
 
-#: gnu/packages/audio.scm:407
-msgid "Software for recording and editing sounds"
-msgstr ""
-
-#: gnu/packages/audio.scm:409
+#: gnu/packages/audio.scm:791
 msgid ""
 "Audacity is a multi-track audio editor designed for recording, playing\n"
 "and editing digital audio.  It features digital effects and spectrum analysis\n"
 "tools."
 msgstr ""
 
-#: gnu/packages/audio.scm:444
-msgid "Tonewheel organ synthesizer"
+#: gnu/packages/audio.scm:847
+msgid ""
+"This is an open-source version of SGI's audiofile library.\n"
+"It provides a uniform programming interface for processing of audio data to\n"
+"and from audio files of many common formats.\n"
+"\n"
+"Currently supported file formats include AIFF/AIFF-C, WAVE, and NeXT/Sun\n"
+".snd/.au, BICS, and raw data.  Supported compression formats are currently\n"
+"G.711 mu-law and A-law."
 msgstr ""
 
-#: gnu/packages/audio.scm:446
+#: gnu/packages/audio.scm:889
+msgid ""
+"Autotalent is a LADSPA plugin for real-time pitch-correction.  Among its\n"
+"controls are allowable notes, strength of correction, LFO for vibrato and\n"
+"formant warp."
+msgstr ""
+
+#: gnu/packages/audio.scm:933
 msgid ""
 "AZR-3 is a port of the free VST plugin AZR-3.  It is a tonewheel organ\n"
 "with drawbars, distortion and rotating speakers.  The organ has three\n"
@@ -143,11 +188,7 @@ msgid ""
 "plugins are provided."
 msgstr ""
 
-#: gnu/packages/audio.scm:483
-msgid "Audio plug-in pack for LV2 and JACK environments"
-msgstr ""
-
-#: gnu/packages/audio.scm:485
+#: gnu/packages/audio.scm:972
 msgid ""
 "Calf Studio Gear is an audio plug-in pack for LV2 and JACK environments.\n"
 "The suite contains lots of effects (delay, modulation, signal processing,\n"
@@ -156,35 +197,31 @@ msgid ""
 "tools (analyzer, mono/stereo tools, crossovers)."
 msgstr ""
 
-#: gnu/packages/audio.scm:537
-msgid "Software speech synthesizer"
-msgstr ""
-
-#: gnu/packages/audio.scm:538
+#: gnu/packages/audio.scm:1017
 msgid ""
-"eSpeak is a software speech synthesizer for English and\n"
-"other languages.  eSpeak uses a \"formant synthesis\" method.  This allows many\n"
-"languages to be provided in a small size.  The speech is clear, and can be used\n"
-"at high speeds, but is not as natural or smooth as larger synthesizers which are\n"
-"based on human speech recordings."
-msgstr ""
-
-#: gnu/packages/audio.scm:585
-msgid "LV2 plugins for live use"
+"LV2 port of CAPS, a collection of audio plugins comprising basic virtual\n"
+"guitar amplification and a small range of classic effects, signal processors and\n"
+"generators of mostly elementary and occasionally exotic nature."
 msgstr ""
 
-#: gnu/packages/audio.scm:587
+#: gnu/packages/audio.scm:1056
 msgid ""
 "The infamous plugins are a collection of LV2 audio plugins for live\n"
 "performances.  The plugins include a cellular automaton synthesizer, an\n"
 "envelope follower, distortion effects, tape effects and more."
 msgstr ""
 
-#: gnu/packages/audio.scm:628
-msgid "SWH plugins in LV2 format"
+#: gnu/packages/audio.scm:1091
+msgid ""
+"Snapcast is a multi-room client-server audio player.  Clients are time\n"
+"synchronized with the server to play synced audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:630
+#: gnu/packages/audio.scm:1122
+msgid "This package provides Steve Harris's LADSPA plugins."
+msgstr ""
+
+#: gnu/packages/audio.scm:1164
 msgid ""
 "Swh-plugins-lv2 is a collection of audio plugins in LV2 format.  Plugin\n"
 "classes include: dynamics (compressor, limiter), time (delay, chorus,\n"
@@ -192,42 +229,45 @@ msgid ""
 "emulation (valve, tape), bit fiddling (decimator, pointer-cast), etc."
 msgstr ""
 
-#: gnu/packages/audio.scm:664
-msgid "Sound and music computing system"
+#: gnu/packages/audio.scm:1232
+msgid ""
+"Tao is a software package for sound synthesis using physical\n"
+"models.  It provides a virtual acoustic material constructed from masses and\n"
+"springs which can be used as the basis for building quite complex virtual\n"
+"musical instruments.  Tao comes with a synthesis language for creating and\n"
+"playing instruments and a C++ API for those who would like to use it as an\n"
+"object library."
 msgstr ""
 
-#: gnu/packages/audio.scm:666
+#: gnu/packages/audio.scm:1270
 msgid ""
 "Csound is a user-programmable and user-extensible sound processing\n"
 "language and software synthesizer."
 msgstr ""
 
-#: gnu/packages/audio.scm:707 gnu/packages/audio.scm:2808
-msgid "C++ wrapper around the ALSA API"
+#: gnu/packages/audio.scm:1297
+msgid ""
+"midicomp can manipulate SMF (Standard MIDI File) files.  It can both\n"
+"  read and write SMF files in 0 or format 1 and also read and write its own\n"
+"  plain text format.  This means a SMF file can be turned into easily\n"
+"  parseable text, edited with any text editor or filtered through any script\n"
+"  language, and recompiled back into a binary SMF file."
 msgstr ""
 
-#: gnu/packages/audio.scm:709
+#: gnu/packages/audio.scm:1345
 msgid ""
 "clalsadrv is a C++ wrapper around the ALSA API simplifying access to\n"
 "ALSA PCM devices."
 msgstr ""
 
-#: gnu/packages/audio.scm:746
-msgid "LADSPA ambisonics plugins"
-msgstr ""
-
-#: gnu/packages/audio.scm:748
+#: gnu/packages/audio.scm:1384
 msgid ""
 "The AMB plugins are a set of LADSPA ambisonics plugins, mainly to be\n"
 "used within Ardour.  Features include: mono and stereo to B-format panning,\n"
 "horizontal rotator, square, hexagon and cube decoders."
 msgstr ""
 
-#: gnu/packages/audio.scm:783
-msgid "Chorus, phaser, and vintage high-pass and low-pass filters"
-msgstr ""
-
-#: gnu/packages/audio.scm:785
+#: gnu/packages/audio.scm:1421
 msgid ""
 "This package provides various LADSPA plugins.  @code{cs_chorus} and\n"
 "@code{cs_phaser} provide chorus and phaser effects, respectively;\n"
@@ -237,21 +277,13 @@ msgid ""
 "the non-linear circuit elements of their original analog counterparts."
 msgstr ""
 
-#: gnu/packages/audio.scm:823
-msgid "LADSPA reverb plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:825
+#: gnu/packages/audio.scm:1461
 msgid ""
 "This package provides a stereo reverb LADSPA plugin based on the\n"
 "well-known greverb."
 msgstr ""
 
-#: gnu/packages/audio.scm:859
-msgid "LADSPA four-band parametric equalizer plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:861
+#: gnu/packages/audio.scm:1497
 msgid ""
 "This package provides a LADSPA plugin for a four-band parametric\n"
 "equalizer.  Each section has an active/bypass switch, frequency, bandwidth and\n"
@@ -260,34 +292,26 @@ msgid ""
 "The 2nd order resonant filters are implemented using a Mitra-Regalia style\n"
 "lattice filter, which is stable even while parameters are being changed.\n"
 "\n"
-"All switches and controls are internally smoothed, so they can be used 'live'\n"
+"All switches and controls are internally smoothed, so they can be used @code{live}\n"
 "without any clicks or zipper noises.  This makes this plugin suitable for use\n"
 "in systems that allow automation of plugin control ports, such as Ardour, or\n"
 "for stage use."
 msgstr ""
 
-#: gnu/packages/audio.scm:904
-msgid "LADSPA stereo width plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:906
+#: gnu/packages/audio.scm:1542
 msgid ""
 "This package provides a LADSPA plugin to manipulate the stereo width of\n"
 "audio signals."
 msgstr ""
 
-#: gnu/packages/audio.scm:941
-msgid "LADSPA plugin for synthesizer oscillators"
-msgstr ""
-
-#: gnu/packages/audio.scm:943
+#: gnu/packages/audio.scm:1579
 msgid ""
 "The @code{blvco} LADSPA plugin provides three anti-aliased oscillators:\n"
 "\n"
 "@enumerate\n"
 "@item Pulse-VCO, a dirac pulse oscillator with flat amplitude spectrum\n"
 "@item Saw-VCO, a sawtooth oscillator with 1/F amplitude spectrum\n"
-"@item Rec-VCO, a square / rectange oscillator\n"
+"@item Rec-VCO, a square / rectangle oscillator\n"
 "@end enumerate\n"
 "\n"
 "\n"
@@ -295,29 +319,17 @@ msgid ""
 "output of analog synthesizers such as the Moog Voyager."
 msgstr ""
 
-#: gnu/packages/audio.scm:985
-msgid "LADSPA Autowah effect plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:987
+#: gnu/packages/audio.scm:1623
 msgid ""
 "This package provides a LADSPA plugin for a Wah effect with envelope\n"
 "follower."
 msgstr ""
 
-#: gnu/packages/audio.scm:1021
-msgid "LADSPA stereo reverb plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:1023
+#: gnu/packages/audio.scm:1659
 msgid "This package provides a LADSPA plugin for a stereo reverb effect."
 msgstr ""
 
-#: gnu/packages/audio.scm:1061
-msgid "SoundFont synthesizer"
-msgstr ""
-
-#: gnu/packages/audio.scm:1063
+#: gnu/packages/audio.scm:1700
 msgid ""
 "FluidSynth is a real-time software synthesizer based on the SoundFont 2\n"
 "specifications.  FluidSynth reads and handles MIDI events from the MIDI input\n"
@@ -325,39 +337,21 @@ msgid ""
 "also play midifiles using a Soundfont."
 msgstr ""
 
-#: gnu/packages/audio.scm:1094
-msgid "MPEG-4 and MPEG-2 AAC decoder"
+#: gnu/packages/audio.scm:1739
+msgid "FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR, -PS, and DAB+."
 msgstr ""
 
-#: gnu/packages/audio.scm:1096
-msgid ""
-"FAAD2 is an MPEG-4 and MPEG-2 AAC decoder supporting LC, Main, LTP, SBR,\n"
-"PS, and DAB+."
-msgstr ""
-
-#: gnu/packages/audio.scm:1125
-msgid "Signal processing language"
-msgstr "信号处理语言"
-
-#: gnu/packages/audio.scm:1127
+#: gnu/packages/audio.scm:1780
 msgid "Faust is a programming language for realtime audio signal processing."
 msgstr ""
 
-#: gnu/packages/audio.scm:1207
-msgid "GUS compatible patches for MIDI players"
-msgstr ""
-
-#: gnu/packages/audio.scm:1209
+#: gnu/packages/audio.scm:1849
 msgid ""
 "FreePats is a project to create a free and open set of GUS compatible\n"
 "patches that can be used with softsynths such as Timidity and WildMidi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1261
-msgid "Virtual guitar amplifier"
-msgstr ""
-
-#: gnu/packages/audio.scm:1262
+#: gnu/packages/audio.scm:1902
 msgid ""
 "Guitarix is a virtual guitar amplifier running JACK.\n"
 "Guitarix takes the signal from your guitar as a mono-signal from your sound\n"
@@ -368,11 +362,7 @@ msgid ""
 "auto-wah."
 msgstr ""
 
-#: gnu/packages/audio.scm:1316
-msgid "Audio effects processor"
-msgstr ""
-
-#: gnu/packages/audio.scm:1318
+#: gnu/packages/audio.scm:1958
 msgid ""
 "Rakarrack is a richly featured multi-effects processor emulating a\n"
 "guitar effects pedalboard.  Effects include compressor, expander, noise gate,\n"
@@ -384,22 +374,14 @@ msgid ""
 "well suited to all musical instruments and vocals."
 msgstr ""
 
-#: gnu/packages/audio.scm:1369
-msgid "LV2 convolution reverb"
-msgstr ""
-
-#: gnu/packages/audio.scm:1371
+#: gnu/packages/audio.scm:2014
 msgid ""
 "IR is a low-latency, real-time, high performance signal convolver\n"
 "especially for creating reverb effects.  It supports impulse responses with 1,\n"
 "2 or 4 channels, in any soundfile format supported by libsndfile."
 msgstr ""
 
-#: gnu/packages/audio.scm:1401
-msgid "JACK audio connection kit"
-msgstr ""
-
-#: gnu/packages/audio.scm:1403
+#: gnu/packages/audio.scm:2055
 msgid ""
 "JACK is a low-latency audio server.  It can connect a number of\n"
 "different applications to an audio device, as well as allowing them to share\n"
@@ -409,32 +391,20 @@ msgid ""
 "synchronous execution of all clients, and low latency operation."
 msgstr ""
 
-#: gnu/packages/audio.scm:1509
-msgid "Simple LV2 host for JACK"
-msgstr ""
-
-#: gnu/packages/audio.scm:1511
+#: gnu/packages/audio.scm:2151
 msgid ""
 "Jalv is a simple but fully featured LV2 host for JACK.  It runs LV2\n"
 "plugins and exposes their ports as JACK ports, essentially making any LV2\n"
 "plugin function as a JACK application."
 msgstr ""
 
-#: gnu/packages/audio.scm:1554
-msgid "Linux Audio Developer's Simple Plugin API (LADSPA)"
-msgstr ""
-
-#: gnu/packages/audio.scm:1556
+#: gnu/packages/audio.scm:2197
 msgid ""
 "LADSPA is a standard that allows software audio processors and effects\n"
 "to be plugged into a wide range of audio synthesis and recording packages."
 msgstr ""
 
-#: gnu/packages/audio.scm:1602
-msgid "Audio application session manager"
-msgstr ""
-
-#: gnu/packages/audio.scm:1604
+#: gnu/packages/audio.scm:2251
 msgid ""
 "LASH is a session management system for audio applications.  It allows\n"
 "you to save and restore audio sessions consisting of multiple interconneced\n"
@@ -442,11 +412,7 @@ msgid ""
 "connections between them."
 msgstr ""
 
-#: gnu/packages/audio.scm:1625
-msgid "Bauer stereophonic-to-binaural DSP"
-msgstr ""
-
-#: gnu/packages/audio.scm:1627
+#: gnu/packages/audio.scm:2274
 msgid ""
 "The Bauer stereophonic-to-binaural DSP (bs2b) library and plugins is\n"
 "designed to improve headphone listening of stereo audio records.  Recommended\n"
@@ -454,21 +420,47 @@ msgid ""
 "essential distortions."
 msgstr ""
 
-#: gnu/packages/audio.scm:1650
-msgid "Implementation of the Open Sound Control protocol"
+#: gnu/packages/audio.scm:2298
+msgid ""
+"The Bauer stereophonic-to-binaural DSP (bs2b) library and\n"
+"plugins is designed to improve headphone listening of stereo audio records.\n"
+"Recommended for headphone prolonged listening to disable superstereo fatigue\n"
+"without essential distortions.  This package contains a LADSPA plugin for use\n"
+"with applications that support them (e.g. PulseAudio)."
 msgstr ""
 
-#: gnu/packages/audio.scm:1652
+#: gnu/packages/audio.scm:2324
 msgid ""
 "liblo is a lightweight library that provides an easy to use\n"
-"implementation of the Open Sound Control (OSC) protocol."
+"implementation of the Open Sound Control (@dfn{OSC}) protocol."
 msgstr ""
 
-#: gnu/packages/audio.scm:1674
-msgid "Python bindings for liblo"
-msgstr "liblo 的 Python 绑定"
+#: gnu/packages/audio.scm:2350
+msgid ""
+"RtAudio is a set of C++ classes that provides a common API for real-time\n"
+"audio input/output.  It was designed with the following objectives:\n"
+"\n"
+"@itemize\n"
+"@item object-oriented C++ design\n"
+"@item simple, common API across all supported platforms\n"
+"@item only one source and one header file for easy inclusion in programming\n"
+"projects\n"
+"@item allow simultaneous multi-api support\n"
+"@item support dynamic connection of devices\n"
+"@item provide extensive audio device parameter control\n"
+"@item allow audio device capability probing\n"
+"@item automatic internal conversion for data format, channel number\n"
+"compensation, (de)interleaving, and byte-swapping\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/audio.scm:2386
+msgid ""
+"This package provides bindings for PortAudio v19, the\n"
+"cross-platform audio input/output stream library."
+msgstr ""
 
-#: gnu/packages/audio.scm:1676
+#: gnu/packages/audio.scm:2413
 msgid ""
 "Pyliblo is a Python wrapper for the liblo Open Sound Control (OSC)\n"
 "library.  It supports almost the complete functionality of liblo, allowing you\n"
@@ -476,22 +468,14 @@ msgid ""
 "included are the command line utilities @code{send_osc} and @code{dump_osc}."
 msgstr ""
 
-#: gnu/packages/audio.scm:1717
-msgid "Library to simplify use of LV2 plugins in applications"
-msgstr ""
-
-#: gnu/packages/audio.scm:1719
+#: gnu/packages/audio.scm:2463
 msgid ""
 "Lilv is a C library to make the use of LV2 plugins as simple as possible\n"
 "for applications.  Lilv is the successor to SLV2, rewritten to be\n"
 "significantly faster and have minimal dependencies."
 msgstr ""
 
-#: gnu/packages/audio.scm:1745
-msgid "LV2 audio plugin specification"
-msgstr ""
-
-#: gnu/packages/audio.scm:1747
+#: gnu/packages/audio.scm:2491
 msgid ""
 "LV2 is an open specification for audio plugins and host applications.\n"
 "At its core, LV2 is a simple stable interface, accompanied by extensions which\n"
@@ -499,38 +483,22 @@ msgid ""
 "software."
 msgstr ""
 
-#: gnu/packages/audio.scm:1797
-msgid "LV2 port of the mda Piano plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:1798
+#: gnu/packages/audio.scm:2528
 msgid "An LV2 port of the mda Piano VSTi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1811
-msgid "LV2 port of the mda EPiano plugin"
-msgstr ""
-
-#: gnu/packages/audio.scm:1812
+#: gnu/packages/audio.scm:2542
 msgid "An LV2 port of the mda EPiano VSTi."
 msgstr ""
 
-#: gnu/packages/audio.scm:1857
-msgid "C++ libraries for LV2 plugins"
-msgstr "LV2 插件的 C++ 库"
-
-#: gnu/packages/audio.scm:1859
+#: gnu/packages/audio.scm:2574
 msgid ""
 "The LV2 Toolkit (LVTK) contains libraries that wrap the LV2 C API and\n"
 "extensions into easy to use C++ classes.  It is the successor of\n"
 "lv2-c++-tools."
 msgstr ""
 
-#: gnu/packages/audio.scm:1900
-msgid "3D audio API"
-msgstr "3D 音频 API"
-
-#: gnu/packages/audio.scm:1902
+#: gnu/packages/audio.scm:2617
 msgid ""
 "OpenAL provides capabilities for playing audio in a virtual 3D\n"
 "environment.  Distance attenuation, doppler shift, and directional sound\n"
@@ -540,80 +508,82 @@ msgid ""
 "buffers, and audio capture."
 msgstr ""
 
-#: gnu/packages/audio.scm:1932
-msgid "Free implementation of OpenAL's ALUT standard"
-msgstr ""
-
-#: gnu/packages/audio.scm:1933
+#: gnu/packages/audio.scm:2648
 msgid "freealut is the OpenAL Utility Toolkit."
 msgstr ""
 
-#: gnu/packages/audio.scm:1962
-msgid "Modular patch bay for audio and MIDI systems"
-msgstr ""
-
-#: gnu/packages/audio.scm:1964
+#: gnu/packages/audio.scm:2681
 msgid ""
 "Patchage is a modular patch bay for audio and MIDI systems based on JACK\n"
 "and ALSA."
 msgstr ""
 
-#: gnu/packages/audio.scm:1990
-msgid "Jack server control application"
+#: gnu/packages/audio.scm:2711
+msgid ""
+"The Portable C Audio Library (pcaudiolib) provides a C@tie{}API to\n"
+"different audio devices such as ALSA or PulseAudio."
 msgstr ""
 
-#: gnu/packages/audio.scm:1991
+#: gnu/packages/audio.scm:2743
 msgid ""
 "Control a Jack server.  Allows you to plug various sources\n"
 "into various outputs and to start, stop and configure jackd"
 msgstr ""
 
-#: gnu/packages/audio.scm:2017
-msgid "Real-time audio utility library"
+#: gnu/packages/audio.scm:2777
+msgid ""
+"QJackRcd is a simple graphical stereo recorder for JACK\n"
+"supporting silence processing for automatic pause, file splitting, and\n"
+"background file post-processing."
+msgstr ""
+
+#: gnu/packages/audio.scm:2892
+msgid ""
+"SuperCollider is a synthesis engine (@code{scsynth} or\n"
+"@code{supernova}) and programming language (@code{sclang}).  It can be used\n"
+"for experimenting with sound synthesis and algorithmic composition.\n"
+"\n"
+"SuperCollider requires jackd to be installed in your user profile and your\n"
+"user must be allowed to access the realtime features of the kernel.  Search\n"
+"for \"realtime\" in the index of the Guix manual to learn how to achieve this\n"
+"using Guix System."
 msgstr ""
 
-#: gnu/packages/audio.scm:2019
+#: gnu/packages/audio.scm:2925
 msgid ""
 "Raul (Real-time Audio Utility Library) is a C++ utility library primarily\n"
 "aimed at audio/musical applications."
 msgstr ""
 
-#: gnu/packages/audio.scm:2062
-msgid "Audio time-stretching and pitch-shifting library"
+#: gnu/packages/audio.scm:2964
+msgid ""
+"This package contains the @command{resample} and\n"
+"@command{windowfilter} command line utilities.  The @command{resample} command\n"
+"allows changing the sampling rate of a sound file, while the\n"
+"@command{windowfilter} command allows designing Finite Impulse Response (FIR)\n"
+"filters using the so-called @emph{window method}."
 msgstr ""
 
-#: gnu/packages/audio.scm:2064
+#: gnu/packages/audio.scm:3007
 msgid ""
 "Rubber Band is a library and utility program that permits changing the\n"
 "tempo and pitch of an audio recording independently of one another."
 msgstr ""
 
-#: gnu/packages/audio.scm:2112
-msgid "Cross-platform MIDI library for C++"
-msgstr ""
-
-#: gnu/packages/audio.scm:2114
+#: gnu/packages/audio.scm:3035
 msgid ""
 "RtMidi is a set of C++ classes (RtMidiIn, RtMidiOut, and API specific\n"
 "classes) that provide a common cross-platform API for realtime MIDI\n"
 "input/output."
 msgstr ""
 
-#: gnu/packages/audio.scm:2139
-msgid "Library for serialising LV2 atoms to/from RDF"
-msgstr ""
-
-#: gnu/packages/audio.scm:2141
+#: gnu/packages/audio.scm:3063
 msgid ""
 "Sratom is a library for serialising LV2 atoms to/from RDF, particularly\n"
 "the Turtle syntax."
 msgstr ""
 
-#: gnu/packages/audio.scm:2169
-msgid "Library for loading and wrapping LV2 plugin UIs"
-msgstr ""
-
-#: gnu/packages/audio.scm:2171
+#: gnu/packages/audio.scm:3091
 msgid ""
 "Suil is a lightweight C library for loading and wrapping LV2 plugin UIs.\n"
 "\n"
@@ -625,11 +595,13 @@ msgid ""
 "Suil currently supports every combination of Gtk, Qt, and X11."
 msgstr ""
 
-#: gnu/packages/audio.scm:2228
-msgid "Software synthesizer for playing MIDI files"
+#: gnu/packages/audio.scm:3123
+msgid ""
+"@code{libebur128} is a C library that implements the EBU R 128 standard\n"
+"for loudness normalisation."
 msgstr ""
 
-#: gnu/packages/audio.scm:2230
+#: gnu/packages/audio.scm:3177
 msgid ""
 "TiMidity++ is a software synthesizer.  It can play MIDI files by\n"
 "converting them into PCM waveform data; give it a MIDI data along with digital\n"
@@ -638,43 +610,27 @@ msgid ""
 "disks as various audio file formats."
 msgstr ""
 
-#: gnu/packages/audio.scm:2268
-msgid "Modular and extensible audio processing system"
-msgstr ""
-
-#: gnu/packages/audio.scm:2270
+#: gnu/packages/audio.scm:3217
 msgid ""
 "Vamp is an audio processing plugin system for plugins that extract\n"
 "descriptive information from audio data — typically referred to as audio\n"
 "analysis plugins or audio feature extraction plugins."
 msgstr ""
 
-#: gnu/packages/audio.scm:2309
-msgid "Library for time stretching and pitch scaling of audio"
-msgstr ""
-
-#: gnu/packages/audio.scm:2311
+#: gnu/packages/audio.scm:3259
 msgid ""
 "SBSMS (Subband Sinusoidal Modeling Synthesis) is software for time\n"
 "stretching and pitch scaling of audio.  This package contains the library."
 msgstr ""
 
-#: gnu/packages/audio.scm:2330
-msgid "Hybrid lossless audio codec"
-msgstr ""
-
-#: gnu/packages/audio.scm:2332
+#: gnu/packages/audio.scm:3291
 msgid ""
 "WavPack is an audio compression format with lossless, lossy and hybrid\n"
 "compression modes.  This package contains command-line programs and library to\n"
 "encode and decode wavpack files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2351
-msgid "Mod file playing library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2353
+#: gnu/packages/audio.scm:3312
 msgid ""
 "Libmodplug renders mod music files as raw audio data, for playing or\n"
 "conversion.  mod, .s3m, .it, .xm, and a number of lesser-known formats are\n"
@@ -682,33 +638,21 @@ msgid ""
 "surround and reverb."
 msgstr ""
 
-#: gnu/packages/audio.scm:2372
-msgid "Module player library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2374
+#: gnu/packages/audio.scm:3333
 msgid ""
 "Libxmp is a library that renders module files to PCM data.  It supports\n"
 "over 90 mainstream and obscure module formats including Protracker (MOD),\n"
 "Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT)."
 msgstr ""
 
-#: gnu/packages/audio.scm:2397
-msgid "Extended module player"
-msgstr ""
-
-#: gnu/packages/audio.scm:2399
+#: gnu/packages/audio.scm:3358
 msgid ""
 "Xmp is a portable module player that plays over 90 mainstream and\n"
 "obscure module formats, including Protracker MOD, Fasttracker II XM, Scream\n"
 "Tracker 3 S3M and Impulse Tracker IT files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2430
-msgid "Audio processing library for changing tempo, pitch and playback rate"
-msgstr ""
-
-#: gnu/packages/audio.scm:2432
+#: gnu/packages/audio.scm:3386
 msgid ""
 "SoundTouch is an audio processing library for changing the tempo, pitch\n"
 "and playback rates of audio streams or audio files.  It is intended for\n"
@@ -716,11 +660,7 @@ msgid ""
 "control functionality, or just for playing around with the sound effects."
 msgstr ""
 
-#: gnu/packages/audio.scm:2469
-msgid "Sound processing utility"
-msgstr "声音处理实用工具"
-
-#: gnu/packages/audio.scm:2471
+#: gnu/packages/audio.scm:3425
 msgid ""
 "SoX (Sound eXchange) is a command line utility that can convert\n"
 "various formats of computer audio files to other formats.  It can also\n"
@@ -728,92 +668,60 @@ msgid ""
 "can play and record audio files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2494
-msgid "One-dimensional sample-rate conversion library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2496
+#: gnu/packages/audio.scm:3450
 msgid ""
 "The SoX Resampler library (libsoxr) performs one-dimensional sample-rate\n"
 "conversion.  It may be used, for example, to resample PCM-encoded audio."
 msgstr ""
 
-#: gnu/packages/audio.scm:2526
-msgid "MPEG Audio Layer 2 (MP2) encoder"
-msgstr ""
-
-#: gnu/packages/audio.scm:2528
+#: gnu/packages/audio.scm:3474
 msgid ""
 "TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on\n"
 "tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and\n"
 "portions of LAME."
 msgstr ""
 
-#: gnu/packages/audio.scm:2567
-msgid "Audio I/O library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2569
+#: gnu/packages/audio.scm:3534
 msgid ""
 "PortAudio is a portable C/C++ audio I/O library providing a simple API\n"
 "to record and/or play sound using a callback function or a blocking read/write\n"
 "interface."
 msgstr ""
 
-#: gnu/packages/audio.scm:2599
-msgid "Graphical user interface for FluidSynth"
-msgstr ""
-
-#: gnu/packages/audio.scm:2601
+#: gnu/packages/audio.scm:3566
 msgid ""
 "Qsynth is a GUI front-end application for the FluidSynth SoundFont\n"
 "synthesizer written in C++."
 msgstr ""
 
-#: gnu/packages/audio.scm:2638
-msgid "Networked audio system"
-msgstr ""
-
-#: gnu/packages/audio.scm:2640
+#: gnu/packages/audio.scm:3605
 msgid ""
 "RSound allows you to send audio from an application and transfer it\n"
 "directly to a different computer on your LAN network.  It is an audio daemon\n"
 "with a much different focus than most other audio daemons."
 msgstr ""
 
-#: gnu/packages/audio.scm:2671
-msgid "JACK audio frequency analyzer and display"
-msgstr ""
-
-#: gnu/packages/audio.scm:2673
+#: gnu/packages/audio.scm:3638
 msgid ""
 "XJackFreak is an audio analysis and equalizing tool for the Jack Audio\n"
 "Connection Kit.  It can display the FFT of any input, modify it and output the\n"
 "result."
 msgstr ""
 
-#: gnu/packages/audio.scm:2717
-msgid "Fast, partitioned convolution engine library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2719
+#: gnu/packages/audio.scm:3690
 msgid ""
 "Zita convolver is a C++ library providing a real-time convolution\n"
 "engine."
 msgstr ""
 
-#: gnu/packages/audio.scm:2764
-msgid "C++ library for resampling audio signals"
-msgstr ""
-
-#: gnu/packages/audio.scm:2766
+#: gnu/packages/audio.scm:3742
 msgid ""
 "Libzita-resampler is a C++ library for resampling audio signals.  It is\n"
 "designed to be used within a real-time processing context, to be fast, and to\n"
 "provide high-quality sample rate conversion."
 msgstr ""
 
-#: gnu/packages/audio.scm:2810
+#: gnu/packages/audio.scm:3789
 msgid ""
 "Zita-alsa-pcmi is a C++ wrapper around the ALSA API.  It provides easy\n"
 "access to ALSA PCM devices, taking care of the many functions required to\n"
@@ -821,11 +729,7 @@ msgid ""
 "point audio data."
 msgstr ""
 
-#: gnu/packages/audio.scm:2841
-msgid "Cue and toc file parsers and utilities"
-msgstr ""
-
-#: gnu/packages/audio.scm:2842
+#: gnu/packages/audio.scm:3816
 msgid ""
 "Cuetools is a set of programs that are useful for manipulating\n"
 "and using CUE sheet (cue) files and Table of Contents (toc) files.  CUE and TOC\n"
@@ -833,11 +737,7 @@ msgid ""
 "machine-readable ASCII format."
 msgstr ""
 
-#: gnu/packages/audio.scm:2861
-msgid "WAVE audio data processing tool"
-msgstr "WAVE 音频数据处理工具"
-
-#: gnu/packages/audio.scm:2862
+#: gnu/packages/audio.scm:3839
 msgid ""
 "shntool is a multi-purpose WAVE data processing and reporting\n"
 "utility.  File formats are abstracted from its core, so it can process any file\n"
@@ -846,74 +746,273 @@ msgid ""
 "use them split WAVE data into multiple files."
 msgstr ""
 
-#: gnu/packages/audio.scm:2900
-msgid "DTS Coherent Acoustics decoder"
-msgstr ""
-
-#: gnu/packages/audio.scm:2901
+#: gnu/packages/audio.scm:3879
 msgid ""
 "Dcadec is a DTS Coherent Acoustics surround sound decoder\n"
 "with support for HD extensions."
 msgstr ""
 
-#: gnu/packages/audio.scm:2922
-msgid "Tool to adjust loudness of media files"
-msgstr ""
-
-#: gnu/packages/audio.scm:2924
+#: gnu/packages/audio.scm:3917
 msgid ""
 "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its\n"
 "flavors EBU R128, ATSC A/85, and ReplayGain 2.0.  It helps normalizing the\n"
 "loudness of audio and video files to the same level."
 msgstr ""
 
-#: gnu/packages/audio.scm:2955
-msgid "Lightweight audio filtering library"
-msgstr ""
-
-#: gnu/packages/audio.scm:2956
+#: gnu/packages/audio.scm:3949
 msgid ""
 "An easy to use audio filtering library made from webrtc\n"
 "code, used in @code{libtoxcore}."
 msgstr ""
 
-#: gnu/packages/audio.scm:3000
-msgid "GSM 06.10 lossy speech compression library"
-msgstr ""
-
-#: gnu/packages/audio.scm:3001
+#: gnu/packages/audio.scm:4002
 msgid ""
 "This C library provides an encoder and a decoder for the GSM\n"
 "06.10 RPE-LTP lossy speech compression algorithm."
 msgstr ""
 
-#: gnu/packages/audio.scm:3022
-msgid "ALSA wrappers for Python"
-msgstr ""
-
-#: gnu/packages/audio.scm:3024
+#: gnu/packages/audio.scm:4025
 msgid ""
 "This package contains wrappers for accessing the ALSA API from Python.\n"
 "It is currently fairly complete for PCM devices, and has some support for\n"
 "mixers."
 msgstr ""
 
-#: gnu/packages/audio.scm:3083
-msgid "Sound editor"
+#: gnu/packages/audio.scm:4049
+msgid ""
+"This package provides an encoder for the LDAC\n"
+"high-resolution Bluetooth audio streaming codec for streaming at up to 990\n"
+"kbps at 24 bit/96 kHz."
 msgstr ""
 
-#: gnu/packages/audio.scm:3086
+#: gnu/packages/audio.scm:4096
+msgid ""
+"This project is a rebirth of a direct integration between\n"
+"Bluez and ALSA.  Since Bluez >= 5, the built-in integration has been removed\n"
+"in favor of 3rd party audio applications.  From now on, Bluez acts as a\n"
+"middleware between an audio application, which implements Bluetooth audio\n"
+"profile, and a Bluetooth audio device.  BlueALSA registers all known Bluetooth\n"
+"audio profiles in Bluez, so in theory every Bluetooth device (with audio\n"
+"capabilities) can be connected.  In order to access the audio stream, one has\n"
+"to connect to the ALSA PCM device called @code{bluealsa}.  The device is based\n"
+"on the ALSA software PCM plugin."
+msgstr ""
+
+#: gnu/packages/audio.scm:4162
 msgid ""
 "Snd is a sound editor modelled loosely after Emacs.  It can be\n"
 "customized and extended using either the s7 Scheme implementation (included in\n"
 "the Snd sources), Ruby, or Forth."
 msgstr ""
 
-#: gnu/packages/backup.scm:112
-msgid "Encrypted backup using rsync algorithm"
+#: gnu/packages/audio.scm:4192
+msgid ""
+"Noise Repellent is an LV2 plugin to reduce noise.  It has\n"
+"the following features:\n"
+"\n"
+"@enumerate\n"
+"@item Spectral gating and spectral subtraction suppression rule\n"
+"@item Adaptive and manual noise thresholds estimation\n"
+"@item Adjustable noise floor\n"
+"@item Adjustable offset of thresholds to perform over-subtraction\n"
+"@item Time smoothing and a masking estimation to reduce artifacts\n"
+"@item Basic onset detector to avoid transients suppression\n"
+"@item Whitening of the noise floor to mask artifacts and to recover higher\n"
+"  frequencies\n"
+"@item Option to listen to the residual signal\n"
+"@item Soft bypass\n"
+"@item Noise profile saved with the session\n"
+"@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/backup.scm:114
+#: gnu/packages/audio.scm:4263
+msgid ""
+"RNNoise is a library that uses deep learning to apply\n"
+"noise suppression to audio sources with voice presence.  This package provides\n"
+"an LV2 audio plugin."
+msgstr ""
+
+#: gnu/packages/audio.scm:4309
+msgid ""
+"@code{cli-visualizer} displays fast-Fourier\n"
+"transforms (FFTs) of the sound being played, as well as other graphical\n"
+"representations."
+msgstr ""
+
+#: gnu/packages/audio.scm:4363
+msgid ""
+"C.A.V.A. is a bar audio spectrum visualizer for the terminal\n"
+"using ALSA, MPD, PulseAudio, or a FIFO buffer as its input."
+msgstr ""
+
+#: gnu/packages/audio.scm:4397
+msgid "Fluid-3 is Frank Wen's pro-quality GM soundfont."
+msgstr ""
+
+#: gnu/packages/audio.scm:4421
+msgid ""
+"FDK is a library for encoding and decoding Advanced Audio\n"
+"Coding (AAC) format audio, developed by Fraunhofer IIS, and included as part of\n"
+"Android.  It supports several Audio Object Types including MPEG-2 and MPEG-4 AAC\n"
+"LC, HE-AAC (AAC LC + SBR), HE-AACv2 (LC + SBR + PS) as well AAC-LD (low delay)\n"
+"and AAC-ELD (enhanced low delay) for real-time communication.  The encoding\n"
+"library supports sample rates up to 96 kHz and up to eight channels (7.1\n"
+"                                                                     surround)."
+msgstr ""
+
+#: gnu/packages/audio.scm:4461
+msgid ""
+"OpenShot Audio Library (libopenshot-audio) allows\n"
+"high-quality editing and playback of audio, and is based on the JUCE\n"
+"library."
+msgstr ""
+
+#: gnu/packages/audio.scm:4489
+msgid ""
+"FAudio is an XAudio reimplementation that focuses solely on\n"
+"developing fully accurate DirectX Audio runtime libraries."
+msgstr ""
+
+#: gnu/packages/audio.scm:4519
+msgid ""
+"Gnaural is a programmable auditory binaural beat synthesizer\n"
+"intended to be used for brainwave entrainment.  Gnaural supports creation of\n"
+"binaural beat tracks of different frequencies and exporting of tracks into\n"
+"different audio formats.  Gnaural can also be linked over the internet with\n"
+"other Gnaural instances, allowing synchronous sessions between many users."
+msgstr ""
+
+#: gnu/packages/audio.scm:4554
+msgid ""
+"DarkIce is a live audio streamer.  It takes audio input from\n"
+"a sound card, encodes it into Ogg Vorbis and/or mp3, and sends the audio\n"
+"stream to one or more IceCast and/or ShoutCast servers."
+msgstr ""
+
+#: gnu/packages/audio.scm:4579
+msgid ""
+"Libltc is a POSIX-C Library for handling\n"
+"@dfn{Linear/Longitudinal Time Code} (LTC) data."
+msgstr ""
+
+#: gnu/packages/audio.scm:4613
+msgid ""
+"TTA performs lossless compression on multichannel 8,16 and 24 bits\n"
+"data of the Wav audio files.  Being lossless means that no data-\n"
+"quality is lost in the compression - when uncompressed, the data will\n"
+"be identical to the original.  The compression ratios of TTA depend on\n"
+"the type of music file being compressed, but the compression size\n"
+"will generally range between 30% - 70% of the original.  TTA format\n"
+"supports both of ID3v1/v2 and APEv2 tags."
+msgstr ""
+
+#: gnu/packages/audio.scm:4648
+msgid ""
+"@code{libsoundio} is a C library providing audio input and\n"
+"output.  The API is suitable for real-time software such as digital audio\n"
+"workstations as well as consumer software such as music players."
+msgstr ""
+
+#: gnu/packages/audio.scm:4674
+msgid ""
+"Redkite is a small GUI toolkit developed in C++17 and\n"
+"inspired from other well known GUI toolkits such as Qt and GTK.  It is\n"
+"minimal on purpose and is intended to be statically linked to applications,\n"
+"therefore satisfying any requirements they may have to be self contained,\n"
+"as is the case with audio plugins."
+msgstr ""
+
+#: gnu/packages/audio.scm:4746
+msgid ""
+"Carla is a modular audio plugin host, with features like\n"
+"transport control, automation of parameters via MIDI CC and remote control\n"
+"over OSC.  Carla currently supports LADSPA (including LRDF), DSSI, LV2, VST2,\n"
+"and VST3 plugin formats, plus SF2 and SFZ file support.  It uses JACK as the\n"
+"default and preferred audio driver but also supports native drivers like ALSA."
+msgstr ""
+
+#: gnu/packages/audio.scm:4782
+msgid ""
+"Ecasound is a software package designed for multitrack audio\n"
+"processing. It can be used for simple tasks like audio playback, recording and\n"
+"format conversions, as well as for multitrack effect processing, mixing,\n"
+"recording and signal recycling. Ecasound supports a wide range of audio inputs,\n"
+"outputs and effect algorithms. Effects and audio objects can be combined in\n"
+"various ways, and their parameters can be controlled by operator objects like\n"
+"oscillators and MIDI-CCs. A versatile console mode user-interface is included\n"
+"in the package."
+msgstr ""
+
+#: gnu/packages/audio.scm:4822
+msgid ""
+"libaudec is a wrapper library over ffmpeg, sndfile and\n"
+"libsamplerate for reading and resampling audio files, based on Robin Gareus'\n"
+"@code{audio_decoder} code."
+msgstr ""
+
+#: gnu/packages/audio.scm:4854
+msgid ""
+"lv2lint is an LV2 lint-like tool that checks whether a\n"
+"given plugin and its UI(s) match up with the provided metadata and adhere\n"
+"to well-known best practices."
+msgstr ""
+
+#: gnu/packages/audio.scm:4890
+msgid ""
+"lv2toweb allows the user to create an xhtml page with information\n"
+"about the given LV2 plugin, provided that the plugin and its UI(s) match up\n"
+"with the provided metadata and adhere to well-known best practices."
+msgstr ""
+
+#: gnu/packages/audio.scm:4919
+msgid ""
+"ZToolkit (Ztk) is a cross-platform GUI toolkit heavily\n"
+"inspired by GTK.  It handles events and low level drawing on behalf of\n"
+"the user and provides a high-level API for managing the UI and custom\n"
+"widgets.  ZToolkit is written in C and was created to be used for building\n"
+"audio plugin UIs, where the dependencies often need to be kept to a\n"
+"minimum."
+msgstr ""
+
+#: gnu/packages/audio.scm:4953
+msgid ""
+"libInstPatch is a library for processing digital sample based MIDI\n"
+"instrument \"patch\" files.  The types of files libInstPatch supports are used\n"
+"for creating instrument sounds for wavetable synthesis.  libInstPatch provides\n"
+"an object framework (based on GObject) to load patch files, which can then be\n"
+"edited, converted, compressed and saved."
+msgstr ""
+
+#: gnu/packages/audio.scm:5000
+msgid ""
+"The LSP DSP library provides a set of functions that perform\n"
+"SIMD-optimized computing on several hardware architectures.  All functions\n"
+"currently operate on IEEE-754 single-precision floating-point numbers."
+msgstr ""
+
+#: gnu/packages/audio.scm:5033
+msgid ""
+"Codec 2 is a speech codec designed for communications quality speech\n"
+"between 700 and 3200 bit/s.  The main application is low bandwidth HF/VHF\n"
+"digital radio."
+msgstr ""
+
+#: gnu/packages/audio.scm:5133
+msgid ""
+"Ableton Link is a C++ library that synchronizes musical beat, tempo, and phase\n"
+"across multiple applications running on one or more devices.  Applications on devices\n"
+"connected to a local network discover each other automatically and form a musical\n"
+"session in which each participant can perform independently: anyone can start or stop\n"
+"while still staying in time."
+msgstr ""
+
+#: gnu/packages/audio.scm:5190
+msgid ""
+"Butt is a tool to stream audio to a ShoutCast or\n"
+"Icecast server."
+msgstr ""
+
+#: gnu/packages/backup.scm:143
 msgid ""
 "Duplicity backs up directories by producing encrypted tar-format volumes\n"
 "and uploading them to a remote or local file server.  Because duplicity uses\n"
@@ -923,11 +1022,7 @@ msgid ""
 "spying and/or modification by the server."
 msgstr ""
 
-#: gnu/packages/backup.scm:143
-msgid "File verification and repair tools"
-msgstr ""
-
-#: gnu/packages/backup.scm:144
+#: gnu/packages/backup.scm:169
 msgid ""
 "Par2cmdline uses Reed-Solomon error-correcting codes to\n"
 "generate and verify PAR2 recovery files.  These files can be distributed\n"
@@ -939,11 +1034,7 @@ msgid ""
 "can even repair them."
 msgstr ""
 
-#: gnu/packages/backup.scm:180
-msgid "Simple incremental backup tool"
-msgstr ""
-
-#: gnu/packages/backup.scm:182
+#: gnu/packages/backup.scm:208
 msgid ""
 "Hdup2 is a backup utility, its aim is to make backup really simple.  The\n"
 "backup scheduling is done by means of a cron job.  It supports an\n"
@@ -951,11 +1042,7 @@ msgid ""
 "backups (called chunks) to allow easy burning to CD/DVD."
 msgstr ""
 
-#: gnu/packages/backup.scm:236
-msgid "Multi-format archive and compression library"
-msgstr ""
-
-#: gnu/packages/backup.scm:238
+#: gnu/packages/backup.scm:305
 msgid ""
 "Libarchive provides a flexible interface for reading and writing\n"
 "archives in various formats such as tar and cpio.  Libarchive also supports\n"
@@ -966,11 +1053,7 @@ msgid ""
 "random access nor for in-place modification."
 msgstr ""
 
-#: gnu/packages/backup.scm:315
-msgid "Provide a list of files to backup"
-msgstr ""
-
-#: gnu/packages/backup.scm:317
+#: gnu/packages/backup.scm:375
 msgid ""
 "Rdup is a utility inspired by rsync and the plan9 way of doing backups.\n"
 "Rdup itself does not backup anything, it only print a list of absolute\n"
@@ -978,11 +1061,7 @@ msgid ""
 "list and implement the backup strategy."
 msgstr ""
 
-#: gnu/packages/backup.scm:347
-msgid "Tar-compatible archiver"
-msgstr "Tar-兼容的归档工具"
-
-#: gnu/packages/backup.scm:349
+#: gnu/packages/backup.scm:407
 msgid ""
 "Btar is a tar-compatible archiver which allows arbitrary compression and\n"
 "ciphering, redundancy, differential backup, indexed extraction, multicore\n"
@@ -990,11 +1069,7 @@ msgid ""
 "errors."
 msgstr ""
 
-#: gnu/packages/backup.scm:375
-msgid "Local/remote mirroring+incremental backup"
-msgstr ""
-
-#: gnu/packages/backup.scm:377
+#: gnu/packages/backup.scm:435
 msgid ""
 "Rdiff-backup backs up one directory to another, possibly over a network.\n"
 "The target directory ends up a copy of the source directory, but extra reverse\n"
@@ -1009,23 +1084,15 @@ msgid ""
 "rdiff-backup is easy to use and settings have sensible defaults."
 msgstr ""
 
-#: gnu/packages/backup.scm:419
-msgid "Deduplicating snapshot backup utility based on rsync"
-msgstr ""
-
-#: gnu/packages/backup.scm:420
+#: gnu/packages/backup.scm:481
 msgid ""
-"rsnapshot is a filesystem snapshot utility based on rsync.\n"
+"rsnapshot is a file system snapshot utility based on rsync.\n"
 "rsnapshot makes it easy to make periodic snapshots of local machines, and\n"
 "remote machines over SSH.  To reduce the disk space required for each backup,\n"
 "rsnapshot uses hard links to deduplicate identical files."
 msgstr ""
 
-#: gnu/packages/backup.scm:455
-msgid "Tools & library for data backup and distributed storage"
-msgstr ""
-
-#: gnu/packages/backup.scm:457
+#: gnu/packages/backup.scm:563
 msgid ""
 "Libchop is a set of utilities and library for data backup and\n"
 "distributed storage.  Its main application is @command{chop-backup}, an\n"
@@ -1036,11 +1103,7 @@ msgid ""
 "detection, and lossless compression."
 msgstr ""
 
-#: gnu/packages/backup.scm:556
-msgid "Deduplicated, encrypted, authenticated and compressed backups"
-msgstr ""
-
-#: gnu/packages/backup.scm:557
+#: gnu/packages/backup.scm:710
 msgid ""
 "Borg is a deduplicating backup program.  Optionally, it\n"
 "supports compression and authenticated encryption.  The main goal of Borg is to\n"
@@ -1050,23 +1113,7 @@ msgid ""
 "to not fully trusted targets.  Borg is a fork of Attic."
 msgstr ""
 
-#: gnu/packages/backup.scm:603
-msgid "Deduplicating backup program"
-msgstr ""
-
-#: gnu/packages/backup.scm:604
-msgid ""
-"Attic is a deduplicating backup program.  The main goal of\n"
-"Attic is to provide an efficient and secure way to backup data.  The data\n"
-"deduplication technique used makes Attic suitable for daily backups since only\n"
-"changes are stored."
-msgstr ""
-
-#: gnu/packages/backup.scm:634
-msgid "WIM file manipulation library and utilities"
-msgstr ""
-
-#: gnu/packages/backup.scm:635
+#: gnu/packages/backup.scm:742
 msgid ""
 "wimlib is a C library and set of command-line utilities for\n"
 "creating, modifying, extracting, and mounting archives in the Windows Imaging\n"
@@ -1074,46 +1121,94 @@ msgid ""
 "NTFS volumes using @code{ntfs-3g}, preserving NTFS-specific attributes."
 msgstr ""
 
-#: gnu/packages/backup.scm:692
-msgid "Easy and secure backup program"
+#: gnu/packages/backup.scm:854
+msgid ""
+"With dirvish you can maintain a set of complete images of your\n"
+"file systems with unattended creation and expiration.  A dirvish backup vault\n"
+"is like a time machine for your data. "
 msgstr ""
 
-#: gnu/packages/backup.scm:693
+#: gnu/packages/backup.scm:946
 msgid ""
-"Obnam is an easy, secure backup program.  Features\n"
-"include snapshot backups, data de-duplication and encrypted backups\n"
-"using GnuPG.  Backups can be stored on local hard disks, or online via\n"
-"the SSH SFTP protocol.  The backup server, if used, does not require\n"
-"any special software, on top of SSH."
+"Restic is a program that does backups right and was designed\n"
+"with the following principles in mind:\n"
+"\n"
+"@itemize\n"
+"@item Easy: Doing backups should be a frictionless process, otherwise you\n"
+"might be tempted to skip it.  Restic should be easy to configure and use, so\n"
+"that, in the event of a data loss, you can just restore it.  Likewise,\n"
+"restoring data should not be complicated.\n"
+"\n"
+"@item Fast: Backing up your data with restic should only be limited by your\n"
+"network or hard disk bandwidth so that you can backup your files every day.\n"
+"Nobody does backups if it takes too much time.  Restoring backups should only\n"
+"transfer data that is needed for the files that are to be restored, so that\n"
+"this process is also fast.\n"
+"\n"
+"@item Verifiable: Much more important than backup is restore, so restic\n"
+"enables you to easily verify that all data can be restored.  @item Secure:\n"
+"Restic uses cryptography to guarantee confidentiality and integrity of your\n"
+"data.  The location the backup data is stored is assumed not to be a trusted\n"
+"environment (e.g.  a shared space where others like system administrators are\n"
+"able to access your backups).  Restic is built to secure your data against\n"
+"such attackers.\n"
+"\n"
+"@item Efficient: With the growth of data, additional snapshots should only\n"
+"take the storage of the actual increment.  Even more, duplicate data should be\n"
+"de-duplicated before it is actually written to the storage back end to save\n"
+"precious backup space.\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/backup.scm:799
-msgid "Fast, disk based, rotating network backup system"
+#: gnu/packages/backup.scm:1001
+msgid ""
+"ZBackup is a globally-deduplicating backup tool, based on the\n"
+"ideas found in Rsync.  Feed a large @file{.tar} into it, and it will\n"
+"store duplicate regions of it only once, then compress and optionally\n"
+"encrypt the result.  Feed another @file{.tar} file, and it will also\n"
+"re-use any data found in any previous backups.  This way only new\n"
+"changes are stored, and as long as the files are not very different,\n"
+"the amount of storage required is very low.  Any of the backup files\n"
+"stored previously can be read back in full at any time.  The program\n"
+"is format-agnostic, so you can feed virtually any files to it."
 msgstr ""
 
-#: gnu/packages/backup.scm:801
+#: gnu/packages/backup.scm:1039
 msgid ""
-"With dirvish you can maintain a set of complete images of your\n"
-"filesystems with unattended creation and expiration.  A dirvish backup vault\n"
-"is like a time machine for your data. "
+"Dump examines files in a file system, determines which ones\n"
+"need to be backed up, and copies those files to a specified disk, tape or\n"
+"other storage medium.  Subsequent incremental backups can then be layered on\n"
+"top of the full backup.  The restore command performs the inverse function of\n"
+"dump; it can restore a full backup of a file system.  Single files and\n"
+"directory subtrees may also be restored from full or partial backups in\n"
+"interactive mode."
 msgstr ""
 
-#: gnu/packages/base.scm:73
-msgid "Hello, GNU world: An example GNU package"
+#: gnu/packages/backup.scm:1086
+msgid ""
+"Burp is a network backup and restore program.  It attempts\n"
+"to reduce network traffic and the amount of space that is used by each\n"
+"backup."
 msgstr ""
 
-#: gnu/packages/base.scm:75
+#: gnu/packages/backup.scm:1115
+msgid ""
+"Disarchive can disassemble software archives into data\n"
+"and metadata.  The goal is to create a small amount of metadata that\n"
+"can be used to recreate a software archive bit-for-bit from the\n"
+"original files.  For example, a software archive made using tar and\n"
+"Gzip will need to describe the order of files in the tarball and the\n"
+"compression parameters used by Gzip."
+msgstr ""
+
+#: gnu/packages/base.scm:92
 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 ""
 
-#: gnu/packages/base.scm:110
-msgid "Print lines matching a pattern"
-msgstr ""
-
-#: gnu/packages/base.scm:112
+#: gnu/packages/base.scm:129
 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"
@@ -1124,11 +1219,7 @@ msgid ""
 "including, for example, recursive directory searching."
 msgstr ""
 
-#: gnu/packages/base.scm:134
-msgid "Stream editor"
-msgstr ""
-
-#: gnu/packages/base.scm:156
+#: gnu/packages/base.scm:171
 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"
@@ -1137,11 +1228,7 @@ msgid ""
 "implementation offers several extensions over the standard utility."
 msgstr ""
 
-#: gnu/packages/base.scm:196
-msgid "Managing tar archives"
-msgstr "管理 tar 归档"
-
-#: gnu/packages/base.scm:198
+#: gnu/packages/base.scm:228
 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"
@@ -1151,11 +1238,7 @@ msgid ""
 "standard utility."
 msgstr ""
 
-#: gnu/packages/base.scm:221
-msgid "Apply differences to originals, with optional backups"
-msgstr ""
-
-#: gnu/packages/base.scm:223
+#: gnu/packages/base.scm:259
 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"
@@ -1164,11 +1247,7 @@ msgid ""
 "differences."
 msgstr ""
 
-#: gnu/packages/base.scm:243
-msgid "Comparing and merging files"
-msgstr "比较和合并文件"
-
-#: gnu/packages/base.scm:245
+#: gnu/packages/base.scm:282
 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"
@@ -1177,11 +1256,7 @@ msgid ""
 "interactive means to merge two files."
 msgstr ""
 
-#: gnu/packages/base.scm:282
-msgid "Operating on files matching given criteria"
-msgstr ""
-
-#: gnu/packages/base.scm:284
+#: gnu/packages/base.scm:318
 msgid ""
 "Findutils supplies the basic file directory searching utilities of the\n"
 "GNU system.  It consists of two primary searching utilities: \"find\"\n"
@@ -1191,23 +1266,16 @@ msgid ""
 "used to apply commands with arbitrarily long arguments."
 msgstr ""
 
-#: gnu/packages/base.scm:340
-msgid "Core GNU utilities (file, text, shell)"
-msgstr "核心 GNU 工具（文件、文本、shell）"
-
-#: gnu/packages/base.scm:342
+#: gnu/packages/base.scm:398
 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."
+"GNU Coreutils package includes all of the basic command-line tools that\n"
+"are expected in a POSIX system, excluding shell.  This package is the union of\n"
+"the GNU fileutils, sh-utils, and textutils packages.  Most of these tools\n"
+"offer extended functionality beyond that which is outlined in the POSIX\n"
+"standard."
 msgstr ""
 
-#: gnu/packages/base.scm:384
-msgid "Remake files automatically"
-msgstr "自动重命令文件"
-
-#: gnu/packages/base.scm:386
+#: gnu/packages/base.scm:476
 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"
@@ -1217,11 +1285,7 @@ msgid ""
 "change.  GNU make offers many powerful extensions over the standard utility."
 msgstr ""
 
-#: gnu/packages/base.scm:428
-msgid "Binary utilities: bfd gas gprof ld"
-msgstr "二进制文件处理实用工具：bfs gas gprof ld"
-
-#: gnu/packages/base.scm:430
+#: gnu/packages/base.scm:559
 msgid ""
 "GNU Binutils is a collection of tools for working with binary files.\n"
 "Perhaps the most notable are \"ld\", a linker, and \"as\", an assembler.\n"
@@ -1231,22 +1295,14 @@ msgid ""
 "included."
 msgstr ""
 
-#: gnu/packages/base.scm:517
-msgid "The linker wrapper"
-msgstr ""
-
-#: gnu/packages/base.scm:519
+#: gnu/packages/base.scm:695
 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."
+"The linker wrapper (or @code{ld-wrapper}) wraps the linker to add any\n"
+"missing @code{-rpath} flags, and to detect any misuse of libraries outside of\n"
+"the store."
 msgstr ""
 
-#: gnu/packages/base.scm:695
-msgid "The GNU C Library"
-msgstr "GNU C 库"
-
-#: gnu/packages/base.scm:697
+#: gnu/packages/base.scm:960
 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"
@@ -1256,47 +1312,21 @@ msgid ""
 "with the Linux kernel."
 msgstr ""
 
-#: gnu/packages/base.scm:775
-msgid "The GNU C Library (GNU Hurd variant)"
-msgstr "GNU C 库（GNU Hurd 变种）"
-
-#: gnu/packages/base.scm:887
-msgid "All the locales supported by the GNU C Library"
-msgstr ""
-
-#: gnu/packages/base.scm:889
+#: gnu/packages/base.scm:1081
 msgid ""
 "This package provides all the locales supported by the GNU C Library,\n"
-"more than 400 in total.  To use them set the 'LOCPATH' environment variable to\n"
-"the 'share/locale' sub-directory of this package."
-msgstr ""
-
-#: gnu/packages/base.scm:957
-msgid "Small sample of UTF-8 locales"
-msgstr ""
-
-#: gnu/packages/base.scm:959
-msgid ""
-"This package provides a small sample of UTF-8 locales mostly useful in\n"
-"test environments."
-msgstr ""
-
-#: gnu/packages/base.scm:977
-msgid "Find full path of shell commands"
+"more than 400 in total.  To use them set the @code{LOCPATH} environment variable\n"
+"to the @code{share/locale} sub-directory of this package."
 msgstr ""
 
-#: gnu/packages/base.scm:979
+#: gnu/packages/base.scm:1232
 msgid ""
 "The which program finds the location of executables in PATH, with a\n"
 "variety of options.  It is an alternative to the shell \"type\" built-in\n"
 "command."
 msgstr ""
 
-#: gnu/packages/base.scm:1084
-msgid "Database of current and historical time zones"
-msgstr ""
-
-#: gnu/packages/base.scm:1085
+#: gnu/packages/base.scm:1350
 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"
@@ -1305,22 +1335,14 @@ msgid ""
 "and daylight-saving rules."
 msgstr ""
 
-#: gnu/packages/base.scm:1136
-msgid "Character set conversion library"
-msgstr ""
-
-#: gnu/packages/base.scm:1138
+#: gnu/packages/base.scm:1408
 msgid ""
 "libiconv provides an implementation of the iconv function for systems\n"
 "that lack it.  iconv is used to convert between character encodings in a\n"
 "program.  It supports a wide variety of different encodings."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:108
-msgid "Fast and easy BitTorrent client"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:110
+#: gnu/packages/bittorrent.scm:125
 msgid ""
 "Transmission is a BitTorrent client that comes with graphical,\n"
 "textual, and Web user interfaces.  Transmission also has a daemon for\n"
@@ -1328,129 +1350,105 @@ msgid ""
 "DHT, µTP, PEX and Magnet Links."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:142
-msgid "BitTorrent library of rtorrent"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:144
+#: gnu/packages/bittorrent.scm:159
 msgid ""
 "LibTorrent is a BitTorrent library used by and developed in parallel\n"
 "with the BitTorrent client rtorrent.  It is written in C++ with emphasis on\n"
 "speed and efficiency."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:171
-msgid "BitTorrent client with ncurses interface"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:173
+#: gnu/packages/bittorrent.scm:188
 msgid ""
 "rTorrent is a BitTorrent client with an ncurses interface.  It supports\n"
 "full encryption, DHT, PEX, and Magnet Links.  It can also be controlled via\n"
 "XML-RPC over SCGI."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:217 gnu/packages/bittorrent.scm:258
-msgid "Console client for the Transmission BitTorrent daemon"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:218
+#: gnu/packages/bittorrent.scm:221
 msgid ""
 "Tremc is a console client, with a curses interface, for the\n"
 "Transmission BitTorrent daemon."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:259
+#: gnu/packages/bittorrent.scm:262
 msgid ""
 "Transmission-remote-cli is a console client, with a curses\n"
 "interface, for the Transmission BitTorrent daemon.  This package is no longer\n"
 "maintained upstream."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:307
-msgid "Utility for parallel downloading files"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:309
+#: gnu/packages/bittorrent.scm:312
 msgid ""
 "Aria2 is a lightweight, multi-protocol & multi-source command-line\n"
 "download utility.  It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink.\n"
 "Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:342
-msgid "Universal download manager with GTK+ interface"
-msgstr "带有 GTK+ 界面的通用下载管理器"
-
-#: gnu/packages/bittorrent.scm:344
+#: gnu/packages/bittorrent.scm:345
 msgid ""
 "uGet is portable download manager with GTK+ interface supporting\n"
 "HTTP, HTTPS, BitTorrent and Metalink, supporting multi-connection\n"
 "downloads, download scheduling, download rate limiting."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:372
-msgid "Utility to create BitTorrent metainfo files"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:373
+#: gnu/packages/bittorrent.scm:377
 msgid ""
-"mktorrent is a simple command-line utility to create\n"
-"BitTorrent @dfn{metainfo} files, often known simply as @dfn{torrents}, from\n"
-"both single files and whole directories.  It can add multiple trackers and web\n"
-"seed URLs, and set the @code{private} flag to disallow advertisement through\n"
-"the distributed hash table (DHT) and Peer Exchange.  Hashing is multi-threaded\n"
+"mktorrent is a simple command-line utility to create BitTorrent\n"
+"@dfn{metainfo} files, often known simply as @dfn{torrents}, from both single\n"
+"files and whole directories.  It can add multiple trackers and web seed URLs,\n"
+"and set the @code{private} flag to disallow advertisement through the\n"
+"distributed hash table (@dfn{DHT}) and Peer Exchange.  Hashing is multi-threaded\n"
 "and will take advantage of multiple processor cores where possible."
 msgstr ""
 
-#: gnu/packages/bittorrent.scm:414
-msgid "Feature complete BitTorrent implementation"
-msgstr ""
-
-#: gnu/packages/bittorrent.scm:416
+#: gnu/packages/bittorrent.scm:417
 msgid ""
-"libtorrent-rasterbar is a feature complete C++ BitTorrent implementation\n"
+"libtorrent-rasterbar is a feature-complete C++ BitTorrent implementation\n"
 "focusing on efficiency and scalability.  It runs on embedded devices as well as\n"
 "desktops."
 msgstr ""
 
-#: gnu/packages/certs.scm:66
-msgid "Python script to extract .pem data from certificate collection"
+#: gnu/packages/bittorrent.scm:468
+msgid ""
+"qBittorrent is a BitTorrent client programmed in C++/Qt that uses\n"
+"libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg.\n"
+"\n"
+"It aims to be a good alternative to all other BitTorrent clients out there.\n"
+"qBittorrent is fast, stable and provides unicode support as well as many\n"
+"features."
+msgstr ""
+
+#: gnu/packages/bittorrent.scm:541
+msgid ""
+"Deluge contains the common features to BitTorrent clients such as\n"
+"Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange\n"
+"(PEX), UPnP, NAT-PMP, Proxy support, Web seeds, global and per-torrent\n"
+"speed limits.  Deluge heavily utilises the ​libtorrent library.  It is\n"
+"designed to run as both a normal standalone desktop application and as a\n"
+"​client-server."
 msgstr ""
 
-#: gnu/packages/certs.scm:68
+#: gnu/packages/certs.scm:70
 msgid ""
 "certdata2pem.py is a Python script to transform X.509 certificate\n"
 "\"source code\" as contained, for example, in the Mozilla sources, into\n"
 ".pem formatted certificates."
 msgstr ""
 
-#: gnu/packages/certs.scm:137
-msgid "CA certificates from Mozilla"
-msgstr ""
-
-#: gnu/packages/certs.scm:139
+#: gnu/packages/certs.scm:142
 msgid ""
 "This package provides certificates for Certification Authorities (CA)\n"
 "taken from the NSS package and thus ultimately from the Mozilla project."
 msgstr ""
 
-#: gnu/packages/certs.scm:208
-msgid "Let's Encrypt root and intermediate certificates"
-msgstr ""
-
-#: gnu/packages/certs.scm:209
+#: gnu/packages/certs.scm:211
 msgid ""
 "This package provides a certificate store containing only the\n"
 "Let's Encrypt root and intermediate certificates.  It is intended to be used\n"
 "within Guix."
 msgstr ""
 
-#: gnu/packages/compression.scm:100
-msgid "Compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:102
+#: gnu/packages/compression.scm:134
 msgid ""
 "zlib is designed to be a free, general-purpose, legally unencumbered --\n"
 "that is, not covered by any patents -- lossless data-compression library for\n"
@@ -1463,42 +1461,26 @@ msgid ""
 "in compression."
 msgstr ""
 
-#: gnu/packages/compression.scm:133
-msgid "Zip Compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:135
+#: gnu/packages/compression.scm:173
 msgid ""
 "Minizip is a minimalistic library that supports compressing,\n"
 "extracting and viewing ZIP archives.  This version is extracted from\n"
 "the @code{zlib} source."
 msgstr ""
 
-#: gnu/packages/compression.scm:154
-msgid "Replacement for Sun's 'jar' utility"
-msgstr ""
-
-#: gnu/packages/compression.scm:156
+#: gnu/packages/compression.scm:194
 msgid ""
-"FastJar is an attempt to create a much faster replacement for Sun's 'jar'\n"
-"utility.  Instead of being written in Java, FastJar is written in C."
+"FastJar is an attempt to create a much faster replacement for Sun's\n"
+"@code{jar} utility.  Instead of being written in Java, FastJar is written in C."
 msgstr ""
 
-#: gnu/packages/compression.scm:190
-msgid "C library for manipulating POSIX tar files"
-msgstr ""
-
-#: gnu/packages/compression.scm:192
+#: gnu/packages/compression.scm:225
 msgid ""
 "libtar is a C library for manipulating POSIX tar files.  It handles\n"
 "adding and extracting files to/from a tar archive."
 msgstr ""
 
-#: gnu/packages/compression.scm:209
-msgid "General file (de)compression (using lzw)"
-msgstr ""
-
-#: gnu/packages/compression.scm:214
+#: gnu/packages/compression.scm:271
 msgid ""
 "GNU Gzip provides data compression and decompression utilities; the\n"
 "typical extension is \".gz\".  Unlike the \"zip\" format, it compresses a single\n"
@@ -1506,11 +1488,7 @@ msgid ""
 "\".tar.gz\" or \".tgz\", etc."
 msgstr ""
 
-#: gnu/packages/compression.scm:284
-msgid "High-quality data compression program"
-msgstr ""
-
-#: gnu/packages/compression.scm:286
+#: gnu/packages/compression.scm:381
 msgid ""
 "bzip2 is a freely available, patent free (see below), high-quality data\n"
 "compressor.  It typically compresses files to within 10% to 15% of the best\n"
@@ -1519,11 +1497,7 @@ msgid ""
 "decompression."
 msgstr ""
 
-#: gnu/packages/compression.scm:307
-msgid "Parallel bzip2 compression utility"
-msgstr ""
-
-#: gnu/packages/compression.scm:309
+#: gnu/packages/compression.scm:438
 msgid ""
 "lbzip2 is a multi-threaded compression utility with support for the\n"
 "bzip2 compressed file format.  lbzip2 can process standard bz2 files in\n"
@@ -1533,11 +1507,7 @@ msgid ""
 "compatible with bzip2 – both at file format and command line level."
 msgstr ""
 
-#: gnu/packages/compression.scm:339
-msgid "Parallel bzip2 implementation"
-msgstr "可并行的 bzip2 实现"
-
-#: gnu/packages/compression.scm:341
+#: gnu/packages/compression.scm:473
 msgid ""
 "Pbzip2 is a parallel implementation of the bzip2 block-sorting file\n"
 "compressor that uses pthreads and achieves near-linear speedup on SMP machines.\n"
@@ -1545,11 +1515,7 @@ msgid ""
 "compressed with pbzip2 can be decompressed with bzip2)."
 msgstr ""
 
-#: gnu/packages/compression.scm:362
-msgid "General-purpose data compression"
-msgstr "通用数据压缩"
-
-#: gnu/packages/compression.scm:364
+#: gnu/packages/compression.scm:513
 msgid ""
 "XZ Utils is free general-purpose data compression software with high\n"
 "compression ratio.  XZ Utils were written for POSIX-like systems, but also\n"
@@ -1562,11 +1528,17 @@ msgid ""
 "than gzip and 15 % smaller output than bzip2."
 msgstr ""
 
-#: gnu/packages/compression.scm:392
-msgid "Data compression library suitable for real-time data de-/compression"
+#: gnu/packages/compression.scm:550
+msgid ""
+"Lhasa is a replacement for the Unix LHA tool, for\n"
+"decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives.  The backend for the\n"
+"tool is a library, so that it can be reused for other purposes.  Lhasa aims to\n"
+"be compatible with as many types of lzh/lzs archives as possible.  It also aims\n"
+"to generate the same output as the (non-free) Unix LHA tool, so that it will\n"
+"act as a free drop-in replacement."
 msgstr ""
 
-#: gnu/packages/compression.scm:394
+#: gnu/packages/compression.scm:576
 msgid ""
 "LZO is a data compression library which is suitable for data\n"
 "de-/compression in real-time.  This means it favours speed over\n"
@@ -1576,22 +1548,7 @@ msgid ""
 "format are designed to be portable across platforms."
 msgstr ""
 
-#: gnu/packages/compression.scm:430
-msgid "Python bindings for the LZO data compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:432
-msgid ""
-"Python-LZO provides Python bindings for LZO, i.e. you can access\n"
-"the LZO library from your Python scripts thereby compressing ordinary\n"
-"Python strings."
-msgstr ""
-
-#: gnu/packages/compression.scm:455
-msgid "Compress or expand files"
-msgstr ""
-
-#: gnu/packages/compression.scm:457
+#: gnu/packages/compression.scm:601
 msgid ""
 "Lzop is a file compressor which is very similar to gzip.  Lzop uses the\n"
 "LZO data compression library for compression services, and its main advantages\n"
@@ -1599,11 +1556,7 @@ msgid ""
 "some compression ratio)."
 msgstr ""
 
-#: gnu/packages/compression.scm:476
-msgid "Lossless data compressor based on the LZMA algorithm"
-msgstr ""
-
-#: gnu/packages/compression.scm:478
+#: gnu/packages/compression.scm:622
 msgid ""
 "Lzip is a lossless data compressor with a user interface similar to the\n"
 "one of gzip or bzip2.  Lzip decompresses almost as fast as gzip and compresses\n"
@@ -1611,11 +1564,7 @@ msgid ""
 "archiving.  Lzip is a clean implementation of the LZMA algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:497
-msgid "Recover and decompress data from damaged lzip files"
-msgstr ""
-
-#: gnu/packages/compression.scm:499
+#: gnu/packages/compression.scm:643
 msgid ""
 "Lziprecover is a data recovery tool and decompressor for files in the lzip\n"
 "compressed data format (.lz).  It can test the integrity of lzip files, extract\n"
@@ -1631,11 +1580,7 @@ msgid ""
 "decompressors when faced with corrupted input."
 msgstr ""
 
-#: gnu/packages/compression.scm:540
-msgid "Archives in shell scripts, uuencode/uudecode"
-msgstr ""
-
-#: gnu/packages/compression.scm:542
+#: gnu/packages/compression.scm:700
 msgid ""
 "GNU sharutils is a package for creating and manipulating shell\n"
 "archives that can be readily emailed.  A shell archive is a file that can be\n"
@@ -1643,71 +1588,25 @@ msgid ""
 "This package is mostly for compatibility and historical interest."
 msgstr ""
 
-#: gnu/packages/compression.scm:573
-msgid "Library for SoundFont decompression"
-msgstr ""
-
-#: gnu/packages/compression.scm:575
+#: gnu/packages/compression.scm:734
 msgid ""
 "SfArkLib is a C++ library for decompressing SoundFont files compressed\n"
 "with the sfArk algorithm."
 msgstr ""
 
-#: gnu/packages/compression.scm:608
-msgid "Basic sfArk decompressor"
-msgstr ""
-
-#: gnu/packages/compression.scm:609
+#: gnu/packages/compression.scm:770
 msgid ""
 "SfArk extractor converts SoundFonts in the compressed legacy\n"
 "sfArk file format to the uncompressed sf2 format."
 msgstr ""
 
-#: gnu/packages/compression.scm:626
-msgid "Compression tools for some formats used by Microsoft"
-msgstr ""
-
-#: gnu/packages/compression.scm:628
+#: gnu/packages/compression.scm:790
 msgid ""
 "The purpose of libmspack is to provide both compression and\n"
 "decompression of some loosely related file formats used by Microsoft."
 msgstr ""
 
-#: gnu/packages/compression.scm:647
-msgid "Low-level interface to bzip2 compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:648
-msgid ""
-"This module provides a Perl interface to the bzip2\n"
-"compression library."
-msgstr ""
-
-#: gnu/packages/compression.scm:682
-msgid "Low-level interface to zlib compression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:683
-msgid ""
-"This module provides a Perl interface to the zlib\n"
-"compression library."
-msgstr ""
-
-#: gnu/packages/compression.scm:704
-msgid "IO Interface to compressed files/buffers"
-msgstr ""
-
-#: gnu/packages/compression.scm:705
-msgid ""
-"IO-Compress provides a Perl interface to allow reading and\n"
-"writing of compressed data created with the zlib and bzip2 libraries."
-msgstr ""
-
-#: gnu/packages/compression.scm:732
-msgid "Compression algorithm focused on speed"
-msgstr ""
-
-#: gnu/packages/compression.scm:733
+#: gnu/packages/compression.scm:839
 msgid ""
 "LZ4 is a lossless compression algorithm, providing\n"
 "compression speed at 400 MB/s per core (0.16 Bytes/cycle).  It also features an\n"
@@ -1716,30 +1615,7 @@ msgid ""
 "time for compression ratio."
 msgstr ""
 
-#: gnu/packages/compression.scm:758
-msgid "LZ4 bindings for Python"
-msgstr ""
-
-#: gnu/packages/compression.scm:760
-msgid ""
-"This package provides python bindings for the lz4 compression library\n"
-"by Yann Collet.  The project contains bindings for the LZ4 block format and\n"
-"the LZ4 frame format."
-msgstr ""
-
-#: gnu/packages/compression.scm:783
-msgid "String compression"
-msgstr ""
-
-#: gnu/packages/compression.scm:784
-msgid "Lz-string is a string compressor library for Python."
-msgstr ""
-
-#: gnu/packages/compression.scm:822
-msgid "Tools to create and extract squashfs file systems"
-msgstr ""
-
-#: gnu/packages/compression.scm:824
+#: gnu/packages/compression.scm:883
 msgid ""
 "Squashfs is a highly compressed read-only file system for Linux.  It uses\n"
 "zlib to compress files, inodes, and directories.  All blocks are packed to\n"
@@ -1749,21 +1625,13 @@ msgid ""
 "extract such file systems."
 msgstr ""
 
-#: gnu/packages/compression.scm:861
-msgid "Parallel implementation of gzip"
-msgstr ""
-
-#: gnu/packages/compression.scm:863
+#: gnu/packages/compression.scm:923
 msgid ""
 "This package provides a parallel implementation of gzip that exploits\n"
 "multiple processors and multiple cores when compressing data."
 msgstr ""
 
-#: gnu/packages/compression.scm:887
-msgid "Parallel indexing implementation of LZMA"
-msgstr ""
-
-#: gnu/packages/compression.scm:889
+#: gnu/packages/compression.scm:949
 msgid ""
 "The existing XZ Utils provide great compression in the .xz file format,\n"
 "but they produce just one big block of compressed data.  Pixz instead produces\n"
@@ -1772,31 +1640,18 @@ msgid ""
 "tarballs."
 msgstr ""
 
-#: gnu/packages/compression.scm:930
-msgid "Implementation of the Brotli compression algorithm"
-msgstr ""
-
-#: gnu/packages/compression.scm:932
-msgid ""
-"Brotli is a general-purpose lossless compression algorithm.  It is\n"
-"similar in speed to deflate but offers denser compression.  This package\n"
-"provides encoder and a decoder libraries: libbrotlienc and libbrotlidec,\n"
-"respectively, based on the reference implementation from Google."
-msgstr ""
-
-#: gnu/packages/compression.scm:956
-msgid "Tool to unpack Cabinet archives"
-msgstr ""
-
-#: gnu/packages/compression.scm:957
+#: gnu/packages/compression.scm:996
 msgid "Extracts files out of Microsoft Cabinet (.cab) archives"
 msgstr ""
 
-#: gnu/packages/compression.scm:989
-msgid "Delta encoder for binary files"
+#: gnu/packages/compression.scm:1030
+msgid ""
+"This library allows reading and writing gzip-compressed JSON catalog\n"
+"files, which can be used to store GPG, PKCS-7 and SHA-256 checksums for each\n"
+"file."
 msgstr ""
 
-#: gnu/packages/compression.scm:990
+#: gnu/packages/compression.scm:1065
 msgid ""
 "xdelta encodes only the differences between two binary files\n"
 "using the VCDIFF algorithm and patch file format described in RFC 3284.  It can\n"
@@ -1805,11 +1660,7 @@ msgid ""
 "human-readable output."
 msgstr ""
 
-#: gnu/packages/compression.scm:1022
-msgid "Large file compressor with a very high compression ratio"
-msgstr ""
-
-#: gnu/packages/compression.scm:1023
+#: gnu/packages/compression.scm:1098
 msgid ""
 "lrzip is a compression utility that uses long-range\n"
 "redundancy reduction to improve the subsequent compression ratio of\n"
@@ -1820,88 +1671,29 @@ msgid ""
 "well as bzip2."
 msgstr ""
 
-#: gnu/packages/compression.scm:1059
-msgid "Filter for improving compression of typed binary data"
-msgstr ""
-
-#: gnu/packages/compression.scm:1060
-msgid ""
-"Bitshuffle is an algorithm that rearranges typed, binary data\n"
-"for improving compression, as well as a python/C package that implements this\n"
-"algorithm within the Numpy framework."
-msgstr ""
-
-#: gnu/packages/compression.scm:1079
-msgid "Fast compressor/decompressor"
-msgstr ""
-
-#: gnu/packages/compression.scm:1080
+#: gnu/packages/compression.scm:1127
 msgid ""
-"Snappy is a compression/decompression library. It does not\n"
+"Snappy is a compression/decompression library.  It does not\n"
 "aim for maximum compression, or compatibility with any other compression library;\n"
-"instead, it aims for very high speeds and reasonable compression. For instance,\n"
+"instead, it aims for very high speeds and reasonable compression.  For instance,\n"
 "compared to the fastest mode of zlib, Snappy is an order of magnitude faster\n"
 "for most inputs, but the resulting compressed files are anywhere from 20% to\n"
 "100% bigger."
 msgstr ""
 
-#: gnu/packages/compression.scm:1204
-msgid "Compression/decompression algorithm in Java"
-msgstr ""
-
-#: gnu/packages/compression.scm:1205
-msgid ""
-"Snappy-java is a Java port of the snappy, a fast C++\n"
-"compresser/decompresser."
-msgstr ""
-
-#: gnu/packages/compression.scm:1311
-msgid "Java port of snappy"
-msgstr "snappy 的 Java 移植"
-
-#: gnu/packages/compression.scm:1312
-msgid ""
-"Iq80-snappy is a rewrite (port) of Snappy writen in pure\n"
-"Java.  This compression code produces a byte-for-byte exact copy of the output\n"
-"created by the original C++ code, and extremely fast."
-msgstr ""
-
-#: gnu/packages/compression.scm:1351
-msgid "Java bzip2 compression/decompression library"
-msgstr ""
-
-#: gnu/packages/compression.scm:1352
-msgid ""
-"Jbzip2 is a Java bzip2 compression/decompression library.\n"
-"It can be used as a replacement for the Apache @code{CBZip2InputStream} /\n"
-"@code{CBZip2OutputStream} classes."
-msgstr ""
-
-#: gnu/packages/compression.scm:1417
-msgid "Command-line file archiver with high compression ratio"
-msgstr ""
-
-#: gnu/packages/compression.scm:1418
+#: gnu/packages/compression.scm:1197
 msgid ""
 "p7zip is a command-line port of 7-Zip, a file archiver that\n"
 "handles the 7z format which features very high compression ratios."
 msgstr ""
 
-#: gnu/packages/compression.scm:1457
-msgid "Compressed C++ iostream"
-msgstr ""
-
-#: gnu/packages/compression.scm:1458
+#: gnu/packages/compression.scm:1245
 msgid ""
 "gzstream is a small library for providing zlib\n"
 "functionality in a C++ iostream."
 msgstr ""
 
-#: gnu/packages/compression.scm:1505
-msgid "Incremental journaling archiver"
-msgstr ""
-
-#: gnu/packages/compression.scm:1506
+#: gnu/packages/compression.scm:1295
 msgid ""
 "ZPAQ is a command-line archiver for realistic situations with\n"
 "many duplicate and already compressed files.  It backs up only those files\n"
@@ -1915,21 +1707,13 @@ msgid ""
 "or junctions, and always follows hard links."
 msgstr ""
 
-#: gnu/packages/compression.scm:1587
-msgid "Extract CAB files from InstallShield installers"
-msgstr ""
-
-#: gnu/packages/compression.scm:1589
+#: gnu/packages/compression.scm:1397
 msgid ""
 "@command{unshield} is a tool and library for extracting @file{.cab}\n"
 " archives from InstallShield installers."
 msgstr ""
 
-#: gnu/packages/compression.scm:1615
-msgid "Zstandard real-time compression algorithm"
-msgstr ""
-
-#: gnu/packages/compression.scm:1616
+#: gnu/packages/compression.scm:1458
 msgid ""
 "Zstandard (@command{zstd}) is a lossless compression algorithm\n"
 "that combines very fast operation with a compression ratio comparable to that of\n"
@@ -1939,11 +1723,7 @@ msgid ""
 "speed."
 msgstr ""
 
-#: gnu/packages/compression.scm:1658
-msgid "Threaded implementation of the Zstandard compression algorithm"
-msgstr ""
-
-#: gnu/packages/compression.scm:1659
+#: gnu/packages/compression.scm:1517
 msgid ""
 "Parallel Zstandard (PZstandard or @command{pzstd}) is a\n"
 "multi-threaded implementation of the @uref{http://zstd.net/, Zstandard\n"
@@ -1956,11 +1736,7 @@ msgid ""
 "the actual decompression, the other input and output."
 msgstr ""
 
-#: gnu/packages/compression.scm:1700
-msgid "Compression and file packing utility"
-msgstr ""
-
-#: gnu/packages/compression.scm:1702
+#: gnu/packages/compression.scm:1557
 msgid ""
 "Zip is a compression and file packaging/archive utility.  Zip is useful\n"
 "for packaging a set of files for distribution, for archiving files, and for\n"
@@ -1975,11 +1751,7 @@ msgid ""
 "Compression ratios of 2:1 to 3:1 are common for text files."
 msgstr ""
 
-#: gnu/packages/compression.scm:1757
-msgid "Decompression and file extraction utility"
-msgstr ""
-
-#: gnu/packages/compression.scm:1759
+#: gnu/packages/compression.scm:1622
 msgid ""
 "UnZip is an extraction utility for archives compressed in .zip format,\n"
 "also called \"zipfiles\".\n"
@@ -1990,29 +1762,20 @@ msgid ""
 "recreates the stored directory structure by default."
 msgstr ""
 
-#: gnu/packages/compression.scm:1800
-msgid "Library for accessing zip files"
-msgstr ""
-
-#: gnu/packages/compression.scm:1802
-msgid "ZZipLib is a library based on zlib for accessing zip files."
-msgstr ""
-
-#: gnu/packages/compression.scm:1819
-msgid "Provides an interface to ZIP archive files"
-msgstr ""
-
-#: gnu/packages/compression.scm:1820 gnu/packages/perl.scm:279
+#: gnu/packages/compression.scm:1725
 msgid ""
-"The Archive::Zip module allows a Perl program to create,\n"
-"manipulate, read, and write Zip archive files."
+"Ziptime helps make @file{.zip} archives reproducible by replacing\n"
+"timestamps in the file header with a fixed time (1 January 2008).\n"
+"\n"
+"``Extra fields'' are not changed, so you'll need to use the @code{-X} option to\n"
+"@command{zip} to prevent it from storing the ``universal time'' field."
 msgstr ""
 
-#: gnu/packages/compression.scm:1842
-msgid "C library for reading, creating, and modifying zip archives"
+#: gnu/packages/compression.scm:1770
+msgid "ZZipLib is a library based on zlib for accessing zip files."
 msgstr ""
 
-#: gnu/packages/compression.scm:1843
+#: gnu/packages/compression.scm:1830
 msgid ""
 "Libzip is a C library for reading, creating, and modifying\n"
 "zip archives.  Files can be added from data buffers, files, or compressed data\n"
@@ -2020,11 +1783,7 @@ msgid ""
 "archive can be reverted."
 msgstr ""
 
-#: gnu/packages/compression.scm:1876
-msgid "Universal tool to manage file archives of various types"
-msgstr ""
-
-#: gnu/packages/compression.scm:1877
+#: gnu/packages/compression.scm:1864
 msgid ""
 "The main command is @command{aunpack} which extracts files\n"
 "from an archive.  The other commands provided are @command{apack} (to create\n"
@@ -2034,129 +1793,287 @@ msgid ""
 "of archives."
 msgstr ""
 
-#: gnu/packages/compression.scm:1899
-msgid "Generic archive extracting mechanism"
+#: gnu/packages/compression.scm:1890
+msgid ""
+"Lunzip is a decompressor for files in the lzip compression format (.lz),\n"
+"written as a single small C tool with no dependencies.  This makes it\n"
+"well-suited to embedded and other systems without a C++ compiler, or for use in\n"
+"applications such as software installers that need only to decompress files,\n"
+"not compress them.\n"
+"Lunzip is intended to be fully compatible with the regular lzip package."
+msgstr ""
+
+#: gnu/packages/compression.scm:1917
+msgid ""
+"Clzip is a compressor and decompressor for files in the lzip compression\n"
+"format (.lz), written as a single small C tool with no dependencies.  This makes\n"
+"it well-suited to embedded and other systems without a C++ compiler, or for use\n"
+"in other applications like package managers.\n"
+"Clzip is intended to be fully compatible with the regular lzip package."
 msgstr ""
 
-#: gnu/packages/compression.scm:1900
+#: gnu/packages/compression.scm:1945
 msgid ""
-"It allows you to extract any archive file of the type .tar,\n"
-".tar.gz, .gz, .Z, tar.bz2, .tbz, .bz2, .zip, .xz,, .txz, .tar.xz or .lzma\n"
-"without having to worry how it does so, or use different interfaces for each\n"
-"type by using either Perl modules, or command-line tools on your system."
+"Lzlib is a C library for in-memory LZMA compression and decompression in\n"
+"the lzip format.  It supports integrity checking of the decompressed data, and\n"
+"all functions are thread-safe.  The library should never crash, even in case of\n"
+"corrupted input."
 msgstr ""
 
-#: gnu/packages/compression.scm:1936
-msgid "XZ in Java"
+#: gnu/packages/compression.scm:1969
+msgid ""
+"Plzip is a massively parallel (multi-threaded) lossless data compressor\n"
+"and decompressor that uses the lzip file format (.lz).  Files produced by plzip\n"
+"are fully compatible with lzip and can be rescued with lziprecover.\n"
+"On multiprocessor machines, plzip can compress and decompress large files much\n"
+"faster than lzip, at the cost of a slightly reduced compression ratio (0.4% to\n"
+"2%).  The number of usable threads is limited by file size: on files of only a\n"
+"few MiB, plzip is no faster than lzip.\n"
+"Files that were compressed with regular lzip will also not be decompressed\n"
+"faster by plzip, unless the @code{-b} option was used: lzip usually produces\n"
+"single-member files which can't be decompressed in parallel."
 msgstr ""
 
-#: gnu/packages/compression.scm:1937
+#: gnu/packages/compression.scm:2003
 msgid ""
-"Tukaani-xz is an implementation of xz compression/decompression\n"
-"algorithms in Java."
+"innoextract allows extracting Inno Setup installers under\n"
+"non-Windows systems without running the actual installer using wine."
 msgstr ""
 
-#: gnu/packages/databases.scm:147
-msgid "Clustered RDF storage and query engine"
+#: gnu/packages/compression.scm:2050
+msgid ""
+"This package provides the reference implementation of Brotli,\n"
+"a generic-purpose lossless compression algorithm that compresses data using a\n"
+"combination of a modern variant of the LZ77 algorithm, Huffman coding and 2nd\n"
+"order context modeling, with a compression ratio comparable to the best\n"
+"currently available general-purpose compression methods.  It is similar in speed\n"
+"with @code{deflate} but offers more dense compression.\n"
+"\n"
+"The specification of the Brotli Compressed Data Format is defined in RFC 7932."
 msgstr ""
 
-#: gnu/packages/databases.scm:148
+#: gnu/packages/compression.scm:2071
 msgid ""
-"4store is a RDF/SPARQL store written in C, supporting\n"
-"either single machines or networked clusters."
+"@code{python-google-brotli} provides a Python interface to\n"
+"@code{google-brotli}, an implementation of the Brotli lossless compression\n"
+"algorithm."
+msgstr ""
+
+#: gnu/packages/compression.scm:2093
+msgid ""
+"UCL implements a number of compression algorithms that\n"
+"achieve an excellent compression ratio while allowing fast decompression.\n"
+"Decompression requires no additional memory.\n"
+"\n"
+"Compared to LZO, the UCL algorithms achieve a better compression ratio but\n"
+"decompression is a little bit slower."
 msgstr ""
 
-#: gnu/packages/databases.scm:167
-msgid "Hash library of database functions compatible with traditional dbm"
+#: gnu/packages/compression.scm:2142
+msgid ""
+"The Ultimate Packer for eXecutables (UPX) is an executable file\n"
+"compressor.  UPX typically reduces the file size of programs and shared\n"
+"libraries by around 50%--70%, thus reducing disk space, network load times,\n"
+"download times, and other distribution and storage costs."
+msgstr ""
+
+#: gnu/packages/compression.scm:2171
+msgid ""
+"QuaZIP is a simple C++ wrapper over Gilles Vollant's\n"
+"ZIP/UNZIP package that can be used to access ZIP archives.  It uses\n"
+"Trolltech's Qt toolkit.\n"
+"\n"
+"QuaZIP allows you to access files inside ZIP archives using QIODevice\n"
+"API, and that means that you can also use QTextStream, QDataStream or\n"
+"whatever you would like to use on your zipped files.\n"
+"\n"
+"QuaZIP provides complete abstraction of the ZIP/UNZIP API, for both\n"
+"reading from and writing to ZIP archives. "
 msgstr ""
 
-#: gnu/packages/databases.scm:169
+#: gnu/packages/compression.scm:2220
 msgid ""
-"GDBM is a library for manipulating hashed databases.  It is used to\n"
-"store key/value pairs in a file in a manner similar to the Unix dbm library\n"
-"and provides interfaces to the traditional file format."
+"Zutils is a collection of utilities able to process any combination of\n"
+"compressed and uncompressed files transparently.  If any given file, including\n"
+"standard input, is compressed, its decompressed content is used instead.\n"
+"\n"
+"@command{zcat}, @command{zcmp}, @command{zdiff}, and @command{zgrep} are\n"
+"improved replacements for the shell scripts provided by GNU gzip.\n"
+"@command{ztest} tests the integrity of supported compressed files.\n"
+"@command{zupdate} recompresses files with lzip, similar to gzip's\n"
+"@command{znew}.\n"
+"\n"
+"Supported compression formats are bzip2, gzip, lzip, and xz.  Zutils uses\n"
+"external compressors: the compressor to be used for each format is configurable\n"
+"at run time, and must be installed separately."
 msgstr ""
 
-#: gnu/packages/databases.scm:219
-msgid "Berkeley database"
-msgstr "Berkeley 数据库"
+#: gnu/packages/compression.scm:2278
+msgid ""
+"This package provides a script to unpack self-extracting\n"
+"archives generated by @command{makeself} or @command{mojo} without running the\n"
+"possibly untrusted extraction shell script."
+msgstr ""
 
-#: gnu/packages/databases.scm:221
+#: gnu/packages/compression.scm:2306
 msgid ""
-"Berkeley DB is an embeddable database allowing developers the choice of\n"
-"SQL, Key/Value, XML/XQuery or Java Object storage for their data model."
+"(N)compress provides the original compress and uncompress\n"
+"programs that used to be the de facto UNIX standard for compressing and\n"
+"uncompressing files.  These programs implement a fast, simple Lempel-Ziv (LZW)\n"
+"file compression algorithm."
 msgstr ""
 
-#: gnu/packages/databases.scm:310
-msgid "Utility for dumping and restoring ElasticSearch indexes"
+#: gnu/packages/compression.scm:2336
+msgid ""
+"Xarchiver is a front-end to various command line archiving\n"
+"tools.  It uses GTK+ tool-kit and is designed to be desktop-environment\n"
+"independent.  Supported formats are 7z, ARJ, bzip2, gzip, LHA, lzma, lzop,\n"
+"RAR, RPM, DEB, tar, and ZIP.  It cannot perform functions for archives, whose\n"
+"archiver is not installed."
+msgstr ""
+
+#: gnu/packages/compression.scm:2373
+msgid ""
+"Archive huge numbers of files, or split massive tar archives into smaller\n"
+"chunks."
+msgstr ""
+
+#: gnu/packages/compression.scm:2394
+msgid ""
+"Blosc is a high performance compressor optimized for binary data. It has\n"
+"been designed to transmit data to the processor cache faster than the\n"
+"traditional, non-compressed, direct memory fetch approach via a\n"
+"@code{memcpy()} system call.  Blosc is meant not only to reduce the size of\n"
+"large datasets on-disk or in-memory, but also to accelerate memory-bound\n"
+"computations."
+msgstr ""
+
+#: gnu/packages/compression.scm:2432
+msgid ""
+"ECM is a utility that converts ECM files, i.e., CD data files\n"
+"with their error correction data losslessly rearranged for better compression,\n"
+"to their original, binary CD format."
+msgstr ""
+
+#: gnu/packages/compression.scm:2456
+msgid ""
+"Tarlz is a massively parallel (multi-threaded) combined implementation of\n"
+"the tar archiver and the lzip compressor.  Tarlz creates, lists, and extracts\n"
+"archives in a simplified and safer variant of the POSIX pax format compressed\n"
+"with lzip, keeping the alignment between tar members and lzip members.  The\n"
+"resulting multimember tar.lz archive is fully backward compatible with standard\n"
+"tar tools like GNU tar, which treat it like any other tar.lz archive.  Tarlz\n"
+"can append files to the end of such compressed archives."
 msgstr ""
 
-#: gnu/packages/databases.scm:312
+#: gnu/packages/databases.scm:193
+msgid ""
+"4store is a RDF/SPARQL store written in C, supporting\n"
+"either single machines or networked clusters."
+msgstr ""
+
+#: gnu/packages/databases.scm:239
+msgid ""
+"@code{pg_tmp} creates temporary PostgreSQL databases, suitable for tasks\n"
+"like running software test suites.  Temporary databases created with\n"
+"@code{pg_tmp} have a limited shared memory footprint and are automatically\n"
+"garbage-collected after a configurable number of seconds (the default is\n"
+"60)."
+msgstr ""
+
+#: gnu/packages/databases.scm:268
 msgid ""
 "This package provides a utility for dumping the contents of an\n"
 "ElasticSearch index to a compressed file and restoring the dumpfile back to an\n"
 "ElasticSearch server"
 msgstr ""
 
-#: gnu/packages/databases.scm:350
-msgid "Fast key-value storage library"
-msgstr "快速的键值对存储库"
+#: gnu/packages/databases.scm:420
+msgid ""
+"Firebird is an SQL @acronym{RDBMS, relational database management system}\n"
+"with rich support for ANSI SQL (e.g., @code{INSERT...RETURNING}) including\n"
+"@acronym{UDFs, user-defined functions} and PSQL stored procedures, cursors, and\n"
+"triggers.  Transactions provide full ACID-compliant referential integrity.\n"
+"\n"
+"The database requires very little manual maintenance once set up, making it\n"
+"ideal for small business or embedded use.\n"
+"\n"
+"When installed as a traditional local or remote (network) database server,\n"
+"Firebird can grow to terabyte scale with proper tuning---although PostgreSQL\n"
+"may be a better choice for such very large environments.\n"
+"\n"
+"Firebird can also be embedded into stand-alone applications that don't want or\n"
+"need a full client & server.  Used in this manner, it offers richer SQL support\n"
+"than SQLite as well as the option to seamlessly migrate to a client/server\n"
+"database later."
+msgstr ""
 
-#: gnu/packages/databases.scm:352
+#: gnu/packages/databases.scm:472
 msgid ""
 "LevelDB is a fast key-value storage library that provides an ordered\n"
 "mapping from string keys to string values."
 msgstr ""
 
-#: gnu/packages/databases.scm:372
-msgid "In memory caching service"
-msgstr ""
-
-#: gnu/packages/databases.scm:373
+#: gnu/packages/databases.scm:493
 msgid ""
-"Memcached is a in memory key value store.  It has a small\n"
+"Memcached is an in-memory key-value store.  It has a small\n"
 "and generic API, and was originally intended for use with dynamic web\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/databases.scm:478
-msgid "High performance and high availability document database"
+#: gnu/packages/databases.scm:556
+msgid ""
+"libMemcached is a library to use memcached in C/C++\n"
+"applications.  It comes with a complete reference guide and documentation of\n"
+"the API, and provides features such as:\n"
+"@itemize\n"
+"@item Asynchronous and synchronous transport support\n"
+"@item Consistent hashing and distribution\n"
+"@item Tunable hashing algorithm to match keys\n"
+"@item Access to large object support\n"
+"@item Local replication\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/databases.scm:480
+#: gnu/packages/databases.scm:596
 msgid ""
-"Mongo is a high-performance, high availability, schema-free\n"
-"document-oriented database.  A key goal of MongoDB is to bridge the gap\n"
-"between key/value stores (which are fast and highly scalable) and traditional\n"
-"RDBMS systems (which are deep in functionality)."
+"@code{pylibmc} is a client in Python for memcached.  It is a wrapper\n"
+"around TangentOrg’s libmemcached library, and can be used as a drop-in\n"
+"replacement for the code@{python-memcached} library."
 msgstr ""
 
-#: gnu/packages/databases.scm:556
-msgid "Fast, easy to use, and popular database"
+#: gnu/packages/databases.scm:630
+msgid ""
+"MyCLI is a command line interface for MySQL, MariaDB, and Percona with\n"
+"auto-completion and syntax highlighting."
 msgstr ""
 
-#: gnu/packages/databases.scm:558
+#: gnu/packages/databases.scm:701
 msgid ""
 "MySQL is a fast, reliable, and easy to use relational database\n"
 "management system that supports the standardized Structured Query\n"
 "Language."
 msgstr ""
 
-#: gnu/packages/databases.scm:634
-msgid "SQL database server"
-msgstr ""
-
-#: gnu/packages/databases.scm:636
+#: gnu/packages/databases.scm:970
 msgid ""
 "MariaDB is a multi-user and multi-threaded SQL database server, designed\n"
 "as a drop-in replacement of MySQL."
 msgstr ""
 
-#: gnu/packages/databases.scm:674
-msgid "Powerful object-relational database system"
+#: gnu/packages/databases.scm:1002
+msgid ""
+"The MariaDB Connector/C is used to connect applications\n"
+"developed in C/C++ to MariaDB and MySQL databases."
+msgstr ""
+
+#: gnu/packages/databases.scm:1027
+msgid ""
+"Galera is a wsrep-provider that is used with MariaDB for load-balancing\n"
+"and high-availability (HA)."
 msgstr ""
 
-#: gnu/packages/databases.scm:676
+#: gnu/packages/databases.scm:1076
 msgid ""
 "PostgreSQL is a powerful object-relational database system.  It is fully\n"
 "ACID compliant, has full support for foreign keys, joins, views, triggers, and\n"
@@ -2166,11 +2083,19 @@ msgid ""
 "pictures, sounds, or video."
 msgstr ""
 
-#: gnu/packages/databases.scm:715
-msgid "Key-value database"
+#: gnu/packages/databases.scm:1216
+msgid ""
+"@code{pgloader} is a program that can load data or migrate databases from\n"
+"CSV, DB3, iXF, SQLite, MS-SQL or MySQL to PostgreSQL."
+msgstr ""
+
+#: gnu/packages/databases.scm:1240
+msgid ""
+"PyMySQL is a pure-Python MySQL client library, based on PEP 249.\n"
+"Most public APIs are compatible with @command{mysqlclient} and MySQLdb."
 msgstr ""
 
-#: gnu/packages/databases.scm:716
+#: gnu/packages/databases.scm:1267
 msgid ""
 "QDBM is a library of routines for managing a\n"
 "database.  The database is a simple data file containing key-value\n"
@@ -2180,11 +2105,7 @@ msgid ""
 "organized in a hash table or B+ tree."
 msgstr ""
 
-#: gnu/packages/databases.scm:771
-msgid "Manipulate plain text files as databases"
-msgstr ""
-
-#: gnu/packages/databases.scm:773
+#: gnu/packages/databases.scm:1304
 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"
@@ -2193,11 +2114,15 @@ msgid ""
 "types are supported, as is encryption."
 msgstr ""
 
-#: gnu/packages/databases.scm:860
-msgid "Persistent key-value store for fast storage"
+#: gnu/packages/databases.scm:1327
+msgid ""
+"This package provides an Emacs major mode @code{rec-mode}\n"
+"for working with GNU Recutils text-based, human-editable databases.  It\n"
+"supports editing, navigation, and querying of recutils database files\n"
+"including field and record folding."
 msgstr ""
 
-#: gnu/packages/databases.scm:862
+#: gnu/packages/databases.scm:1424
 msgid ""
 "RocksDB is a library that forms the core building block for a fast\n"
 "key-value server, especially suited for storing data on flash drives.  It\n"
@@ -2208,14 +2133,10 @@ msgid ""
 "data in a single database.  RocksDB is partially based on @code{LevelDB}."
 msgstr ""
 
-#: gnu/packages/databases.scm:921
-msgid "Command-line tool for accessing SPARQL endpoints over HTTP"
-msgstr ""
-
-#: gnu/packages/databases.scm:922
+#: gnu/packages/databases.scm:1486
 msgid ""
 "Sparql-query is a command-line tool for accessing SPARQL\n"
-"endpoints over HTTP.  It has been intentionally designed to 'feel' similar to\n"
+"endpoints over HTTP.  It has been intentionally designed to @code{feel} similar to\n"
 "tools for interrogating SQL databases.  For example, you can enter a query over\n"
 "several lines, using a semi-colon at the end of a line to indicate the end of\n"
 "your query.  It also supports readline so that you can more easily recall and\n"
@@ -2223,23 +2144,21 @@ msgid ""
 "for example from a shell script."
 msgstr ""
 
-#: gnu/packages/databases.scm:964
-msgid "The SQLite database management system"
-msgstr ""
-
-#: gnu/packages/databases.scm:966
+#: gnu/packages/databases.scm:1579
 msgid ""
-"SQLite is a software library that implements a self-contained, serverless,\n"
-"zero-configuration, transactional SQL database engine.  SQLite is the most\n"
-"widely deployed SQL database engine in the world.  The source code for SQLite\n"
-"is in the public domain."
+"Sqitch is a standalone change management system for database schemas,\n"
+"which uses SQL to describe changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:1015
-msgid "Trivial database"
+#: gnu/packages/databases.scm:1608
+msgid ""
+"SQLcrush lets you view and edit a database directly from the text\n"
+"console through an ncurses interface.  You can explore each table's structure,\n"
+"browse and edit the contents, add and delete entries, all while tracking your\n"
+"changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:1017
+#: gnu/packages/databases.scm:1646
 msgid ""
 "TDB is a Trivial Database.  In concept, it is very much like GDBM,\n"
 "and BSD's DB except that it allows multiple simultaneous writers and uses\n"
@@ -2247,19 +2166,11 @@ msgid ""
 "extremely small."
 msgstr ""
 
-#: gnu/packages/databases.scm:1036
-msgid "Database independent interface for Perl"
-msgstr ""
-
-#: gnu/packages/databases.scm:1037
+#: gnu/packages/databases.scm:1666
 msgid "This package provides an database interface for Perl."
 msgstr ""
 
-#: gnu/packages/databases.scm:1085
-msgid "Extensible and flexible object <-> relational mapper"
-msgstr ""
-
-#: gnu/packages/databases.scm:1086
+#: gnu/packages/databases.scm:1714
 msgid ""
 "An SQL to OO mapper with an object API inspired by\n"
 "Class::DBI (with a compatibility layer as a springboard for porting) and a\n"
@@ -2271,21 +2182,13 @@ msgid ""
 "\"ORDER BY\" and \"HAVING\" support."
 msgstr ""
 
-#: gnu/packages/databases.scm:1117
-msgid "Cursor with built-in caching support"
-msgstr ""
-
-#: gnu/packages/databases.scm:1118
+#: gnu/packages/databases.scm:1746
 msgid ""
 "DBIx::Class::Cursor::Cached provides a cursor class with\n"
 "built-in caching support."
 msgstr ""
 
-#: gnu/packages/databases.scm:1140
-msgid "Introspect many-to-many relationships"
-msgstr ""
-
-#: gnu/packages/databases.scm:1141
+#: gnu/packages/databases.scm:1769
 msgid ""
 "Because the many-to-many relationships are not real\n"
 "relationships, they can not be introspected with DBIx::Class.  Many-to-many\n"
@@ -2295,42 +2198,26 @@ msgid ""
 "introspected and examined."
 msgstr ""
 
-#: gnu/packages/databases.scm:1199
-msgid "Create a DBIx::Class::Schema based on a database"
-msgstr ""
-
-#: gnu/packages/databases.scm:1200
+#: gnu/packages/databases.scm:1828
 msgid ""
 "DBIx::Class::Schema::Loader automates the definition of a\n"
 "DBIx::Class::Schema by scanning database table definitions and setting up the\n"
 "columns, primary keys, unique constraints and relationships."
 msgstr ""
 
-#: gnu/packages/databases.scm:1224
-msgid "DBI PostgreSQL interface"
-msgstr ""
-
-#: gnu/packages/databases.scm:1225
+#: gnu/packages/databases.scm:1853
 msgid ""
 "This package provides a PostgreSQL driver for the Perl5\n"
 "@dfn{Database Interface} (DBI)."
 msgstr ""
 
-#: gnu/packages/databases.scm:1249
-msgid "DBI MySQL interface"
-msgstr ""
-
-#: gnu/packages/databases.scm:1250
+#: gnu/packages/databases.scm:1891
 msgid ""
 "This package provides a MySQL driver for the Perl5\n"
 "@dfn{Database Interface} (DBI)."
 msgstr ""
 
-#: gnu/packages/databases.scm:1269
-msgid "SQlite interface for Perl"
-msgstr ""
-
-#: gnu/packages/databases.scm:1270
+#: gnu/packages/databases.scm:1911
 msgid ""
 "DBD::SQLite is a Perl DBI driver for SQLite, that includes\n"
 "the entire thing in the distribution.  So in order to get a fast transaction\n"
@@ -2338,11 +2225,14 @@ msgid ""
 "module, and nothing else."
 msgstr ""
 
-#: gnu/packages/databases.scm:1301
-msgid "Generate SQL from Perl data structures"
+#: gnu/packages/databases.scm:1936
+msgid ""
+"@code{MySQL::Config} emulates the @code{load_defaults} function from\n"
+"libmysqlclient.  It will fill an array with long options, ready to be parsed by\n"
+"@code{Getopt::Long}."
 msgstr ""
 
-#: gnu/packages/databases.scm:1302
+#: gnu/packages/databases.scm:1965
 msgid ""
 "This module was inspired by the excellent DBIx::Abstract.\n"
 "While based on the concepts used by DBIx::Abstract, the concepts used have\n"
@@ -2352,43 +2242,43 @@ msgid ""
 "time your data changes."
 msgstr ""
 
-#: gnu/packages/databases.scm:1331
-msgid "Split SQL code into atomic statements"
+#: gnu/packages/databases.scm:1995
+msgid ""
+"This module is nearly identical to @code{SQL::Abstract} 1.81, and exists\n"
+"to preserve the ability of users to opt into the new way of doing things in\n"
+"later versions according to their own schedules.\n"
+"\n"
+"It is an abstract SQL generation module based on the concepts used by\n"
+"@code{DBIx::Abstract}, with several important differences, especially when it\n"
+"comes to @code{WHERE} clauses.  These concepts were modified to make the SQL\n"
+"easier to generate from Perl data structures.\n"
+"\n"
+"The underlying idea is for this module to do what you mean, based on the data\n"
+"structures you provide it.  You shouldn't have to modify your code every time\n"
+"your data changes, as this module figures it out."
 msgstr ""
 
-#: gnu/packages/databases.scm:1332
+#: gnu/packages/databases.scm:2031
 msgid ""
 "This module tries to split any SQL code, even including\n"
 "non-standard extensions, into the atomic statements it is composed of."
 msgstr ""
 
-#: gnu/packages/databases.scm:1350
-msgid "SQL tokenizer"
-msgstr ""
-
-#: gnu/packages/databases.scm:1351
+#: gnu/packages/databases.scm:2050
 msgid ""
 "SQL::Tokenizer is a tokenizer for SQL queries.  It does not\n"
 "claim to be a parser or query verifier.  It just creates sane tokens from a\n"
 "valid SQL query."
 msgstr ""
 
-#: gnu/packages/databases.scm:1369
-msgid "Data source abstraction library"
-msgstr ""
-
-#: gnu/packages/databases.scm:1370
+#: gnu/packages/databases.scm:2069
 msgid ""
 "Unixodbc is a library providing an API with which to access\n"
 "data sources.  Data sources include SQL Servers and any software with an ODBC\n"
 "Driver."
 msgstr ""
 
-#: gnu/packages/databases.scm:1394
-msgid "In-memory key/value and document store"
-msgstr ""
-
-#: gnu/packages/databases.scm:1396
+#: gnu/packages/databases.scm:2095
 msgid ""
 "UnQLite is an in-process software library which implements a\n"
 "self-contained, serverless, zero-configuration, transactional NoSQL\n"
@@ -2397,33 +2287,21 @@ msgid ""
 "similar to BerkeleyDB, LevelDB, etc."
 msgstr ""
 
-#: gnu/packages/databases.scm:1424
-msgid "Key-value cache and store"
-msgstr ""
-
-#: gnu/packages/databases.scm:1425
+#: gnu/packages/databases.scm:2148
 msgid ""
 "Redis is an advanced key-value cache and store.  Redis\n"
 "supports many data structures including strings, hashes, lists, sets, sorted\n"
 "sets, bitmaps and hyperloglogs."
 msgstr ""
 
-#: gnu/packages/databases.scm:1452
-msgid "Kyoto Cabinet is a modern implementation of the DBM database"
-msgstr ""
-
-#: gnu/packages/databases.scm:1454
+#: gnu/packages/databases.scm:2177
 msgid ""
 "Kyoto Cabinet is a standalone file-based database that supports Hash\n"
 "and B+ Tree data storage models.  It is a fast key-value lightweight\n"
 "database and supports many programming languages.  It is a NoSQL database."
 msgstr ""
 
-#: gnu/packages/databases.scm:1480
-msgid "Tokyo Cabinet is a modern implementation of the DBM database"
-msgstr ""
-
-#: gnu/packages/databases.scm:1482
+#: gnu/packages/databases.scm:2205
 msgid ""
 "Tokyo Cabinet is a library of routines for managing a database.\n"
 "The database is a simple data file containing records, each is a pair of a\n"
@@ -2433,11 +2311,7 @@ msgid ""
 "organized in hash table, B+ tree, or fixed-length array."
 msgstr ""
 
-#: gnu/packages/databases.scm:1517
-msgid "NoSQL data engine"
-msgstr ""
-
-#: gnu/packages/databases.scm:1519
+#: gnu/packages/databases.scm:2243
 msgid ""
 "WiredTiger is an extensible platform for data management.  It supports\n"
 "row-oriented storage (where all columns of a row are stored together),\n"
@@ -2446,29 +2320,17 @@ msgid ""
 "trees (LSM), for sustained throughput under random insert workloads."
 msgstr ""
 
-#: gnu/packages/databases.scm:1570
-msgid "Wired Tiger bindings for GNU Guile"
-msgstr ""
-
-#: gnu/packages/databases.scm:1572
+#: gnu/packages/databases.scm:2296
 msgid ""
 "This package provides Guile bindings to the WiredTiger ``NoSQL''\n"
 "database."
 msgstr ""
 
-#: gnu/packages/databases.scm:1604
-msgid "Perl5 access to Berkeley DB version 1.x"
-msgstr ""
-
-#: gnu/packages/databases.scm:1606
+#: gnu/packages/databases.scm:2326
 msgid "The DB::File module provides Perl bindings to the Berkeley DB version 1.x."
 msgstr ""
 
-#: gnu/packages/databases.scm:1633
-msgid "Lightning Memory-Mapped Database library"
-msgstr ""
-
-#: gnu/packages/databases.scm:1635
+#: gnu/packages/databases.scm:2374
 msgid ""
 "The @dfn{Lightning Memory-Mapped Database} (LMDB) is a high-performance\n"
 "transactional database.  Unlike more complex relational databases, LMDB handles\n"
@@ -2481,22 +2343,22 @@ msgid ""
 "virtual address space — not physical RAM."
 msgstr ""
 
-#: gnu/packages/databases.scm:1672
-msgid "C++ connector for PostgreSQL"
+#: gnu/packages/databases.scm:2408
+msgid ""
+"@code{lmdbxx} is a comprehensive @code{C++} wrapper for the\n"
+"@code{LMDB} embedded database library, offering both an error-checked\n"
+"procedural interface and an object-oriented resource interface with RAII\n"
+"semantics."
 msgstr ""
 
-#: gnu/packages/databases.scm:1674
+#: gnu/packages/databases.scm:2442
 msgid ""
 "Libpqxx is a C++ library to enable user programs to communicate with the\n"
 "PostgreSQL database back-end.  The database back-end can be local or it may be\n"
 "on another machine, accessed via TCP/IP."
 msgstr ""
 
-#: gnu/packages/databases.scm:1697
-msgid "Small object-relational mapping utility"
-msgstr ""
-
-#: gnu/packages/databases.scm:1699
+#: gnu/packages/databases.scm:2468
 msgid ""
 "Peewee is a simple and small ORM (object-relation mapping) tool.  Peewee\n"
 "handles converting between pythonic values and those used by databases, so you\n"
@@ -2505,11 +2367,16 @@ msgid ""
 "can autogenerate peewee models using @code{pwiz}, a model generator."
 msgstr ""
 
-#: gnu/packages/databases.scm:1746
-msgid "Library providing transparent encryption of SQLite database files"
+#: gnu/packages/databases.scm:2518
+msgid ""
+"Tortoise ORM is an easy-to-use asyncio ORM (Object Relational Mapper)\n"
+"inspired by Django.  Tortoise ORM was build with relations in mind and\n"
+"admiration for the excellent and popular Django ORM.  It’s engraved in its\n"
+"design that you are working not with just tables, you work with relational\n"
+"data."
 msgstr ""
 
-#: gnu/packages/databases.scm:1747
+#: gnu/packages/databases.scm:2562
 msgid ""
 "SQLCipher is an implementation of SQLite, extended to\n"
 "provide transparent 256-bit AES encryption of database files.  Pages are\n"
@@ -2518,27 +2385,19 @@ msgid ""
 "development."
 msgstr ""
 
-#: gnu/packages/databases.scm:1779 gnu/packages/databases.scm:1806
-msgid "Python ODBC Library"
-msgstr "Python ODBC 库"
-
-#: gnu/packages/databases.scm:1780
+#: gnu/packages/databases.scm:2595
 msgid ""
 "@code{python-pyodbc-c} provides a Python DB-API driver\n"
 "for ODBC."
 msgstr ""
 
-#: gnu/packages/databases.scm:1807
+#: gnu/packages/databases.scm:2620
 msgid ""
 "@code{python-pyodbc} provides a Python DB-API driver\n"
 "for ODBC."
 msgstr ""
 
-#: gnu/packages/databases.scm:1844
-msgid "Read Microsoft Access databases"
-msgstr ""
-
-#: gnu/packages/databases.scm:1845
+#: gnu/packages/databases.scm:2653
 msgid ""
 "MDB Tools is a set of tools and applications to read the\n"
 "proprietary MDB file format used in Microsoft's Access database package.  This\n"
@@ -2547,77 +2406,39 @@ msgid ""
 "etc., and an SQL engine for performing simple SQL queries."
 msgstr ""
 
-#: gnu/packages/databases.scm:1886
-msgid "Python binding for the ‘Lightning’ database (LMDB)"
-msgstr ""
-
-#: gnu/packages/databases.scm:1888
+#: gnu/packages/databases.scm:2699
 msgid ""
 "python-lmdb or py-lmdb is a Python binding for the @dfn{Lightning\n"
 "Memory-Mapped Database} (LMDB), a high-performance key-value store."
 msgstr ""
 
-#: gnu/packages/databases.scm:1942
-msgid "ActiveRecord ORM for Python"
-msgstr ""
-
-#: gnu/packages/databases.scm:1944
+#: gnu/packages/databases.scm:2738
 msgid ""
 "Orator provides a simple ActiveRecord-like Object Relational Mapping\n"
 "implementation for Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:1971
-msgid "Multi-model database system"
-msgstr ""
-
-#: gnu/packages/databases.scm:1972
+#: gnu/packages/databases.scm:2784
 msgid ""
 "Virtuoso is a scalable cross-platform server that combines\n"
 "relational, graph, and document data management with web application server\n"
 "and web services platform functionality."
 msgstr ""
 
-#: gnu/packages/databases.scm:2000
-msgid "Database interface and MySQL driver for R"
-msgstr ""
-
-#: gnu/packages/databases.scm:2002
-msgid ""
-"This package provides a DBI interface to MySQL / MariaDB.  The RMySQL\n"
-"package contains an old implementation based on legacy code from S-PLUS which\n"
-"is being phased out.  A modern MySQL client based on Rcpp is available from\n"
-"the RMariaDB package."
-msgstr ""
-
-#: gnu/packages/databases.scm:2027
-msgid ""
-"Cassandra Cluster Manager for Apache Cassandra clusters on\n"
-"localhost"
-msgstr ""
-
-#: gnu/packages/databases.scm:2029
+#: gnu/packages/databases.scm:2812
 msgid ""
 "Cassandra Cluster Manager is a development tool for testing\n"
 "local Cassandra clusters. It creates, launches and removes Cassandra clusters\n"
 "on localhost."
 msgstr ""
 
-#: gnu/packages/databases.scm:2055
-msgid "SQLite bindings for Python"
-msgstr ""
-
-#: gnu/packages/databases.scm:2057
+#: gnu/packages/databases.scm:2840
 msgid ""
 "Pysqlite provides SQLite bindings for Python that comply to the\n"
 "Database API 2.0T."
 msgstr ""
 
-#: gnu/packages/databases.scm:2084
-msgid "Database abstraction library"
-msgstr ""
-
-#: gnu/packages/databases.scm:2086
+#: gnu/packages/databases.scm:2867
 msgid ""
 "SQLAlchemy is the Python SQL toolkit and Object Relational Mapper that\n"
 "gives application developers the full power and flexibility of SQL.  It\n"
@@ -2626,11 +2447,7 @@ msgid ""
 "simple and Pythonic domain language."
 msgstr ""
 
-#: gnu/packages/databases.scm:2125
-msgid "Various utility functions for SQLAlchemy"
-msgstr ""
-
-#: gnu/packages/databases.scm:2127
+#: gnu/packages/databases.scm:2908
 msgid ""
 "SQLAlchemy-utils provides various utility functions and custom data types\n"
 "for SQLAlchemy.  SQLAlchemy is an SQL database abstraction library for Python.\n"
@@ -2647,21 +2464,23 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/databases.scm:2168
-msgid "Database migration tool for SQLAlchemy"
+#: gnu/packages/databases.scm:2960
+msgid ""
+"This package provides mock helpers for SQLAlchemy that makes it easy\n"
+"to mock an SQLAlchemy session while preserving the ability to do asserts.\n"
+"\n"
+"Normally Normally SQLAlchemy's expressions cannot be easily compared as\n"
+"comparison on binary expression produces yet another binary expression, but\n"
+"this library provides functions to facilitate such comparisons."
 msgstr ""
 
-#: gnu/packages/databases.scm:2170
+#: gnu/packages/databases.scm:2995
 msgid ""
 "Alembic is a lightweight database migration tool for usage with the\n"
 "SQLAlchemy Database Toolkit for Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2192
-msgid "Tiny key value database with concurrency support"
-msgstr ""
-
-#: gnu/packages/databases.scm:2194
+#: gnu/packages/databases.scm:3023
 msgid ""
 "PickleShare is a small ‘shelve’-like datastore with concurrency support.\n"
 "Like shelve, a PickleShareDB object acts like a normal dictionary.  Unlike\n"
@@ -2672,11 +2491,7 @@ msgid ""
 "PickleShare."
 msgstr ""
 
-#: gnu/packages/databases.scm:2239
-msgid "Another Python SQLite Wrapper"
-msgstr ""
-
-#: gnu/packages/databases.scm:2240
+#: gnu/packages/databases.scm:3076
 msgid ""
 "APSW is a Python wrapper for the SQLite\n"
 "embedded relational database engine.  In contrast to other wrappers such as\n"
@@ -2684,22 +2499,21 @@ msgid ""
 "translate the complete SQLite API into Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2264
-msgid "Neo4j driver code written in Python"
+#: gnu/packages/databases.scm:3113
+msgid ""
+"The package aiosqlite replicates the standard sqlite3 module, but with\n"
+"async versions of all the standard connection and cursor methods, and context\n"
+"managers for automatically closing connections."
 msgstr ""
 
-#: gnu/packages/databases.scm:2265
+#: gnu/packages/databases.scm:3134
 msgid ""
 "This package provides the Neo4j Python driver that connects\n"
 "to the database using Neo4j's binary protocol.  It aims to be minimal, while\n"
 "being idiomatic to Python."
 msgstr ""
 
-#: gnu/packages/databases.scm:2284
-msgid "Library and toolkit for working with Neo4j in Python"
-msgstr ""
-
-#: gnu/packages/databases.scm:2285
+#: gnu/packages/databases.scm:3154
 msgid ""
 "This package provides a client library and toolkit for\n"
 "working with Neo4j from within Python applications and from the command\n"
@@ -2707,30 +2521,26 @@ msgid ""
 "designed to be easy and intuitive to use."
 msgstr ""
 
-#: gnu/packages/databases.scm:2310
-msgid "Python PostgreSQL adapter"
-msgstr ""
-
-#: gnu/packages/databases.scm:2312
-msgid "psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API 2.0. "
-msgstr ""
-
-#: gnu/packages/databases.scm:2335
-msgid "SQLAlchemy schema displayer"
+#: gnu/packages/databases.scm:3180
+msgid ""
+"psycopg2 is a thread-safe PostgreSQL adapter that implements DB-API\n"
+"2.0."
 msgstr ""
 
-#: gnu/packages/databases.scm:2336
+#: gnu/packages/databases.scm:3206
 msgid ""
 "This package provides a program to build Entity\n"
 "Relationship diagrams from a SQLAlchemy model (or directly from the\n"
 "database)."
 msgstr ""
 
-#: gnu/packages/databases.scm:2366
-msgid "MySQLdb is an interface to the popular MySQL database server for Python"
+#: gnu/packages/databases.scm:3240
+msgid ""
+"Yoyo is a database schema migration tool.  Migrations are written as SQL\n"
+"files or Python scripts that define a list of migration steps."
 msgstr ""
 
-#: gnu/packages/databases.scm:2367
+#: gnu/packages/databases.scm:3261
 msgid ""
 "MySQLdb is an interface to the popular MySQL database server\n"
 "for Python.  The design goals are:\n"
@@ -2741,85 +2551,122 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/databases.scm:2395
-msgid "Python extension that wraps protocol parsing code in hiredis"
-msgstr ""
-
-#: gnu/packages/databases.scm:2396
+#: gnu/packages/databases.scm:3287
 msgid ""
 "Python-hiredis is a python extension that wraps protocol\n"
 "parsing code in hiredis.  It primarily speeds up parsing of multi bulk replies."
 msgstr ""
 
-#: gnu/packages/databases.scm:2419
-msgid "Fake implementation of redis API for testing purposes"
-msgstr ""
-
-#: gnu/packages/databases.scm:2420
+#: gnu/packages/databases.scm:3314
 msgid ""
-"Fakeredis is a pure python implementation of the redis-py\n"
-"python client that simulates talking to a redis server.  This was created for a\n"
-"single purpose: to write unittests.  Setting up redis is not hard, but many time\n"
-" you want to write unittests that do not talk to an external server (such as\n"
-"redis).  This module now allows tests to simply use this module as a reasonable\n"
-"substitute for redis."
-msgstr ""
-
-#: gnu/packages/databases.scm:2448
-msgid "Redis Python client"
+"Fakeredis is a pure-Python implementation of the redis-py Python client\n"
+"that simulates talking to a redis server.  It was created for a single purpose:\n"
+"to write unit tests.\n"
+"\n"
+"Setting up redis is not hard, but one often wants to write unit tests that don't\n"
+"talk to an external server such as redis.  This module can be used as a\n"
+"reasonable substitute."
 msgstr ""
 
-#: gnu/packages/databases.scm:2450
+#: gnu/packages/databases.scm:3345
 msgid "This package provides a Python interface to the Redis key-value store."
 msgstr ""
 
-#: gnu/packages/databases.scm:2471
-msgid "Simple job queues for Python"
-msgstr ""
-
-#: gnu/packages/databases.scm:2473
+#: gnu/packages/databases.scm:3389
 msgid ""
 "RQ (Redis Queue) is a simple Python library for queueing jobs and\n"
 "processing them in the background with workers.  It is backed by Redis and it\n"
 "is designed to have a low barrier to entry."
 msgstr ""
 
-#: gnu/packages/databases.scm:2496
-msgid "Port of asyncio-redis to trollius"
+#: gnu/packages/databases.scm:3428
+msgid ""
+"This package provides job scheduling capabilities to @code{python-rq}\n"
+"(Redis Queue)."
 msgstr ""
 
-#: gnu/packages/databases.scm:2497
+#: gnu/packages/databases.scm:3448
 msgid ""
 "@code{trollius-redis} is a Redis client for Python\n"
-"  trollius.  It is an asynchronious IO (PEP 3156) implementation of the\n"
+"  trollius.  It is an asynchronous IO (PEP 3156) implementation of the\n"
 "  Redis protocol."
 msgstr ""
 
-#: gnu/packages/databases.scm:2524
-msgid "Non-validating SQL parser"
-msgstr ""
-
-#: gnu/packages/databases.scm:2525
+#: gnu/packages/databases.scm:3476
 msgid ""
 "Sqlparse is a non-validating SQL parser for Python.  It\n"
 "provides support for parsing, splitting and formatting SQL statements."
 msgstr ""
 
-#: gnu/packages/databases.scm:2545
-msgid "Library to write SQL queries in a pythonic way"
-msgstr ""
-
-#: gnu/packages/databases.scm:2546
+#: gnu/packages/databases.scm:3496
 msgid ""
 "@code{python-sql} is a library to write SQL queries, that\n"
 "transforms idiomatic python function calls to well-formed SQL queries."
 msgstr ""
 
-#: gnu/packages/debug.scm:80
-msgid "Heuristical file minimizer"
+#: gnu/packages/databases.scm:3522
+msgid ""
+"PyPika is a python SQL query builder that exposes the full richness of\n"
+"the SQL language using a syntax that reflects the resulting query."
+msgstr ""
+
+#: gnu/packages/databases.scm:3642
+msgid ""
+"Apache Arrow is a columnar in-memory analytics layer\n"
+"designed to accelerate big data.  It houses a set of canonical in-memory\n"
+"representations of flat and hierarchical data along with multiple\n"
+"language-bindings for structure manipulation.  It also provides IPC and common\n"
+"algorithm implementations."
+msgstr ""
+
+#: gnu/packages/databases.scm:3681
+msgid ""
+"This library provides a Pythonic API wrapper for the reference Arrow C++\n"
+"implementation, along with tools for interoperability with pandas, NumPy, and\n"
+"other traditional Python scientific computing packages."
+msgstr ""
+
+#: gnu/packages/databases.scm:3702
+msgid ""
+"This package provides a Python client library for CrateDB.\n"
+"It implements the Python DB API 2.0 specification and includes support for\n"
+"SQLAlchemy."
+msgstr ""
+
+#: gnu/packages/databases.scm:3721
+msgid ""
+"This library implements a database independent abstraction layer in C,\n"
+"similar to the DBI/DBD layer in Perl.  Writing one generic set of code,\n"
+"programmers can leverage the power of multiple databases and multiple\n"
+"simultaneous database connections by using this framework."
+msgstr ""
+
+#: gnu/packages/databases.scm:3789
+msgid ""
+"The @code{libdbi-drivers} library provides the database specific drivers\n"
+"for the @code{libdbi} framework.\n"
+"\n"
+"The drivers officially supported by @code{libdbi} are:\n"
+"@itemize\n"
+"@item MySQL,\n"
+"@item PostgreSQL,\n"
+"@item SQLite.\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/databases.scm:3831
+msgid ""
+"SOCI is an abstraction layer for several database backends, including\n"
+"PostreSQL, SQLite, ODBC and MySQL."
+msgstr ""
+
+#: gnu/packages/databases.scm:3855
+msgid ""
+"FreeTDS is an implementation of the Tabular DataStream protocol, used for\n"
+"connecting to MS SQL and Sybase servers over TCP/IP."
 msgstr ""
 
-#: gnu/packages/debug.scm:82
+#: gnu/packages/debug.scm:106
 msgid ""
 "Delta assists you in minimizing \"interesting\" files subject to a test\n"
 "of their interestingness.  A common such situation is when attempting to\n"
@@ -2827,11 +2674,7 @@ msgid ""
 "program to exhibit a bug."
 msgstr ""
 
-#: gnu/packages/debug.scm:137
-msgid "Reducer for interesting code"
-msgstr ""
-
-#: gnu/packages/debug.scm:139
+#: gnu/packages/debug.scm:167
 msgid ""
 "C-Reduce is a tool that takes a large C or C++ program that has a\n"
 "property of interest (such as triggering a compiler bug) and automatically\n"
@@ -2840,11 +2683,7 @@ msgid ""
 "tools that process C/C++ code."
 msgstr ""
 
-#: gnu/packages/debug.scm:268
-msgid "Security-oriented fuzzer"
-msgstr ""
-
-#: gnu/packages/debug.scm:270
+#: gnu/packages/debug.scm:239
 msgid ""
 "American fuzzy lop is a security-oriented fuzzer that employs a novel\n"
 "type of compile-time instrumentation and genetic algorithms to automatically\n"
@@ -2855,13 +2694,25 @@ msgid ""
 "down the road."
 msgstr ""
 
-#: gnu/packages/debug.scm:328
-msgid "Expose race conditions in Makefiles"
+#: gnu/packages/debug.scm:383
+msgid ""
+"QEMU is a generic machine emulator and virtualizer.  This package\n"
+"of QEMU is used only by the american fuzzy lop package.\n"
+"\n"
+"When used as a machine emulator, QEMU can run OSes and programs made for one\n"
+"machine (e.g. an ARM board) on a different machine---e.g., your own PC.  By\n"
+"using dynamic translation, it achieves very good performance.\n"
+"\n"
+"When used as a virtualizer, QEMU achieves near native performances by\n"
+"executing the guest code directly on the host CPU.  QEMU supports\n"
+"virtualization when executing under the Xen hypervisor or using\n"
+"the KVM kernel module in Linux.  When using KVM, QEMU can virtualize x86,\n"
+"server and embedded PowerPC, and S390 guests."
 msgstr ""
 
-#: gnu/packages/debug.scm:330
+#: gnu/packages/debug.scm:453
 msgid ""
-"Stress Make is a customized GNU Make that explicitely manages the order\n"
+"Stress Make is a customized GNU Make that explicitly manages the order\n"
 "in which concurrent jobs are run to provoke erroneous behavior into becoming\n"
 "manifest.  It can run jobs in the order in which they're launched, in backwards\n"
 "order, or in random order.  The thought is that if code builds correctly with\n"
@@ -2869,62 +2720,226 @@ msgid ""
 "conditions."
 msgstr ""
 
-#: gnu/packages/debug.scm:357
-msgid "Transparent application input fuzzer"
-msgstr ""
-
-#: gnu/packages/debug.scm:358
+#: gnu/packages/debug.scm:481
 msgid ""
 "Zzuf is a transparent application input fuzzer.  It works by\n"
 "intercepting file operations and changing random bits in the program's\n"
 "input.  Zzuf's behaviour is deterministic, making it easy to reproduce bugs."
 msgstr ""
 
-#: gnu/packages/dejagnu.scm:77
-msgid "GNU software testing framework"
+#: gnu/packages/debug.scm:535
+msgid ""
+"Scanmem is a debugging utility designed to isolate the\n"
+"address of an arbitrary variable in an executing process.  Scanmem simply\n"
+"needs to be told the pid of the process and the value of the variable at\n"
+"several different times.  After several scans of the process, scanmem isolates\n"
+"the position of the variable and allows you to modify its value."
+msgstr ""
+
+#: gnu/packages/debug.scm:565
+msgid ""
+"Remake is an enhanced version of GNU Make that adds improved\n"
+"error reporting, better tracing, profiling, and a debugger."
+msgstr ""
+
+#: gnu/packages/debug.scm:626
+msgid ""
+"rr is a lightweight tool for recording, replaying and debugging\n"
+"execution of applications (trees of processes and threads).  Debugging extends\n"
+"GDB with very efficient reverse-execution, which in combination with standard\n"
+"GDB/x86 features like hardware data watchpoints, makes debugging much more\n"
+"fun."
+msgstr ""
+
+#: gnu/packages/debug.scm:654
+msgid ""
+"The @code{libbacktrace} library can be linked into a C/C++\n"
+"program to produce symbolic backtraces."
+msgstr ""
+
+#: gnu/packages/debug.scm:695
+msgid ""
+"The libleak tool detects memory leaks by hooking memory\n"
+"functions such as @code{malloc}.  It comes as a shared object to be pre-loaded\n"
+"via @code{LD_PRELOAD} when launching the application.  It prints the full call\n"
+"stack at suspicious memory leak points.  Modifying or recompiling the target\n"
+"program is not required, and the detection can be enabled or disabled while\n"
+"the target application is running.  The overhead incurred by libleak is\n"
+"smaller than that of other tools such as Valgrind, and it aims to be easier to\n"
+"use than similar tools like @command{mtrace}."
 msgstr ""
 
-#: gnu/packages/dejagnu.scm:79
+#: gnu/packages/debug.scm:731
+msgid ""
+"MspDebug supports FET430UIF, eZ430, RF2500 and Olimex\n"
+"MSP430-JTAG-TINY programmers, as well as many other compatible\n"
+"devices.  It can be used as a proxy for gdb or as an independent\n"
+"debugger with support for programming, disassembly and reverse\n"
+"engineering."
+msgstr ""
+
+#: gnu/packages/dejagnu.scm:80
 msgid ""
 "DejaGnu is a framework for testing software.  In effect, it serves as\n"
 "a front-end for all tests written for a program.  Thus, each program can have\n"
 "multiple test suites, which are then all managed by a single harness."
 msgstr ""
 
-#: gnu/packages/games.scm:164
-msgid "Tron clone in 3D"
+#: gnu/packages/games.scm:272
+msgid ""
+"Abe's Amazing Adventure is a scrolling,\n"
+"platform-jumping, key-collecting, ancient pyramid exploring game, vaguely in\n"
+"the style of similar games for the Commodore+4."
+msgstr ""
+
+#: gnu/packages/games.scm:342
+msgid ""
+"Adanaxis is a fast-moving first person shooter set in deep space, where\n"
+"the fundamentals of space itself are changed.  By adding another dimension to\n"
+"space this game provides an environment with movement in four directions and\n"
+"six planes of rotation.  Initially the game explains the 4D control system via\n"
+"a graphical sequence, before moving on to 30 levels of gameplay with numerous\n"
+"enemy, ally, weapon and mission types.  Features include simulated 4D texturing,\n"
+"mouse and joystick control, and original music."
+msgstr ""
+
+#: gnu/packages/games.scm:386
+msgid ""
+"Guide Alex the Allegator through the jungle in order to save his\n"
+"girlfriend Lola from evil humans who want to make a pair of shoes out of her.\n"
+"Plenty of classic platforming in four nice colors guaranteed!\n"
+"\n"
+"The game includes a built-in editor so you can design and share your own maps."
+msgstr ""
+
+#: gnu/packages/games.scm:416
+msgid ""
+"Armagetron Advanced is a multiplayer game in 3d that\n"
+"attempts to emulate and expand on the lightcycle sequence from the movie Tron.\n"
+"It's an old school arcade game slung into the 21st century.  Highlights\n"
+"include a customizable playing arena, HUD, unique graphics, and AI bots.  For\n"
+"the more advanced player there are new game modes and a wide variety of\n"
+"physics settings to tweak as well."
+msgstr ""
+
+#: gnu/packages/games.scm:474
+msgid ""
+"Space is a vast area, an unbounded territory where it seems there is\n"
+"a room for everybody, but reversal of fortune put things differently.  The\n"
+"hordes of hostile creatures crawled out from the dark corners of the universe,\n"
+"craving to conquer your homeland.  Their force is compelling, their legions\n"
+"are interminable.  However, humans didn't give up without a final showdown and\n"
+"put their best pilot to fight back.  These malicious invaders chose the wrong\n"
+"galaxy to conquer and you are to prove it!  Go ahead and make alien aggressors\n"
+"regret their insolence."
+msgstr ""
+
+#: gnu/packages/games.scm:542
+msgid ""
+"Bastet (short for Bastard Tetris) is a simple ncurses-based falling brick\n"
+"game.  Unlike normal Tetris, Bastet does not choose the next brick at random.\n"
+"Instead, it uses a special algorithm to choose the worst brick possible.\n"
+"\n"
+"Playing bastet can be a painful experience, especially if you usually make\n"
+"canyons and wait for the long I-shaped block to clear four rows at a time."
+msgstr ""
+
+#: gnu/packages/games.scm:580
+msgid ""
+"Vitetris is a classic multiplayer Tetris clone for the\n"
+"terminal."
+msgstr ""
+
+#: gnu/packages/games.scm:623
+msgid ""
+"Blobwars: Metal Blob Solid is a 2D platform game, the first\n"
+"in the Blobwars series.  You take on the role of a fearless Blob agent.  Your\n"
+"mission is to infiltrate various enemy bases and rescue as many MIAs as\n"
+"possible, while battling many vicious aliens."
+msgstr ""
+
+#: gnu/packages/games.scm:718
+msgid ""
+"These are the BSD games.  See the fortune-mod package for fortunes.\n"
+"\n"
+"Action: atc (keep the airplanes safe), hack (explore the dangerous Dungeon),\n"
+"hunt (kill the others for the Pair of Boots, multi-player only), robots (avoid\n"
+"the evil robots), sail (game of naval warfare with wooden ships), snake (steal\n"
+"the $$ from the cave, anger the snake, and get out alive), tetris (game of\n"
+"lining up the falling bricks of different shapes), and worm (eat, grow big,\n"
+"and neither bite your tail, nor ram the wall).\n"
+"\n"
+"Amusements: banner (prints a large banner), bcd & morse & ppt (print a punch\n"
+"card, or paper tape, or Morse codes), caesar & rot13 (ciphers and deciphers\n"
+"the input), factor (factorizes a number), number (translates numbers into\n"
+"text), pig (translates from English to Pig Latin), pom (should print the\n"
+"Moon's phase), primes (generates primes), rain & worms (plays an screen-saver\n"
+"in terminal), random (prints randomly chosen lines from files, or returns a\n"
+"random exit-code), and wtf (explains what do some acronyms mean).\n"
+"\n"
+"Board: backgammon (lead the men out of board faster than the friend do),\n"
+"boggle (find the words in the square of letters), dab (game of dots and\n"
+"boxes), gomoku (game of five in a row), hangman (guess a word before man is\n"
+"hanged), and monop (game of monopoly, hot-seat only).  Also the card-games:\n"
+"canfield, cribbage, fish (juniors game), and mille.\n"
+"\n"
+"Quests: adventure (search for treasures with the help of wizard),\n"
+"battlestar (explore the world around, starting from dying spaceship),\n"
+"phantasia (role-play as an rogue), trek (hunt the Klingons, and save the\n"
+"Federation), and wump (hunt the big smelly Wumpus in a dark cave).\n"
+"\n"
+"Quizzes: arithmetic and quiz."
 msgstr ""
 
-#: gnu/packages/games.scm:165
+#: gnu/packages/games.scm:813
 msgid ""
-"Armagetron is a multiplayer game in 3d that attempts to\n"
-"emulate and expand on the lightcycle sequence from the movie Tron.  It's\n"
-"an old school arcade game slung into the 21st century.  Highlights include\n"
-"a customizable playing arena, HUD, unique graphics, and AI bots.  For the\n"
-"more advanced player there are new game modes and a wide variety of physics\n"
-"settings to tweak as well."
+"BZFlag is a 3D multi-player multiplatform tank battle game that\n"
+"allows users to play against each other in a network environment.\n"
+"There are five teams: red, green, blue, purple and rogue (rogue tanks\n"
+"are black).  Destroying a player on another team scores a win, while\n"
+"being destroyed or destroying a teammate scores a loss.  Rogues have\n"
+"no teammates (not even other rogues), so they cannot shoot teammates\n"
+"and they do not have a team score.\n"
+"\n"
+"There are two main styles of play: capture-the-flag and free-for-all.\n"
+"In capture-the-flag, each team (except rogues) has a team base and\n"
+"each team with at least one player has a team flag.  The object is to\n"
+"capture an enemy team's flag by bringing it to your team's base.  This\n"
+"destroys every player on the captured team, subtracts one from that\n"
+"team's score, and adds one to your team's score.  In free-for-all,\n"
+"there are no team flags or team bases.  The object is simply to get as\n"
+"high a score as possible."
 msgstr ""
 
-#: gnu/packages/games.scm:238
-msgid "Survival horror roguelike video game"
+#: gnu/packages/games.scm:887
+msgid ""
+"Cataclysm: Dark Days Ahead (or \"DDA\" for short) is a roguelike set\n"
+"in a post-apocalyptic world.  Struggle to survive in a harsh, persistent,\n"
+"procedurally generated world.  Scavenge the remnants of a dead civilization\n"
+"for food, equipment, or, if you are lucky, a vehicle with a full tank of gas\n"
+"to get you out of Dodge.  Fight to defeat or escape from a wide variety of\n"
+"powerful monstrosities, from zombies to giant insects to killer robots and\n"
+"things far stranger and deadlier, and against the others like yourself, that\n"
+"want what you have."
 msgstr ""
 
-#: gnu/packages/games.scm:240
+#: gnu/packages/games.scm:937
 msgid ""
-"Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.\n"
-"Struggle to survive in a harsh, persistent, procedurally generated world.\n"
-"Scavenge the remnants of a dead civilization for food, equipment, or, if you are\n"
-"lucky, a vehicle with a full tank of gas to get you out of Dodge.  Fight to\n"
-"defeat or escape from a wide variety of powerful monstrosities, from zombies to\n"
-"giant insects to killer robots and things far stranger and deadlier, and against\n"
-"the others like yourself, that want what you have."
+"Cockatrice is a program for playing tabletop card games\n"
+"over a network.  Its server design prevents users from manipulating the game\n"
+"for unfair advantage.  The client also provides a single-player mode, which\n"
+"allows users to brew while offline."
 msgstr ""
 
-#: gnu/packages/games.scm:281
-msgid "Speaking cow text filter"
+#: gnu/packages/games.scm:991
+msgid ""
+"This package provides a reimplementation of the 1997 Bullfrog business\n"
+"simulation game @i{Theme Hospital}.  As well as faithfully recreating the\n"
+"original engine, CorsixTH adds support for high resolutions, custom levels and\n"
+"more.  This package does @emph{not} provide the game assets."
 msgstr ""
 
-#: gnu/packages/games.scm:282
+#: gnu/packages/games.scm:1033
 msgid ""
 "Cowsay is basically a text filter.  Send some text into it,\n"
 "and you get a cow saying your text.  If you think a talking cow isn't enough,\n"
@@ -2932,11 +2947,36 @@ msgid ""
 "tired of cows, a variety of other ASCII-art messengers are available."
 msgstr ""
 
-#: gnu/packages/games.scm:348
-msgid "Free content game based on the Doom engine"
+#: gnu/packages/games.scm:1074
+msgid ""
+"@command{lolcat} concatenates files and streams like\n"
+"regular @command{cat}, but it also adds terminal escape codes between\n"
+"characters and lines resulting in a rainbow effect."
 msgstr ""
 
-#: gnu/packages/games.scm:350
+#: gnu/packages/games.scm:1189
+msgid ""
+"FooBillard++ is an advanced 3D OpenGL billiard game\n"
+"based on the original foobillard 3.0a sources from Florian Berger.\n"
+"You can play it with one or two players or against the computer.\n"
+"\n"
+"The game features:\n"
+"\n"
+"@itemize\n"
+"@item Wood paneled table with gold covers and gold diamonds.\n"
+"@item Reflections on balls.\n"
+"@item Zoom in and out, rotation, different angles and bird's eye view.\n"
+"@item Different game modes: 8 or 9-ball, Snooker or Carambole.\n"
+"@item Tournaments.  Compete against other players.\n"
+"@item Animated cue with strength and eccentric hit adjustment.\n"
+"@item Jump shots and snipping.\n"
+"@item Realistic gameplay and billiard sounds.\n"
+"@item Red-Green stereo.\n"
+"@item And much more.\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/games.scm:1259
 msgid ""
 "The Freedoom project aims to create a complete free content first person\n"
 "shooter game.  Freedoom by itself is just the raw material for a game: it must\n"
@@ -2945,24 +2985,106 @@ msgid ""
 "effects and music to make a completely free game."
 msgstr ""
 
-#: gnu/packages/games.scm:381
-msgid "Backgammon game"
+#: gnu/packages/games.scm:1309
+msgid ""
+"Freedroid RPG is an @dfn{RPG} (Role-Playing Game) with isometric graphics.\n"
+"The game tells the story of a world destroyed by a conflict between robots and\n"
+"their human masters.  To restore peace to humankind, the player must complete\n"
+"numerous quests while fighting off rebelling robots---either by taking control\n"
+"of them, or by simply blasting them to pieces with melee and ranged weapons in\n"
+"real-time combat."
 msgstr ""
 
-#: gnu/packages/games.scm:382
+#: gnu/packages/games.scm:1388
 msgid ""
-"The GNU backgammon application can be used for playing, analyzing and\n"
-"teaching the game.  It has an advanced evaluation engine based on artificial\n"
-"neural networks suitable for both beginners and advanced players.  In\n"
-"addition to a command-line interface, it also features an attractive, 3D\n"
-"representation of the playing board."
+"Golly simulates Conway's Game of Life and many other types of cellular\n"
+"automata.  The following features are available:\n"
+"@enumerate\n"
+"@item Support for bounded and unbounded universes, with cells of up to 256\n"
+"  states.\n"
+"@item Support for multiple algorithms, including Bill Gosper's Hashlife\n"
+"  algorithm.\n"
+"@item Loading patterns from BMP, PNG, GIF and TIFF image files.\n"
+"@item Reading RLE, macrocell, Life 1.05/1.06, dblife and MCell files.\n"
+"@item Scriptable via Lua or Python.\n"
+"@item Extracting patterns, rules and scripts from zip files.\n"
+"@item Downloading patterns, rules and scripts from online archives.\n"
+"@item Pasting patterns from the clipboard.\n"
+"@item Unlimited undo/redo.\n"
+"@item Configurable keyboard shortcuts.\n"
+"@item Auto fit option to keep patterns within the view.\n"
+"@end enumerate"
 msgstr ""
 
-#: gnu/packages/games.scm:411
-msgid "3d Rubik's cube game"
+#: gnu/packages/games.scm:1435
+msgid ""
+"Engine for Caesar III, a city-building real-time strategy game.\n"
+"Julius includes some UI enhancements while preserving the logic (including\n"
+"bugs) of the original game, so that saved games are compatible.  This package\n"
+"does not include game data."
 msgstr ""
 
-#: gnu/packages/games.scm:413
+#: gnu/packages/games.scm:1469
+msgid ""
+"Fork of Julius, an engine for the a city-building real-time strategy\n"
+"game Caesar III.  Gameplay enhancements include:\n"
+"\n"
+"@itemize\n"
+"@item roadblocks;\n"
+"@item market special orders;\n"
+"@item global labour pool;\n"
+"@item partial warehouse storage;\n"
+"@item increased game limits;\n"
+"@item zoom controls.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/games.scm:1508
+msgid ""
+"Me and My Shadow is a puzzle/platform game in which you try\n"
+"to reach the exit by solving puzzles.  Spikes, moving blocks, fragile blocks\n"
+"and much more stand between you and the exit.  Record your moves and let your\n"
+"shadow mimic them to reach blocks you couldn't reach alone."
+msgstr ""
+
+#: gnu/packages/games.scm:1567
+msgid ""
+"@code{Open Surge} is a 2D retro side-scrolling platformer\n"
+"inspired by the Sonic games.  The player runs at high speeds through each\n"
+"level while collecting items and avoiding obstacles.  The game includes a\n"
+"built-in level editor."
+msgstr ""
+
+#: gnu/packages/games.scm:1613
+msgid ""
+"Knights is a multiplayer game involving several knights who\n"
+"must run around a dungeon and complete various quests.  Each game revolves\n"
+"around a quest – for example, you might have to find some items and carry them\n"
+"back to your starting point.  This may sound easy, but as there are only\n"
+"enough items in the dungeon for one player to win, you may end up having to\n"
+"kill your opponents to get their stuff!  Other quests involve escaping from\n"
+"the dungeon, fighting a duel to the death against the enemy knights, or\n"
+"destroying an ancient book using a special wand."
+msgstr ""
+
+#: gnu/packages/games.scm:1660
+msgid ""
+"GNOME Chess provides a 2D board for playing chess games\n"
+"against human or computer players.  It supports loading and saving games in\n"
+"Portable Game Notation.  To play against a computer, install a chess engine\n"
+"such as chess or stockfish."
+msgstr ""
+
+#: gnu/packages/games.scm:1722
+msgid ""
+"The GNU backgammon application (also known as \"gnubg\") can\n"
+"be used for playing, analyzing and teaching the game.  It has an advanced\n"
+"evaluation engine based on artificial neural networks suitable for both\n"
+"beginners and advanced players.  In addition to a command-line interface, it\n"
+"also features an attractive, 3D representation of the playing board."
+msgstr ""
+
+#: gnu/packages/games.scm:1763
 msgid ""
 "GNUbik is a puzzle game in which you must manipulate a cube to make\n"
 "each of its faces have a uniform color.  The game is customizable, allowing\n"
@@ -2971,21 +3093,13 @@ msgid ""
 "scriptable with Guile."
 msgstr ""
 
-#: gnu/packages/games.scm:435
-msgid "The game of Shogi (Japanese chess)"
-msgstr ""
-
-#: gnu/packages/games.scm:436
+#: gnu/packages/games.scm:1786
 msgid ""
 "GNU Shogi is a program that plays the game Shogi (Japanese\n"
 "Chess).  It is similar to standard chess but this variant is far more complicated."
 msgstr ""
 
-#: gnu/packages/games.scm:467
-msgid "Tetris clone based on the SDL library"
-msgstr ""
-
-#: gnu/packages/games.scm:469
+#: gnu/packages/games.scm:1819
 msgid ""
 "LTris is a tetris clone: differently shaped blocks are falling down the\n"
 "rectangular playing field and can be moved sideways or rotated by 90 degree\n"
@@ -2999,37 +3113,122 @@ msgid ""
 "watch your CPU playing while enjoying a cup of tea!"
 msgstr ""
 
-#: gnu/packages/games.scm:520
-msgid "Version of the classic 3D shoot'em'up game Doom"
+#: gnu/packages/games.scm:1944
+msgid ""
+"NetHack is a single player dungeon exploration game that runs\n"
+"on a wide variety of computer systems, with a variety of graphical and text\n"
+"interfaces all using the same game engine.  Unlike many other Dungeons &\n"
+"Dragons-inspired games, the emphasis in NetHack is on discovering the detail of\n"
+"the dungeon and not simply killing everything in sight - in fact, killing\n"
+"everything in sight is a good way to die quickly.  Each game presents a\n"
+"different landscape - the random number generator provides an essentially\n"
+"unlimited number of variations of the dungeon and its denizens to be discovered\n"
+"by the player in one of a number of characters: you can pick your race, your\n"
+"role, and your gender."
 msgstr ""
 
-#: gnu/packages/games.scm:522
-msgid "PrBoom+ is a Doom source port developed from the original PrBoom project."
+#: gnu/packages/games.scm:1990
+msgid ""
+"PipeWalker is a simple puzzle game with many diffent themes: connect all\n"
+"computers to one network server, bring water from a source to the taps, etc.\n"
+"The underlying mechanism is always the same: you must turn each tile in the\n"
+"grid in the right direction to combine all components into a single circuit.\n"
+"Every puzzle has a complete solution, although there may be more than one."
 msgstr ""
 
-#: gnu/packages/games.scm:569
-msgid "Action platformer game"
+#: gnu/packages/games.scm:2040
+msgid "PrBoom+ is a Doom source port developed from the original PrBoom project."
 msgstr ""
 
-#: gnu/packages/games.scm:571
+#: gnu/packages/games.scm:2090
 msgid ""
 "ReTux is an action platformer loosely inspired by the Mario games,\n"
 "utilizing the art assets from the @code{SuperTux} project."
 msgstr ""
 
-#: gnu/packages/games.scm:600
-msgid "User interface for gnushogi"
-msgstr "gnushogi 的用户界面"
+#: gnu/packages/games.scm:2201
+msgid ""
+"RogueBox Adventures is a graphical roguelike with strong influences\n"
+"from sandbox games like Minecraft or Terraria.  The main idea of RogueBox\n"
+"Adventures is to offer the player a kind of roguelike toy-world.  This world\n"
+"can be explored and changed freely."
+msgstr ""
 
-#: gnu/packages/games.scm:601
-msgid "A graphical user interface for the package @code{gnushogi}."
+#: gnu/packages/games.scm:2314
+msgid ""
+"Barbie Seahorse Adventures is a retro style platform arcade game.\n"
+"You are Barbie the seahorse who travels through the jungle, up to the\n"
+"volcano until you float on bubbles to the moon.  On the way to your\n"
+"final destination you will encounter various enemies, servants of the\n"
+"evil overlord who has stolen the galaxy crystal.  Avoid getting hit\n"
+"and defeat them with your bubbles!"
+msgstr ""
+
+#: gnu/packages/games.scm:2375
+msgid ""
+"Solarus is a 2D game engine written in C++, that can run games\n"
+"scripted in Lua.  It has been designed with 16-bit classic Action-RPGs\n"
+"in mind."
+msgstr ""
+
+#: gnu/packages/games.scm:2404
+msgid ""
+"Solarus Quest Editor is a graphical user interface to create and\n"
+"modify quests for the Solarus engine."
+msgstr ""
+
+#: gnu/packages/games.scm:2478
+msgid ""
+"In SuperStarfighter, up to four local players compete in a\n"
+"2D arena with fast-moving ships and missiles.  Different game types are\n"
+"available, as well as a single-player mode with AI-controlled ships."
+msgstr ""
+
+#: gnu/packages/games.scm:2611
+msgid ""
+"Trigger-rally is a 3D rally simulation with great physics\n"
+"for drifting on over 200 maps.  Different terrain materials like dirt,\n"
+"asphalt, sand, ice, etc. and various weather, light, and fog conditions give\n"
+"this rally simulation the edge over many other games.  You need to make it\n"
+"through the maps in often tight time limits and can further improve by beating\n"
+"the recorded high scores.  All attached single races must be finished in time\n"
+"in order to win an event, unlocking additional events and cars.  Most maps are\n"
+"equipped with spoken co-driver notes and co-driver icons."
+msgstr ""
+
+#: gnu/packages/games.scm:2667
+msgid ""
+"This package provides @command{ufo2map}, a program used to generate\n"
+"maps for the UFO: Alien Invasion strategy game."
+msgstr ""
+
+#: gnu/packages/games.scm:2709
+msgid "This package contains maps and other assets for UFO: Alien Invasion."
+msgstr ""
+
+#: gnu/packages/games.scm:2796
+msgid ""
+"UFO: Alien Invasion is a tactical strategy game set in the year 2084.\n"
+"You control a secret organisation charged with defending Earth from a brutal\n"
+"alien enemy.  Build up your bases, prepare your team, and dive head-first into\n"
+"the fast and flowing turn-based combat.\n"
+"\n"
+"Over the long term you will need to conduct research into the alien threat to\n"
+"figure out their mysterious goals and use their powerful weapons for your own\n"
+"ends.  You will produce unique items and use them in combat against your\n"
+"enemies.\n"
+"\n"
+"You can also use them against your friends with the multiplayer functionality.\n"
+"\n"
+"Warning: This is a pre-release version of UFO: AI!  Some things may not work\n"
+"properly."
 msgstr ""
 
-#: gnu/packages/games.scm:650
-msgid "GNU/Linux port of the indie game \"l'Abbaye des Morts\""
+#: gnu/packages/games.scm:2834
+msgid "A graphical user interface for the package @code{gnushogi}."
 msgstr ""
 
-#: gnu/packages/games.scm:651
+#: gnu/packages/games.scm:2887
 msgid ""
 "L'Abbaye des Morts is a 2D platform game set in 13th century\n"
 "France.  The Cathars, who preach about good Christian beliefs, were being\n"
@@ -3038,22 +3237,14 @@ msgid ""
 "that beneath its ruins lay buried an ancient evil."
 msgstr ""
 
-#: gnu/packages/games.scm:703
-msgid "Dungeon exploration roguelike"
-msgstr ""
-
-#: gnu/packages/games.scm:704
+#: gnu/packages/games.scm:2940
 msgid ""
 "Angband is a Classic dungeon exploration roguelike.  Explore\n"
 "the depths below Angband, seeking riches, fighting monsters, and preparing to\n"
 "fight Morgoth, the Lord of Darkness."
 msgstr ""
 
-#: gnu/packages/games.scm:744
-msgid "Lemmings clone"
-msgstr ""
-
-#: gnu/packages/games.scm:746
+#: gnu/packages/games.scm:2989
 msgid ""
 "Pingus is a free Lemmings-like puzzle game in which the player takes\n"
 "command of a bunch of small animals and has to guide them through levels.\n"
@@ -3063,22 +3254,21 @@ msgid ""
 "level's exit.  The game is presented in a 2D side view."
 msgstr ""
 
-#: gnu/packages/games.scm:768
-msgid "Convert English text to humorous dialects"
-msgstr ""
-
-#: gnu/packages/games.scm:769
+#: gnu/packages/games.scm:3012
 msgid ""
 "The GNU Talk Filters are programs that convert English text\n"
 "into stereotyped or otherwise humorous dialects.  The filters are provided as\n"
 "a C library, so they can easily be integrated into other programs."
 msgstr ""
 
-#: gnu/packages/games.scm:801
-msgid "Simulate the display from \"The Matrix\""
+#: gnu/packages/games.scm:3058
+msgid ""
+"The player controls a character (one of three: Good, Bad, and Dead),\n"
+"dodges the missiles (lots of it cover the screen, but the character's hitbox\n"
+"is very small), and shoot at the adversaries that keep appear on the screen."
 msgstr ""
 
-#: gnu/packages/games.scm:802
+#: gnu/packages/games.scm:3102
 msgid ""
 "CMatrix simulates the display from \"The Matrix\" and is\n"
 "based on the screensaver from the movie's website.  It works with terminal\n"
@@ -3086,22 +3276,18 @@ msgid ""
 "asynchronously and at a user-defined speed."
 msgstr ""
 
-#: gnu/packages/games.scm:822
-msgid "Full chess implementation"
-msgstr ""
-
-#: gnu/packages/games.scm:823
+#: gnu/packages/games.scm:3123
+#, fuzzy
 msgid ""
 "GNU Chess is a chess engine.  It allows you to compete\n"
 "against the computer in a game of chess, either through the default terminal\n"
 "interface or via an external visual interface such as GNU XBoard."
 msgstr ""
+"GNU Chess 是一个国际象棋引擎。 它可以让您进行竞争\n"
+"和电脑下棋，可以通过默认的终端机\n"
+"界面或通过外部可视化界面，如GNU XBoard。"
 
-#: gnu/packages/games.scm:851
-msgid "Twisted adventures of young pig farmer Dink Smallwood"
-msgstr ""
-
-#: gnu/packages/games.scm:853
+#: gnu/packages/games.scm:3185
 msgid ""
 "GNU FreeDink is a free and portable re-implementation of the engine\n"
 "for the role-playing game Dink Smallwood.  It supports not only the original\n"
@@ -3109,19 +3295,21 @@ msgid ""
 "To that extent, it also includes a front-end for managing all of your D-Mods."
 msgstr ""
 
-#: gnu/packages/games.scm:878
-msgid "Game data for GNU Freedink"
-msgstr ""
-
-#: gnu/packages/games.scm:880
+#: gnu/packages/games.scm:3213
 msgid "This package contains the game data of GNU Freedink."
-msgstr ""
+msgstr "这个软件包包含了 GNU Freedink 的游戏数据。"
 
-#: gnu/packages/games.scm:932
-msgid "Graphical user interface for chess programs"
+#: gnu/packages/games.scm:3237
+#, fuzzy
+msgid ""
+"DFArc makes it easy to play and manage the GNU FreeDink game\n"
+"and its numerous D-Mods."
 msgstr ""
+"DFArc 使您可以轻松地玩和管理 GNU FreeDink 游戏\n"
+"以及其众多的 D-Mod。"
 
-#: gnu/packages/games.scm:933
+#: gnu/packages/games.scm:3290
+#, fuzzy
 msgid ""
 "GNU XBoard is a graphical board for all varieties of chess,\n"
 "including international chess, xiangqi (Chinese chess), shogi (Japanese chess)\n"
@@ -3129,24 +3317,13 @@ msgid ""
 "fully interactive graphical interface and it can load and save games in the\n"
 "Portable Game Notation."
 msgstr ""
+"GNU XBoard 是一个用于各种棋类的图形棋盘。\n"
+"包括国际象棋、象棋、将棋\n"
+"和 Makruk。 还支持一些不太知名的变体。 它提出了一个\n"
+"完全交互式的图形界面，它可以加载和保存游戏中的游戏\n"
+"便携式游戏符号。"
 
-#: gnu/packages/games.scm:986
-msgid "Ball and paddle game"
-msgstr ""
-
-#: gnu/packages/games.scm:987
-msgid ""
-"XBoing is a blockout type game where you have a paddle which\n"
-"you control to bounce a ball around the game zone destroying blocks with a\n"
-"proton ball.  Each block carries a different point value.  The more blocks you\n"
-"destroy, the better your score.  The person with the highest score wins."
-msgstr ""
-
-#: gnu/packages/games.scm:1019
-msgid "Typing tutor"
-msgstr ""
-
-#: gnu/packages/games.scm:1021
+#: gnu/packages/games.scm:3326
 msgid ""
 "GNU Typist is a universal typing tutor.  It can be used to learn and\n"
 "practice touch-typing.  Several tutorials are included; in addition to\n"
@@ -3155,11 +3332,7 @@ msgid ""
 "are primarily in English, however some in other languages are provided."
 msgstr ""
 
-#: gnu/packages/games.scm:1068
-msgid "3D game engine written in C++"
-msgstr ""
-
-#: gnu/packages/games.scm:1070
+#: gnu/packages/games.scm:3394
 msgid ""
 "The Irrlicht Engine is a high performance realtime 3D engine written in\n"
 "C++.  Features include an OpenGL renderer, extensible materials, scene graph\n"
@@ -3167,11 +3340,7 @@ msgid ""
 "for common mesh file formats, and collision detection."
 msgstr ""
 
-#: gnu/packages/games.scm:1122
-msgid "2D space shooter"
-msgstr ""
-
-#: gnu/packages/games.scm:1124
+#: gnu/packages/games.scm:3448
 msgid ""
 "M.A.R.S. is a 2D space shooter with pretty visual effects and\n"
 "attractive physics.  Players can battle each other or computer controlled\n"
@@ -3179,19 +3348,8 @@ msgid ""
 "match, cannon keep, and grave-itation pit."
 msgstr ""
 
-#: gnu/packages/games.scm:1165
-msgid "Main game data for the Minetest game engine"
-msgstr ""
-
-#: gnu/packages/games.scm:1167
-msgid "Game data for the Minetest infinite-world block sandox game."
-msgstr ""
-
-#: gnu/packages/games.scm:1219
-msgid "Infinite-world block sandbox game"
-msgstr ""
-
-#: gnu/packages/games.scm:1221
+#: gnu/packages/games.scm:3534
+#, fuzzy
 msgid ""
 "Minetest is a sandbox construction game.  Players can create and destroy\n"
 "various types of blocks in a three-dimensional open world.  This allows\n"
@@ -3199,12 +3357,26 @@ msgid ""
 "single player.  Mods and texture packs allow players to personalize the game\n"
 "in different ways."
 msgstr ""
+"Minetest 是一款沙盒建筑游戏。 玩家可以创造和破坏\n"
+"各种类型的积木在三维开放世界中。 这使得\n"
+"在每一个可能的创作中形成结构，在多人服务器上或作为一个新的结构\n"
+"单人游戏。 Mods 和材质包让玩家可以个性化的游戏\n"
+"以不同的方式。"
 
-#: gnu/packages/games.scm:1260
-msgid "Curses Implementation of the Glk API"
+#: gnu/packages/games.scm:3572
+msgid "Game data for the Minetest infinite-world block sandbox game."
+msgstr "Minetest 无限世界积木沙盒游戏的游戏数据。"
+
+#: gnu/packages/games.scm:3595
+#, fuzzy
+msgid ""
+"MineClone is a Minetest subgame, that aims to recreate Minecraft as\n"
+"closely as the engine allows."
 msgstr ""
+"MineClone 是一款 Minetest 子游戏，旨在将 Minecraft 重现为\n"
+"在引擎允许的情况下，紧密结合。"
 
-#: gnu/packages/games.scm:1262
+#: gnu/packages/games.scm:3633
 msgid ""
 "Glk defines a portable API for applications with text UIs.  It was\n"
 "primarily designed for interactive fiction, but it should be suitable for many\n"
@@ -3213,11 +3385,7 @@ msgid ""
 "using the @code{curses.h} library for screen control."
 msgstr ""
 
-#: gnu/packages/games.scm:1300
-msgid "Interpreter for Glulx VM"
-msgstr ""
-
-#: gnu/packages/games.scm:1302
+#: gnu/packages/games.scm:3673
 msgid ""
 "Glulx is a 32-bit portable virtual machine intended for writing and\n"
 "playing interactive fiction.  It was designed by Andrew Plotkin to relieve\n"
@@ -3225,35 +3393,28 @@ msgid ""
 "reference interpreter, using the Glk API."
 msgstr ""
 
-#: gnu/packages/games.scm:1339
-msgid "Z-machine interpreter"
-msgstr ""
-
-#: gnu/packages/games.scm:1341
+#: gnu/packages/games.scm:3701
 msgid ""
-"Fizmo is a console-based Z-machine interpreter.  It is used to play\n"
-"interactive fiction, also known as text adventures, which were implemented\n"
-"either by Infocom or created using the Inform compiler."
-msgstr ""
-
-#: gnu/packages/games.scm:1395
-msgid "Reference frontend for the libretro API"
+"Fifechan is a lightweight cross platform GUI library written in C++\n"
+"specifically designed for games.  It has a built in set of extendable GUI\n"
+"Widgets, and allows users to create more."
 msgstr ""
 
-#: gnu/packages/games.scm:1397
+#: gnu/packages/games.scm:3797
 msgid ""
-"Libretro is a simple but powerful development interface that allows for\n"
-"the easy creation of emulators, games and multimedia applications that can plug\n"
-"straight into any libretro-compatible frontend.  RetroArch is the official\n"
-"reference frontend for the libretro API, currently used by most as a modular\n"
-"multi-system game/emulator system."
+"@acronym{FIFE, Flexible Isometric Free Engine} is a multi-platform\n"
+"isometric game engine.  Python bindings are included allowing users to create\n"
+"games using Python as well as C++."
 msgstr ""
 
-#: gnu/packages/games.scm:1417
-msgid "Play the game of Go"
+#: gnu/packages/games.scm:3832
+msgid ""
+"Fizmo is a console-based Z-machine interpreter.  It is used to play\n"
+"interactive fiction, also known as text adventures, which were implemented\n"
+"either by Infocom or created using the Inform compiler."
 msgstr ""
 
-#: gnu/packages/games.scm:1419
+#: gnu/packages/games.scm:3852
 msgid ""
 "GNU Go is a program that plays the game of Go, in which players\n"
 "place stones on a grid to form territory or capture other stones.  While\n"
@@ -3264,11 +3425,7 @@ msgid ""
 "Protocol)."
 msgstr ""
 
-#: gnu/packages/games.scm:1447
-msgid "High speed arctic racing game based on Tux Racer"
-msgstr ""
-
-#: gnu/packages/games.scm:1449
+#: gnu/packages/games.scm:3882
 msgid ""
 "Extreme Tux Racer, or etracer as it is called for short, is\n"
 "a simple OpenGL racing game featuring Tux, the Linux mascot.  The goal of the\n"
@@ -3281,11 +3438,7 @@ msgid ""
 "This game is based on the GPL version of the famous game TuxRacer."
 msgstr ""
 
-#: gnu/packages/games.scm:1531
-msgid "3D kart racing game"
-msgstr ""
-
-#: gnu/packages/games.scm:1532
+#: gnu/packages/games.scm:3953
 msgid ""
 "SuperTuxKart is a 3D kart racing game, with a focus on\n"
 "having fun over realism.  You can play with up to 4 friends on one PC, racing\n"
@@ -3293,11 +3446,16 @@ msgid ""
 "also available."
 msgstr ""
 
-#: gnu/packages/games.scm:1564
-msgid "Game of jumping to the next floor, trying not to fall"
+#: gnu/packages/games.scm:4030
+msgid ""
+"Unknown Horizons is a 2D realtime strategy simulation with an emphasis\n"
+"on economy and city building.  Expand your small settlement to a strong and\n"
+"wealthy colony, collect taxes and supply your inhabitants with valuable\n"
+"goods.  Increase your power with a well balanced economy and with strategic\n"
+"trade and diplomacy."
 msgstr ""
 
-#: gnu/packages/games.scm:1566
+#: gnu/packages/games.scm:4087
 msgid ""
 "GNUjump is a simple, yet addictive game in which you must jump from\n"
 "platform to platform to avoid falling, while the platforms drop at faster rates\n"
@@ -3305,11 +3463,7 @@ msgid ""
 "falling, themeable graphics and sounds, and replays."
 msgstr ""
 
-#: gnu/packages/games.scm:1609
-msgid "Turn-based strategy game"
-msgstr ""
-
-#: gnu/packages/games.scm:1611
+#: gnu/packages/games.scm:4123
 msgid ""
 "The Battle for Wesnoth is a fantasy, turn based tactical strategy game,\n"
 "with several single player campaigns, and multiplayer games (both networked and\n"
@@ -3321,48 +3475,20 @@ msgid ""
 "next campaign."
 msgstr ""
 
-#: gnu/packages/games.scm:1655
-msgid "X86 emulator with CGA/EGA/VGA/etc. graphics and sound"
-msgstr ""
-
-#: gnu/packages/games.scm:1656
+#: gnu/packages/games.scm:4146
 msgid ""
-"DOSBox is a DOS-emulator that uses the SDL library.  DOSBox\n"
-"also emulates CPU:286/386 realmode/protected mode, Directory\n"
-"FileSystem/XMS/EMS, Tandy/Hercules/CGA/EGA/VGA/VESA graphics, a\n"
-"SoundBlaster/Gravis Ultra Sound card for excellent sound compatibility with\n"
-"older games."
+"This package contains a dedicated server for @emph{The\n"
+"Battle for Wesnoth}."
 msgstr ""
 
-#: gnu/packages/games.scm:1701
-msgid "Mouse and keyboard discovery for children"
-msgstr ""
-
-#: gnu/packages/games.scm:1703
+#: gnu/packages/games.scm:4189
 msgid ""
 "Gamine is a game designed for young children who are learning to use the\n"
 "mouse and keyboard.  The child uses the mouse to draw colored dots and lines\n"
 "on the screen and keyboard to display letters."
 msgstr ""
 
-#: gnu/packages/games.scm:1735
-msgid "Puzzle game with a cat in lead role"
-msgstr ""
-
-#: gnu/packages/games.scm:1736
-msgid ""
-"Project Raincat is a game developed by Carnegie Mellon\n"
-"students through GCS during the Fall 2008 semester.  Raincat features game\n"
-"play inspired from classics Lemmings and The Incredible Machine.  The project\n"
-"proved to be an excellent learning experience for the programmers.  Everything\n"
-"is programmed in Haskell."
-msgstr ""
-
-#: gnu/packages/games.scm:1770
-msgid "Client for 'The Mana World' and similar games"
-msgstr ""
-
-#: gnu/packages/games.scm:1772
+#: gnu/packages/games.scm:4224
 msgid ""
 "ManaPlus is a 2D MMORPG client for game servers.  It is the only\n"
 "fully supported client for @uref{http://www.themanaworld.org, The mana\n"
@@ -3370,131 +3496,7 @@ msgid ""
 "@uref{http://landoffire.org, Land of fire}."
 msgstr ""
 
-#: gnu/packages/games.scm:1822
-msgid "Nintendo 64 emulator core library"
-msgstr ""
-
-#: gnu/packages/games.scm:1824
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"core library."
-msgstr ""
-
-#: gnu/packages/games.scm:1868 gnu/packages/games.scm:1913
-#: gnu/packages/games.scm:1955 gnu/packages/games.scm:1997
-#: gnu/packages/games.scm:2313
-msgid "Mupen64Plus SDL input plugin"
-msgstr ""
-
-#: gnu/packages/games.scm:1870
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"SDL audio plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:1915
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"SDL input plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:1957
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"high-level emulation (HLE) RSP processor plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:1999
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Z64 RSP processor plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2043 gnu/packages/games.scm:2097
-#: gnu/packages/games.scm:2147 gnu/packages/games.scm:2195
-msgid "Mupen64Plus Rice Video plugin"
-msgstr ""
-
-#: gnu/packages/games.scm:2045
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Arachnoid video plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2099
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Glide64 video plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2149
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Glide64MK2 video plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2197
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Rice Video plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2249
-msgid "Mupen64Plus Z64 video plugin"
-msgstr ""
-
-#: gnu/packages/games.scm:2251
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"Z64 video plugin."
-msgstr ""
-
-#: gnu/packages/games.scm:2315
-msgid ""
-"Mupen64Plus is a cross-platform plugin-based Nintendo 64 (N64) emulator\n"
-"which is capable of accurately playing many games.  This package contains the\n"
-"command line user interface.  Installing this package is the easiest way\n"
-"towards a working Mupen64Plus for casual users."
-msgstr ""
-
-#: gnu/packages/games.scm:2372
-msgid "Nintendo Entertainment System (NES/Famicom) emulator"
-msgstr ""
-
-#: gnu/packages/games.scm:2374
-msgid ""
-"Nestopia UE (Undead Edition) is a fork of the Nintendo Entertainment\n"
-"System (NES/Famicom) emulator Nestopia, with enhancements from members of the\n"
-"emulation community.  It provides highly accurate emulation."
-msgstr ""
-
-#: gnu/packages/games.scm:2404
-msgid "Video game console emulator front-end"
-msgstr ""
-
-#: gnu/packages/games.scm:2405
-msgid ""
-"EmulationStation provides a graphical front-end to a large\n"
-"number of video game console emulators.  It features an interface that is\n"
-"usable with any game controller that has at least 4 buttons, theming support,\n"
-"and a game metadata scraper."
-msgstr ""
-
-#: gnu/packages/games.scm:2459
-msgid "Transportation economics simulator"
-msgstr ""
-
-#: gnu/packages/games.scm:2460
+#: gnu/packages/games.scm:4276
 msgid ""
 "OpenTTD is a game in which you transport goods and\n"
 "passengers by land, water and air.  It is a re-implementation of Transport\n"
@@ -3504,13 +3506,9 @@ msgid ""
 "engine.  When you start it you will be prompted to download a graphics set."
 msgstr ""
 
-#: gnu/packages/games.scm:2517
-msgid "Base graphics set for OpenTTD"
-msgstr ""
-
-#: gnu/packages/games.scm:2519
+#: gnu/packages/games.scm:4336
 msgid ""
-"The OpenGFX projects is an implementation of the OpenTTD base grahics\n"
+"The OpenGFX project is an implementation of the OpenTTD base graphics\n"
 "set that aims to ensure the best possible out-of-the-box experience.\n"
 "\n"
 "OpenGFX provides you with...\n"
@@ -3523,33 +3521,29 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/games.scm:2564
-msgid "Base sounds for OpenTTD"
-msgstr ""
-
-#: gnu/packages/games.scm:2565
+#: gnu/packages/games.scm:4382
 msgid ""
 "OpenSFX is a set of free base sounds for OpenTTD which make\n"
 "it possible to play OpenTTD without requiring the proprietary sound files from\n"
 "the original Transport Tycoon Deluxe."
 msgstr ""
 
-#: gnu/packages/games.scm:2602
-msgid "Music set for OpenTTD"
-msgstr ""
-
-#: gnu/packages/games.scm:2603
+#: gnu/packages/games.scm:4420
 msgid ""
 "OpenMSX is a music set for OpenTTD which makes it possible\n"
 "to play OpenTTD without requiring the proprietary music from the original\n"
 "Transport Tycoon Deluxe."
 msgstr ""
 
-#: gnu/packages/games.scm:2681
-msgid "Free software re-implementation of RollerCoaster Tycoon 2"
+#: gnu/packages/games.scm:4491
+msgid "openrct2-title-sequences is a set of title sequences for OpenRCT2."
+msgstr ""
+
+#: gnu/packages/games.scm:4531
+msgid "openrct2-objects is a set of objects for OpenRCT2."
 msgstr ""
 
-#: gnu/packages/games.scm:2682
+#: gnu/packages/games.scm:4594
 msgid ""
 "OpenRCT2 is a free software re-implementation of\n"
 "RollerCoaster Tycoon 2 (RCT2).  The gameplay revolves around building and\n"
@@ -3559,51 +3553,27 @@ msgid ""
 "images, etc.)"
 msgstr ""
 
-#: gnu/packages/games.scm:2724
-msgid "Pinball simulator"
-msgstr ""
-
-#: gnu/packages/games.scm:2725
+#: gnu/packages/games.scm:4637
 msgid ""
 "The Emilia Pinball Project is a pinball simulator.  There\n"
 "are only two levels to play with, but they are very addictive."
 msgstr ""
 
-#: gnu/packages/games.scm:2746
-msgid "Board game inspired by The Settlers of Catan"
-msgstr ""
-
-#: gnu/packages/games.scm:2747
+#: gnu/packages/games.scm:4661
 msgid ""
 "Pioneers is an emulation of the board game The Settlers of\n"
 "Catan.  It can be played on a local network, on the internet, and with AI\n"
 "players."
 msgstr ""
 
-#: gnu/packages/games.scm:2781
-msgid "Nintendo DS emulator"
-msgstr ""
-
-#: gnu/packages/games.scm:2783
-msgid "DeSmuME is an emulator for the Nintendo DS handheld gaming console."
-msgstr ""
-
-#: gnu/packages/games.scm:2821 gnu/packages/gnome.scm:2617
-msgid "Logic puzzle game"
-msgstr "逻辑解谜游戏"
-
-#: gnu/packages/games.scm:2822
+#: gnu/packages/games.scm:4703
 msgid ""
 "The goal of this logic game is to open all cards in a 6x6\n"
 "grid, using a number of hints as to their relative position.  The game idea\n"
 "is attributed to Albert Einstein."
 msgstr ""
 
-#: gnu/packages/games.scm:2851
-msgid "MUD and telnet client"
-msgstr ""
-
-#: gnu/packages/games.scm:2853
+#: gnu/packages/games.scm:4733
 msgid ""
 "POWWOW is a client software which can be used for telnet as well as for\n"
 "@dfn{Multi-User Dungeon} (MUD).  Additionally it can serve as a nice client for\n"
@@ -3611,58 +3581,21 @@ msgid ""
 "http://lavachat.symlynx.com/unix/"
 msgstr ""
 
-#: gnu/packages/games.scm:3023
-msgid "Arena shooter derived from the Cube 2 engine"
-msgstr ""
-
-#: gnu/packages/games.scm:3025
+#: gnu/packages/games.scm:4845
 msgid ""
 "Red Eclipse is an arena shooter, created from the Cube2 engine.\n"
 "Offering an innovative parkour system and distinct but all potent weapons,\n"
 "Red Eclipse provides fast paced and accessible gameplay."
 msgstr ""
 
-#: gnu/packages/games.scm:3119
-msgid "Nintendo multi-system emulator"
-msgstr ""
-
-#: gnu/packages/games.scm:3121
-msgid ""
-"higan (formerly bsnes) is an emulator for multiple Nintendo video game\n"
-"consoles, including the Nintendo Entertainment System (NES/Famicom), Super\n"
-"Nintendo Entertainment System (SNES/Super Famicom), Game Boy, Game Boy\n"
-"Color (GBC), and Game Boy Advance (GBA).  It also supports the subsystems\n"
-"Super Game Boy, BS-X Satellaview, and Sufami Turbo."
-msgstr ""
-
-#: gnu/packages/games.scm:3179
-msgid "Game Boy Advance emulator"
-msgstr ""
-
-#: gnu/packages/games.scm:3181
-msgid ""
-"mGBA is an emulator for running Game Boy Advance games.  It aims to be\n"
-"faster and more accurate than many existing Game Boy Advance emulators, as\n"
-"well as adding features that other emulators lack.  It also supports Game Boy\n"
-"and Game Boy Color games."
-msgstr ""
-
-#: gnu/packages/games.scm:3237
-msgid "Text adventure game"
-msgstr ""
-
-#: gnu/packages/games.scm:3239
+#: gnu/packages/games.scm:4910
 msgid ""
 "Grue Hunter is a text adventure game written in Perl.  You must make\n"
 "your way through an underground cave system in search of the Grue.  Can you\n"
 "capture it and get out alive?"
 msgstr ""
 
-#: gnu/packages/games.scm:3281
-msgid "Old-school earthworm action game"
-msgstr ""
-
-#: gnu/packages/games.scm:3283
+#: gnu/packages/games.scm:4954
 msgid ""
 "lierolibre is an earthworm action game where you fight another player\n"
 "(or the computer) underground using a wide array of weapons.\n"
@@ -3687,23 +3620,44 @@ msgid ""
 "fullscreen, use F5 or Alt+Enter."
 msgstr ""
 
-#: gnu/packages/games.scm:3358
-msgid "3D Real-time strategy and real-time tactics game"
+#: gnu/packages/games.scm:5033
+msgid ""
+"Tennix is a 2D tennis game.  You can play against the\n"
+"computer or against another player using the keyboard.  The game runs\n"
+"in-window at 640x480 resolution or fullscreen."
 msgstr ""
 
-#: gnu/packages/games.scm:3360
+#: gnu/packages/games.scm:5115
 msgid ""
 "Warzone 2100 offers campaign, multi-player, and single-player skirmish\n"
-"modes. An extensive tech tree with over 400 different technologies, combined\n"
+"modes.  An extensive tech tree with over 400 different technologies, combined\n"
 "with the unit design system, allows for a wide variety of possible units and\n"
 "tactics."
 msgstr ""
 
-#: gnu/packages/games.scm:3393
-msgid "2D scrolling shooter game"
+#: gnu/packages/games.scm:5191
+msgid ""
+"In Widelands, you are the regent of a small clan.  You start out with\n"
+"nothing but your headquarters, where all your resources are stored.\n"
+"\n"
+"In the course of the game, you will build an ever growing settlement.  Every\n"
+"member of your clan will do his or her part to produce more resources---wood,\n"
+"food, iron, gold and more---to further this growth.  The economic network is\n"
+"complex and different in the four tribes (Barbarians, Empire, Atlanteans, and\n"
+"Frisians).\n"
+"\n"
+"As you are not alone in the world, you will meet other clans sooner or later.\n"
+"Some of them may be friendly and you may eventually trade with them.  However,\n"
+"if you want to rule the world, you will have to train soldiers and fight.\n"
+"\n"
+"Widelands offers single-player mode with different campaigns; the campaigns\n"
+"all tell stories of tribes and their struggle in the Widelands universe!\n"
+"However, settling really starts when you unite with friends over the Internet\n"
+"or LAN to build up new empires together---or to crush each other in the dusts\n"
+"of war.  Widelands also offers an Artificial Intelligence to challenge you."
 msgstr ""
 
-#: gnu/packages/games.scm:3395
+#: gnu/packages/games.scm:5241
 msgid ""
 "In the year 2579, the intergalactic weapons corporation, WEAPCO, has\n"
 "dominated the galaxy.  Guide Chris Bainfield and his friend Sid Wilson on\n"
@@ -3712,11 +3666,7 @@ msgid ""
 "in strikes against the evil corporation."
 msgstr ""
 
-#: gnu/packages/games.scm:3426
-msgid "Fast-paced, arcade-style, top-scrolling space shooter"
-msgstr ""
-
-#: gnu/packages/games.scm:3428
+#: gnu/packages/games.scm:5274
 msgid ""
 "In this game you are the captain of the cargo ship Chromium B.S.U. and\n"
 "are responsible for delivering supplies to the troops on the front line.  Your\n"
@@ -3724,11 +3674,7 @@ msgid ""
 "safety of the Chromium vessel."
 msgstr ""
 
-#: gnu/packages/games.scm:3503
-msgid "Drawing software for children"
-msgstr ""
-
-#: gnu/packages/games.scm:3505
+#: gnu/packages/games.scm:5358
 msgid ""
 "Tux Paint is a free drawing program designed for young children (kids\n"
 "ages 3 and up).  It has a simple, easy-to-use interface; fun sound effects;\n"
@@ -3737,52 +3683,31 @@ msgid ""
 "your child be creative."
 msgstr ""
 
-#: gnu/packages/games.scm:3543
-msgid "Stamp images for Tux Paint"
-msgstr ""
-
-#: gnu/packages/games.scm:3545
+#: gnu/packages/games.scm:5399
 msgid ""
 "This package contains a set of \"Rubber Stamp\" images which can be used\n"
 "with the \"Stamp\" tool within Tux Paint."
 msgstr ""
 
-#: gnu/packages/games.scm:3592
-msgid "Configure Tux Paint"
-msgstr ""
-
-#: gnu/packages/games.scm:3594
+#: gnu/packages/games.scm:5448
 msgid "Tux Paint Config is a graphical configuration editor for Tux Paint."
 msgstr ""
 
-#: gnu/packages/games.scm:3626
-msgid "2D platformer game"
-msgstr ""
-
-#: gnu/packages/games.scm:3627
+#: gnu/packages/games.scm:5499
 msgid ""
-"SuperTux is a free classic 2D jump'n run sidescroller game\n"
-"in a style similar to the original Super Mario games covered under\n"
-"the GNU GPL."
-msgstr ""
-
-#: gnu/packages/games.scm:3661
-msgid "MUD client"
+"SuperTux is a classic 2D jump'n run sidescroller game in\n"
+"a style similar to the original Super Mario games."
 msgstr ""
 
-#: gnu/packages/games.scm:3663
+#: gnu/packages/games.scm:5534
 msgid ""
-"TinTin++ is a MUD client which supports MCCP (Mud Client Compression Protocol),\n"
-"MMCP (Mud Master Chat Protocol), xterm 256 colors, most TELNET options used by MUDs,\n"
-"as well as those required to login via telnet on Linux / Mac OS X servers, and an\n"
-"auto mapper with a VT100 map display."
+"TinTin++ is a MUD client which supports MCCP (Mud Client Compression\n"
+"Protocol), MMCP (Mud Master Chat Protocol), xterm 256 colors, most TELNET\n"
+"options used by MUDs, as well as those required to login via telnet on\n"
+"Linux / Mac OS X servers, and an auto mapper with a VT100 map display."
 msgstr ""
 
-#: gnu/packages/games.scm:3700
-msgid "Programming game"
-msgstr ""
-
-#: gnu/packages/games.scm:3701
+#: gnu/packages/games.scm:5580
 msgid ""
 "Learn programming, playing with ants and spider webs ;-)\n"
 "Your robot ant can be programmed in many languages: OCaml, Python, C, C++,\n"
@@ -3790,34 +3715,22 @@ msgid ""
 "programmers may also add their own favorite language."
 msgstr ""
 
-#: gnu/packages/games.scm:3745
-msgid "Keyboard mashing and doodling game for babies"
-msgstr ""
-
-#: gnu/packages/games.scm:3746
+#: gnu/packages/games.scm:5619
 msgid ""
 "Bambam is a simple baby keyboard (and gamepad) masher\n"
 "application that locks the keyboard and mouse and instead displays bright\n"
 "colors, pictures, and sounds."
 msgstr ""
 
-#: gnu/packages/games.scm:3789
-msgid "Arcade-style fire fighting game"
-msgstr ""
-
-#: gnu/packages/games.scm:3791
+#: gnu/packages/games.scm:5685
 msgid ""
 "Mr. Rescue is an arcade styled 2d action game centered around evacuating\n"
-"civilians from burning buildings.  The game features fast paced fire\n"
-"extinguishing action, intense boss battles, a catchy soundtrack and lots of\n"
+"civilians from burning buildings.  The game features fast-paced fire\n"
+"extinguishing action, intense boss battles, a catchy soundtrack, and lots of\n"
 "throwing people around in pseudo-randomly generated buildings."
 msgstr ""
 
-#: gnu/packages/games.scm:3898
-msgid "Non-euclidean graphical rogue-like game"
-msgstr ""
-
-#: gnu/packages/games.scm:3900
+#: gnu/packages/games.scm:5797
 msgid ""
 "HyperRogue is a game in which the player collects treasures and fights\n"
 "monsters -- rogue-like but for the fact that it is played on the hyperbolic\n"
@@ -3831,33 +3744,21 @@ msgid ""
 "symbols, it still needs graphics to render the non-euclidean world."
 msgstr ""
 
-#: gnu/packages/games.scm:3943
-msgid "Shooter with space station destruction"
-msgstr ""
-
-#: gnu/packages/games.scm:3945
+#: gnu/packages/games.scm:5844
 msgid ""
 "Kobo Deluxe is an enhanced version of Akira Higuchi's XKobo graphical game\n"
 "for Un*x systems with X11."
 msgstr ""
 
-#: gnu/packages/games.scm:3977
-msgid "Turn based empire building strategy game"
-msgstr ""
-
-#: gnu/packages/games.scm:3978
+#: gnu/packages/games.scm:5876
 msgid ""
-"Freeciv is a turn based empire building strategy game\n"
+"Freeciv is a turn-based empire building strategy game\n"
 "inspired by the history of human civilization.  The game commences in\n"
 "prehistory and your mission is to lead your tribe from the Stone Age\n"
-"to the Space Age."
-msgstr ""
-
-#: gnu/packages/games.scm:4009
-msgid "Recreation of data decryption effect in \"Sneakers\""
+"into the Space Age."
 msgstr ""
 
-#: gnu/packages/games.scm:4011
+#: gnu/packages/games.scm:5909
 msgid ""
 "@code{No More Secrets} provides a command line tool called \"nms\"\n"
 "that recreates the famous data decryption effect seen on screen in the 1992\n"
@@ -3868,41 +3769,25 @@ msgid ""
 "starting a decryption sequence to reveal the original plaintext characters."
 msgstr ""
 
-#: gnu/packages/games.scm:4038
-msgid "Data files for MegaGlest"
-msgstr ""
-
-#: gnu/packages/games.scm:4039
+#: gnu/packages/games.scm:5937
 msgid "This package contains the data files required for MegaGlest."
 msgstr ""
 
-#: gnu/packages/games.scm:4092
-msgid "3D real-time strategy (RTS) game"
-msgstr ""
-
-#: gnu/packages/games.scm:4093
+#: gnu/packages/games.scm:5991
 msgid ""
 "MegaGlest is a cross-platform 3D real-time strategy (RTS)\n"
 "game, where you control the armies of one of seven different factions: Tech,\n"
 "Magic, Egypt, Indians, Norsemen, Persian or Romans."
 msgstr ""
 
-#: gnu/packages/games.scm:4143
-msgid "Side-scrolling physics platformer with a ball of tar"
-msgstr ""
-
-#: gnu/packages/games.scm:4144
+#: gnu/packages/games.scm:6043
 msgid ""
 "In FreeGish you control Gish, a ball of tar who lives\n"
 "happily with his girlfriend Brea, until one day a mysterious dark creature\n"
 "emerges from a sewer hole and pulls her below ground."
 msgstr ""
 
-#: gnu/packages/games.scm:4179
-msgid "Classic overhead run-and-gun game"
-msgstr ""
-
-#: gnu/packages/games.scm:4180
+#: gnu/packages/games.scm:6083
 msgid ""
 "C-Dogs SDL is a classic overhead run-and-gun game,\n"
 "supporting up to 4 players in co-op and deathmatch modes.  Customize your\n"
@@ -3910,33 +3795,21 @@ msgid ""
 "over 100 user-created campaigns."
 msgstr ""
 
-#: gnu/packages/games.scm:4280
-msgid "3D puzzle game"
-msgstr ""
-
-#: gnu/packages/games.scm:4281
+#: gnu/packages/games.scm:6184
 msgid ""
 "Kiki the nano bot is a 3D puzzle game.  It is basically a\n"
 "mixture of the games Sokoban and Kula-World.  Your task is to help Kiki, a\n"
 "small robot living in the nano world, repair its maker."
 msgstr ""
 
-#: gnu/packages/games.scm:4371
-msgid "2D retro multiplayer shooter game"
-msgstr ""
-
-#: gnu/packages/games.scm:4372
+#: gnu/packages/games.scm:6251
 msgid ""
 "Teeworlds is an online multiplayer game.  Battle with up to\n"
 "16 players in a variety of game modes, including Team Deathmatch and Capture\n"
 "The Flag.  You can even design your own maps!"
 msgstr ""
 
-#: gnu/packages/games.scm:4425
-msgid "Puzzle game with a dexterity component"
-msgstr ""
-
-#: gnu/packages/games.scm:4426
+#: gnu/packages/games.scm:6313
 msgid ""
 "Enigma is a puzzle game with 550 unique levels.  The object\n"
 "of the game is to find and uncover pairs of identically colored ‘Oxyd’ stones.\n"
@@ -3948,11 +3821,17 @@ msgid ""
 "with the mouse isn’t always trivial."
 msgstr ""
 
-#: gnu/packages/games.scm:4497
-msgid "Puzzle game"
+#: gnu/packages/games.scm:6348
+msgid ""
+"Chroma is an abstract puzzle game. A variety of colourful\n"
+"shapes are arranged in a series of increasingly complex patterns, forming\n"
+"fiendish traps that must be disarmed and mysterious puzzles that must be\n"
+"manipulated in order to give up their subtle secrets.  Initially so\n"
+"straightforward that anyone can pick it up and begin to play, yet gradually\n"
+"becoming difficult enough to tax even the brightest of minds."
 msgstr ""
 
-#: gnu/packages/games.scm:4498
+#: gnu/packages/games.scm:6418
 msgid ""
 "Fish Fillets NG is strictly a puzzle game.  The goal in\n"
 "every of the seventy levels is always the same: find a safe way out.  The fish\n"
@@ -3961,26 +3840,14 @@ msgid ""
 "fish.  The whole game is accompanied by quiet, comforting music."
 msgstr ""
 
-#: gnu/packages/games.scm:4562
-msgid "Roguelike dungeon crawler game"
-msgstr ""
-
-#: gnu/packages/games.scm:4563
+#: gnu/packages/games.scm:6486
 msgid ""
-"Dungeon Crawl Stone Soup is a roguelike adventure through\n"
-"dungeons filled with dangerous monsters in a quest to find the mystifyingly\n"
-"fabulous Orb of Zot."
-msgstr ""
-
-#: gnu/packages/games.scm:4609
-msgid "Graphical roguelike dungeon crawler game"
+"Dungeon Crawl Stone Soup (also known as \"Crawl\" or DCSS\n"
+"for short) is a roguelike adventure through dungeons filled with dangerous\n"
+"monsters in a quest to find the mystifyingly fabulous Orb of Zot."
 msgstr ""
 
-#: gnu/packages/games.scm:4639
-msgid "Cross-platform third-person action game"
-msgstr ""
-
-#: gnu/packages/games.scm:4640
+#: gnu/packages/games.scm:6563
 msgid ""
 "Lugaru is a third-person action game.  The main character,\n"
 "Turner, is an anthropomorphic rebel bunny rabbit with impressive combat skills.\n"
@@ -3990,19 +3857,11 @@ msgid ""
 "fight against their plot and save his fellow rabbits from slavery."
 msgstr ""
 
-#: gnu/packages/games.scm:4691
-msgid "Data files for 0ad"
-msgstr ""
-
-#: gnu/packages/games.scm:4692
+#: gnu/packages/games.scm:6614
 msgid "0ad-data provides the data files required by the game 0ad."
 msgstr ""
 
-#: gnu/packages/games.scm:4814
-msgid "3D real-time strategy game of ancient warfare"
-msgstr ""
-
-#: gnu/packages/games.scm:4815
+#: gnu/packages/games.scm:6733
 msgid ""
 "0 A.D. is a real-time strategy (RTS) game of ancient\n"
 "warfare.  It's a historically-based war/economy game that allows players to\n"
@@ -4012,24 +3871,16 @@ msgid ""
 "0ad needs a window manager that supports 'Extended Window Manager Hints'."
 msgstr ""
 
-#: gnu/packages/games.scm:4891
-msgid "Colossal Cave Adventure"
-msgstr ""
-
-#: gnu/packages/games.scm:4892
+#: gnu/packages/games.scm:6799
 msgid ""
-"The original Colossal Cave Adventure from 1976 was the\n"
-"origin of all text adventures, dungeon-crawl (computer) games, and\n"
-"computer-hosted roleplaying games.  This is the last version released by\n"
+"The original Colossal Cave Adventure from 1976 was the origin of all\n"
+"text adventures, dungeon-crawl (computer) games, and computer-hosted\n"
+"roleplaying games.  This is a forward port of the last version released by\n"
 "Crowther & Woods, its original authors, in 1995.  It has been known as\n"
-"\"adventure 2.5\" and \"430-point adventure\"."
+"``adventure 2.5'' and ``430-point adventure''."
 msgstr ""
 
-#: gnu/packages/games.scm:4903
-msgid "Single-player, RPG roguelike game set in the world of Eyal"
-msgstr ""
-
-#: gnu/packages/games.scm:5008
+#: gnu/packages/games.scm:6926
 msgid ""
 "Tales of Maj’Eyal (ToME) RPG, featuring tactical turn-based\n"
 "combat and advanced character building.  Play as one of many unique races and\n"
@@ -4040,41 +3891,1096 @@ msgid ""
 "Tales of Maj’Eyal offers engaging roguelike gameplay for the 21st century."
 msgstr ""
 
-#: gnu/packages/gcc.scm:336
-msgid "GNU Compiler Collection"
+#: gnu/packages/games.scm:6972
+msgid ""
+"Quakespasm is a modern engine for id software's Quake 1.\n"
+"It includes support for 64 bit CPUs, custom music playback, a new sound driver,\n"
+"some graphical niceities, and numerous bug-fixes and other improvements."
+msgstr ""
+
+#: gnu/packages/games.scm:7030
+msgid ""
+"vkquake is a modern engine for id software's Quake 1.\n"
+"It includes support for 64 bit CPUs, custom music playback, a new sound driver,\n"
+"some graphical niceities, and numerous bug-fixes and other improvements."
+msgstr ""
+
+#: gnu/packages/games.scm:7084
+msgid ""
+"Yamagi Quake II is an enhanced client for id Software's Quake II.\n"
+"The main focus is an unchanged single player experience like back in 1997,\n"
+"thus the gameplay and the graphics are unaltered.  However the user may use one\n"
+"of the unofficial retexturing packs.  In comparison with the official client,\n"
+"over 1000 bugs were fixed and an extensive code audit done,\n"
+"making Yamagi Quake II one of the most solid Quake II implementations available."
+msgstr ""
+
+#: gnu/packages/games.scm:7120
+msgid "Nudoku is a ncurses-based Sudoku game for your terminal."
+msgstr ""
+
+#: gnu/packages/games.scm:7167
+msgid ""
+"The Butterfly Effect (tbe) is a game that uses\n"
+"realistic physics simulations to combine lots of simple mechanical\n"
+"elements to achieve a simple goal in the most complex way possible."
+msgstr ""
+
+#: gnu/packages/games.scm:7212
+msgid ""
+"Pioneer is a space adventure game set in our galaxy at the turn of the\n"
+"31st century.  The game is open-ended, and you are free to eke out whatever\n"
+"kind of space-faring existence you can think of.  Look for fame or fortune by\n"
+"exploring the millions of star systems.  Turn to a life of crime as a pirate,\n"
+"smuggler or bounty hunter.  Forge and break alliances with the various\n"
+"factions fighting for power, freedom or self-determination.  The universe is\n"
+"whatever you make of it."
+msgstr ""
+
+#: gnu/packages/games.scm:7241
+msgid ""
+"Badass generates false commits for a range of dates, essentially\n"
+"hacking the gamification of contribution graphs on platforms such as\n"
+"Github or Gitlab."
+msgstr ""
+
+#: gnu/packages/games.scm:7315
+msgid ""
+"Colobot: Gold Edition is a real-time strategy game, where\n"
+"you can program your units (bots) in a language called CBOT, which is similar\n"
+"to C++ and Java.  Your mission is to find a new planet to live and survive.\n"
+"You can save humanity and get programming skills!"
+msgstr ""
+
+#: gnu/packages/games.scm:7408
+msgid ""
+"GZdoom is a port of the Doom 2 game engine, with a modern\n"
+"renderer.  It improves modding support with ZDoom's advanced mapping features\n"
+"and the new ZScript language.  In addition to Doom, it supports Heretic, Hexen,\n"
+"Strife, Chex Quest, and fan-created games like Harmony, Hacx and Freedoom."
+msgstr ""
+
+#: gnu/packages/games.scm:7444
+msgid ""
+"Odamex is a modification of the Doom engine that\n"
+"allows players to easily join servers dedicated to playing Doom\n"
+"online."
+msgstr ""
+
+#: gnu/packages/games.scm:7472
+msgid ""
+"Chocolate Doom takes a different approach to other source ports.  Its\n"
+"aim is to accurately reproduce the experience of playing Vanilla Doom.  It is\n"
+"a conservative, historically accurate Doom source port, which is compatible\n"
+"with the thousands of mods and levels that were made before the Doom source\n"
+"code was released.  Rather than flashy new graphics, Chocolate Doom's main\n"
+"features are its accurate reproduction of the game as it was played in the\n"
+"1990s.  The project is developed around a carefully-considered philosophy that\n"
+"intentionally restricts which features may be added (and rejects any that\n"
+"affect gameplay)."
+msgstr ""
+
+#: gnu/packages/games.scm:7511
+msgid ""
+"Crispy Doom is a friendly fork of Chocolate Doom that provides a higher\n"
+"display resolution, removes the static limits of the Doom engine and offers\n"
+"further optional visual, tactical and physical enhancements while remaining\n"
+"entirely config file, savegame, netplay and demo compatible with the\n"
+"original."
+msgstr ""
+
+#: gnu/packages/games.scm:7584
+msgid "This package provides C11 / gnu11 utilities C library"
+msgstr ""
+
+#: gnu/packages/games.scm:7642
+msgid ""
+"Fortune is a command-line utility which displays a random\n"
+"quotation from a collection of quotes."
+msgstr ""
+
+#: gnu/packages/games.scm:7684
+msgid "Xonotic-data provides the data files required by the game Xonotic."
+msgstr ""
+
+#: gnu/packages/games.scm:7880
+msgid ""
+"Xonotic is a free, fast-paced first-person shooter.\n"
+"The project is geared towards providing addictive arena shooter\n"
+"gameplay which is all spawned and driven by the community itself.\n"
+"Xonotic is a direct successor of the Nexuiz project with years of\n"
+"development between them, and it aims to become the best possible\n"
+"open-source FPS of its kind."
 msgstr ""
 
-#: gnu/packages/gcc.scm:338
+#: gnu/packages/games.scm:7931
+msgid ""
+"Frotz is an interpreter for Infocom games and other Z-machine\n"
+"games in the text adventure/interactive fiction genre.  This version of Frotz\n"
+"complies with standard 1.0 of Graham Nelson's specification.  It plays all\n"
+"Z-code games V1-V8, including V6, with sound support through libao, and uses\n"
+"ncurses for text display."
+msgstr ""
+
+#: gnu/packages/games.scm:7973
+msgid ""
+"Frotz is an interpreter for Infocom games and\n"
+"other Z-machine games in the text adventure/interactive fiction genre.\n"
+"dfrotz is the dumb interface version.  You get no screen control; everything\n"
+"is just printed to the terminal line by line.  The terminal handles all the\n"
+"scrolling.  Maybe you'd like to experience what it's like to play Adventure on\n"
+"a teletype.  A much cooler use for compiling Frotz with the dumb interface is\n"
+"that it can be wrapped in CGI scripting, PHP, and the like to allow people\n"
+"to play games on webpages.  It can also be made into a chat bot."
+msgstr ""
+
+#: gnu/packages/games.scm:8037
+msgid ""
+"Frotz is an interpreter for Infocom games and other Z-machine\n"
+"games in the text adventure/interactive fiction genre.  This version of Frotz\n"
+"using SDL fully supports all these versions of the Z-Machine including the\n"
+"graphical version 6.  Graphics and sound are created through the use of the SDL\n"
+"libraries.  AIFF sound effects and music in MOD and OGG formats are supported\n"
+"when packaged in Blorb container files or optionally from individual files."
+msgstr ""
+
+#: gnu/packages/games.scm:8131
+msgid ""
+"Frozen-Bubble is a clone of the popular Puzzle Bobble game, in which\n"
+"you attempt to shoot bubbles into groups of the same color to cause them to\n"
+"pop.\n"
+"\n"
+"Players compete as penguins and must use the arrow keys to aim a colored\n"
+"bubble at groups of bubbles.  The objective is to clear all the bubbles off\n"
+"the screen before a bubble passes below a line at the bottom.\n"
+"\n"
+"It features 100 single-player levels, a two-player mode, music and striking\n"
+"graphics.  A level editor is also included to allow players to create and play\n"
+"their own levels."
+msgstr ""
+
+#: gnu/packages/games.scm:8167
+msgid ""
+"Libmanette is a small GObject library giving you simple\n"
+"access to game controllers.  It supports the de-facto standard gamepads as\n"
+"defined by the W3C standard Gamepad specification or as implemented by the SDL\n"
+"GameController."
+msgstr ""
+
+#: gnu/packages/games.scm:8214
+msgid ""
+"Quadrapassel comes from the classic falling-block game,\n"
+"Tetris.  The goal of the game is to create complete horizontal lines of\n"
+"blocks, which will disappear.  The blocks come in seven different shapes made\n"
+"from four blocks each: one straight, two L-shaped, one square, and two\n"
+"S-shaped.  The blocks fall from the top center of the screen in a random\n"
+"order.  You rotate the blocks and move them across the screen to drop them in\n"
+"complete lines.  You score by dropping blocks fast and completing lines.  As\n"
+"your score gets higher, you level up and the blocks fall faster."
+msgstr ""
+
+#: gnu/packages/games.scm:8268
+msgid ""
+"Endless Sky is a 2D space trading and combat game.  Explore\n"
+"other star systems.  Earn money by trading, carrying passengers, or completing\n"
+"missions.  Use your earnings to buy a better ship or to upgrade the weapons and\n"
+"engines on your current one.  Blow up pirates.  Take sides in a civil war.  Or\n"
+"leave human space behind and hope to find friendly aliens whose culture is more\n"
+"civilized than your own."
+msgstr ""
+
+#: gnu/packages/games.scm:8418
+msgid ""
+"StepMania is a dance and rhythm game.  It features 3D\n"
+"graphics, keyboard and dance pad support, and an editor for creating your own\n"
+"steps.\n"
+"\n"
+"This package provides the core application, but no song is shipped.  You need\n"
+"to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory."
+msgstr ""
+
+#: gnu/packages/games.scm:8458
+msgid ""
+"@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,\n"
+"which is played by pressing buttons and following along sliders as they appear\n"
+"on screen.  Its aim is to be able to play any beatmap even on low-end hardware.\n"
+"\n"
+"This package provides the core application, but no beatmaps.  You need to\n"
+"download and unpack them separately."
+msgstr ""
+
+#: gnu/packages/games.scm:8543
+msgid ""
+"Battle Tanks (also known as \"btanks\") is a funny battle\n"
+"game, where you can choose one of three vehicles and eliminate your enemy\n"
+"using the whole arsenal of weapons.  It has original cartoon-like graphics and\n"
+"cool music, it’s fun and dynamic, it has several network modes for deathmatch\n"
+"and cooperative."
+msgstr ""
+
+#: gnu/packages/games.scm:8577
+msgid ""
+"Slime Volley is a 2D arcade-oriented volleyball simulation, in\n"
+"the spirit of some Java games of the same name.\n"
+"\n"
+"Two teams, 1-3 players each, try to be the first to get 10 points.\n"
+"This happens when the one ball touches the floor on the other side of\n"
+"the net.  There can be 1 to 8 balls in game.  Once one ball touches\n"
+"the ground, the set ends and all balls are served again."
+msgstr ""
+
+#: gnu/packages/games.scm:8607
+msgid ""
+"Slingshot is a two-dimensional strategy game where two\n"
+"players attempt to shoot one another through a section of space populated by\n"
+"planets.  The main feature of the game is that the shots, once fired, are\n"
+"affected by the gravity of the planets."
+msgstr ""
+
+#: gnu/packages/games.scm:8655
+msgid ""
+"4D-TRIS is an alteration of the well-known Tetris game.  The\n"
+"game field is extended to 4D space, which has to filled up by the gamer with\n"
+"4D hyper cubes."
+msgstr ""
+
+#: gnu/packages/games.scm:8732
+msgid ""
+"Arx Libertatis is a cross-platform port of Arx Fatalis, a 2002\n"
+"first-person role-playing game / dungeon crawler developed by Arkane Studios.\n"
+"This port however does not include the game data, so you need to obtain a copy\n"
+"of the original Arx Fatalis or its demo to play Arx Libertatis.  Arx Fatalis\n"
+"features crafting, melee and ranged combat, as well as a unique casting system\n"
+"where the player draws runes in real time to effect the desired spell."
+msgstr ""
+
+#: gnu/packages/games.scm:8779
+msgid ""
+"The Legend of Edgar is a 2D platform game with a persistent world.\n"
+"When Edgar's father fails to return home after venturing out one dark and stormy night,\n"
+"Edgar fears the worst: he has been captured by the evil sorcerer who lives in\n"
+"a fortress beyond the forbidden swamp."
+msgstr ""
+
+#: gnu/packages/games.scm:8881
+msgid ""
+"OpenClonk is a multiplayer action/tactics/skill game.  It is\n"
+"often referred to as a mixture of The Settlers and Worms.  In a simple 2D\n"
+"antfarm-style landscape, the player controls a crew of Clonks, small but\n"
+"robust humanoid beings.  The game encourages free play but the normal goal is\n"
+"to either exploit valuable resources from the earth by building a mine or\n"
+"fight each other on an arena-like map."
+msgstr ""
+
+#: gnu/packages/games.scm:8913
+msgid ""
+"Flare (Free Libre Action Roleplaying Engine) is a simple\n"
+"game engine built to handle a very specific kind of game: single-player 2D\n"
+"action RPGs."
+msgstr ""
+
+#: gnu/packages/games.scm:8978
+msgid ""
+"Flare is a single-player 2D action RPG with\n"
+"fast-paced action and a dark fantasy style."
+msgstr ""
+
+#: gnu/packages/games.scm:9030
+msgid ""
+"Far below the surface of the planet is a place of limitless\n"
+"power.  Those that seek to control such a utopia will soon bring an end to\n"
+"themselves.  Seeking an end to the troubles that plague him, PSI user Merit\n"
+"journeys into the hallowed Orcus Dome in search of answers.\n"
+"\n"
+"Meritous is a action-adventure game with simple controls but a challenge to\n"
+"find a balance of power versus recovery time during real-time battles.  Set in\n"
+"a procedurally generated world, the player can explore thousands of rooms in\n"
+"search of powerful artifacts, tools to help them, and to eventually free the\n"
+"Orcus Dome from evil."
+msgstr ""
+
+#: gnu/packages/games.scm:9094
+msgid ""
+"Marble Marcher is a video game that uses a fractal physics\n"
+"engine and fully procedural rendering to produce beautiful and unique\n"
+"gameplay.  The game is played on the surface of evolving fractals.  The goal\n"
+"of the game is to get your marble to the flag as quickly as possible.  But be\n"
+"careful not to fall off the level or get crushed by the fractal!  There are 24\n"
+"levels to unlock."
+msgstr ""
+
+#: gnu/packages/games.scm:9136
+msgid ""
+"SimGear is a set of libraries designed to be used as\n"
+"building blocks for quickly assembling 3D simulations, games, and\n"
+"visualization applications.  SimGear is developed by the FlightGear project\n"
+"and also provides the base for the FlightGear Flight Simulator."
+msgstr ""
+
+#: gnu/packages/games.scm:9229
+msgid ""
+"The goal of the FlightGear project is to create a\n"
+"sophisticated flight simulator framework for use in research or academic\n"
+"environments, pilot training, as an industry engineering tool, for DIY-ers to\n"
+"pursue their favorite interesting flight simulation idea, and last but\n"
+"certainly not least as a fun, realistic, and challenging desktop flight\n"
+"simulator."
+msgstr ""
+
+#: gnu/packages/games.scm:9276
+msgid ""
+"You, as a bunny, have to jump on your opponents to make them\n"
+"explode.  It is a true multiplayer game; you cannot play this alone.  You can\n"
+"play with up to four players simultaneously.  It has network support."
+msgstr ""
+
+#: gnu/packages/games.scm:9345
+msgid ""
+"Hedgewars is a turn based strategy, artillery, action and comedy game,\n"
+"featuring the antics of pink hedgehogs with attitude as they battle from the\n"
+"depths of hell to the depths of space.\n"
+"\n"
+"As commander, it's your job to assemble your crack team of hedgehog soldiers\n"
+"and bring the war to your enemy."
+msgstr ""
+
+#: gnu/packages/games.scm:9378
+msgid ""
+"Harmonist: Dayoriah Clan Infiltration is a stealth\n"
+"coffee-break roguelike game.  The game has a heavy focus on tactical\n"
+"positioning, light and noise mechanisms, making use of various terrain types\n"
+"and cones of view for monsters.  Aiming for a replayable streamlined experience,\n"
+"the game avoids complex inventory management and character building, relying\n"
+"on items and player adaptability for character progression."
+msgstr ""
+
+#: gnu/packages/games.scm:9510
+msgid ""
+"Drascula: The Vampire Strikes Back is a classic humorous 2D\n"
+"point and click adventure game.\n"
+"\n"
+"In Drascula you play the role of John Hacker, a British estate agent, that\n"
+"gets to meet a gorgeous blond girl who is kidnapped by the notorious vampire\n"
+"Count Drascula and embark on a fun yet dangerous quest to rescue her.\n"
+"Unfortunately, Hacker is not aware of Drascula's real ambitions: DOMINATING\n"
+"the World and demonstrating that he is even more evil than his brother Vlad."
+msgstr ""
+
+#: gnu/packages/games.scm:9592
+msgid ""
+"Lure of the Temptress is a classic 2D point and click adventure game.\n"
+"\n"
+"You are Diermot, an unwilling hero who'd prefer a quiet life, and are, to all\n"
+"intents and purposes, a good man.  After decades of unrest the King has united\n"
+"the warring factions in his kingdom and all his lands are at peace, except\n"
+"a remote region around a town called Turnvale.  A revolt has recently taken\n"
+"place in Turnvale, a revolt orchestrated by an apprentice sorceress called\n"
+"Selena, the titular temptress.  The king calls together his finest horsemen\n"
+"and heads off (with you in tow) to Turnvale just to witness how hellish\n"
+"mercenary monsters called Skorl are invading the town.\n"
+"\n"
+"The king's men are defeated, the king is killed and you fall of your horse and\n"
+"bang your head heavily on the ground.  You have been *unconscious for a while\n"
+"when you realize that you are in a dingy cell guarded by a not so friendly\n"
+"Skorl.  Maybe it would be an idea to try and escape..."
+msgstr ""
+
+#: gnu/packages/games.scm:9693
+msgid ""
+"Flight of the Amazon Queen is a 2D point-and-click\n"
+"adventure game set in the 1940s.\n"
+"\n"
+"You assume the role of Joe King, a pilot for hire who is given the job\n"
+"of flying Faye Russell (a famous movie star) into the Amazon jungle\n"
+"for a photo shoot.  Of course, things never go according to plans.\n"
+"After an unfortunate turn of events they find themselves stranded in\n"
+"the heart of the Amazon jungle, where Joe will embark on a quest to\n"
+"rescue a kidnapped princess and in the process, discover the true\n"
+"sinister intentions of a suspiciously located Lederhosen company.  In\n"
+"a rich 2D environment, Joe will cross paths with a variety of unlikely\n"
+"jungle inhabitants including, but not limited to, a tribe of Amazon\n"
+"women and 6-foot-tall pygmies."
+msgstr ""
+
+#: gnu/packages/games.scm:9795
+msgid ""
+"Beneath a Steel Sky is a science-fiction thriller set in a bleak\n"
+"post-apocalyptic vision of the future.  It revolves around Union City,\n"
+"where selfishness, rivalry, and corruption by its citizens seems to be\n"
+"all too common, those who can afford it live underground, away from\n"
+"the pollution and social problems which are plaguing the city.\n"
+"\n"
+"You take on the role of Robert Foster, an outcast of sorts from the\n"
+"city since a boy who was raised in a remote environment outside of\n"
+"Union City simply termed ``the gap''.  Robert's mother took him away\n"
+"from Union City as a child on their way to ``Hobart'' but the\n"
+"helicopter crashed on its way.  Unfortunately, Robert's mother died,\n"
+"but he survived and was left to be raised by a local tribe from the\n"
+"gap.\n"
+"\n"
+"Years later, Union City security drops by and abducts Robert, killing\n"
+"his tribe in the process; upon reaching the city the helicopter taking\n"
+"him there crashes with him escaping, high upon a tower block in the\n"
+"middle of the city.  He sets out to discover the truth about his past,\n"
+"and to seek vengeance for the killing of his tribe."
+msgstr ""
+
+#: gnu/packages/games.scm:9858
+msgid ""
+"GNU Robots is a game in which you program a robot to explore a world\n"
+"full of enemies that can hurt it, obstacles and food to be eaten.  The goal of\n"
+"the game is to stay alive and collect prizes.  The robot program conveniently\n"
+"may be written in a plain text file in the Scheme programming language."
+msgstr ""
+
+#: gnu/packages/games.scm:9928
+msgid ""
+"Ri-li is a game in which you drive a wooden toy\n"
+"steam locomotive across many levels and collect all the coaches to\n"
+"win."
+msgstr ""
+
+#: gnu/packages/games.scm:9984
+msgid ""
+"FreeOrion is a turn-based space empire and galactic conquest (4X)\n"
+"computer game being designed and built by the FreeOrion project.  Control an\n"
+"empire with the goal of exploring the galaxy, expanding your territory,\n"
+"exploiting the resources, and exterminating rival alien empires.  FreeOrion is\n"
+"inspired by the tradition of the Master of Orion games, but is not a clone or\n"
+"remake of that series or any other game."
+msgstr ""
+
+#: gnu/packages/games.scm:10040
+msgid ""
+"Leela-zero is a Go engine with no human-provided knowledge, modeled after\n"
+"the AlphaGo Zero paper.  The current best network weights file for the engine\n"
+"can be downloaded from @url{https://zero.sjeng.org/best-network}."
+msgstr ""
+
+#: gnu/packages/games.scm:10115
+msgid ""
+"This a tool for Go players which performs the following functions:\n"
+"@itemize\n"
+"@item SGF editor,\n"
+"@item Analysis frontend for Leela Zero (or compatible engines),\n"
+"@item GTP interface (to play against an engine),\n"
+"@item IGS client (to play on the internet),\n"
+"@item Export games to a variety of formats.\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/games.scm:10160
+msgid ""
+"KTuberling is a drawing toy intended for small children and\n"
+"adults who remain young at heart.  The game has no winner; the only purpose is\n"
+"to make the funniest faces you can.  Several activities are possible, e.g.:\n"
+"\n"
+"@itemize\n"
+"@item Give the potato a funny face, clothes, and other goodies\n"
+"@item Build a small town, complete with school, zoo, and fire department\n"
+"@item Create a fantastic moonscape with spaceships and aliens\n"
+"@item Top a pizza\n"
+"@end itemize\n"
+"\n"
+"KTuberling can speak the name of each the object in several languages,\n"
+"to assist in learning basic vocabulary.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10207
+msgid ""
+"Picmi is a number logic game in which cells in a grid have\n"
+"to be colored or left blank according to numbers given at the side of the\n"
+"grid.  The aim is to reveal a hidden picture.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10245
+msgid ""
+"Kolf is a miniature golf game for one to ten players.  The\n"
+"game is played from an overhead view, with a short bar representing the golf\n"
+"club.  Kolf features many different types of objects, such as water hazards,\n"
+"slopes, sand traps, and black holes (warps), among others.\n"
+"\n"
+"Features are:\n"
+"@itemize\n"
+"@item Single and Multi-player (up to ten players) modes\n"
+"@item High scores table\n"
+"@item Dynamic courses\n"
+"@item Third-party courses\n"
+"@item Course editor\n"
+"@end itemize\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10289
+msgid ""
+"Shared library and common files for kmahjongg, kshisen and\n"
+"other Mah Jongg like games."
+msgstr ""
+
+#: gnu/packages/games.scm:10323
+msgid ""
+"In KMahjongg the tiles are scrambled and staked on top of\n"
+"each other to resemble a certain shape.  The player is then expected to remove\n"
+"all the tiles off the game board by locating each tile's matching pair.\n"
+"\n"
+"A variety of tile layouts are included, as well as an editor to create new\n"
+"layouts.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10365
+msgid ""
+"KShisen is a solitaire-like game played using the standard\n"
+"set of Mahjong tiles.  Unlike Mahjong however, KShisen has only one layer of\n"
+"scrambled tiles\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10410
+msgid ""
+"Kajongg is the ancient Chinese board game for 4 players.\n"
+"\n"
+"If you are looking for the Mah Jongg solitaire please use the application\n"
+"kmahjongg.\n"
+"\n"
+"Kajongg can be used in two different ways: Scoring a manual game where you\n"
+"play as always and use Kajongg for the computation of scores and for\n"
+"bookkeeping.  Or you can use Kajongg to play against any combination of other\n"
+"human players or computer players.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10453
+msgid ""
+"KBreakout is similar to the classics breakout and xboing,\n"
+"featuring a number of added graphical enhancements and effects.  You control a\n"
+"paddle at the bottom of the playing-field, and must destroy bricks at the top\n"
+"by bouncing balls against them.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10492
+msgid ""
+"KMines is a classic Minesweeper game.  The idea is to\n"
+"uncover all the squares without blowing up any mines.  When a mine is blown\n"
+"up, the game is over.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10530
+msgid ""
+"Konquest is the KDE version of Gnu-Lactic Konquest.  Players\n"
+"conquer other planets by sending ships to them.  The goal is to build an\n"
+"interstellar empire and ultimately conquer all other player's planets.  The\n"
+"game can be played with up to nine empires, commanded either by the computer\n"
+"or by puny earthlings.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10570
+msgid ""
+"KBounce is a single player arcade game with the elements of\n"
+"puzzle.  It is played on a field, surrounded by wall, with two or more balls\n"
+"bouncing around within the walls.  The object of the game is to build new\n"
+"walls to decrease the size of the active field.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10609
+msgid ""
+"KBlocks is the classic Tetris-like falling blocks game.\n"
+"\n"
+"The idea is to stack the falling blocks to create horizontal lines without any\n"
+"gaps.  When a line is completed it is removed, and more space is available in\n"
+"the play area.  When there is not enough space for blocks to fall, the game is\n"
+"over.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10653
+msgid ""
+"KSudoku is a Sudoku game and solver, supporting a range of\n"
+"2D and 3D Sudoku variants.  In addition to playing Sudoku, it can print Sudoku\n"
+"puzzle sheets and find the solution to any Sudoku puzzle.\n"
+"\n"
+"The word Sudoku means \"single number in an allotted place\" in Japanese.\n"
+"These are the basic rules: Every Sudoku is a square divided into 3x3\n"
+"subsquares with 3x3 cells each.\n"
+"\n"
+"Some cells are filled with a number at the beginning.  The remaining ones are\n"
+"to be filled by the player using numbers from 1 to 9, without repeating a\n"
+"number twice on each column, row or subsquare (each of them must contain only\n"
+"one 1, one 2, one 3, and so on).  The game requires logic and patience.\n"
+"Solving takes usually 10 to 30 minutes, depending on puzzle level, your skill\n"
+"and experience.\n"
+"\n"
+"The numerals in Sudoku puzzles are used for convenience (for example in 16x16\n"
+"board we use letters): arithmetic relationships between numbers are\n"
+"irrelevant.\n"
+"\n"
+"This program supports also 16x16 games with numbers from 1 to 16 and 256\n"
+"cells with 16 cols, rows and subsquares!\n"
+"\n"
+"More information at http://en.wikipedia.org/wiki/Sudoku\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10709
+msgid ""
+"KLines is a simple but highly addictive one player game.\n"
+"\n"
+"The player has to move the colored balls around the game board, gathering them\n"
+"into the lines of the same color by five.  Once the line is complete it is\n"
+"removed from the board, therefore freeing precious space.  In the same time\n"
+"the new balls keep arriving by three after each move, filling up the game\n"
+"board.\n"
+"\n"
+"KLines is a single-player game where the player removes colored balls from the\n"
+"board by arranging them into lines of five or more.  However, every time the\n"
+"player moves a ball, three more balls are added to the board.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10753
+msgid ""
+"KGoldrunner is an action game where the hero runs through a\n"
+"maze, climbs stairs, dig holes and dodges enemies in order to collect all the\n"
+"gold nuggets and escape to the next level.  Your enemies are also after the\n"
+"gold.  Worse still, they are after you!.\n"
+"\n"
+"KGoldrunner is a fast-paced platform game where the player must navigate a\n"
+"maze while collecting gold nuggets and avoiding enemies.  A variety of level\n"
+"packs are included, as well as an editor to create new levels.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10797
+msgid ""
+"KDiamond is a three-in-a-row game like Bejeweled.  It\n"
+"features unlimited fun with randomly generated games and five difficulty\n"
+"levels with varying number of diamond colors and board sizes.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10834
+msgid ""
+"KFourInLine is a board game for two players based on the\n"
+"Connect-Four game.\n"
+"\n"
+"KFourInLine is a game where two players take turns dropping pieces into a\n"
+"grid, the winner being the first to place four pieces in a line.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10874
+msgid ""
+"KBlackbox is a game of hide and seek played on a grid of\n"
+"boxes where the computer has hidden several balls.  The position of the hidden\n"
+"balls can be deduced by shooting beams into the box\n"
+"\n"
+"KBlackBox is a game of hide and seek played on an grid of boxes, where the\n"
+"player shoots rays into the grid to deduce the positions of hidden objects.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10915
+msgid ""
+"KNetWalk is a small game where you have to build up a\n"
+"computer network by rotating the wires to connect the terminals to the server.\n"
+"When the network is build, a highscore-list comes up where competitions can be\n"
+"fought out.\n"
+"\n"
+"KNetwalk is a puzzle game where the player arranges sections of wire to\n"
+"connect all the computers on the board.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:10954
+msgid ""
+"Bomber is a single player arcade game.\n"
+"\n"
+"The player is invading various cities in a plane that is decreasing in height.\n"
+"The goal of the game is to destroy all the buildings and advance to the next\n"
+"level.  Each level gets a bit harder by increasing the speed of the plane and\n"
+"the height of the buildings.\n"
+"\n"
+"Bomber is a game where you fly a spaceship and attempt to bomb the buildings\n"
+"below you.  Each pass the spaceship makes, it gets lower and lower.  If you've\n"
+"not destroyed a building in your path, you will crash into it.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11000
+msgid ""
+"Granatier is a clone of the classic Bomberman game,\n"
+"inspired by the work of the Clanbomber clone.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11039
+msgid ""
+"KsirK is a multi-player network-enabled game.  The goal of\n"
+"the game is simply to conquer the world by attacking your neighbors with your\n"
+"armies.\n"
+"\n"
+"At the beginning of the game, countries are distributed to all the players.\n"
+"Each country contains one army represented by an infantryman.  Each player has\n"
+"some armies to distribute to his countries.  On each turn, each player can\n"
+"attack his neighbours, eventually conquering one or more countries.  At the\n"
+"end of each turn, some bonus armies are distributed to the players in function\n"
+"of the number of countries they own.  The winner is the player that conquered\n"
+"all the world.\n"
+"\n"
+"Features:\n"
+"@itemize\n"
+"@item Support for 1-6 human or computer players\n"
+"@item Multi-player gaming over a network\n"
+"@item You can easily create new skins with SVG graphics and the skin editor\n"
+"@item Hot New Stuff support.  You can easily download and install new skins\n"
+"@end itemize\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11100
+msgid ""
+"Palapeli is a jigsaw puzzle game.  Unlike other games in\n"
+"that genre, you are not limited to aligning pieces on imaginary grids.  The\n"
+"pieces are freely moveable.  Also, Palapeli features real persistency, i.e.\n"
+"everything you do is saved on your disk immediately.\n"
+"\n"
+"Palapeli is the Finnish word for jigsaw puzzle.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11140
+msgid ""
+"Kiriki is an addictive and fun dice game, designed to be\n"
+"played by as many as six players.\n"
+"\n"
+"Participants have to collect points by rolling five dice for up to three times\n"
+"per single turn to make combinations with the highest score.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11181
+msgid ""
+"Kigo is an open-source implementation of the popular Go\n"
+"game.\n"
+"\n"
+"Go is a strategic board game for two players.  It is also known as\n"
+"igo (Japanese), weiqi or wei ch'i (Chinese) or baduk (Korean).  Go is noted\n"
+"for being rich in strategic complexity despite its simple rules.  The game is\n"
+"played by two players who alternately place black and white stones (playing\n"
+"pieces, now usually made of glass or plastic) on the vacant intersections of a\n"
+"grid of 19x19 lines (9x9 or 13x13 for easier games).\n"
+"\n"
+"You also need to install a go engine, e.g. @code{gnugo}.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11227
+msgid ""
+"Kubrick is a game based on the Rubik's Cube puzzle.\n"
+"\n"
+"The cube sizes range from 2x2x2 up to 6x6x6, or you can play with irregular\n"
+"\"bricks\" such as 5x3x2 or \"mats\" such as 6x4x1 or 2x2x1.  The game has a\n"
+"selection of puzzles at several levels of difficulty, as well as demos of\n"
+"pretty patterns and solution moves, or you can make up your own puzzles.  The\n"
+"game has unlimited undo, redo, save and reload capabilities.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11268
+msgid ""
+"Lieutnant Skat (from German \"Offiziersskat\") is a fun and\n"
+"engaging card game for two players, where the second player is either live\n"
+"opponent, or a built in artificial intelligence.\n"
+"\n"
+"Lieutnant Skat is a simplified variant of the Skat card game for two players.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11307
+msgid ""
+"Kapman is a clone of the well known game Pac-Man.\n"
+"\n"
+"You must run through the maze to eat all pills without being captured by a\n"
+"ghost.  By eating an energizer, Kapman gets the ability to eat ghosts for a\n"
+"few seconds.  When a stage is cleared of pills and energizer the player is\n"
+"taken to the next stage with slightly increased game speed\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11347
+msgid ""
+"KSpaceduel is a space battle game for one or two players,\n"
+"where two ships fly around a star in a struggle to be the only survivor.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11381
+msgid ""
+"Bovo is a Gomoku (from Japanese 五目並べ - lit.  \"five\n"
+"points\") like game for two players, where the opponents alternate in placing\n"
+"their respective pictogram on the game board.  The winner is the first to\n"
+"complete a line of five markers.  (Also known as: Connect Five, Five in a row,\n"
+"X and O, Naughts and Crosses)\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11420
+msgid ""
+"Killbots is a simple game of evading killer robots.\n"
+"\n"
+"Who created the robots and why they have been programmed to destroy, no one\n"
+"knows.  All that is known is that the robots are numerous and their sole\n"
+"objective is to destroy you.  Fortunately for you, their creator has focused\n"
+"on quantity rather than quality and as a result the robots are severely\n"
+"lacking in intelligence.  Your superior wit and a fancy teleportation device\n"
+"are your only weapons against the never-ending stream of mindless automatons.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11463
+msgid ""
+"KSnakeDuel is a fast action game where you steer a snake\n"
+"which has to eat food.  While eating the snake grows.  But once a player\n"
+"collides with the other snake or the wall the game is lost.  This becomes of\n"
+"course more and more difficult the longer the snakes grow.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11500
+msgid ""
+"In Kollision you use mouse to control a small blue ball in a\n"
+"closed space environment filled with small red balls, which move about\n"
+"chaotically.  Your goal is to avoid touching any of those red balls with your\n"
+"blue one, because the moment you do the game will be over.  The longer you can\n"
+"stay in game the higher will your score be.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11541
+msgid ""
+"KBattleship is a Battle Ship game for KDE.\n"
+"\n"
+"Ships are placed on a board which represents the sea.  Players try to hit each\n"
+"others ships in turns without knowing where they are placed.  The first player\n"
+"to destroy all ships wins the game.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11582
+msgid ""
+"KReversi is a simple one player strategy game played\n"
+"against the computer.\n"
+"\n"
+"If a player's piece is captured by an opposing player, that piece is turned\n"
+"over to reveal the color of that player.  A winner is declared when one player\n"
+"has more pieces of his own color on the board and there are no more possible\n"
+"moves.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11623
+msgid ""
+"KSquares is an implementation of the popular paper based\n"
+"game Squares.  Two players take turns connecting dots on a grid to complete\n"
+"squares, the player with the most squares wins.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11661
+msgid ""
+"KJumpingcube is a simple tactical game for one or two\n"
+"players, played on a grid of numbered squares.  Each turn, players compete for\n"
+"control of the board by capturing or adding to one square.\n"
+"\n"
+"This package is part of the KDE games module."
+msgstr ""
+
+#: gnu/packages/games.scm:11751
+msgid ""
+"X-Moto is a challenging 2D motocross platform game, where\n"
+"physics play an all important role in the gameplay.  You need to\n"
+"control your bike to its limit, if you want to have a chance finishing\n"
+"the more difficult challenges."
+msgstr ""
+
+#: gnu/packages/games.scm:11799
+msgid ""
+"Eboard is a chess board interface for ICS (Internet Chess Servers)\n"
+"and chess engines."
+msgstr ""
+
+#: gnu/packages/games.scm:11851
+msgid ""
+"ChessX is a chess database.  With ChessX you can operate on your\n"
+"collection of chess games in many ways: browse, edit, add, organize, analyze,\n"
+"etc.  You can also play games on FICS or against an engine."
+msgstr ""
+
+#: gnu/packages/games.scm:11903
+msgid ""
+"Stockfish is a very strong chess engine.  It is much stronger than the\n"
+"best human chess grandmasters.  It can be used with UCI-compatible GUIs like\n"
+"ChessX."
+msgstr ""
+
+#: gnu/packages/games.scm:11934
+msgid ""
+"Barrage is a rather destructive action game that puts you on a shooting\n"
+"range with the objective to hit as many dummy targets as possible within\n"
+"3 minutes.  You control a gun that may either fire small or large grenades at\n"
+"soldiers, jeeps and tanks.  The gameplay is simple but it is not that easy to\n"
+"get high scores."
+msgstr ""
+
+#: gnu/packages/games.scm:11960
+msgid ""
+"This is a clone of the classic game BurgerTime.  In it, you play\n"
+"the part of a chef who must create burgers by stepping repeatedly on\n"
+"the ingredients until they fall into place.  And to make things more\n"
+"complicated, you also must avoid evil animate food items while\n"
+"performing this task, with nothing but your trusty pepper shaker to\n"
+"protect you."
+msgstr ""
+
+#: gnu/packages/games.scm:11992
+msgid ""
+"Seven Kingdoms, designed by Trevor Chan, brings a blend of Real-Time\n"
+"Strategy with the addition of trade, diplomacy, and espionage.  The game\n"
+"enables players to compete against up to six other kingdoms allowing players\n"
+"to conquer opponents by defeating them in war (with troops or machines),\n"
+"capturing their buildings with spies, or offering opponents money for their\n"
+"kingdom."
+msgstr ""
+
+#: gnu/packages/games.scm:12108
+msgid ""
+"In the grand tradition of Marble Madness and Super Monkey Ball,\n"
+"Neverball has you guide a rolling ball through dangerous territory.  Balance\n"
+"on narrow bridges, navigate mazes, ride moving platforms, and dodge pushers\n"
+"and shovers to get to the goal.  Race against the clock to collect coins to\n"
+"earn extra balls.  Also included is Neverputt, which is a 3D miniature golf\n"
+"game."
+msgstr ""
+
+#: gnu/packages/games.scm:12185
+msgid ""
+"With PokerTH you can play the Texas holdem poker game, either against\n"
+"computer opponents or against real players online."
+msgstr ""
+
+#: gnu/packages/games.scm:12222
+msgid ""
+"Pilot your ship inside a planet to find and rescue the colonists trapped\n"
+"inside the Zenith Colony."
+msgstr ""
+
+#: gnu/packages/games.scm:12244
+msgid ""
+"Provides a large set of Go-related services for X11:\n"
+"@itemize\n"
+"@item Local games with precise implementation of the Chinese and Japanese rulesets\n"
+"@item Edition and visualization of SGF files-Connection to the NNGS or IGS Go servers\n"
+"@item Bridge to Go modem protocol, allowing to play against Go modem-capable AIs\n"
+"such as GnuGo.\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/games.scm:12304
+msgid ""
+"Passage is meant to be a memento mori game.  It presents an entire life,\n"
+"from young adulthood through old age and death, in the span of five minutes.\n"
+"Of course, it's a game, not a painting or a film, so the choices that you make\n"
+"as the player are crucial.  There's no ``right'' way to play Passage, just as\n"
+"there's no right way to interpret it."
+msgstr ""
+
+#: gnu/packages/games.scm:12338
+msgid ""
+"High performance animated desktop background setter for\n"
+"X11 that won't set your CPU on fire, drain your laptop battery, or lower video\n"
+"game FPS."
+msgstr ""
+
+#: gnu/packages/games.scm:12368
+msgid ""
+"Curse of War is a fast-paced action strategy game originally\n"
+"implemented using ncurses user interface.  An SDL graphical version is also\n"
+"available."
+msgstr ""
+
+#: gnu/packages/gcc.scm:365
 msgid ""
 "GCC is the GNU Compiler Collection.  It provides compiler front-ends\n"
 "for several languages, including C, C++, Objective-C, Fortran, Java, Ada, and\n"
 "Go.  It also includes runtime support libraries for these languages."
 msgstr ""
 
-#: gnu/packages/gcc.scm:432
+#: gnu/packages/gcc.scm:550
 msgid ""
 "GCC is the GNU Compiler Collection.  It provides compiler front-ends\n"
 "for several languages, including C, C++, Objective-C, Fortran, Ada, and Go.\n"
 "It also includes runtime support libraries for these languages."
 msgstr ""
 
-#: gnu/packages/gcc.scm:462
-msgid "GNU C++ standard library"
-msgstr ""
-
-#: gnu/packages/gcc.scm:497
-msgid "Collection of subroutines used by various GNU programs"
-msgstr ""
-
-#: gnu/packages/gcc.scm:682
-msgid "GNU libstdc++ documentation"
+#: gnu/packages/gcc.scm:789
+msgid ""
+"This package is part of the GNU Compiler Collection and provides an\n"
+"embeddable library for generating machine code on-the-fly at runtime.  This\n"
+"shared library can then be dynamically-linked into bytecode interpreters and\n"
+"other such programs that want to generate machine code on-the-fly at run-time.\n"
+"It can also be used for ahead-of-time code generation for building standalone\n"
+"compilers.  The just-in-time (jit) part of the name is now something of a\n"
+"misnomer."
 msgstr ""
 
-#: gnu/packages/gcc.scm:750
-msgid "Manipulating sets and relations of integer points bounded by linear constraints"
+#: gnu/packages/gcc.scm:803
+msgid ""
+"This package is part of the GNU Compiler Collection and\n"
+"provides the GNU compiler for the Go programming language."
 msgstr ""
 
-#: gnu/packages/gcc.scm:753
+#: gnu/packages/gcc.scm:995
 msgid ""
 "isl is a library for manipulating sets and relations of integer points\n"
 "bounded by linear constraints.  Supported operations on sets include\n"
@@ -4086,11 +4992,7 @@ msgid ""
 "dependence analysis and bounds on piecewise step-polynomials."
 msgstr ""
 
-#: gnu/packages/gcc.scm:803
-msgid "Library to generate code for scanning Z-polyhedra"
-msgstr ""
-
-#: gnu/packages/gcc.scm:805
+#: gnu/packages/gcc.scm:1061
 msgid ""
 "CLooG is a free software library to generate code for scanning\n"
 "Z-polyhedra.  That is, it finds a code (e.g., in C, FORTRAN...) that\n"
@@ -4105,11 +5007,7 @@ msgid ""
 "effective code."
 msgstr ""
 
-#: gnu/packages/gcc.scm:860
-msgid "Reference manual for the C programming language"
-msgstr ""
-
-#: gnu/packages/gcc.scm:862
+#: gnu/packages/gcc.scm:1118
 msgid ""
 "This is a reference manual for the C programming language, as\n"
 "implemented by the GNU C Compiler (gcc).  As a reference, it is not intended\n"
@@ -4117,11 +5015,7 @@ msgid ""
 "of the language.  Library functions are not included."
 msgstr ""
 
-#: gnu/packages/gettext.scm:98
-msgid "Tools and documentation for translation (used to build other packages)"
-msgstr ""
-
-#: gnu/packages/gettext.scm:100
+#: gnu/packages/gettext.scm:126
 msgid ""
 "GNU Gettext is a package providing a framework for translating the\n"
 "textual output of programs into multiple languages.  It provides translators\n"
@@ -4129,52 +5023,59 @@ msgid ""
 "translated messages from the catalogs.  Nearly all GNU packages use Gettext."
 msgstr ""
 
-#: gnu/packages/gettext.scm:130
-msgid "Tools and documentation for translation"
+#: gnu/packages/gettext.scm:184
+msgid ""
+"GNU libtextstyle is a C library that provides an easy way to add styling\n"
+"to programs that produce output to a console or terminal emulator window.  It\n"
+"allows applications to emit text annotated with styling information, such as\n"
+"color, font attributes (weight, posture), or underlining."
 msgstr ""
 
-#: gnu/packages/gettext.scm:195
-msgid "Scripts to ease maintenance of translations"
+#: gnu/packages/gettext.scm:221
+msgid ""
+"The mdpo utility creates pofiles, the format stabilished by GNU Gettext,\n"
+"from Markdown files."
 msgstr ""
 
-#: gnu/packages/gettext.scm:197
+#: gnu/packages/gettext.scm:292
 msgid ""
 "The po4a (PO for anything) project goal is to ease translations (and\n"
 "more interestingly, the maintenance of translations) using gettext tools on\n"
 "areas where they were not expected like documentation."
 msgstr ""
 
-#: gnu/packages/gimp.scm:60
-msgid "Image pixel format conversion library"
+#: gnu/packages/gimp.scm:130
+msgid ""
+"Poly2Tri-C is a library for generating, refining and rendering\n"
+"2-Dimensional Constrained Delaunay Triangulations."
 msgstr ""
 
-#: gnu/packages/gimp.scm:62
+#: gnu/packages/gimp.scm:162
 msgid ""
-"Babl is a dynamic, any to any, pixel format translation library.\n"
-"It allows converting between different methods of storing pixels known as\n"
-"pixel formats that have with different bitdepths and other data\n"
-"representations, color models and component permutations.\n"
-"\n"
-"A vocabulary to formulate new pixel formats from existing primitives is\n"
-"provided as well as the framework to add new color models and data types."
+"MrG is is a C API for creating user interfaces.  It can be\n"
+"used as an application writing environment or as an interactive canvas for part\n"
+"of a larger interface."
 msgstr ""
 
-#: gnu/packages/gimp.scm:119
-msgid "Graph based image processing framework"
+#: gnu/packages/gimp.scm:199
+msgid ""
+"Babl is a dynamic, any-to-any pixel format translation library.\n"
+"It allows converting between different methods of storing pixels, known as\n"
+"@dfn{pixel formats}, that have different bit depths and other data\n"
+"representations, color models, and component permutations.\n"
+"\n"
+"A vocabulary to formulate new pixel formats from existing primitives is\n"
+"provided, as well as a framework to add new color models and data types."
 msgstr ""
 
-#: gnu/packages/gimp.scm:120
+#: gnu/packages/gimp.scm:262
 msgid ""
 "GEGL (Generic Graphics Library) provides infrastructure to\n"
 "do demand based cached non destructive image editing on larger than RAM\n"
 "buffers."
 msgstr ""
 
-#: gnu/packages/gimp.scm:180
-msgid "GNU Image Manipulation Program"
-msgstr ""
-
-#: gnu/packages/gimp.scm:182
+#: gnu/packages/gimp.scm:346
 msgid ""
 "GIMP is an application for image manipulation tasks such as photo\n"
 "retouching, composition and authoring.  It supports all common image formats\n"
@@ -4182,11 +5083,7 @@ msgid ""
 "that is extensible via a plugin system."
 msgstr ""
 
-#: gnu/packages/gimp.scm:230
-msgid "GIMP plug-in to edit image in fourier space"
-msgstr ""
-
-#: gnu/packages/gimp.scm:232
+#: gnu/packages/gimp.scm:408
 msgid ""
 "This package provides a simple plug-in to apply the fourier transform on\n"
 "an image, allowing you to work with the transformed image inside GIMP.  You\n"
@@ -4194,33 +5091,290 @@ msgid ""
 "inverse fourier transform."
 msgstr ""
 
-#: gnu/packages/gnome.scm:200
-msgid "CD/DVD burning tool for Gnome"
+#: gnu/packages/gimp.scm:437
+msgid ""
+"Libmypaint, also called \"brushlib\", is a library for making\n"
+"brushstrokes which is used by MyPaint and GIMP."
+msgstr ""
+
+#: gnu/packages/gimp.scm:460
+msgid ""
+"This package provides the default set of brushes for\n"
+"MyPaint."
 msgstr ""
 
-#: gnu/packages/gnome.scm:201
+#: gnu/packages/gimp.scm:543
+msgid ""
+"This package provides resynthesizer plugins for GIMP, which encompasses\n"
+"tools for healing selections (content-aware fill), enlarging the canvas and\n"
+"healing the border, increasing the resolution while adding detail, and\n"
+"transferring the style of an image."
+msgstr ""
+
+#: gnu/packages/gimp.scm:654
+msgid ""
+"The Glimpse Image Editor is an application for image\n"
+"manipulation tasks such as photo retouching, composition and authoring.\n"
+"It supports all common image formats as well as specialized ones.  It\n"
+"features a highly customizable interface that is extensible via a plugin\n"
+"system.  It was forked from the GNU Image Manipulation Program."
+msgstr ""
+
+#: gnu/packages/gnome.scm:272
+msgid "GUPnP-IGD is a library to handle UPnP IGD port mapping."
+msgstr ""
+
+#: gnu/packages/gnome.scm:327
 msgid ""
 "Brasero is an application to burn CD/DVD for the Gnome\n"
 "Desktop.  It is designed to be as simple as possible and has some unique\n"
 "features to enable users to create their discs easily and quickly."
 msgstr ""
 
-#: gnu/packages/gnome.scm:276
-msgid "Simple backup tool, for regular encrypted backups"
+#: gnu/packages/gnome.scm:373
+msgid ""
+"Libcloudproviders is a DBus API that allows cloud storage sync\n"
+"clients to expose their services.  Clients such as file managers and desktop\n"
+"environments can then provide integrated access to the cloud providers\n"
+"services."
+msgstr ""
+
+#: gnu/packages/gnome.scm:422
+msgid ""
+"LibGRSS is a Glib abstraction to handle feeds in RSS, Atom,\n"
+"and other formats."
+msgstr ""
+
+#: gnu/packages/gnome.scm:450
+msgid ""
+"GNOME-JS-Common provides common modules for GNOME JavaScript\n"
+"bindings."
+msgstr ""
+
+#: gnu/packages/gnome.scm:533
+msgid ""
+"Seed is a library and interpreter, dynamically bridging\n"
+"(through GObjectIntrospection) the WebKit JavaScriptCore engine, with the\n"
+"GNOME platform.  It serves as something which enables you to write standalone\n"
+"applications in JavaScript, or easily enable your application to be extensible\n"
+"in JavaScript."
+msgstr ""
+
+#: gnu/packages/gnome.scm:592
+msgid ""
+"Libdmapsharing is a library which allows programs to access,\n"
+"share and control the playback of media content using DMAP (DAAP, DPAP & DACP).\n"
+"It is written in C using GObject and libsoup."
+msgstr ""
+
+#: gnu/packages/gnome.scm:627
+msgid ""
+"GTX is a small collection of convenience functions intended to\n"
+"enhance the GLib testing framework.  With specific emphasis on easing the pain\n"
+"of writing test cases for asynchronous interactions."
+msgstr ""
+
+#: gnu/packages/gnome.scm:704
+msgid ""
+"Dee is a library that uses DBus to provide objects allowing\n"
+"you to create Model-View-Controller type programs across DBus.  It also consists\n"
+"of utility objects which extend DBus allowing for peer-to-peer discoverability\n"
+"of known objects without needing a central registrar."
+msgstr ""
+
+#: gnu/packages/gnome.scm:785
+msgid ""
+"Zeitgeist is a service which logs the users’s activities and\n"
+"events, anywhere from files opened to websites visited and conversations.  It\n"
+"makes this information readily available for other applications to use.  It is\n"
+"able to establish relationships between items based on similarity and usage\n"
+"patterns."
+msgstr ""
+
+#: gnu/packages/gnome.scm:852
+msgid ""
+"GNOME Recipes helps you discover what to cook today,\n"
+"tomorrow, the rest of the week and for special occasions."
+msgstr ""
+
+#: gnu/packages/gnome.scm:920
+msgid ""
+"GNOME Photos is a simple and elegant replacement for using a\n"
+"file manager to deal with photos.  Enhance, crop and edit in a snap.  Seamless\n"
+"cloud integration is offered through GNOME Online Accounts."
+msgstr ""
+
+#: gnu/packages/gnome.scm:982
+msgid ""
+"GNOME Music is the new GNOME music playing application that\n"
+"aims to combine an elegant and immersive browsing experience with simple\n"
+"and straightforward controls."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1003
+msgid ""
+"PortableXDR is an implementation of External Data\n"
+"Representation (XDR) Library.  It is a standard data serialization format, for\n"
+"uses such as computer network protocols.  It allows data to be transferred\n"
+"between different kinds of computer systems."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1041
+msgid ""
+"Tepl is a library that eases the development of\n"
+"GtkSourceView-based text editors and IDEs."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1074
+msgid ""
+"krb5-auth-dialog is a simple dialog that monitors Kerberos\n"
+"tickets, and pops up a dialog when they are about to expire."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1102
+msgid ""
+"Notification-Daemon is the server implementation of the\n"
+"freedesktop.org desktop notification specification."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1143
+msgid ""
+"The mm-common module provides the build infrastructure\n"
+"and utilities shared among the GNOME C++ binding libraries.  Release\n"
+"archives of mm-common include the Doxygen tag file for the GNU C++\n"
+"Library reference documentation."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1184
+msgid ""
+"PhoDav was initially developed as a file-sharing mechanism for Spice,\n"
+"but it is generic enough to be reused in other projects,\n"
+"in particular in the GNOME desktop."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1237
+msgid ""
+"GNOME Color Manager is a session framework that makes\n"
+"it easy to manage, install and generate color profiles\n"
+"in the GNOME desktop."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1272
+msgid ""
+"GNOME Online Miners provides a set of crawlers that\n"
+"go through your online content and index them locally in Tracker.\n"
+"It has miners for Facebook, Flickr, Google, ownCloud and SkyDrive."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1303
+msgid ""
+"This package provides a library to handle resource discovery\n"
+"and announcement over @acronym{SSDP, Simple Service Discovery Protocol} and\n"
+"a debugging tool, @command{gssdp-device-sniffer}."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1334
+msgid ""
+"This package provides GUPnP, an object-oriented framework\n"
+"for creating UPnP devices and control points, written in C using\n"
+"@code{GObject} and @code{libsoup}."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1368
+msgid ""
+"This package provides a small utility library to\n"
+"support DLNA-related tasks such as media profile guessing, transcoding to a\n"
+"given profile, etc.  DLNA is a subset of UPnP A/V."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1398
+msgid ""
+"This package provides a small library for handling\n"
+"and implementation of UPnP A/V profiles."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1427
+msgid ""
+"The libmediaart library is the foundation for media art caching,\n"
+"extraction, and lookup for applications on the desktop."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1491
+msgid ""
+"This package provides a set-up wizard when a\n"
+"user logs into GNOME for the first time.  It typically provides a\n"
+"tour of all gnome components and allows the user to set them up."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1531
+msgid ""
+"GNOME User Share is a small package that binds together\n"
+"various free software projects to bring easy to use user-level file\n"
+"sharing to the masses."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1586
+msgid ""
+"Sushi is a DBus-activated service that allows applications to\n"
+"preview files on the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:278
+#: gnu/packages/gnome.scm:1627
+msgid ""
+"Rygel is a home media solution (@dfn{UPnP AV MediaServer and\n"
+"MediaRenderer}) for GNOME that allows you to easily share audio, video, and\n"
+"pictures, and to control a media player on your home network.\n"
+"\n"
+"Rygel achieves interoperability with other devices by trying to conform to the\n"
+"strict requirements of DLNA and by converting media on-the-fly to formats that\n"
+"client devices can handle."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1680
+msgid ""
+"Libnma is an applet library for Network Manager.  It was\n"
+"initially part of network-manager-applet and has now become a separate\n"
+"project."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1706
+msgid ""
+"GNOME Menus contains the libgnome-menu library, the layout\n"
+"configuration files for the GNOME menu, as well as a simple menu editor."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1782
 msgid ""
 "Déjà Dup is a simple backup tool, for regular encrypted backups.  It\n"
 "uses duplicity as the backend, which supports incremental backups and storage\n"
 "either on a local, or remote machine via a number of methods."
 msgstr ""
 
-#: gnu/packages/gnome.scm:325
-msgid "Diagram creation for GNOME"
+#: gnu/packages/gnome.scm:1819
+msgid ""
+"GNOME Commander is a two-pane graphical file manager using GNOME\n"
+"libraries.  It aims to fulfill the demands of more advanced users who\n"
+"like to focus on file management, their work through special applications\n"
+"and running smart commands."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1845
+msgid ""
+"The GNOME User Documentation explains how to use the GNOME desktop and its\n"
+"components.  It covers usage and setup of the core GNOME programs by end-users\n"
+"and system administrators."
+msgstr ""
+
+#: gnu/packages/gnome.scm:1871
+msgid ""
+"The GNOME Getting Started Documentation contains GNOME's intuitive\n"
+"\"Getting Started\" tour, with video guides, that can be viewed with Yelp.\n"
+"\n"
+"It is normally used together with @command{gnome-initial-setup}, but is also\n"
+"useful as a tutorial and users' guide for new or less experienced users."
 msgstr ""
 
-#: gnu/packages/gnome.scm:326
+#: gnu/packages/gnome.scm:1916
 msgid ""
 "Dia can be used to draw different types of diagrams, and\n"
 "includes support for UML static structure diagrams (class diagrams), entity\n"
@@ -4228,33 +5382,28 @@ msgid ""
 "formats like PNG, SVG, PDF and EPS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:382
-msgid "Library for accessing online service APIs"
-msgstr ""
-
-#: gnu/packages/gnome.scm:384
+#: gnu/packages/gnome.scm:1967
 msgid ""
 "libgdata is a GLib-based library for accessing online service APIs using\n"
 "the GData protocol — most notably, Google's services.  It provides APIs to\n"
 "access the common Google services, and has full asynchronous support."
 msgstr ""
 
-#: gnu/packages/gnome.scm:414
-msgid "GObject-based library for handling and rendering XPS documents"
-msgstr ""
-
-#: gnu/packages/gnome.scm:416
+#: gnu/packages/gnome.scm:2001
 msgid ""
 "libgxps is a GObject-based library for handling and rendering XPS\n"
 "documents.  This package also contains binaries that can convert XPS documents\n"
 "to other formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:436
-msgid "Bootstrap GNOME modules built from Git"
+#: gnu/packages/gnome.scm:2045
+msgid ""
+"Characters is a simple utility application to find\n"
+"and insert unusual characters.  It allows you to quickly find the\n"
+"character you are looking for by searching for keywords."
 msgstr ""
 
-#: gnu/packages/gnome.scm:437
+#: gnu/packages/gnome.scm:2066
 msgid ""
 "gnome-common contains various files needed to bootstrap\n"
 "GNOME modules built from Git.  It contains a common \"autogen.sh\" script that\n"
@@ -4262,11 +5411,13 @@ msgid ""
 "commonly used macros."
 msgstr ""
 
-#: gnu/packages/gnome.scm:488
-msgid "Libgnome-desktop, gnome-about, and desktop-wide documents"
+#: gnu/packages/gnome.scm:2127
+msgid ""
+"GNOME Contacts organizes your contact information from online and\n"
+"offline sources, providing a centralized place for managing your contacts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:490
+#: gnu/packages/gnome.scm:2206
 msgid ""
 "The libgnome-desktop library provides API shared by several applications\n"
 "on the desktop, but that cannot live in the platform for various reasons.\n"
@@ -4276,49 +5427,40 @@ msgid ""
 "The gnome-about program helps find which version of GNOME is installed."
 msgstr ""
 
-#: gnu/packages/gnome.scm:523
-msgid "Documentation utilities for the Gnome project"
-msgstr ""
-
-#: gnu/packages/gnome.scm:525
+#: gnu/packages/gnome.scm:2241
 msgid ""
 "Gnome-doc-utils is a collection of documentation utilities for the\n"
 "Gnome project.  It includes xml2po tool which makes it easier to translate\n"
 "and keep up to date translations of documentation."
 msgstr ""
 
-#: gnu/packages/gnome.scm:564
-msgid "Disk management utility for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:565
+#: gnu/packages/gnome.scm:2291
 msgid "Disk management utility for GNOME."
 msgstr ""
 
-#: gnu/packages/gnome.scm:608
-msgid "Libraries for displaying certificates and accessing key stores"
+#: gnu/packages/gnome.scm:2335
+msgid ""
+"Application to show you the fonts installed on your computer\n"
+"for your use as thumbnails.  Selecting any thumbnails shows the full view of how\n"
+"the font would look under various sizes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:610
+#: gnu/packages/gnome.scm:2390
 msgid ""
 "The GCR package contains libraries used for displaying certificates and\n"
 "accessing key stores.  It also provides the viewer for crypto files on the\n"
 "GNOME Desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:639
-msgid "Accessing passwords from the GNOME keyring"
+#: gnu/packages/gnome.scm:2429
+msgid "This library provides docking features for gtk+."
 msgstr ""
 
-#: gnu/packages/gnome.scm:641
+#: gnu/packages/gnome.scm:2477
 msgid "Client library to access passwords from the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:703
-msgid "Daemon to store passwords and encryption keys"
-msgstr ""
-
-#: gnu/packages/gnome.scm:705
+#: gnu/packages/gnome.scm:2551
 msgid ""
 "gnome-keyring is a program that keeps passwords and other secrets for\n"
 "users.  It is run as a daemon in the session, similar to ssh-agent, and other\n"
@@ -4329,11 +5471,7 @@ msgid ""
 "forgotten when the session ends."
 msgstr ""
 
-#: gnu/packages/gnome.scm:774
-msgid "GNOME's document viewer"
-msgstr ""
-
-#: gnu/packages/gnome.scm:776
+#: gnu/packages/gnome.scm:2624
 msgid ""
 "Evince is a document viewer for multiple document formats.  It\n"
 "currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal\n"
@@ -4341,50 +5479,51 @@ msgid ""
 "on the GNOME Desktop with a single simple application."
 msgstr ""
 
-#: gnu/packages/gnome.scm:805
-msgid "GNOME settings for various desktop components"
-msgstr ""
-
-#: gnu/packages/gnome.scm:807
+#: gnu/packages/gnome.scm:2670
 msgid ""
 "Gsettings-desktop-schemas contains a collection of GSettings schemas\n"
 "for settings shared by various components of the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:841
-msgid "Utility to implement the Freedesktop Icon Naming Specification"
+#: gnu/packages/gnome.scm:2706
+msgid ""
+"Liblarch is a Python library built to easily handle data structures such\n"
+"as lists, trees and acyclic graphs.  There's also a GTK binding that will\n"
+"allow you to use your data structure in a @code{Gtk.Treeview}.\n"
+"\n"
+"Liblarch support multiple views of one data structure and complex filtering.\n"
+"That way, you have a clear separation between your data themselves (Model)\n"
+"and how they are displayed (View)."
+msgstr ""
+
+#: gnu/packages/gnome.scm:2764
+msgid ""
+"Getting Things GNOME! (GTG) is a personal tasks and TODO list items\n"
+"organizer for the GNOME desktop environment inspired by the Getting Things\n"
+"Done (GTD) methodology.  GTG is designed with flexibility, adaptability,\n"
+"and ease of use in mind so it can be used as more than just GTD software.\n"
+"GTG is intended to help you track everything you need to do and need to\n"
+"know, from small tasks to large projects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:843
+#: gnu/packages/gnome.scm:2804
 msgid ""
 "To help with the transition to the Freedesktop Icon Naming\n"
 "Specification, the icon naming utility maps the icon names used by the\n"
 "GNOME and KDE desktops to the icon names proposed in the specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:874
-msgid "GNOME icon theme"
-msgstr ""
-
-#: gnu/packages/gnome.scm:876
+#: gnu/packages/gnome.scm:2835
 msgid "Icons for the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:913
-msgid "Tango icon theme"
-msgstr ""
-
-#: gnu/packages/gnome.scm:914
+#: gnu/packages/gnome.scm:2873
 msgid ""
 "This is an icon theme that follows the Tango visual\n"
 "guidelines."
 msgstr ""
 
-#: gnu/packages/gnome.scm:940
-msgid "Database of common MIME types"
-msgstr ""
-
-#: gnu/packages/gnome.scm:942
+#: gnu/packages/gnome.scm:2904
 msgid ""
 "The shared-mime-info package contains the core database of common types\n"
 "and the update-mime-database command used to extend it.  It requires glib2 to\n"
@@ -4393,19 +5532,18 @@ msgid ""
 "database is translated at Transifex."
 msgstr ""
 
-#: gnu/packages/gnome.scm:966
-msgid "Freedesktop icon theme"
+#: gnu/packages/gnome.scm:2989
+msgid ""
+"system-config-printer is a CUPS administration tool.  It's written in\n"
+"Python using GTK+, and uses the @acronym{IPP, Internet Printing Protocol} when\n"
+"configuring CUPS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:968
+#: gnu/packages/gnome.scm:3013
 msgid "Freedesktop icon theme."
 msgstr ""
 
-#: gnu/packages/gnome.scm:996
-msgid "GNOME desktop notification library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:998
+#: gnu/packages/gnome.scm:3064
 msgid ""
 "Libnotify is a library that sends desktop notifications to a\n"
 "notification daemon, as defined in the Desktop Notifications spec.  These\n"
@@ -4413,11 +5551,7 @@ msgid ""
 "some form of information without getting in the user's way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1032
-msgid "GObject plugin system"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1034
+#: gnu/packages/gnome.scm:3112
 msgid ""
 "Libpeas is a gobject-based plugin engine, targeted at giving every\n"
 "application the chance to assume its own extensibility.  It also has a set of\n"
@@ -4426,33 +5560,21 @@ msgid ""
 "API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1063
-msgid "OpenGL extension to GTK+"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1064
+#: gnu/packages/gnome.scm:3152
 msgid ""
 "GtkGLExt is an OpenGL extension to GTK+.  It provides\n"
 "additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget\n"
 "API add-ons to make GTK+ widgets OpenGL-capable."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1107
-msgid "GTK+ rapid application development tool"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1108
+#: gnu/packages/gnome.scm:3204
 msgid ""
 "Glade is a rapid application development (RAD) tool to\n"
 "enable quick & easy development of user interfaces for the GTK+ toolkit and\n"
 "the GNOME desktop environment."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1136
-msgid "CSS2 parsing and manipulation library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1138
+#: gnu/packages/gnome.scm:3238
 msgid ""
 "Libcroco is a standalone CSS2 parsing and manipulation library.\n"
 "The parser provides a low level event driven SAC-like API and a CSS object\n"
@@ -4460,31 +5582,27 @@ msgid ""
 "XML/CSS rendering engine."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1171
-msgid "GNOME's Structured File Library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1173
+#: gnu/packages/gnome.scm:3293
 msgid ""
 "Libgsf aims to provide an efficient extensible I/O abstraction for\n"
 "dealing with different structured file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1224
-msgid "Render SVG files using Cairo"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1226
+#: gnu/packages/gnome.scm:3363
 msgid ""
 "Librsvg is a C library to render SVG files using the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1250
-msgid "Create trees of CORBA Interface Definition Language files"
+#: gnu/packages/gnome.scm:3543
+msgid ""
+"Librsvg is a library to render SVG images to Cairo surfaces.\n"
+"GNOME uses this to render SVG icons.  Outside of GNOME, other desktop\n"
+"environments use it for similar purposes.  Wikimedia uses it for Wikipedia's SVG\n"
+"diagrams."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1251
+#: gnu/packages/gnome.scm:3570
 msgid ""
 "Libidl is a library for creating trees of CORBA Interface\n"
 "Definition Language (idl) files, which is a specification for defining\n"
@@ -4493,144 +5611,88 @@ msgid ""
 "functionality was designed to be as reusable and portable as possible."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1291
-msgid "CORBA 2.4-compliant Object Request Broker"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1292
+#: gnu/packages/gnome.scm:3618
 msgid ""
 "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb)\n"
 "featuring mature C, C++ and Python bindings."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1339
-msgid "Framework for creating reusable components for use in GNOME applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1340
+#: gnu/packages/gnome.scm:3674
 msgid ""
 "Bonobo is a framework for creating reusable components for\n"
 "use in GNOME applications, built on top of CORBA."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1371
-msgid "Store application preferences"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1372
+#: gnu/packages/gnome.scm:3706
 msgid ""
 "Gconf is a system for storing application preferences.  It\n"
 "is intended for user preferences; not arbitrary data storage."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1406
-msgid "Base MIME and Application database for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1407
+#: gnu/packages/gnome.scm:3741
 msgid ""
 "GNOME Mime Data is a module which contains the base MIME\n"
 "and Application database for GNOME.  The data stored by this module is\n"
 "designed to be accessed through the MIME functions in GnomeVFS."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1450
-msgid "Access files and folders in GNOME applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1452
+#: gnu/packages/gnome.scm:3786
 msgid ""
 "GnomeVFS is the core library used to access files and folders in GNOME\n"
 "applications.  It provides a file system abstraction which allows applications\n"
 "to access local and remote files with a single consistent API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1496
-msgid "Useful routines for building applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1497
+#: gnu/packages/gnome.scm:3832
 msgid ""
 "The libgnome library provides a number of useful routines\n"
 "for building modern applications, including session management, activation of\n"
 "files and URIs, and displaying help."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1520
-msgid "2D drawing library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1521
+#: gnu/packages/gnome.scm:3856
 msgid ""
 "Libart is a 2D drawing library intended as a\n"
 "high-quality vector-based 2D library with antialiasing and alpha composition."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1548
-msgid "Flexible widget for creating interactive structured graphics"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1549
+#: gnu/packages/gnome.scm:3884
 msgid ""
 "The GnomeCanvas widget provides a flexible widget for\n"
 "creating interactive structured graphics."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1573
-msgid "C++ bindings to the GNOME Canvas library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1574
+#: gnu/packages/gnome.scm:3907
 msgid "C++ bindings to the GNOME Canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1605
-msgid "Additional widgets for applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1606
+#: gnu/packages/gnome.scm:3940
 msgid ""
 "The libgnomeui library provides additional widgets for\n"
 "applications.  Many of the widgets from libgnomeui have already been\n"
 "ported to GTK+."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1632
-msgid "Load glade interfaces and access the glade built widgets"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1633
+#: gnu/packages/gnome.scm:3967
 msgid ""
 "Libglade is a library that provides interfaces for loading\n"
 "graphical interfaces described in glade files and for accessing the\n"
 "widgets built in the loading process."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1663 gnu/packages/gnome.scm:1695
-msgid "Printing framework for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1665
+#: gnu/packages/gnome.scm:3999
 msgid ""
 "GNOME-print was a printing framework for GNOME.  It has been deprecated\n"
 "since ca. 2006, when GTK+ itself incorporated printing support."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1739
-msgid "Some user interface controls using Bonobo"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1740
+#: gnu/packages/gnome.scm:4074
 msgid ""
 "The Bonobo UI library provides a number of user interface\n"
 "controls using the Bonobo component framework."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1765
-msgid "Window Navigator Construction Kit"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1767
+#: gnu/packages/gnome.scm:4103
 msgid ""
 "Libwnck is the Window Navigator Construction Kit, a library for use in\n"
 "writing pagers, tasklists, and more generally applications that are dealing\n"
@@ -4638,19 +5700,11 @@ msgid ""
 "Hints specification (EWMH)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1820
-msgid "Document-centric objects and utilities"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1821
+#: gnu/packages/gnome.scm:4161
 msgid "A GLib/GTK+ set of document-centric objects and utilities."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1905
-msgid "Spreadsheet application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1907
+#: gnu/packages/gnome.scm:4247
 msgid ""
 "GNUmeric is a GNU spreadsheet application, running under GNOME.  It is\n"
 "interoperable with other spreadsheet applications.  It has a vast array of\n"
@@ -4659,29 +5713,21 @@ msgid ""
 "engineering."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1947
-msgid "Default GNOME 3 themes"
+#: gnu/packages/gnome.scm:4304
+msgid "Drawing is a basic image editor aiming at the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1949
+#: gnu/packages/gnome.scm:4340
 msgid "The default GNOME 3 themes (Adwaita and some accessibility themes)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:1982
-msgid "Manage encryption keys and passwords in the GNOME keyring"
-msgstr ""
-
-#: gnu/packages/gnome.scm:1984
+#: gnu/packages/gnome.scm:4388
 msgid ""
 "Seahorse is a GNOME application for managing encryption keys and\n"
 "passwords in the GNOME keyring."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2022 gnu/packages/gnome.scm:2258
-msgid "Compiler for the GObject type system"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2024
+#: gnu/packages/gnome.scm:4431
 msgid ""
 "Vala is a programming language that aims to bring modern programming\n"
 "language features to GNOME developers without imposing any additional runtime\n"
@@ -4689,11 +5735,7 @@ msgid ""
 "libraries written in C."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2056
-msgid "Virtual Terminal Emulator"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2058
+#: gnu/packages/gnome.scm:4482
 msgid ""
 "VTE is a library (libvte) implementing a terminal emulator widget for\n"
 "GTK+, and a minimal sample application (vte) using that.  Vte is mainly used in\n"
@@ -4701,39 +5743,27 @@ msgid ""
 "editors, IDEs, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2091
-msgid "Enhanced VTE terminal widget"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2093
+#: gnu/packages/gnome.scm:4509
 msgid ""
 "VTE is a library (libvte) implementing a terminal emulator widget for\n"
 "GTK+, this fork provides additional functions exposed for keyboard text\n"
 "selection and URL hints."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2179
-msgid "Remote desktop viewer for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2180
+#: gnu/packages/gnome.scm:4589
 msgid ""
 "Vinagre is a remote display client supporting the VNC, SPICE\n"
 "and RDP protocols."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2232
-msgid "Low-level GNOME configuration system"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2233
+#: gnu/packages/gnome.scm:4637
 msgid ""
 "Dconf is a low-level configuration system.  Its main purpose\n"
 "is to provide a backend to GSettings on platforms that don't already have\n"
 "configuration storage systems."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2260
+#: gnu/packages/gnome.scm:4665
 msgid ""
 "JSON-GLib is a C library based on GLib providing serialization and\n"
 "deserialization support for the JavaScript Object Notation (JSON) format\n"
@@ -4742,11 +5772,7 @@ msgid ""
 "and objects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2299
-msgid "High-level API for X Keyboard Extension"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2301
+#: gnu/packages/gnome.scm:4716
 msgid ""
 "LibXklavier is a library providing high-level API for X Keyboard\n"
 "Extension known as XKB.  This library is intended to support XFree86 and other\n"
@@ -4754,58 +5780,38 @@ msgid ""
 "indicators etc)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2329
-msgid "Python bindings to librsvg"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2331
+#: gnu/packages/gnome.scm:4746
 msgid ""
-"This packages provides Python bindings to librsvg, the SVG rendering\n"
+"This package provides Python bindings to librsvg, the SVG rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2381
-msgid "Network-related GIO modules"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2383
+#: gnu/packages/gnome.scm:4778
 msgid ""
 "This package contains various network related extensions for the GIO\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2414
-msgid "RESTful web api query library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2416
+#: gnu/packages/gnome.scm:4811
 msgid ""
 "This library was designed to make it easier to access web services that\n"
 "claim to be \"RESTful\".  It includes convenience wrappers for libsoup and\n"
 "libxml to ease remote use of the RESTful API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2539
-msgid "GLib-based HTTP Library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2541
+#: gnu/packages/gnome.scm:4943
 msgid ""
 "LibSoup is an HTTP client/server library for GNOME.  It uses GObjects\n"
 "and the GLib main loop, to integrate well with GNOME applications."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2587
-msgid "GObject bindings for \"Secret Service\" API"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2589
+#: gnu/packages/gnome.scm:5008
 msgid ""
 "Libsecret is a GObject based library for storing and retrieving passwords\n"
 "and other secrets.  It communicates with the \"Secret Service\" using DBus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2618
+#: gnu/packages/gnome.scm:5049
 msgid ""
 "Five or More is a game where you try to align\n"
 " five or more objects of the same color and shape causing them to disappear.\n"
@@ -4813,21 +5819,19 @@ msgid ""
 " Try to last as long as possible."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2656
-msgid "Minesweeper game"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2658
+#: gnu/packages/gnome.scm:5093
 msgid ""
 "Mines (previously gnomine) is a puzzle game where you locate mines\n"
 "floating in an ocean using only your brain and a little bit of luck."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2689
-msgid "Japanese logic game"
+#: gnu/packages/gnome.scm:5134
+msgid ""
+"MultiWriter can be used to write an ISO file to multiple USB devices at\n"
+"once."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2691
+#: gnu/packages/gnome.scm:5178
 msgid ""
 "Sudoku is a Japanese logic game that exploded in popularity in 2005.\n"
 "GNOME Sudoku is meant to have an interface as simple and unobstrusive as\n"
@@ -4835,11 +5839,7 @@ msgid ""
 "more fun."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2737
-msgid "Terminal emulator"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2739
+#: gnu/packages/gnome.scm:5226
 msgid ""
 "GNOME Terminal is a terminal emulator application for accessing a\n"
 "UNIX shell environment which can be used to run programs available on\n"
@@ -4849,22 +5849,14 @@ msgid ""
 "keyboard shortcuts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2805
-msgid "Color management service"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2806
+#: gnu/packages/gnome.scm:5306
 msgid ""
 "Colord is a system service that makes it easy to manage,\n"
 "install and generate color profiles to accurately color manage input and\n"
 "output devices."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2850
-msgid "Geolocation service"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2851
+#: gnu/packages/gnome.scm:5342
 msgid ""
 "Geoclue is a D-Bus service that provides location\n"
 "information.  The primary goal of the Geoclue project is to make creating\n"
@@ -4873,11 +5865,7 @@ msgid ""
 "permission from user."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2886
-msgid "Geocoding and reverse-geocoding library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2888
+#: gnu/packages/gnome.scm:5388
 msgid ""
 "geocode-glib is a convenience library for geocoding (finding longitude,\n"
 "and latitude from an address) and reverse geocoding (finding an address from\n"
@@ -4885,11 +5873,7 @@ msgid ""
 "faster results and to avoid unnecessary server load."
 msgstr ""
 
-#: gnu/packages/gnome.scm:2941
-msgid "System daemon for managing power devices"
-msgstr ""
-
-#: gnu/packages/gnome.scm:2943
+#: gnu/packages/gnome.scm:5459
 msgid ""
 "UPower is an abstraction for enumerating power devices,\n"
 "listening to device events and querying history and statistics.  Any\n"
@@ -4897,21 +5881,13 @@ msgid ""
 "service via the system message bus."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3001
-msgid "Location, time zone, and weather library for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3003
+#: gnu/packages/gnome.scm:5503
 msgid ""
 "libgweather is a library to access weather information from online\n"
 "services for numerous locations."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3054
-msgid "GNOME settings daemon"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3056
+#: gnu/packages/gnome.scm:5588
 msgid ""
 "This package contains the daemon responsible for setting the various\n"
 "parameters of a GNOME session and the applications that run under it.  It\n"
@@ -4919,42 +5895,33 @@ msgid ""
 "settings, themes, mouse settings, and startup of other daemons."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3093
-msgid "Library to parse and save media playlists for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3094
+#: gnu/packages/gnome.scm:5625
 msgid ""
 "Totem-pl-parser is a GObjects-based library to parse and save\n"
 "playlists in a variety of formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3128
-msgid "Solitaire card games"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3130
+#: gnu/packages/gnome.scm:5661
 msgid ""
 "Aisleriot (also known as Solitaire or sol) is a collection of card games\n"
 "which are easy to play with the aid of a mouse."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3154
-msgid "API documentation browser for GNOME"
+#: gnu/packages/gnome.scm:5691
+msgid ""
+"Amtk is the acronym for @acronym{Amtk, Actions Menus and Toolbars Kit}.\n"
+"It is a basic GtkUIManager replacement based on GAction.  It is suitable for\n"
+"both a traditional UI or a modern UI with a GtkHeaderBar."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3156
+#: gnu/packages/gnome.scm:5732
 msgid ""
 "Devhelp is an API documentation browser for GTK+ and GNOME.  It works\n"
 "natively with GTK-Doc (the API reference system developed for GTK+ and used\n"
 "throughout GNOME for API documentation)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3223
-msgid "Object oriented GL/GLES Abstraction/Utility Layer"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3225
+#: gnu/packages/gnome.scm:5811
 msgid ""
 "Cogl is a small library for using 3D graphics hardware to draw pretty\n"
 "pictures.  The API departs from the flat state machine style of OpenGL and is\n"
@@ -4962,38 +5929,22 @@ msgid ""
 "without stepping on each others toes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3282
-msgid "Open GL based interactive canvas library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3284 gnu/packages/gnome.scm:3313
+#: gnu/packages/gnome.scm:5870 gnu/packages/gnome.scm:5899
 msgid ""
-"Clutter is an Open GL based interactive canvas library, designed for\n"
+"Clutter is an OpenGL-based interactive canvas library, designed for\n"
 "creating fast, mainly 2D single window applications such as media box UIs,\n"
 "presentations, kiosk style applications and so on."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3311
-msgid "Open GL based interactive canvas library GTK+ widget"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3341
-msgid "Integration library for using GStreamer with Clutter"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3343
+#: gnu/packages/gnome.scm:5928
 msgid ""
 "Clutter-Gst is an integration library for using GStreamer with Clutter.\n"
 "It provides a GStreamer sink to upload frames to GL and an actor that\n"
-"implements the ClutterGstPlayer interface using playbin.  Clutter is an Open\n"
-"GL based interactive canvas library."
+"implements the ClutterGstPlayer interface using playbin.  Clutter is an\n"
+"OpenGL-based interactive canvas library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3377
-msgid "C library providing a ClutterActor to display maps"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3379
+#: gnu/packages/gnome.scm:5964
 msgid ""
 "libchamplain is a C library providing a ClutterActor to display maps.\n"
 "It also provides a Gtk+ widget to display maps in Gtk+ applications.  Python\n"
@@ -5001,32 +5952,20 @@ msgid ""
 "such as OpenStreetMap, OpenCycleMap, OpenAerialMap, and Maps for free."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3410
-msgid "Object mapper from GObjects to SQLite"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3412
+#: gnu/packages/gnome.scm:5997
 msgid ""
 "Gom provides an object mapper from GObjects to SQLite.  It helps you\n"
 "write applications that need to store structured data as well as make complex\n"
 "queries upon that data."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3447
-msgid "Useful functionality shared among GNOME games"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3449
+#: gnu/packages/gnome.scm:6034
 msgid ""
 "libgnome-games-support is a small library intended for internal use by\n"
 "GNOME Games, but it may be used by others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3477
-msgid "Sliding block puzzles"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3479
+#: gnu/packages/gnome.scm:6076
 msgid ""
 "GNOME Klotski is a set of block sliding puzzles.  The objective is to move\n"
 "the patterned block to the area bordered by green markers.  To do so, you will\n"
@@ -5034,55 +5973,38 @@ msgid ""
 "as possible!"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3532
-msgid "Framework for discovering and browsing media"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3534 gnu/packages/gnome.scm:3587
+#: gnu/packages/gnome.scm:6118
 msgid ""
 "Grilo is a framework focused on making media discovery and browsing easy\n"
 "for application developers."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3585
-msgid "Plugins for the Grilo media discovery library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3683
-msgid "Simple media player for GNOME based on GStreamer"
+#: gnu/packages/gnome.scm:6165
+msgid ""
+"Grilo is a framework focused on making media discovery and browsing easy\n"
+"for application developers.  This package provides plugins for common media\n"
+"discovery protocols."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3684
+#: gnu/packages/gnome.scm:6277
 msgid ""
 "Totem is a simple yet featureful media player for GNOME\n"
 "which can read a large number of file formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3774
-msgid "Music player for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3775
+#: gnu/packages/gnome.scm:6367
 msgid ""
 "Rhythmbox is a music playing application for GNOME.  It\n"
 "supports playlists, song ratings, and any codecs installed through gstreamer."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3825
-msgid "GNOME image viewer"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3826
+#: gnu/packages/gnome.scm:6427
 msgid ""
 "Eye of GNOME is the GNOME image viewer.  It\n"
 "supports image conversion, rotation, and slideshows."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3848
-msgid "Extensions for the Eye of GNOME image viewer"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3860
+#: gnu/packages/gnome.scm:6461
 msgid ""
 "This package provides plugins for the Eye of GNOME (EOG) image viewer,\n"
 "notably:\n"
@@ -5095,21 +6017,13 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/gnome.scm:3896
-msgid "GObject bindings for libudev"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3898
+#: gnu/packages/gnome.scm:6503
 msgid ""
 "This library provides GObject bindings for libudev.  It was originally\n"
 "part of udev-extras, then udev, then systemd.  It's now a project on its own."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3946
-msgid "Userspace virtual file system for GIO"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3948
+#: gnu/packages/gnome.scm:6572
 msgid ""
 "GVFS is a userspace virtual file system designed to work with the I/O\n"
 "abstraction of GIO.  It contains a GIO module that seamlessly adds GVFS support\n"
@@ -5120,11 +6034,7 @@ msgid ""
 "DAV, and others."
 msgstr ""
 
-#: gnu/packages/gnome.scm:3994
-msgid "GLib binding for libusb1"
-msgstr ""
-
-#: gnu/packages/gnome.scm:3996
+#: gnu/packages/gnome.scm:6609
 msgid ""
 "GUsb is a GObject wrapper for libusb1 that makes it easy to do\n"
 "asynchronous control, bulk and interrupt transfers with proper cancellation\n"
@@ -5132,75 +6042,50 @@ msgid ""
 "USB transfers with your high-level application or system daemon."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4047
-msgid "Document and image scanner"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4048
+#: gnu/packages/gnome.scm:6649
 msgid ""
-"Simple Scan is an easy-to-use application, designed to let\n"
-"users connect their scanner and quickly have the image/document in an\n"
-"appropriate format.  Simple Scan is basically a frontend for SANE - which is\n"
-"the same backend as XSANE uses. This means that all existing scanners will\n"
-"work and the interface is well tested."
+"Document Scanner is an easy-to-use application that lets you connect your\n"
+"scanner and quickly capture images and documents in an appropriate format.  It\n"
+"supports any scanner for which a suitable SANE driver is available, which is\n"
+"almost all of them."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4121
-msgid "Web browser for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4123
+#: gnu/packages/gnome.scm:6721
 msgid ""
 "Eolie is a new web browser for GNOME.  It features Firefox sync support,\n"
 "a secret password store, an adblocker, and a modern UI."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4170
-msgid "GNOME web browser"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4172
+#: gnu/packages/gnome.scm:6797
 msgid ""
 "Epiphany is a GNOME web browser targeted at non-technical users.  Its\n"
 "principles are simplicity and standards compliance."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4228
-msgid "D-Bus debugger"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4230
+#: gnu/packages/gnome.scm:6856
 msgid ""
 "D-Feet is a D-Bus debugger, which can be used to inspect D-Bus interfaces\n"
 "of running programs and invoke methods on those interfaces."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4252
-msgid "XSL stylesheets for Yelp"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4254
+#: gnu/packages/gnome.scm:6879
 msgid ""
-"Yelp-xsl contains XSL stylesheets that are used by the yelp help browser\n"
-"to format Docbook and Mallard documents."
+"Yelp-XSL is a collection of programs and data files to help\n"
+"you build, maintain, and distribute documentation.  It provides XSLT stylesheets\n"
+"that can be built upon for help viewers and publishing systems.  These\n"
+"stylesheets output JavaScript and CSS content, and reference images\n"
+"provided by yelp-xsl. It also redistributes copies of the jQuery and\n"
+"jQuery.Syntax JavaScript libraries."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4285
-msgid "GNOME help browser"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4287
+#: gnu/packages/gnome.scm:6924
 msgid ""
 "Yelp is the help viewer in Gnome.  It natively views Mallard, DocBook,\n"
 "man, info, and HTML documents.  It can locate documents according to the\n"
 "freedesktop.org help system specification."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4315
-msgid "Yelp documentation tools"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4317
+#: gnu/packages/gnome.scm:6954
 msgid ""
 "Yelp-tools is a collection of scripts and build utilities to help create,\n"
 "manage, and publish documentation for Yelp and the web.  Most of the heavy\n"
@@ -5208,32 +6093,20 @@ msgid ""
 "wraps things up in a developer-friendly way."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4354
-msgid "GObject collection library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4356
+#: gnu/packages/gnome.scm:6994
 msgid ""
 "Libgee is a utility library providing GObject-based interfaces and\n"
 "classes for commonly used data structures."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4383
-msgid "GObject wrapper around the Exiv2 photo metadata library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4385
+#: gnu/packages/gnome.scm:7025
 msgid ""
 "Gexiv2 is a GObject wrapper around the Exiv2 photo metadata library.  It\n"
 "allows for GNOME applications to easily inspect and update EXIF, IPTC, and XMP\n"
 "metadata in photo and video files of various formats."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4429
-msgid "Photo manager for GNOME 3"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4431
+#: gnu/packages/gnome.scm:7079
 msgid ""
 "Shotwell is a digital photo manager designed for the GNOME desktop\n"
 "environment.  It allows you to import photos from disk or camera, organize\n"
@@ -5241,62 +6114,38 @@ msgid ""
 "share them with others via social networking and more."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4472
-msgid "Graphical archive manager for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4473
+#: gnu/packages/gnome.scm:7115
 msgid ""
 "File Roller is an archive manager for the GNOME desktop\n"
 "environment that allows users to view, unpack, and create compressed archives\n"
 "such as gzip tarballs."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4551
-msgid "Session manager for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4553
+#: gnu/packages/gnome.scm:7187
 msgid ""
 "This package contains the GNOME session manager, as well as a\n"
 "configuration program to choose applications starting on login."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4606
-msgid "Javascript bindings for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4609
+#: gnu/packages/gnome.scm:7247
 msgid ""
 "Gjs is a javascript binding for GNOME.  It's mainly based on spidermonkey\n"
 "javascript engine and the GObject introspection framework."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4668
-msgid "GNOME text editor"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4669
+#: gnu/packages/gnome.scm:7341
 msgid ""
 "While aiming at simplicity and ease of use, gedit is a\n"
 "powerful general purpose text editor."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4693
-msgid "Display graphical dialog boxes from shell scripts"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4696
+#: gnu/packages/gnome.scm:7368
 msgid ""
 "Zenity is a rewrite of gdialog, the GNOME port of dialog which allows you\n"
 "to display dialog boxes from the commandline and shell scripts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4790
-msgid "Window and compositing manager"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4793
+#: gnu/packages/gnome.scm:7479
 msgid ""
 "Mutter is a window and compositing manager that displays and manages your\n"
 "desktop via OpenGL.  Mutter combines a sophisticated display engine using the\n"
@@ -5304,11 +6153,7 @@ msgid ""
 "window manager."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4828
-msgid "Single sign-on framework for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4831
+#: gnu/packages/gnome.scm:7536
 msgid ""
 "GNOME Online Accounts provides interfaces so that applications and\n"
 "libraries in GNOME can access the user's online accounts.  It has providers for\n"
@@ -5316,32 +6161,20 @@ msgid ""
 "Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4889
-msgid "Store address books and calendars"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4892
+#: gnu/packages/gnome.scm:7629
 msgid ""
 "This package provides a unified backend for programs that work with\n"
 "contacts, tasks, and calendar information.  It was originally developed for\n"
 "Evolution (hence the name), but is now used by other packages as well."
 msgstr ""
 
-#: gnu/packages/gnome.scm:4955
-msgid "Text entry and UI navigation application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:4958
+#: gnu/packages/gnome.scm:7695
 msgid ""
 "Caribou is an input assistive technology intended for switch and pointer\n"
 "users."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5075
-msgid "Network connection manager"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5078
+#: gnu/packages/gnome.scm:7846
 msgid ""
 "NetworkManager is a system network service that manages your network\n"
 "devices and connections, attempting to keep active network connectivity when\n"
@@ -5350,79 +6183,60 @@ msgid ""
 "services."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5112
-msgid "OpenVPN plug-in for NetworkManager"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5114
+#: gnu/packages/gnome.scm:7905
 msgid ""
 "This extension of NetworkManager allows it to take care of connections\n"
 "to virtual private networks (VPNs) via OpenVPN."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5136
-msgid "Database of broadband connection configuration"
+#: gnu/packages/gnome.scm:7958
+msgid ""
+"Support for configuring virtual private networks based on VPNC.\n"
+"Compatible with Cisco VPN concentrators configured to use IPsec."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5137
-msgid "Database of broadband connection configuration."
+#: gnu/packages/gnome.scm:8008
+msgid ""
+"This extension of NetworkManager allows it to take care of connections\n"
+"to @acronym{VPNs, virtual private networks} via OpenConnect, an open client for\n"
+"Cisco's AnyConnect SSL VPN."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5171
-msgid "Applet for managing network connections"
+#: gnu/packages/gnome.scm:8037
+msgid "Database of broadband connection configuration."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5174
+#: gnu/packages/gnome.scm:8082
 msgid ""
 "This package contains a systray applet for NetworkManager.  It displays\n"
 "the available networks and allows users to easily switch between them."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5199
-msgid "C++ wrapper for XML parser library libxml2"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5201
+#: gnu/packages/gnome.scm:8109
 msgid ""
 "This package provides a C++ wrapper for the XML parser library\n"
 "libxml2."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5337
-msgid "Display manager for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5340
+#: gnu/packages/gnome.scm:8314
 msgid ""
 "GNOME Display Manager is a system service that is responsible for\n"
 "providing graphical log-ins and managing local and remote displays."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5364
-msgid "Portable system access library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5367
+#: gnu/packages/gnome.scm:8341
 msgid ""
 "LibGTop is a library to get system specific data such as CPU and memory\n"
 "usage and information about running processes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5397
-msgid "GNOME Bluetooth subsystem"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5400
+#: gnu/packages/gnome.scm:8376
 msgid ""
 "This package contains tools for managing and manipulating Bluetooth\n"
 "devices using the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5466
-msgid "Utilities to configure the GNOME desktop"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5469
+#: gnu/packages/gnome.scm:8488
 msgid ""
 "This package contains configuration applets for the GNOME desktop,\n"
 "allowing to set accessibility configuration, desktop fonts, keyboard and mouse\n"
@@ -5430,65 +6244,64 @@ msgid ""
 "properties, screen resolution, and other GNOME parameters."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5554
-msgid "Desktop shell for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5557
+#: gnu/packages/gnome.scm:8655
 msgid ""
 "GNOME Shell provides core user interface functions for the GNOME desktop,\n"
 "like switching to windows and launching applications."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5591
-msgid "VNC viewer widget for GTK+"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5593
+#: gnu/packages/gnome.scm:8698
 msgid ""
-"GTK-VNC is a VNC viewer widget for GTK+, used by remote desktop viewing\n"
-"applications, for instance the Vinagre client, GNOME Boxes and virt-viewer.\n"
-"GTK-VNC implements client side RFB protocol and authentication extensions such\n"
-"as SASL, TLS and VeNCrypt.  Additionally it supports encoding extensions."
+"GTK-VNC is a project providing client side APIs for the RFB\n"
+"protocol / VNC remote desktop technology.  It is built using coroutines allowing\n"
+"it to be completely asynchronous while remaining single threaded.  It provides a\n"
+"core C library, and bindings for Python (PyGTK)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5621
-msgid "Archives integration support for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5624
+#: gnu/packages/gnome.scm:8728
 msgid ""
 "GNOME Autoar is a library which makes creating and extracting archives\n"
 "easy, safe, and automatic."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5676
-msgid "Metadata database, indexer and search tool"
+#: gnu/packages/gnome.scm:8776
+msgid ""
+"Tracker is a search engine and triplestore for desktop, embedded and mobile.\n"
+"\n"
+"It is a middleware component aimed at desktop application developers who want\n"
+"their apps to browse and search user content.  It's not designed to be used\n"
+"directly by desktop users, but it provides a commandline tool named\n"
+"@command{tracker} for the adventurous.\n"
+"\n"
+"Tracker allows your application to instantly perform full-text searches across\n"
+"all documents.  This feature is used by the @{emph{search} bar in GNOME Files, for\n"
+"example.  This is achieved by indexing the user's home directory in the\n"
+"background.\n"
+"\n"
+"Tracker also allows your application to query and list content that the user\n"
+"has stored.  For example, GNOME Music displays all the music files that are\n"
+"found by Tracker.  This means that GNOME Music doesn't need to maintain a\n"
+"database of its own.\n"
+"\n"
+"If you need to go beyond simple searches, Tracker is also a linked data\n"
+"endpoint and it understands SPARQL. "
 msgstr ""
 
-#: gnu/packages/gnome.scm:5679
+#: gnu/packages/gnome.scm:8864
 msgid ""
 "Tracker is an advanced framework for first class objects with associated\n"
 "metadata and tags.  It provides a one stop solution for all metadata, tags,\n"
 "shared object databases, search tools and indexing."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5728
-msgid "File manager for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5731
+#: gnu/packages/gnome.scm:8928
 msgid ""
 "Nautilus (Files) is a file manager designed to fit the GNOME desktop\n"
 "design and behaviour, giving the user a simple way to navigate and manage its\n"
 "files."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5759
-msgid "Disk usage analyzer for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5761
+#: gnu/packages/gnome.scm:8962
 msgid ""
 "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk\n"
 "usage in the GNOME desktop environment.  It can easily scan device volumes or\n"
@@ -5496,11 +6309,7 @@ msgid ""
 "is complete it provides a graphical representation of each selected folder."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5785
-msgid "Background images for the GNOME desktop"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5787
+#: gnu/packages/gnome.scm:8988
 msgid ""
 "GNOME backgrounds package contains a collection of graphics files which\n"
 "can be used as backgrounds in the GNOME Desktop environment.  Additionally,\n"
@@ -5508,33 +6317,21 @@ msgid ""
 "can add your own files to the collection."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5820
-msgid "Take pictures of your screen"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5822
+#: gnu/packages/gnome.scm:9034
 msgid ""
 "GNOME Screenshot is a utility used for taking screenshots of the entire\n"
 "screen, a window or a user defined area of the screen, with optional\n"
 "beautifying border effects."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5859
-msgid "Graphical editor for GNOME's dconf configuration system"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5861
+#: gnu/packages/gnome.scm:9066
 msgid ""
 "Dconf-editor is a graphical tool for browsing and editing the dconf\n"
 "configuration system for GNOME.  It allows users to configure desktop\n"
 "software that do not provide their own configuration interface."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5887
-msgid "Default MIME type associations for the GNOME desktop"
-msgstr ""
-
-#: gnu/packages/gnome.scm:5889
+#: gnu/packages/gnome.scm:9097
 msgid ""
 "Given many installed packages which might handle a given MIME type, a\n"
 "user running the GNOME desktop probably has some preferences: for example,\n"
@@ -5543,158 +6340,100 @@ msgid ""
 "associations for GNOME."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5948
-msgid "The GNU desktop environment"
+#: gnu/packages/gnome.scm:9129
+msgid "GoVirt is a GObject wrapper for the oVirt REST API."
 msgstr ""
 
-#: gnu/packages/gnome.scm:5951
+#: gnu/packages/gnome.scm:9182
+msgid ""
+"GNOME Weather is a small application that allows you to\n"
+"monitor the current weather conditions for your city, or anywhere in the\n"
+"world."
+msgstr ""
+
+#: gnu/packages/gnome.scm:9289
 msgid ""
 "GNOME is the graphical desktop for GNU.  It includes a wide variety of\n"
 "applications for browsing the web, editing text and images, creating\n"
 "documents and diagrams, playing media, scanning, and much more."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6003
-msgid "Desktop recording program"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6004
+#: gnu/packages/gnome.scm:9338
 msgid ""
 "Byzanz is a simple desktop recording program with a\n"
 "command-line interface.  It can record part or all of an X display for a\n"
 "specified duration and save it as a GIF encoded animated image file."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6031
-msgid "GObject wrapper for libcanberra"
+#: gnu/packages/gnome.scm:9398
+msgid ""
+"Authenticator is a two-factor authentication (2FA) application built for\n"
+"the GNOME desktop environment.\n"
+"\n"
+"Features:\n"
+"\n"
+"@itemize\n"
+"@item QR code scanner\n"
+"@item Beautiful UI\n"
+"@item Huge database of more than 560 supported services\n"
+"@item Keep your PIN tokens secure by locking the application with a password\n"
+"@item Automatically fetch an image for services using their favicon\n"
+"@item The possibility to add new services\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/gnome.scm:6033
+#: gnu/packages/gnome.scm:9436
 msgid ""
 "GSound is a small library for playing system sounds.  It's designed to be\n"
 "used via GObject Introspection, and is a thin wrapper around the libcanberra C\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6060
-msgid "Library for accessing SkyDrive and Hotmail"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6062
+#: gnu/packages/gnome.scm:9465
 msgid ""
 "Libzapojit is a GLib-based library for accessing online service APIs of\n"
 "Microsoft SkyDrive and Hotmail, using their REST protocols."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6098
-msgid "GNOME's clock application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6100
+#: gnu/packages/gnome.scm:9510
 msgid ""
 "GNOME Clocks is a simple clocks application designed to fit the GNOME\n"
 "desktop.  It supports world clock, stop watch, alarms, and count down timer."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6132
-msgid "GNOME's calendar application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6134
+#: gnu/packages/gnome.scm:9556
 msgid ""
 "GNOME Calendar is a simple calendar application designed to fit the GNOME\n"
 "desktop.  It supports multiple calendars, month, week and year view."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6183
-msgid "GNOME's ToDo Application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6185
+#: gnu/packages/gnome.scm:9610
 msgid ""
 "GNOME To Do is a simplistic personal task manager designed to perfectly\n"
 "fit the GNOME desktop."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6213
-msgid "Look up words in dictionary sources"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6215
+#: gnu/packages/gnome.scm:9650
 msgid ""
 "GNOME Dictionary can look for the definition or translation of a word in\n"
 "existing databases over the internet."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6261
-msgid "Customize advanced GNOME 3 options"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6264
+#: gnu/packages/gnome.scm:9709
 msgid ""
-"GNOME Tweak Tool allows adjusting advanced configuration settings in\n"
+"GNOME Tweaks allows adjusting advanced configuration settings in\n"
 "GNOME 3.  This includes things like the fonts used in user interface elements,\n"
 "alternative user interface themes, changes in window management behavior,\n"
 "GNOME Shell appearance and extension, etc."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6291
-msgid "Extensions for GNOME Shell"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6292
+#: gnu/packages/gnome.scm:9737
 msgid ""
 "GNOME Shell extensions modify and extend GNOME Shell\n"
 "functionality and behavior."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6322
-msgid "A flat GTK+ theme with transparent elements"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6323
-msgid ""
-"Arc is a flat theme with transparent elements for GTK 3, GTK\n"
-"2, and GNOME Shell which supports GTK 3 and GTK 2 based desktop environments\n"
-"like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc."
-msgstr ""
-
-#: gnu/packages/gnome.scm:6359
-msgid "Faba icon theme"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6361
-msgid ""
-"Faba is a minimal icon set used as a basis for other themes such as\n"
-"Moka"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6385
-msgid "Moka icon theme"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6386
-msgid ""
-"Moka is a stylized desktop icon set, designed to be clear,\n"
-"simple and consistent."
-msgstr ""
-
-#: gnu/packages/gnome.scm:6416
-msgid "Arc icon theme"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6417
-msgid ""
-"The Arc icon theme provides a set of icons matching the\n"
-"style of the Arc GTK theme.  Icons missing from the Arc theme are provided by\n"
-"the Moka icon theme."
-msgstr ""
-
-#: gnu/packages/gnome.scm:6449
-msgid "Library to aggregate data about people"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6450
+#: gnu/packages/gnome.scm:9780
 msgid ""
 "Libfolks is a library that aggregates information about people\n"
 "from multiple sources (e.g., Telepathy connection managers for IM contacts,\n"
@@ -5703,31 +6442,19 @@ msgid ""
 "compiled."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6485
-msgid "GLib/GObject wrapper for the Facebook API"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6486
+#: gnu/packages/gnome.scm:9822
 msgid ""
 "This library allows you to use the Facebook API from\n"
 "GLib/GObject code."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6514
-msgid "GNOME keyboard configuration library"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6516
+#: gnu/packages/gnome.scm:9852
 msgid ""
 "Libgnomekbd is a keyboard configuration library for the GNOME desktop\n"
 "environment, which can notably display keyboard layouts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6550
-msgid "Library for writing single instance applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6552
+#: gnu/packages/gnome.scm:9888
 msgid ""
 "Libunique is a library for writing single instance applications.  If you\n"
 "launch a single instance application twice, the second instance will either just\n"
@@ -5737,32 +6464,20 @@ msgid ""
 "handling the startup notification side."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6585
-msgid "Desktop calculator"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6587
+#: gnu/packages/gnome.scm:9929
 msgid ""
 "Calculator is an application that solves mathematical equations and\n"
 "is suitable as a default application in a Desktop environment."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6612
-msgid "Virtual sticky note"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6614
+#: gnu/packages/gnome.scm:9959
 msgid ""
 "Xpad is a sticky note that strives to be simple, fault tolerant,\n"
 "and customizable.  Xpad consists of independent pad windows, each is\n"
 "basically a text box in which notes can be written."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6644
-msgid "Unicode character picker and font browser"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6646
+#: gnu/packages/gnome.scm:10032
 msgid ""
 "This program allows you to browse through all the available Unicode\n"
 "characters and categories for the installed fonts, and to examine their\n"
@@ -5770,22 +6485,14 @@ msgid ""
 "only know by its Unicode name or code point."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6676
-msgid "Web development studio"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6678
+#: gnu/packages/gnome.scm:10063
 msgid ""
-"Bluefish is an editor targeted towards programmers and web developers,\n"
+"Bluefish is an editor aimed at programmers and web developers,\n"
 "with many options to write web sites, scripts and other code.\n"
 "Bluefish supports many programming and markup languages."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6710
-msgid "Process viewer and system resource monitor for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6712
+#: gnu/packages/gnome.scm:10103
 msgid ""
 "GNOME System Monitor is a GNOME process viewer and system monitor with\n"
 "an attractive, easy-to-use interface.  It has features, such as a tree view\n"
@@ -5794,43 +6501,27 @@ msgid ""
 "kill/reinice processes."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6738
-msgid "Python client bindings for D-Bus AT-SPI"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6742
+#: gnu/packages/gnome.scm:10145
 msgid ""
 "This package includes a python client library for the AT-SPI D-Bus\n"
 "accessibility infrastructure."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6801
-msgid "Screen reader for individuals who are blind or visually impaired"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6804
+#: gnu/packages/gnome.scm:10215
 msgid ""
 "Orca is a screen reader that provides access to the graphical desktop\n"
 "via speech and refreshable braille.  Orca works with applications and toolkits\n"
 "that support the Assistive Technology Service Provider Interface (AT-SPI)."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6856
-msgid "GNOME's alternative spell checker"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6858
+#: gnu/packages/gnome.scm:10272
 msgid ""
 "gspell provides a flexible API to add spell-checking to a GTK+\n"
 "application.  It provides a GObject API, spell-checking to text entries and\n"
 "text views, and buttons to choose the language."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6900
-msgid "Project management software for the GNOME desktop"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6902
+#: gnu/packages/gnome.scm:10316
 msgid ""
 "GNOME Planner is a project management tool based on the Work Breakdown\n"
 "Structure (WBS).  Its goal is to enable you to easily plan projects.  Based on\n"
@@ -5842,11 +6533,7 @@ msgid ""
 "views can be printed as PDF or PostScript files, or exported to HTML."
 msgstr ""
 
-#: gnu/packages/gnome.scm:6980
-msgid "GNOME music playing application"
-msgstr ""
-
-#: gnu/packages/gnome.scm:6982
+#: gnu/packages/gnome.scm:10391
 msgid ""
 "Lollypop is a music player designed to play well with GNOME desktop.\n"
 "Lollypop plays audio formats such as mp3, mp4, ogg and flac and gets information\n"
@@ -5854,87 +6541,314 @@ msgid ""
 "automatically and it can stream songs from online music services and charts."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7009
-msgid "Video effects for Cheese and other GNOME applications"
-msgstr ""
-
-#: gnu/packages/gnome.scm:7011
+#: gnu/packages/gnome.scm:10416
 msgid ""
 "A collection of GStreamer video filters and effects to be used in\n"
 "photo-booth-like software, such as Cheese."
 msgstr ""
 
-#: gnu/packages/gnome.scm:7071
-msgid "Webcam photo booth software for GNOME"
-msgstr ""
-
-#: gnu/packages/gnome.scm:7073
+#: gnu/packages/gnome.scm:10493
 msgid ""
 "Cheese uses your webcam to take photos and videos.  Cheese can also\n"
 "apply fancy special effects and lets you share the fun with others."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:118
-msgid "Mozilla javascript engine"
+#: gnu/packages/gnome.scm:10546
+msgid ""
+"Password Safe is a password manager which makes use of the KeePass v4\n"
+"format.  It integrates perfectly with the GNOME desktop and provides an easy\n"
+"and uncluttered interface for the management of password databases."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:119
+#: gnu/packages/gnome.scm:10585
 msgid ""
-"SpiderMonkey is Mozilla's JavaScript engine written\n"
-"in C/C++."
+"Sound Juicer extracts audio from compact discs and convert it\n"
+"into audio files that a personal computer or digital audio player can play.\n"
+"It supports ripping to any audio codec supported by a GStreamer plugin, such as\n"
+"mp3, Ogg Vorbis and FLAC"
+msgstr ""
+
+#: gnu/packages/gnome.scm:10641
+msgid ""
+"SoundConverter supports converting between many audio formats including\n"
+"Opus, Ogg Vorbis, FLAC and more.  It supports parallel conversion, and\n"
+"configurable file renaming. "
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:276
-msgid "Netscape API for system level and libc-like functions"
+#: gnu/packages/gnome.scm:10689
+msgid ""
+"Workrave is a program that assists in the recovery and prevention of\n"
+"repetitive strain injury (@dfn{RSI}).  The program frequently alerts you to take\n"
+"micro-pauses and rest breaks, and restricts you to your daily limit."
+msgstr ""
+
+#: gnu/packages/gnome.scm:10730
+msgid ""
+"The GHex program can view and edit files in two ways:\n"
+"hexadecimal or ASCII.  It is useful for editing binary files in general."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:277
+#: gnu/packages/gnome.scm:10769
 msgid ""
-"Netscape Portable Runtime (NSPR) provides a\n"
-"platform-neutral API for system level and libc-like functions.  It is used\n"
-"in the Mozilla clients."
+"The libdazzle library is a companion library to GObject and\n"
+"Gtk+.  It provides various features that the authors wish were in the\n"
+"underlying library but cannot for various reasons.  In most cases, they are\n"
+"wildly out of scope for those libraries.  In other cases, they are not quite\n"
+"generic enough to work for everyone."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:383
-msgid "Network Security Services"
+#: gnu/packages/gnome.scm:10840
+msgid ""
+"Evolution is a personal information management application\n"
+"that provides integrated mail, calendaring and address book\n"
+"functionality."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:385
+#: gnu/packages/gnome.scm:10891
 msgid ""
-"Network Security Services (@dfn{NSS}) is a set of libraries designed to\n"
-"support cross-platform development of security-enabled client and server\n"
-"applications.  Applications built with NSS can support SSL v2 and v3, TLS,\n"
-"PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other\n"
-"security standards."
+"GThumb is an image viewer, browser, organizer, editor and\n"
+"advanced image management tool"
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:767
-msgid "Entirely free browser derived from Mozilla Firefox"
+#: gnu/packages/gnome.scm:10966
+msgid ""
+"Terminator allows you to run multiple GNOME terminals in a grid and\n"
+"tabs, and it supports drag and drop re-ordering of terminals."
 msgstr ""
 
-#: gnu/packages/gnuzilla.scm:769
+#: gnu/packages/gnome.scm:11013
+msgid ""
+"The aim of the handy library is to help with developing user\n"
+"interfaces for mobile devices using GTK+.  It provides responsive GTK+ widgets\n"
+"for usage on small and big screens."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11063
+msgid ""
+"libgit2-glib is a GLib wrapper library around the libgit2 Git\n"
+"access library.  It only implements the core plumbing functions, not really the\n"
+"higher level porcelain stuff."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11128
+msgid ""
+"gitg is a graphical user interface for git.  It aims at being a small,\n"
+"fast and convenient tool to visualize the history of git repositories.\n"
+"Besides visualization, gitg also provides several utilities to manage your\n"
+"repository and commit your work."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11167
+msgid ""
+"Gamin is a file and directory monitoring system defined to be a subset\n"
+"of the FAM (File Alteration Monitor) system.  This is a service provided by a\n"
+"library which detects when a file or a directory has been modified."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11203
+msgid ""
+"GNOME Mahjongg is a game based on the classic Chinese\n"
+"tile-matching game Mahjong.  It features multiple board layouts, tile themes,\n"
+"and a high score table."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11241
+msgid ""
+"This package provides themes and related elements that don't\n"
+"really fit in other upstream packages.  It offers legacy support for GTK+ 2\n"
+"versions of Adwaita, Adwaita-dark and HighContrast themes.  It also provides\n"
+"index files needed for Adwaita to be used outside of GNOME."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11280
+msgid ""
+"Gnote is a note-taking application written for the GNOME desktop\n"
+"environment."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11335
+msgid ""
+"Polari is a simple Internet Relay Chat (IRC) client that is designed to\n"
+"integrate seamlessly with the GNOME desktop."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11388
+msgid ""
+"GNOME Boxes is a simple application to view, access, and\n"
+"manage remote and virtual systems.  Note that this application requires the\n"
+"@code{libvirt} and @code{virtlog} daemons to run.  Use the command\n"
+"@command{info '(guix) Virtualization Services'} to learn how to configure\n"
+"these services on the Guix System."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11471
+msgid ""
+"Geary collects related messages together into conversations,\n"
+"making it easy to find and follow your discussions.  Full-text and keyword\n"
+"search makes it easy to find the email you are looking for.  Geary's\n"
+"full-featured composer lets you send rich, styled text with images, links, and\n"
+"lists, but also send lightweight, easy to read text messages.  Geary\n"
+"automatically picks up your existing GNOME Online Accounts, and adding more is\n"
+"easy.  Geary has a clean, fast, modern interface that works like you want it\n"
+"to."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11516
+msgid ""
+"gLabels is a program for creating labels and business cards.  It is\n"
+"designed to work with various laser/ink-jet peel-off label and business\n"
+"card sheets that you’ll find at most office supply stores."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11558
+msgid ""
+"GNOME LaTeX is a LaTeX editor for the GNOME desktop.  It has features\n"
+"such as build tools, completion of LaTeX commands, structure navigation,\n"
+"symbol tables, document templates, project management, spell-checking, menus\n"
+"and toolbars."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11617
+msgid ""
+"Setzer is a simple yet full-featured LaTeX editor written in Python with\n"
+"GTK+.  It integrates well with the GNOME desktop environment."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11673
+msgid ""
+"libratbag provides @command{ratbagd}, a DBus daemon to\n"
+"configure input devices, mainly gaming mice.  The daemon provides a generic\n"
+"way to access the various features exposed by these mice and abstracts away\n"
+"hardware-specific and kernel-specific quirks.  There is also the\n"
+"@command{ratbagctl} command line interface for configuring devices.\n"
+"\n"
+"libratbag currently supports devices from Logitech, Etekcity, GSkill, Roccat,\n"
+"Steelseries.\n"
+"\n"
+"The ratbagd DBus service can be enabled by adding the following service to\n"
+"your operating-system definition:\n"
+"\n"
+"  (simple-service 'ratbagd dbus-root-service-type (list libratbag))"
+msgstr ""
+
+#: gnu/packages/gnome.scm:11742
+msgid ""
+"Piper is a GTK+ application for configuring gaming mice with\n"
+"onboard configuration for key bindings via libratbag.  Piper requires\n"
+"a @command{ratbagd} daemon running with root privileges.  It can be run\n"
+"manually as root, but is preferably configured as a DBus service that can\n"
+"launch on demand.  This can be configured by enabling the following service,\n"
+"provided there is a DBus service present:\n"
+"\n"
+"  (simple-service 'ratbagd dbus-root-service-type (list libratbag))"
+msgstr ""
+
+#: gnu/packages/gnome.scm:11800
+msgid ""
+"Parlatype is an audio player for the GNOME desktop\n"
+"environment.  Its main purpose is the manual transcription of spoken\n"
+"audio files."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11828
+msgid ""
+"Jsonrpc-GLib is a library to communicate with JSON-RPC based\n"
+"peers in either a synchronous or asynchronous fashion.  It also allows\n"
+"communicating using the GVariant serialization format instead of JSON when\n"
+"both peers support it.  You might want that when communicating on a single\n"
+"host to avoid parser overhead and memory-allocator fragmentation."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11862
+msgid ""
+"Feedbackd provides a DBus daemon to act on events to provide\n"
+"haptic, visual and audio feedback.  It offers the libfeedbackd library and\n"
+"GObject introspection bindings."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11912
+msgid ""
+"Sysprof performs detailed, accurate, and fast CPU profiling of an entire\n"
+"GNU/Linux system including the kernel and all user-space applications.  This\n"
+"helps find the function(s) in which a program spends most of its time.\n"
+"\n"
+"It uses the kernel's built-in @code{ptrace} feature and handles shared\n"
+"libraries.  Applications do not need to be recompiled--or even restarted."
+msgstr ""
+
+#: gnu/packages/gnome.scm:11993
+msgid ""
+"Builder aims to be an integrated development\n"
+"environment (IDE) for writing GNOME-based software.  It features fuzzy search,\n"
+"auto-completion, a mini code map, documentation browsing, Git integration, an\n"
+"integrated profiler via Sysprof, debugging support, and more."
+msgstr ""
+
+#: gnu/packages/gnome.scm:12064
+msgid ""
+"Komikku is an online/offline manga reader for GNOME,\n"
+"developed with the aim of being used with the Librem 5 phone."
+msgstr ""
+
+#: gnu/packages/gnome.scm:12142
+msgid ""
+"GNU Data Access (GDA) is an attempt to provide uniform access to\n"
+"different kinds of data sources (databases, information servers, mail spools,\n"
+"etc).  It is a complete architecture that provides all you need to access\n"
+"your data."
+msgstr ""
+
+#: gnu/packages/gnome.scm:12191
+msgid ""
+"gtranslator is a quite comfortable gettext po/po.gz/(g)mo files editor\n"
+"for the GNOME 3.x platform with many features.  It aims to be a very complete\n"
+"editing environment for translation issues within the GNU gettext/GNOME desktop\n"
+"world."
+msgstr ""
+
+#: gnu/packages/gnome.scm:12257
+msgid ""
+"OCRFeeder is a complete Optical Character Recognition and\n"
+"Document Analysis and Recognition program."
+msgstr ""
+
+#: gnu/packages/gnuzilla.scm:148
+msgid ""
+"SpiderMonkey is Mozilla's JavaScript engine written\n"
+"in C/C++."
+msgstr ""
+
+#: gnu/packages/gnuzilla.scm:1294
 msgid ""
 "IceCat is the GNU version of the Firefox browser.  It is entirely free\n"
 "software, which does not recommend non-free plugins and addons.  It also\n"
-"features built-in privacy-protecting features."
+"features built-in privacy-protecting features.\n"
+"\n"
+"WARNING: IceCat 78 has not yet been released by the upstream IceCat project.\n"
+"This is a preview release, and does not currently meet the privacy-respecting\n"
+"standards of the IceCat project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:97
-msgid "GNOME accessibility toolkit"
+#: gnu/packages/gnuzilla.scm:1619
+msgid ""
+"This package provides an email client built based on Mozilla\n"
+"Thunderbird.  It supports email, news feeds, chat, calendar and contacts."
+msgstr ""
+
+#: gnu/packages/gnuzilla.scm:1680
+msgid ""
+"Firefox Decrypt is a tool to extract passwords from\n"
+"Mozilla (Firefox, Waterfox, Thunderbird, SeaMonkey) profiles."
 msgstr ""
 
-#: gnu/packages/gtk.scm:99
+#: gnu/packages/gtk.scm:118
 msgid ""
 "ATK provides the set of accessibility interfaces that are implemented\n"
 "by other toolkits and applications.  Using the ATK interfaces, accessibility\n"
 "tools have full access to view and control running applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:139
-msgid "2D graphics library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:141
+#: gnu/packages/gtk.scm:162
 msgid ""
 "Cairo is a 2D graphics library with support for multiple output devices.\n"
 "Currently supported output targets include the X Window System (via both\n"
@@ -5952,56 +6866,45 @@ msgid ""
 "affine transformation (scale, rotation, shear, etc.)."
 msgstr ""
 
-#: gnu/packages/gtk.scm:169
-msgid "2D graphics library (with X11 support)"
-msgstr ""
-
-#: gnu/packages/gtk.scm:202
-msgid "OpenType text shaping engine"
+#: gnu/packages/gtk.scm:241
+msgid "HarfBuzz is an OpenType text shaping engine."
 msgstr ""
 
-#: gnu/packages/gtk.scm:204
-msgid "HarfBuzz is an OpenType text shaping engine."
+#: gnu/packages/gtk.scm:270
+msgid ""
+"Libdatrie is an implementation of double-array structure for\n"
+"representing trie.  Trie is a kind of digital search tree."
 msgstr ""
 
-#: gnu/packages/gtk.scm:235
-msgid "GNOME text and font handling library"
+#: gnu/packages/gtk.scm:301
+msgid ""
+"LibThai is a set of Thai language support routines aimed to\n"
+"ease developers’ tasks to incorporate Thai language support in their\n"
+"applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:237
+#: gnu/packages/gtk.scm:352
 msgid ""
 "Pango is the core text and font handling library used in GNOME\n"
 "applications.  It has extensive support for the different writing systems\n"
 "used throughout the world."
 msgstr ""
 
-#: gnu/packages/gtk.scm:263
-msgid "Obsolete pango functions"
-msgstr ""
-
-#: gnu/packages/gtk.scm:264
+#: gnu/packages/gtk.scm:405
 msgid ""
 "Pangox was a X backend to pango.  It is now obsolete and no\n"
 "longer provided by recent pango releases.  pangox-compat provides the\n"
 "functions which were removed."
 msgstr ""
 
-#: gnu/packages/gtk.scm:301
-msgid "GTK+ widget for interactive graph-like environments"
-msgstr ""
-
-#: gnu/packages/gtk.scm:303
+#: gnu/packages/gtk.scm:442
 msgid ""
 "Ganv is an interactive GTK+ widget for interactive “boxes and lines” or\n"
 "graph-like environments, e.g. modular synths or finite state machine\n"
 "diagrams."
 msgstr ""
 
-#: gnu/packages/gtk.scm:371
-msgid "Widget that extends the standard GTK+ 2.x 'GtkTextView' widget"
-msgstr ""
-
-#: gnu/packages/gtk.scm:373
+#: gnu/packages/gtk.scm:498
 msgid ""
 "GtkSourceView is a portable C library that extends the standard GTK+\n"
 "framework for multiline text editing with support for configurable syntax\n"
@@ -6009,56 +6912,32 @@ msgid ""
 "printing and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:422
-msgid "GNOME source code widget"
-msgstr ""
-
-#: gnu/packages/gtk.scm:423
+#: gnu/packages/gtk.scm:548
 msgid ""
 "GtkSourceView is a text widget that extends the standard\n"
 "GTK+ text widget GtkTextView.  It improves GtkTextView by implementing syntax\n"
 "highlighting and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:473
-msgid "GNOME image loading and manipulation library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:475
+#: gnu/packages/gtk.scm:622
 msgid ""
 "GdkPixbuf is a library for image loading and manipulation developed\n"
 "in the GNOME project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:507
-msgid "GNOME image loading and manipulation library, with SVG support"
-msgstr ""
-
-#: gnu/packages/gtk.scm:547
-msgid "Assistive Technology Service Provider Interface, core components"
-msgstr ""
-
-#: gnu/packages/gtk.scm:549
+#: gnu/packages/gtk.scm:731
 msgid ""
 "The Assistive Technology Service Provider Interface, core components,\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:582
-msgid "Assistive Technology Service Provider Interface, ATK bindings"
-msgstr ""
-
-#: gnu/packages/gtk.scm:584
+#: gnu/packages/gtk.scm:788
 msgid ""
 "The Assistive Technology Service Provider Interface\n"
 "is part of the GNOME accessibility project."
 msgstr ""
 
-#: gnu/packages/gtk.scm:643
-msgid "Cross-platform toolkit for creating graphical user interfaces"
-msgstr ""
-
-#: gnu/packages/gtk.scm:645
+#: gnu/packages/gtk.scm:855
 msgid ""
 "GTK+, or the GIMP Toolkit, is a multi-platform toolkit for creating\n"
 "graphical user interfaces.  Offering a complete set of widgets, GTK+ is\n"
@@ -6066,11 +6945,7 @@ msgid ""
 "application suites."
 msgstr ""
 
-#: gnu/packages/gtk.scm:805
-msgid "Cairo bindings for GNU Guile"
-msgstr ""
-
-#: gnu/packages/gtk.scm:807
+#: gnu/packages/gtk.scm:1021
 msgid ""
 "Guile-Cairo wraps the Cairo graphics library for Guile Scheme.\n"
 "Guile-Cairo is complete, wrapping almost all of the Cairo API.  It is API\n"
@@ -6080,21 +6955,13 @@ msgid ""
 "exceptions, macros, and a dynamic programming environment."
 msgstr ""
 
-#: gnu/packages/gtk.scm:853
-msgid "Render SVG images using Cairo from Guile"
-msgstr ""
-
-#: gnu/packages/gtk.scm:855
+#: gnu/packages/gtk.scm:1110
 msgid ""
 "Guile-RSVG wraps the RSVG library for Guile, allowing you to render SVG\n"
 "images onto Cairo surfaces."
 msgstr ""
 
-#: gnu/packages/gtk.scm:900
-msgid "Create SVG or PDF presentations in Guile"
-msgstr ""
-
-#: gnu/packages/gtk.scm:902
+#: gnu/packages/gtk.scm:1182
 msgid ""
 "Guile-Present defines a declarative vocabulary for presentations,\n"
 "together with tools to render presentation documents as SVG or PDF.\n"
@@ -6103,51 +6970,31 @@ msgid ""
 "documents."
 msgstr ""
 
-#: gnu/packages/gtk.scm:956
-msgid "Guile interface for GTK+ programming for GNOME"
-msgstr ""
-
-#: gnu/packages/gtk.scm:958
+#: gnu/packages/gtk.scm:1251
 msgid ""
 "Includes guile-clutter, guile-gnome-gstreamer,\n"
 "guile-gnome-platform (GNOME developer libraries), and guile-gtksourceview."
 msgstr ""
 
-#: gnu/packages/gtk.scm:991
-msgid "C++ bindings to the Cairo 2D graphics library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:993
+#: gnu/packages/gtk.scm:1286
 msgid ""
 "Cairomm provides a C++ programming interface to the Cairo 2D graphics\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1017
-msgid "C++ interface to the Pango text rendering library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1019
+#: gnu/packages/gtk.scm:1329
 msgid ""
 "Pangomm provides a C++ programming interface to the Pango text rendering\n"
 "library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1040
-msgid "C++ interface to the ATK accessibility library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1042
+#: gnu/packages/gtk.scm:1371
 msgid ""
 "ATKmm provides a C++ programming interface to the ATK accessibility\n"
 "toolkit."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1082
-msgid "C++ interface to the GTK+ graphical user interface library"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1084
+#: gnu/packages/gtk.scm:1414
 msgid ""
 "gtkmm is the official C++ interface for the popular GUI library GTK+.\n"
 "Highlights include typesafe callbacks, and a comprehensive set of widgets that\n"
@@ -6156,30 +7003,58 @@ msgid ""
 "extensive documentation, including API reference and a tutorial."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1143
-msgid "Python bindings for cairo"
+#: gnu/packages/gtk.scm:1464
+msgid ""
+"gtksourceviewmm is a portable C++ library that extends the standard GTK+\n"
+"framework for multiline text editing with support for configurable syntax\n"
+"highlighting, unlimited undo/redo, search and replace, a completion framework,\n"
+"printing and other features typical of a source code editor."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1145
+#: gnu/packages/gtk.scm:1496
 msgid "Pycairo is a set of Python bindings for the Cairo graphics library."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1229
-msgid "Python bindings for GTK+"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1231
+#: gnu/packages/gtk.scm:1583
 msgid ""
 "PyGTK allows you to write full featured GTK programs in Python.  It is\n"
 "targeted at GTK 2.x, and can be used in conjunction with gnome-python to\n"
 "write GNOME applications."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1262
-msgid "Library for minimalistic gtk+3 user interfaces"
+#: gnu/packages/gtk.scm:1608
+msgid ""
+"Cairo provides Perl bindings for the vector graphics library\n"
+"cairo.  It supports multiple output targets, including PNG, PDF and SVG.  Cairo\n"
+"produces identical output on all those targets."
+msgstr ""
+
+#: gnu/packages/gtk.scm:1644
+msgid ""
+"Perl bindings to the 2.x series of the Gtk+ widget set.\n"
+"This module allows you to write graphical user interfaces in a Perlish and\n"
+"object-oriented way, freeing you from the casting and memory management in C,\n"
+"yet remaining very close in spirit to original API."
+msgstr ""
+
+#: gnu/packages/gtk.scm:1672
+msgid ""
+"Pango is a library for laying out and rendering text, with an\n"
+"emphasis on internationalization.  Pango can be used anywhere that text layout\n"
+"is needed, but using Pango in conjunction with Cairo and/or Gtk2 provides a\n"
+"complete solution with high quality text handling and graphics rendering.\n"
+"\n"
+"Dynamically loaded modules handle text layout for particular combinations of\n"
+"script and font backend.  Pango provides a wide selection of modules, including\n"
+"modules for Hebrew, Arabic, Hangul, Thai, and a number of Indic scripts.\n"
+"Virtually all of the world's major scripts are supported.\n"
+"\n"
+"In addition to the low level layout rendering routines, Pango includes\n"
+"@code{Pango::Layout}, a high level driver for laying out entire blocks of text,\n"
+"and routines to assist in editing internationalized text."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1263
+#: gnu/packages/gtk.scm:1727
 msgid ""
 "Girara is a library that implements a user interface that\n"
 "focuses on simplicity and minimalism.  Currently based on GTK+, a\n"
@@ -6190,187 +7065,142 @@ msgid ""
 "information."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1330
-msgid "Documentation generator from C source code"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1332
+#: gnu/packages/gtk.scm:1828
 msgid ""
 "GTK-Doc generates API documentation from comments added to C code.  It is\n"
 "typically used to document the public API of GTK+ and GNOME libraries, but it\n"
 "can also be used to document application code."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1360
-msgid "Theming engines for GTK+ 2.x"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1362
+#: gnu/packages/gtk.scm:1869
 msgid ""
 "This package contains the standard GTK+ 2.x theming engines including\n"
 "Clearlooks, Crux, High Contrast, Industrial, LighthouseBlue, Metal, Mist,\n"
 "Redmond95 and ThinIce."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1390
-msgid "Cairo-based theming engine for GTK+ 2.x"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1392
+#: gnu/packages/gtk.scm:1899
 msgid ""
 "Murrine is a cairo-based GTK+ theming engine.  It is named after the\n"
 "glass artworks done by Venicians glass blowers."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1417
-msgid "Spell-checking addon for GTK's TextView widget"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1419
+#: gnu/packages/gtk.scm:1928
 msgid ""
 "GtkSpell provides word-processor-style highlighting and replacement of\n"
 "misspelled words in a GtkTextView widget."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1442
-msgid "Lightweight GTK+ clipboard manager"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1444
+#: gnu/packages/gtk.scm:1956
 msgid ""
 "ClipIt is a clipboard manager with features such as a history, search\n"
 "thereof, global hotkeys and clipboard item actions.  It was forked from\n"
 "Parcellite and adds bugfixes and features."
 msgstr ""
 
-#: gnu/packages/gtk.scm:1481
-msgid "Thin layer of graphic data types"
-msgstr ""
-
-#: gnu/packages/gtk.scm:1482
+#: gnu/packages/gtk.scm:1990
 msgid ""
-"This library provides graphic types and their relative API;\n"
-"it does not deal with windowing system surfaces, drawing, scene graphs, or\n"
-"input."
+"Graphene provides graphic types and their relative API; it\n"
+"does not deal with windowing system surfaces, drawing, scene graphs, or input."
 msgstr ""
 
-#: gnu/packages/guile.scm:132 gnu/packages/guile.scm:211
-msgid "Scheme implementation intended especially for extensions"
-msgstr ""
-
-#: gnu/packages/guile.scm:134 gnu/packages/guile.scm:213
+#: gnu/packages/gtk.scm:2017
 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."
+"GNU Spread Sheet Widget is a library for Gtk+ which provides a widget for\n"
+"viewing and manipulating 2 dimensional tabular data in a manner similar to many\n"
+"popular spread sheet programs."
 msgstr ""
 
-#: gnu/packages/guile.scm:379
-msgid "Package manager for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:381
+#: gnu/packages/gtk.scm:2047
 msgid ""
-"Guildhall is a package manager written for Guile Scheme.  A guild is\n"
-"an association of independent craftspeople.  A guildhall is where they meet.\n"
-"This Guildhall aims to make a virtual space for Guile wizards and journeyfolk\n"
-"to share code.\n"
-"\n"
-"On a practical level, Guildhall lets you share Scheme modules and programs\n"
-"over the internet, and install code that has been shared by others.  Guildhall\n"
-"can handle dependencies, so when a program requires several libraries, and\n"
-"each of those has further dependencies, all of the prerequisites for the\n"
-"program can be installed in one go."
-msgstr ""
-
-#: gnu/packages/guile.scm:473
-msgid "Web application framework written in Guile"
+"Volume Icon is a volume indicator and control applet for @acronym{the\n"
+"Advanced Linux Sound Architecture, ALSA}.  It sits in the system tray,\n"
+"independent of your desktop environment, and supports global key bindings."
 msgstr ""
 
-#: gnu/packages/guile.scm:474
+#: gnu/packages/gtk.scm:2092
 msgid ""
-"GNU Artanis is a web application framework written in Guile\n"
-"Scheme.  A web application framework (WAF) is a software framework that is\n"
-"designed to support the development of dynamic websites, web applications, web\n"
-"services and web resources.  The framework aims to alleviate the overhead\n"
-"associated with common activities performed in web development.  Artanis\n"
-"provides several tools for web development: database access, templating\n"
-"frameworks, session management, URL-remapping for RESTful, page caching, and\n"
-"more."
-msgstr ""
-
-#: gnu/packages/guile.scm:500
-msgid "Framework for building readers for GNU Guile"
+"This program allows you to display GTK+ dialog boxes from command line or\n"
+"shell scripts.  Example of how to use @code{yad} can be consulted at\n"
+"@url{https://sourceforge.net/p/yad-dialog/wiki/browse_pages/}."
 msgstr ""
 
-#: gnu/packages/guile.scm:502
+#: gnu/packages/gtk.scm:2126
 msgid ""
-"Guile-Reader is a simple framework for building readers for GNU Guile.\n"
+"Dragon is a lightweight drag-and-drop source for X where you can run:\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"
+"@example\n"
+"dragon file.tar.gz\n"
+"@end example\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 ""
-
-#: gnu/packages/guile.scm:556
-msgid "Guile bindings to ncurses"
+"to get a window with just that file in it, ready to be dragged where you need it.\n"
+"What if you need to drag into something? Using:\n"
+"\n"
+"@example\n"
+"dragon --target\n"
+"@end example\n"
+"\n"
+"you get a window you can drag files and text into.  Dropped items are\n"
+"printed to standard output."
 msgstr ""
 
-#: gnu/packages/guile.scm:558
+#: gnu/packages/gtk.scm:2197
 msgid ""
-"guile-ncurses provides Guile language bindings for the ncurses\n"
-"library."
-msgstr ""
-
-#: gnu/packages/guile.scm:585
-msgid "Run jobs at scheduled times"
+"@code{libdbusmenu} passes a menu structure across DBus so\n"
+"that a program can create a menu simply without worrying about how it is\n"
+"displayed on the other side of the bus."
 msgstr ""
 
-#: gnu/packages/guile.scm:587
+#: gnu/packages/gtk.scm:2226
 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."
+"Layer Shell is a Wayland protocol for desktop shell\n"
+"components, such as panels, notifications and wallpapers.  It can be used to\n"
+"anchor windows to a corner or edge of the output, or stretch them across the\n"
+"entire output.  It supports all Layer Shell features including popups and\n"
+"popovers."
 msgstr ""
 
-#: gnu/packages/guile.scm:674
-msgid "Guile parser library for the iCalendar format"
+#: gnu/packages/gtk.scm:2274
+msgid ""
+"GooCanvas is a canvas widget for GTK+ that uses the cairo 2D\n"
+"library for drawing."
 msgstr ""
 
-#: gnu/packages/guile.scm:676
+#: gnu/packages/gtk.scm:2335
 msgid ""
-"Guile-ICS is an iCalendar (RFC5545) format parser library written in\n"
-"pure Scheme.  The library can be used to read and write iCalendar data.\n"
-"\n"
-"The library is shipped with documentation in Info format and usage examples."
+"GtkSheet is a matrix widget for GTK+.  It consists of an\n"
+"scrollable grid of cells where you can allocate text.  Cell contents can be\n"
+"edited interactively through a specially designed entry, GtkItemEntry.  It is\n"
+"also a container subclass, allowing you to display buttons, images and any\n"
+"other widget in it.  You can also set many attributes such as border,\n"
+"foreground and background colors, text justification and more."
 msgstr ""
 
-#: gnu/packages/guile.scm:711
-msgid "Collection of useful Guile Scheme modules"
+#: gnu/packages/gtk.scm:2368
+msgid ""
+"GtkDatabox is a widget for live display of large amounts of\n"
+"fluctuating numerical data.  It enables data presentation (for example, on\n"
+"linear or logarithmic scales, as dots or lines, with markers/labels) as well as\n"
+"user interaction (e.g.  measuring distances)."
 msgstr ""
 
-#: gnu/packages/guile.scm:713
+#: gnu/packages/guile.scm:130 gnu/packages/guile.scm:225
 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\"."
+"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 ""
 
-#: gnu/packages/guile.scm:754
-msgid "JSON module for Guile"
+#: gnu/packages/guile.scm:438
+msgid ""
+"This module provides line editing support via the Readline library for\n"
+"GNU@tie{}Guile.  Use the @code{(ice-9 readline)} module and call its\n"
+"@code{activate-readline} procedure to enable it."
 msgstr ""
 
-#: gnu/packages/guile.scm:756
+#: gnu/packages/guile.scm:574
 msgid ""
 "Guile-JSON supports parsing and building JSON documents according to the\n"
 "specification.  These are the main features:\n"
@@ -6383,213 +7213,17 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/guile.scm:843
-msgid "MiniKanren declarative logic system, packaged for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:845
-msgid ""
-"MiniKanren is a relational programming extension to the Scheme\n"
-"programming Language, written as a smaller version of Kanren suitable for\n"
-"pedagogical purposes.  It is featured in the book, The Reasoned Schemer,\n"
-"written by Dan Friedman, William Byrd, and Oleg Kiselyov.\n"
-"\n"
-"This is Ian Price's r6rs packaged version of miniKanren, which deviates\n"
-"slightly from miniKanren mainline.\n"
-"\n"
-"See http://minikanren.org/ for more on miniKanren generally."
-msgstr ""
-
-#: gnu/packages/guile.scm:916
-msgid ""
-"Minimal implementation of incremental computation in Guile\n"
-"Scheme"
-msgstr ""
-
-#: gnu/packages/guile.scm:918
-msgid ""
-"This package provides a complete Scheme implementation of\n"
-"miniAdapton, which implements the core functionality of the Adapton system for\n"
-"incremental computation (also known as self-adjusting computation).  Like\n"
-"Adapton, miniAdapton allows programmers to safely combine mutation and\n"
-"memoization.  miniAdapton is built on top of an even simpler system,\n"
-"microAdapton.  Both miniAdapton and microAdapton are designed to be easy to\n"
-"understand, extend, and port to host languages other than Scheme."
-msgstr ""
-
-#: gnu/packages/guile.scm:1002
-msgid "S-expression based regular expressions"
-msgstr ""
-
-#: gnu/packages/guile.scm:1004
-msgid ""
-"Irregex is an s-expression based alternative to your classic\n"
-"string-based regular expressions.  It implements SRFI 115 and is deeply\n"
-"inspired by the SCSH regular expression system."
-msgstr ""
-
-#: gnu/packages/guile.scm:1085
-msgid "Guile bindings to the GDBM library via Guile's FFI"
-msgstr ""
-
-#: gnu/packages/guile.scm:1087
+#: gnu/packages/guile.scm:677
 msgid ""
 "Guile bindings to the GDBM key-value storage system, using\n"
 "Guile's foreign function interface."
 msgstr ""
 
-#: gnu/packages/guile.scm:1140
-msgid "Access SQLite databases from Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1142
+#: gnu/packages/guile.scm:714
 msgid "This package provides Guile bindings to the SQLite database system."
 msgstr ""
 
-#: gnu/packages/guile.scm:1187
-msgid "Functional static site generator"
-msgstr ""
-
-#: gnu/packages/guile.scm:1188
-msgid ""
-"Haunt is a static site generator written in Guile\n"
-"Scheme.  Haunt features a functional build system and an extensible\n"
-"interface for reading articles in any format."
-msgstr ""
-
-#: gnu/packages/guile.scm:1215
-msgid "Guile application configuration parsing library"
-msgstr ""
-
-#: gnu/packages/guile.scm:1217
-msgid ""
-"Guile Config is a library providing a declarative approach to\n"
-"application configuration specification.  The library provides clean\n"
-"configuration declaration forms, and processors that take care of:\n"
-"configuration file creation; configuration file parsing; command-line\n"
-"parameter parsing using getopt-long; basic GNU command-line parameter\n"
-"generation (--help, --usage, --version); automatic output generation for the\n"
-"above command-line parameters."
-msgstr ""
-
-#: gnu/packages/guile.scm:1255
-msgid "Redis client library for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1256
-msgid ""
-"Guile-redis provides a Scheme interface to the Redis\n"
-"key-value cache and store."
-msgstr ""
-
-#: gnu/packages/guile.scm:1330
-msgid "Whitespace to lisp syntax for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1331
-msgid ""
-"Wisp is a syntax for Guile which provides a Python-like\n"
-"whitespace-significant language.  It may be easier on the eyes for some\n"
-"users and in some situations."
-msgstr ""
-
-#: gnu/packages/guile.scm:1381
-msgid "2D/3D game engine for GNU Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1382
-msgid ""
-"Sly is a 2D/3D game engine written in Guile Scheme.  Sly\n"
-"features a functional reactive programming interface and live coding\n"
-"capabilities."
-msgstr ""
-
-#: gnu/packages/guile.scm:1418
-msgid "Generate C bindings for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1419
-msgid ""
-"G-Wrap is a tool and Guile library for generating function\n"
-"wrappers for inter-language calls.  It currently only supports generating Guile\n"
-"wrappers for C functions.  Given a definition of the types and prototypes for\n"
-"a given C interface, G-Wrap will automatically generate the C code that\n"
-"provides access to that interface and its types from the Scheme level."
-msgstr ""
-
-#: gnu/packages/guile.scm:1456
-msgid "Guile database abstraction layer"
-msgstr ""
-
-#: gnu/packages/guile.scm:1459
-msgid ""
-"guile-dbi is a library for Guile that provides a convenient interface to\n"
-"SQL databases.  Database programming with guile-dbi is generic in that the same\n"
-"programming interface is presented regardless of which database system is used.\n"
-"It currently supports MySQL, Postgres and SQLite3."
-msgstr ""
-
-#: gnu/packages/guile.scm:1485
-msgid "Guile DBI driver for SQLite"
-msgstr ""
-
-#: gnu/packages/guile.scm:1488
-msgid ""
-"guile-dbi is a library for Guile that provides a convenient interface to\n"
-"SQL databases.  This package implements the interface for SQLite."
-msgstr ""
-
-#: gnu/packages/guile.scm:1534
-msgid "DSV module for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1536
-msgid ""
-"Guile-DSV is a GNU Guile module for working with the\n"
-"delimiter-separated values (DSV) data format.  Guile-DSV supports the\n"
-"Unix-style DSV format and RFC 4180 format."
-msgstr ""
-
-#: gnu/packages/guile.scm:1563
-msgid "XOSD bindings for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1565
-msgid ""
-"Guile-XOSD provides Guile bindings for @code{libxosd},\n"
-"@uref{http://sourceforge.net/projects/libxosd/, the X On Screen Display\n"
-"library}."
-msgstr ""
-
-#: gnu/packages/guile.scm:1588
-msgid "Evaluate code in a running Guile process"
-msgstr ""
-
-#: gnu/packages/guile.scm:1590
-msgid ""
-"Guile-Daemon is a small Guile program that loads your initial\n"
-"configuration file, and then reads and evaluates Guile expressions that\n"
-"you send to a FIFO file."
-msgstr ""
-
-#: gnu/packages/guile.scm:1621
-msgid "CommonMark parser for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1623
-msgid ""
-"guile-commonmark is a library for parsing CommonMark, a fully specified\n"
-"variant of Markdown.  The library is written in Guile Scheme and is designed\n"
-"to transform a CommonMark document to SXML.  guile-commonmark tries to closely\n"
-"follow the @uref{http://commonmark.org/, CommonMark spec}, the main difference\n"
-"is no support for parsing block and inline level HTML."
-msgstr ""
-
-#: gnu/packages/guile.scm:1726
-msgid "Structured access to bytevector contents for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1728
+#: gnu/packages/guile.scm:760
 msgid ""
 "Guile bytestructures offers a system imitating the type system\n"
 "of the C programming language, to be used on bytevectors.  C's type\n"
@@ -6598,120 +7232,33 @@ msgid ""
 "type system, elevating types to first-class status."
 msgstr ""
 
-#: gnu/packages/guile.scm:1772
-msgid "Spell-checking from Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1774
-msgid ""
-"guile-aspell is a Guile Scheme library for comparing a string against a\n"
-"dictionary and suggesting spelling corrections."
-msgstr ""
-
-#: gnu/packages/guile.scm:1828
-msgid "Extend Bash using Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1830
-#, scheme-format
-msgid ""
-"Guile-Bash provides a shared library and set of Guile modules,\n"
-"allowing you to extend Bash in Scheme.  Scheme interfaces allow you to access\n"
-"the following aspects of Bash:\n"
-"\n"
-"@itemize\n"
-"@item aliases;\n"
-"@item setting and getting Bash variables;\n"
-"@item creating dynamic variables;\n"
-"@item creating Bash functions with a Scheme implementation;\n"
-"@item reader macro for output capturing;\n"
-"@item reader macro for evaluating raw Bash commands.\n"
-"@end itemize\n"
-"\n"
-"To enable it, run:\n"
-"\n"
-"@example\n"
-"enable -f ~/.guix-profile/lib/bash/libguile-bash.so scm\n"
-"@end example\n"
-"\n"
-"and then run @command{scm example.scm}."
-msgstr ""
-
-#: gnu/packages/guile.scm:1877
-msgid "Asynchronous actor model library for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1879
-msgid ""
-"GNU 8sync (pronounced \"eight-sync\") is an asynchronous programming\n"
-"library for GNU Guile based on the actor model.\n"
-"\n"
-"Note that 8sync is only available for Guile 2.2."
-msgstr ""
-
-#: gnu/packages/guile.scm:1902
-msgid "Lightweight concurrency facility for Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1904
-msgid ""
-"Fibers is a Guile library that implements a a lightweight concurrency\n"
-"facility, inspired by systems like Concurrent ML, Go, and Erlang.  A fiber is\n"
-"like a \"goroutine\" from the Go language: a lightweight thread-like\n"
-"abstraction.  Systems built with Fibers can scale up to millions of concurrent\n"
-"fibers, tens of thousands of concurrent socket connections, and many parallel\n"
-"cores.  The Fibers library also provides Concurrent ML-like channels for\n"
-"communication between fibers.\n"
-"\n"
-"Note that Fibers makes use of some Guile 2.1/2.2-specific features and\n"
-"is not available for Guile 2.0."
-msgstr ""
-
-#: gnu/packages/guile.scm:1959
-msgid "Guile bindings for libgit2"
-msgstr ""
-
-#: gnu/packages/guile.scm:1961
+#: gnu/packages/guile.scm:803
 msgid ""
 "This package provides Guile bindings to libgit2, a library to\n"
 "manipulate repositories of the Git version control system."
 msgstr ""
 
-#: gnu/packages/guile.scm:1996
-msgid "General-purpose syntax highlighter for GNU Guile"
-msgstr ""
-
-#: gnu/packages/guile.scm:1997
+#: gnu/packages/guile.scm:849
 msgid ""
-"Guile-syntax-highlight is a general-purpose syntax\n"
-"highlighting library for GNU Guile.  It can parse code written in various\n"
-"programming languages into a simple s-expression that can be converted to\n"
-"HTML (via SXML) or any other format for rendering."
-msgstr ""
-
-#: gnu/packages/guile.scm:2028
-msgid "S-expression based json reader/writer for Guile"
+"This package provides Guile bindings for zlib, a lossless\n"
+"data-compression library.  The bindings are written in pure Scheme by using\n"
+"Guile's foreign function interface."
 msgstr ""
 
-#: gnu/packages/guile.scm:2029
+#: gnu/packages/guile.scm:885
 msgid ""
-"guile-sjson is a json reader/writer for Guile.\n"
-"It has a nice, simple s-expression based syntax."
-msgstr ""
-
-#: gnu/packages/guile.scm:2073
-msgid "Colorized REPL for Guile"
+"This package provides Guile bindings for lzlib, a C library for\n"
+"in-memory LZMA compression and decompression.  The bindings are written in\n"
+"pure Scheme by using Guile's foreign function interface."
 msgstr ""
 
-#: gnu/packages/guile.scm:2075
-msgid "Guile-colorized provides you with a colorized REPL for GNU Guile."
-msgstr ""
-
-#: gnu/packages/imagemagick.scm:109 gnu/packages/imagemagick.scm:220
-msgid "Create, edit, compose, or convert bitmap images"
+#: gnu/packages/guile.scm:915
+msgid ""
+"This package provides a GNU Guile interface to the zstd (``zstandard'')\n"
+"compression library."
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:111
+#: gnu/packages/imagemagick.scm:136
 msgid ""
 "ImageMagick is a software suite to create, edit, compose, or convert\n"
 "bitmap images.  It can read and write images in a variety of formats (over 100)\n"
@@ -6721,11 +7268,7 @@ msgid ""
 "text, lines, polygons, ellipses and Bézier curves."
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:156
-msgid "Perl interface to ImageMagick"
-msgstr ""
-
-#: gnu/packages/imagemagick.scm:157
+#: gnu/packages/imagemagick.scm:205
 msgid ""
 "This Perl extension allows the reading, manipulation and\n"
 "writing of a large number of image file formats using the ImageMagick library.\n"
@@ -6733,94 +7276,104 @@ msgid ""
 "script."
 msgstr ""
 
-#: gnu/packages/imagemagick.scm:222
+#: gnu/packages/imagemagick.scm:262
 msgid ""
 "GraphicsMagick provides a comprehensive collection of utilities,\n"
 "programming interfaces, and GUIs, to support file format conversion, image\n"
 "processing, and 2D vector rendering."
 msgstr ""
 
-#: gnu/packages/image.scm:94
-msgid "Library for handling PNG files"
+#: gnu/packages/image.scm:131
+msgid ""
+"IQA is a C library for objectively measuring image/video\n"
+"quality.  It implements many popular algorithms, such as MS-SSIM, MS-SSIM*,\n"
+"SIMM, MSE, and PSNR.  It is designed to be fast, accurate, and reliable.  All\n"
+"code is Valgrind-clean and unit tested."
 msgstr ""
 
-#: gnu/packages/image.scm:96
+#: gnu/packages/image.scm:164
 msgid ""
 "Libpng is the official PNG (Portable Network Graphics) reference\n"
 "library.  It supports almost all PNG features and is extensible."
 msgstr ""
 
-#: gnu/packages/image.scm:160
-msgid "APNG patch for libpng"
-msgstr ""
-
-#: gnu/packages/image.scm:162
+#: gnu/packages/image.scm:230
 msgid ""
 "APNG (Animated Portable Network Graphics) is an unofficial\n"
 "extension of the APNG (Portable Network Graphics) format.\n"
 "APNG patch provides APNG support to libpng."
 msgstr ""
 
-#: gnu/packages/image.scm:202
-msgid "Read and write PNG images"
-msgstr ""
-
-#: gnu/packages/image.scm:204
+#: gnu/packages/image.scm:286
 msgid ""
-"This package provides an easy and simple way to read, write and display\n"
-"bitmap images stored in the PNG format.  It can read and write both files and\n"
-"in-memory raw vectors."
+"Pngcrush optimizes @acronym{PNG, Portable Network Graphics}\n"
+"images.  It can further losslessly compress them by as much as 40%."
 msgstr ""
 
-#: gnu/packages/image.scm:239
-msgid "Utility to compress PNG files"
+#: gnu/packages/image.scm:341
+msgid ""
+"A pretty small png library.\n"
+"Currently all documentation resides in @file{pnglite.h}."
 msgstr ""
 
-#: gnu/packages/image.scm:240
+#: gnu/packages/image.scm:363
 msgid ""
-"pngcrusqh is an optimizer for PNG (Portable Network Graphics)\n"
-"files.  It can compress them as much as 40% losslessly."
+"libimagequant is a small, portable C library for\n"
+"high-quality conversion of RGBA images to 8-bit indexed-color (palette)\n"
+"images.  This library can significantly reduces file sizes and powers pngquant\n"
+"and other PNG optimizers."
 msgstr ""
 
-#: gnu/packages/image.scm:259
-msgid "Library for handling JPEG files"
+#: gnu/packages/image.scm:396
+msgid ""
+"pngquant is a PNG compressor that significantly reduces file\n"
+"sizes by converting images to a more efficient 8-bit PNG format with alpha\n"
+"channel (often 60-80% smaller than 24/32-bit PNG files).  Compressed images\n"
+"are fully standards-compliant and are supported by all web browsers and\n"
+"operating systems.\n"
+"\n"
+"Features:\n"
+"@enumerate\n"
+"@item High-quality palette generation using a combination of vector\n"
+"      quantization algorithms.\n"
+"@item Unique adaptive dithering algorithm that adds less noise to images\n"
+"      than the standard Floyd-Steinberg.\n"
+"@item Easy to integrate with shell scripts, GUIs and server-side software.\n"
+"@item Fast mode for real-time processing/large numbers of images.\n"
+"@end enumerate"
 msgstr ""
 
-#: gnu/packages/image.scm:261
+#: gnu/packages/image.scm:426
 msgid ""
 "Libjpeg implements JPEG image encoding, decoding, and transcoding.\n"
 "JPEG is a standardized compression method for full-color and gray-scale\n"
 "images.\n"
-"The included programs provide conversion between the JPEG format and\n"
-"image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats."
-msgstr ""
-
-#: gnu/packages/image.scm:326
-msgid "Implementation of the JPEG XR standard"
+"It also includes programs that provide conversion between the JPEG format and\n"
+"image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file formats, as well as\n"
+"lossless JPEG manipulations such as rotation, scaling or cropping:\n"
+"@enumerate\n"
+"@item cjpeg\n"
+"@item djpeg\n"
+"@item jpegtran\n"
+"@item rdjpgcom\n"
+"@item wrjpgcom\n"
+"@end enumerate"
 msgstr ""
 
-#: gnu/packages/image.scm:327
+#: gnu/packages/image.scm:520
 msgid ""
 "JPEG XR is an approved ISO/IEC International standard (its\n"
 "official designation is ISO/IEC 29199-2). This library is an implementation of that standard."
 msgstr ""
 
-#: gnu/packages/image.scm:350
-msgid "Optimize JPEG images"
-msgstr ""
-
-#: gnu/packages/image.scm:352
+#: gnu/packages/image.scm:544
 msgid ""
 "jpegoptim provides lossless optimization (based on optimizing\n"
 "the Huffman tables) and \"lossy\" optimization based on setting\n"
 "maximum quality factor."
 msgstr ""
 
-#: gnu/packages/image.scm:377
-msgid "Library for handling Mac OS icns resource files"
-msgstr ""
-
-#: gnu/packages/image.scm:379
+#: gnu/packages/image.scm:571
 msgid ""
 "Libicns is a library for the manipulation of Mac OS IconFamily resource\n"
 "type files (ICNS).  @command{icns2png} and @command{png2icns} are provided to\n"
@@ -6830,11 +7383,7 @@ msgid ""
 "extracting icontainer icon files."
 msgstr ""
 
-#: gnu/packages/image.scm:418
-msgid "Library for handling TIFF files"
-msgstr ""
-
-#: gnu/packages/image.scm:420
+#: gnu/packages/image.scm:609
 msgid ""
 "Libtiff provides support for the Tag Image File Format (TIFF), a format\n"
 "used for storing image data.\n"
@@ -6842,11 +7391,7 @@ msgid ""
 "collection of tools for doing simple manipulations of TIFF images."
 msgstr ""
 
-#: gnu/packages/image.scm:472
-msgid "Library and tools for image processing and analysis"
-msgstr ""
-
-#: gnu/packages/image.scm:474
+#: gnu/packages/image.scm:682
 msgid ""
 "Leptonica is a C library and set of command-line tools for efficient\n"
 "image processing and image analysis operations.  It supports rasterop, affine\n"
@@ -6856,13 +7401,9 @@ msgid ""
 "arithmetic ops."
 msgstr ""
 
-#: gnu/packages/image.scm:500
-msgid "Decoder of the JBIG2 image compression format"
-msgstr ""
-
-#: gnu/packages/image.scm:502
+#: gnu/packages/image.scm:722
 msgid ""
-"JBIG2 is designed for lossy or lossless encoding of 'bilevel' (1-bit\n"
+"JBIG2 is designed for lossy or lossless encoding of @code{bilevel} (1-bit\n"
 "monochrome) images at moderately high resolution, and in particular scanned\n"
 "paper documents.  In this domain it is very efficient, offering compression\n"
 "ratios on the order of 100:1.\n"
@@ -6873,28 +7414,41 @@ msgid ""
 "work."
 msgstr ""
 
-#: gnu/packages/image.scm:537
-msgid "JPEG 2000 codec"
+#: gnu/packages/image.scm:792
+msgid ""
+"JBIG-KIT implements the JBIG1 data compression standard (ITU-T T.82 and\n"
+"ISO/IEC 11544:1993), designed for bi-level (one bit per pixel) images such as\n"
+"black-and-white scanned documents.  It is widely used in fax products, printer\n"
+"firmware and drivers, document management systems, and imaging software.\n"
+"\n"
+"This package provides a static C library of (de)compression functions and some\n"
+"simple command-line converters similar to those provided by netpbm.\n"
+"\n"
+"Two JBIG1 variants are available.  One (@file{jbig.c}) implements nearly all\n"
+"options of the standard but has to keep the full uncompressed image in memory.\n"
+"The other (@file{jbig85.c}) implements just the ITU-T T.85 profile, with\n"
+"memory management optimized for embedded and fax applications.  It buffers\n"
+"only a few lines of the uncompressed image in memory and is able to stream\n"
+"images of initially unknown height."
 msgstr ""
 
-#: gnu/packages/image.scm:539
+#: gnu/packages/image.scm:825
 msgid ""
-"The OpenJPEG library is a JPEG 2000 codec written in C.  It has\n"
-"been developed in order to promote the use of JPEG 2000, the new\n"
-"still-image compression standard from the Joint Photographic Experts\n"
-"Group (JPEG).\n"
-"\n"
-"In addition to the basic codec, various other features are under\n"
-"development, among them the JP2 and MJ2 (Motion JPEG 2000) file formats,\n"
-"an indexing tool useful for the JPIP protocol, JPWL-tools for\n"
-"error-resilience, a Java-viewer for j2k-images, ..."
+"OpenJPEG-Data contains all files required to run the openjpeg\n"
+"test suite, including conformance tests (following Rec. ITU-T T.803 | ISO/IEC\n"
+"15444-4 procedures), non-regression tests and unit tests."
 msgstr ""
 
-#: gnu/packages/image.scm:602
-msgid "Tools and library for working with GIF images"
+#: gnu/packages/image.scm:857
+msgid ""
+"OpenJPEG is an implementation of JPEG 2000 codec written in C\n"
+"language.  It has been developed in order to promote the use of JPEG 2000, a\n"
+"still-image compression standard from the Joint Photographic Experts Group\n"
+"(JPEG).  Since April 2015, it is officially recognized by ISO/IEC and ITU-T as a\n"
+"JPEG 2000 Reference Software."
 msgstr ""
 
-#: gnu/packages/image.scm:604
+#: gnu/packages/image.scm:922
 msgid ""
 "GIFLIB is a library for reading and writing GIF images.  It is API and\n"
 "ABI compatible with libungif which was in wide use while the LZW compression\n"
@@ -6902,19 +7456,18 @@ msgid ""
 "compose, and analyze GIF images."
 msgstr ""
 
-#: gnu/packages/image.scm:626
-msgid "GIF decompression library"
+#: gnu/packages/image.scm:973
+msgid ""
+"The libUEMF library is a portable C99 implementation for\n"
+"reading and writing @acronym{WFM, Windows Metafile}, @acronym{EMF, Enhanced\n"
+"Metafile}, and @acronym{EMF+, Enhanced Metafile Plus} files."
 msgstr ""
 
-#: gnu/packages/image.scm:628
+#: gnu/packages/image.scm:995
 msgid "libungif is the old GIF decompression library by the GIFLIB project."
 msgstr ""
 
-#: gnu/packages/image.scm:657
-msgid "Loading, saving, rendering and manipulating image files"
-msgstr ""
-
-#: gnu/packages/image.scm:659
+#: gnu/packages/image.scm:1030
 msgid ""
 "Imlib2 is a library that does image file loading and saving as well as\n"
 "rendering, manipulation, arbitrary polygon support, etc.\n"
@@ -6927,32 +7480,20 @@ msgid ""
 "more modular, simple, and flexible."
 msgstr ""
 
-#: gnu/packages/image.scm:691
-msgid "Wrapper library for imlib2"
-msgstr ""
-
-#: gnu/packages/image.scm:693
+#: gnu/packages/image.scm:1072
 msgid ""
 "Giblib is a simple library which wraps imlib2's context API, avoiding\n"
 "all the context_get/set calls, adds fontstyles to the truetype renderer and\n"
 "supplies a generic doubly-linked list and some string functions."
 msgstr ""
 
-#: gnu/packages/image.scm:735
-msgid "Library for handling popular graphics image formats"
-msgstr ""
-
-#: gnu/packages/image.scm:737
+#: gnu/packages/image.scm:1162
 msgid ""
 "FreeImage is a library for developers who would like to support popular\n"
 "graphics image formats like PNG, BMP, JPEG, TIFF and others."
 msgstr ""
 
-#: gnu/packages/image.scm:792
-msgid "Computer vision library"
-msgstr ""
-
-#: gnu/packages/image.scm:794
+#: gnu/packages/image.scm:1233
 msgid ""
 "VIGRA stands for Vision with Generic Algorithms.  It is an image\n"
 "processing and analysis library that puts its main emphasis on customizable\n"
@@ -6960,11 +7501,14 @@ msgid ""
 "multi-dimensional image processing."
 msgstr ""
 
-#: gnu/packages/image.scm:826
-msgid "Lossless and lossy image compression"
+#: gnu/packages/image.scm:1270
+msgid ""
+"This package provides a C interface to the VIGRA C++ computer vision\n"
+"library.  It is designed primarily to ease the implementation of higher-level\n"
+"language bindings to VIGRA."
 msgstr ""
 
-#: gnu/packages/image.scm:828
+#: gnu/packages/image.scm:1309
 msgid ""
 "WebP is a new image format that provides lossless and lossy compression\n"
 "for images.  WebP lossless images are 26% smaller in size compared to\n"
@@ -6976,52 +7520,32 @@ msgid ""
 "channels."
 msgstr ""
 
-#: gnu/packages/image.scm:856
-msgid "Library for handling MNG files"
-msgstr ""
-
-#: gnu/packages/image.scm:858
+#: gnu/packages/image.scm:1339
 msgid "Libmng is the MNG (Multiple-image Network Graphics) reference library."
 msgstr ""
 
-#: gnu/packages/image.scm:886
-msgid "Library and command-line utility to manage image metadata"
-msgstr ""
-
-#: gnu/packages/image.scm:888
+#: gnu/packages/image.scm:1361
 msgid ""
 "Exiv2 is a C++ library and a command line utility to manage image\n"
 "metadata.  It provides fast and easy read and write access to the Exif, IPTC\n"
 "and XMP metadata of images in various formats."
 msgstr ""
 
-#: gnu/packages/image.scm:928
-msgid "Library for manipulating many image formats"
-msgstr ""
-
-#: gnu/packages/image.scm:929
+#: gnu/packages/image.scm:1402
 msgid ""
 "Developer's Image Library (DevIL) is a library to develop\n"
 "applications with support for many types of images.  DevIL can load, save,\n"
 "convert, manipulate, filter and display a wide variety of image formats."
 msgstr ""
 
-#: gnu/packages/image.scm:949
-msgid "JPEG-2000 library"
-msgstr ""
-
-#: gnu/packages/image.scm:950
+#: gnu/packages/image.scm:1425
 msgid ""
 "The JasPer Project is an initiative to provide a reference\n"
 "implementation of the codec specified in the JPEG-2000 Part-1 standard (i.e.,\n"
 "ISO/IEC 15444-1)."
 msgstr ""
 
-#: gnu/packages/image.scm:980
-msgid "Scaling, colorspace conversion, and dithering library"
-msgstr ""
-
-#: gnu/packages/image.scm:981
+#: gnu/packages/image.scm:1450
 msgid ""
 "Zimg implements the commonly required image processing basics\n"
 "of scaling, colorspace conversion, and depth conversion.  A simple API enables\n"
@@ -7029,11 +7553,7 @@ msgid ""
 "the programmer."
 msgstr ""
 
-#: gnu/packages/image.scm:1014
-msgid "Perceptual image comparison utility"
-msgstr ""
-
-#: gnu/packages/image.scm:1015
+#: gnu/packages/image.scm:1485
 msgid ""
 "PerceptualDiff visually compares two images to determine\n"
 "whether they look alike.  It uses a computational model of the human visual\n"
@@ -7041,35 +7561,14 @@ msgid ""
 "differences in file encoding, image quality, and other small variations."
 msgstr ""
 
-#: gnu/packages/image.scm:1055
-msgid "Image and audio steganography"
-msgstr ""
-
-#: gnu/packages/image.scm:1057
+#: gnu/packages/image.scm:1527
 msgid ""
 "Steghide is a program to hide data in various kinds of image and audio\n"
 "files (known as @dfn{steganography}).  Neither color nor sample frequencies are\n"
 "changed, making the embedding resistant against first-order statistical tests."
 msgstr ""
 
-#: gnu/packages/image.scm:1082
-msgid "Image library for Extempore"
-msgstr ""
-
-#: gnu/packages/image.scm:1084
-msgid ""
-"This package is a collection of assorted single-file libraries.  Of\n"
-"all included libraries only the image loading and decoding library is\n"
-"installed as @code{stb_image}."
-msgstr ""
-
-#: gnu/packages/image.scm:1112
-msgid ""
-"Optimizer that recompresses PNG image files to a\n"
-"smaller size"
-msgstr ""
-
-#: gnu/packages/image.scm:1114
+#: gnu/packages/image.scm:1565
 msgid ""
 "OptiPNG is a PNG optimizer that recompresses image\n"
 "files to a smaller size, without losing any information.  This program\n"
@@ -7077,11 +7576,24 @@ msgid ""
 "PNG, and performs PNG integrity checks and corrections."
 msgstr ""
 
-#: gnu/packages/image.scm:1139
-msgid "SIMD-accelerated JPEG image handling library"
+#: gnu/packages/image.scm:1597
+msgid ""
+"@code{imgp} is a command line image resizer and rotator for JPEG and PNG\n"
+"images.  It can resize (or thumbnail) and rotate thousands of images in a go\n"
+"while saving significantly on storage.\n"
+"\n"
+"This package may optionally be built with @code{python-pillow-simd} in place\n"
+"of @{python-pillow} for SIMD parallelism."
+msgstr ""
+
+#: gnu/packages/image.scm:1632
+msgid ""
+"Collection of graphics images created to test PNG\n"
+"applications like viewers, converters and editors.  As far as that is\n"
+"possible, all formats supported by the PNG standard are represented."
 msgstr ""
 
-#: gnu/packages/image.scm:1140
+#: gnu/packages/image.scm:1685
 msgid ""
 "libjpeg-turbo is a JPEG image codec that accelerates baseline\n"
 "JPEG compression and decompression using SIMD instructions: MMX on x86, SSE2 on\n"
@@ -7094,11 +7606,7 @@ msgid ""
 "and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.)."
 msgstr ""
 
-#: gnu/packages/image.scm:1188
-msgid "Library for reading and writing files in the nifti-1 format"
-msgstr ""
-
-#: gnu/packages/image.scm:1189
+#: gnu/packages/image.scm:1739
 msgid ""
 "Niftilib is a set of i/o libraries for reading and writing\n"
 "files in the nifti-1 data format - a binary file format for storing\n"
@@ -7106,19 +7614,146 @@ msgid ""
 "(fMRI) brain images."
 msgstr ""
 
-#: gnu/packages/image.scm:1235
-msgid "Color picker"
+#: gnu/packages/image.scm:1782
+msgid "Gpick is an advanced color picker and palette editing tool."
 msgstr ""
 
-#: gnu/packages/image.scm:1236
-msgid "Gpick is an advanced color picker and palette editing tool."
+#: gnu/packages/image.scm:1802
+msgid ""
+"Libiptcdata is a C library for manipulating the International Press\n"
+"Telecommunications Council (@dfn{IPTC}) metadata stored within multimedia files\n"
+"such as images.  This metadata can include captions and keywords, often used by\n"
+"popular photo management applications.  The library provides routines for\n"
+"parsing, viewing, modifying, and saving this metadata."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:91
-msgid "Fast and light imlib2-based image viewer"
+#: gnu/packages/image.scm:1833
+msgid ""
+"Flameshot is a screenshot program.\n"
+"Features:\n"
+"\n"
+"@itemize\n"
+"@item Customizable appearance.\n"
+"@item Easy to use.\n"
+"@item In-app screenshot edition.\n"
+"@item DBus interface.\n"
+"@item Upload to Imgur.\n"
+"@end itemize\n"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:93
+#: gnu/packages/image.scm:1869
+msgid ""
+"@command{swappy} is a command-line utility to take and edit screenshots\n"
+"of Wayland desktops.  Works great with grim, slurp and sway.  But can easily\n"
+"work with other screen copy tools that can output a final PNG image to\n"
+"stdout."
+msgstr ""
+
+#: gnu/packages/image.scm:1904
+msgid ""
+"Gifsicle is a command-line GIF image manipulation tool that:\n"
+"\n"
+"@itemize\n"
+"@item Provides a batch mode for changing GIFs in place.\n"
+"@item Prints detailed information about GIFs, including comments.\n"
+"@item Control over interlacing, comments, looping, transparency, etc.\n"
+"@item Creates well-behaved GIFs: removes redundant colors, only uses local color\n"
+"tables, etc.\n"
+"@item Shrinks colormaps and change images to use the Web-safe palette.\n"
+"@item Optimizes GIF animations, or unoptimizes them for easier editing.\n"
+"@end itemize\n"
+"\n"
+"Two other programs are included with Gifsicle: @command{gifview} is a\n"
+"lightweight animated-GIF viewer, and @command{gifdiff} compares two GIFs for\n"
+"identical visual appearance."
+msgstr ""
+
+#: gnu/packages/image.scm:1942
+msgid "Jp2a is a small utility that converts JPEG images to ASCII."
+msgstr ""
+
+#: gnu/packages/image.scm:1967
+msgid "grim can create screenshots from a Wayland compositor."
+msgstr ""
+
+#: gnu/packages/image.scm:1995
+msgid ""
+"Slurp can select a region in a Wayland compositor and print it\n"
+"to the standard output.  It works well together with grim."
+msgstr ""
+
+#: gnu/packages/image.scm:2028
+msgid ""
+"SNG (Scriptable Network Graphics) is a minilanguage designed\n"
+"specifically to represent the entire contents of a PNG (Portable Network\n"
+"Graphics) file in an editable form.  Thus, SNGs representing elaborate\n"
+"graphics images and ancillary chunk data can be readily generated or modified\n"
+"using only text tools.\n"
+"\n"
+"SNG is implemented by a compiler/decompiler called sng that\n"
+"losslessly translates between SNG and PNG."
+msgstr ""
+
+#: gnu/packages/image.scm:2088
+msgid ""
+"LodePNG is a PNG image decoder and encoder, all in one,\n"
+"no dependency or linkage required.  It's made for C (ISO C90), and has a C++\n"
+"wrapper with a more convenient interface on top."
+msgstr ""
+
+#: gnu/packages/image.scm:2112
+msgid ""
+"Icoutils are a set of program for extracting and converting\n"
+"bitmaps from Microsoft Windows icon and cursor files.  These files usually\n"
+"have the extension @code{.ico} or @code{.cur}, but they can also be embedded\n"
+"in executables and libraries (@code{.dll}-files).  (Such embedded files are\n"
+"referred to as resources.)\n"
+"\n"
+"Conversion of these files to and from PNG images is done @command{icotool}.\n"
+"@command{extresso} automates these tasks with the help of special resource\n"
+"scripts.  Resources such can be extracted from MS Windows executable and\n"
+"library files with @command{wrestool}.\n"
+"\n"
+"This package can be used to create @code{favicon.ico} files for web sites."
+msgstr ""
+
+#: gnu/packages/image.scm:2160
+msgid ""
+"Libavif is a C implementation of @acronym{AVIF, the AV1 Image\n"
+"File Format}.  It can encode and decode all YUV formats and bit depths supported\n"
+"by AOM, including with alpha."
+msgstr ""
+
+#: gnu/packages/image.scm:2199
+msgid ""
+"@code{libheif} is an ISO/IEC 23008-12:2017 HEIF and AVIF (AV1 Image File\n"
+"Format) file format decoder and encoder."
+msgstr ""
+
+#: gnu/packages/image.scm:2244
+msgid ""
+"Mtpaint is a graphic editing program which uses the GTK+ toolkit.\n"
+"It can create and edit indexed palette or 24bit RGB images, offers basic\n"
+"painting and palette manipulation tools.  It also handles JPEG, JPEG2000,\n"
+"GIF, TIFF, WEBP, BMP, PNG, XPM formats."
+msgstr ""
+
+#: gnu/packages/image.scm:2306
+msgid ""
+"MyPaint is a simple drawing and painting program that works well with\n"
+"Wacom-style graphics tablets."
+msgstr ""
+
+#: gnu/packages/image.scm:2355
+msgid ""
+"Phockup is a media sorting tool that uses creation date and\n"
+"time information in photos and videos to organize them into folders by year,\n"
+"month and day.  All files which are not images or videos or those which do not\n"
+"have creation date information will be placed in a folder called\n"
+"@file{unknown}."
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:114
 msgid ""
 "feh is an X11 image viewer aimed mostly at console users.\n"
 "Unlike most other viewers, it does not have a fancy GUI, but simply\n"
@@ -7127,11 +7762,7 @@ msgid ""
 "actions."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:143
-msgid "Lightweight GTK+ based image viewer"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:145
+#: gnu/packages/image-viewers.scm:161
 msgid ""
 "Geeqie is a lightweight GTK+ based image viewer for Unix like operating\n"
 "systems.  It features: EXIF, IPTC and XMP metadata browsing and editing\n"
@@ -7141,21 +7772,13 @@ msgid ""
 "collection.  Geeqie was initially based on GQview."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:170
-msgid "Simple and fast image viewer for X"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:171
+#: gnu/packages/image-viewers.scm:187
 msgid ""
 "gpicview is a lightweight GTK+ 2.x based image viewer.\n"
 "It is the default image viewer on LXDE desktop environment."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:202
-msgid "Simple X Image Viewer"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:204
+#: gnu/packages/image-viewers.scm:239
 msgid ""
 "sxiv is an alternative to feh and qiv.  Its primary goal is to\n"
 "provide the most basic features required for fast image viewing.  It has\n"
@@ -7164,11 +7787,7 @@ msgid ""
 "it and customize it for your needs."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:251
-msgid "Simple, fast and elegant image viewer"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:252
+#: gnu/packages/image-viewers.scm:282
 msgid ""
 "Viewnior is an image viewer program.  Created to be simple,\n"
 "fast and elegant.  Its minimalistic interface provides more screenspace for\n"
@@ -7186,21 +7805,13 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:320
-msgid "Render images in the terminal"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:322
+#: gnu/packages/image-viewers.scm:339
 msgid ""
 "Catimg is a little program that prints images in the terminal.\n"
 "It supports JPEG, PNG and GIF formats."
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:373
-msgid "High dynamic range (HDR) imaging application"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:375
+#: gnu/packages/image-viewers.scm:394
 msgid ""
 "Luminance HDR (formerly QtPFSGui) is a graphical user interface\n"
 "application that aims to provide a workflow for high dynamic range (HDR)\n"
@@ -7216,53 +7827,98 @@ msgid ""
 "@end itemize\n"
 msgstr ""
 
-#: gnu/packages/image-viewers.scm:422
-msgid "Image viewer for comics"
-msgstr ""
-
-#: gnu/packages/image-viewers.scm:423
+#: gnu/packages/image-viewers.scm:492
 msgid ""
 "MComix is a customizable image viewer that specializes as\n"
 "a comic and manga reader.  It supports a variety of container formats\n"
-"including CBZ, CB7, CBT, LHA."
+"including CBZ, CB7, CBT, LHA.\n"
+"\n"
+"For PDF support, install the @emph{mupdf} package."
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:534
+msgid ""
+"qView is a Qt image viewer designed with visually\n"
+"minimalism and usability in mind.  Its features include animated GIF\n"
+"controls, file history, rotation/mirroring, and multithreaded\n"
+"preloading."
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:561
+msgid ""
+"Chafa is a command-line utility that converts all kinds of images,\n"
+"including animated GIFs, into ANSI/Unicode character output that can be\n"
+"displayed in a terminal."
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:612
+msgid ""
+"@code{imv} is a command line image viewer intended for use\n"
+"with tiling window managers.  Features include:\n"
+"\n"
+"@itemize\n"
+"@item Native Wayland and X11 support.\n"
+"@item Support for dozens of image formats including:\n"
+"@itemize\n"
+"@item PNG\n"
+"@item JPEG\n"
+"@item Animated GIFs\n"
+"@item SVG\n"
+"@item TIFF\n"
+"@item Various RAW formats\n"
+"@item Photoshop PSD files\n"
+"@end itemize\n"
+"@item Configurable key bindings and behavior.\n"
+"@item Highly scriptable with IPC via imv-msg.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:683
+msgid ""
+"Quick Image Viewer is a small and fast GDK/Imlib2 image viewer.\n"
+"Features include zoom, maxpect, scale down, fullscreen, slideshow, delete,\n"
+"brightness/contrast/gamma correction, pan with keyboard and mouse, flip,\n"
+"rotate left/right, jump/forward/backward images, filename filter and use it\n"
+"to set X desktop background."
+msgstr ""
+
+#: gnu/packages/image-viewers.scm:741
+msgid ""
+"Nomacs is a simple to use image lounge featuring\n"
+"semi-transparent widgets that display additional information such as metadata,\n"
+"thumbnails and histograms.  It is able to browse images compressed archives\n"
+"and add notes to images.\n"
+"\n"
+"Nomacs includes image manipulation methods for adjusting brightness, contrast,\n"
+"saturation, hue, gamma, and exposure.  It has a pseudo color function which\n"
+"allows creating false color images.  A unique feature of Nomacs is the\n"
+"synchronization of multiple instances."
 msgstr ""
 
-#: gnu/packages/inkscape.scm:91
-msgid "Vector graphics editor"
+#: gnu/packages/image-viewers.scm:787
+msgid "xzgv is a fast image viewer that provides extensive keyboard support."
 msgstr ""
 
-#: gnu/packages/inkscape.scm:92
+#: gnu/packages/inkscape.scm:115 gnu/packages/inkscape.scm:302
 msgid ""
 "Inkscape is a vector graphics editor.  What sets Inkscape\n"
 "apart is its use of Scalable Vector Graphics (SVG), an XML-based W3C standard,\n"
 "as the native format."
 msgstr ""
 
-#: gnu/packages/jemalloc.scm:60
-msgid "General-purpose scalable concurrent malloc implementation"
-msgstr ""
-
-#: gnu/packages/jemalloc.scm:62
+#: gnu/packages/jemalloc.scm:68
 msgid ""
 "This library providing a malloc(3) implementation that emphasizes\n"
 "fragmentation avoidance and scalable concurrency support."
 msgstr ""
 
-#: gnu/packages/key-mon.scm:50
-msgid "Show keyboard and mouse status"
-msgstr ""
-
-#: gnu/packages/key-mon.scm:52
+#: gnu/packages/key-mon.scm:53
 msgid ""
 "The key-mon utility displays the current keyboard and mouse status.\n"
 "This is useful for teaching and screencasts."
 msgstr ""
 
-#: gnu/packages/less.scm:41
-msgid "Paginator for terminals"
-msgstr ""
-
-#: gnu/packages/less.scm:43
+#: gnu/packages/less.scm:52
 msgid ""
 "GNU less is a pager, a program that allows you to view large amounts\n"
 "of text in page-sized chunks.  Unlike traditional pagers, it allows both\n"
@@ -7271,19 +7927,22 @@ msgid ""
 "text editors."
 msgstr ""
 
-#: gnu/packages/lesstif.scm:47
-msgid "Clone of the Motif toolkit for the X window system"
+#: gnu/packages/less.scm:100
+msgid ""
+"To browse files, the excellent viewer @code{less} can be\n"
+"used.  By setting the environment variable @code{LESSOPEN}, less can be\n"
+"enhanced by external filters to become more powerful.  The input filter for\n"
+"less described here is called @code{lesspipe.sh}.  It is able to process a\n"
+"wide variety of file formats.  It enables users to inspect archives and\n"
+"display their contents without having to unpack them before.  The filter is\n"
+"easily extensible for new formats."
 msgstr ""
 
 #: gnu/packages/lesstif.scm:48
 msgid "Clone of the Motif toolkit for the X window system."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:95
-msgid "General purpose formula parser and interpreter"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:96
+#: gnu/packages/libreoffice.scm:109
 msgid ""
 "Ixion is a library for calculating the results of formula\n"
 "expressions stored in multiple named targets, or \"cells\".  The cells can\n"
@@ -7291,11 +7950,7 @@ msgid ""
 "their dependencies automatically upon calculation."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:122
-msgid "File import filter library for spreadsheet documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:123
+#: gnu/packages/libreoffice.scm:137
 msgid ""
 "Orcus is a library that provides a collection of standalone\n"
 "file processing filters.  It is currently focused on providing filters for\n"
@@ -7305,33 +7960,35 @@ msgid ""
 "CSV, CSS and XML."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:157
-msgid "Document importer for office suites"
+#: gnu/packages/libreoffice.scm:190
+msgid ""
+"Unoconv is a command-line utility to convert documents from any format\n"
+"that LibreOffice can import, to any format it can export.  It can be used for\n"
+"batch processing and can apply custom style templates and filters.\n"
+"\n"
+"Unoconv converts between over a hundred formats, including Open Document\n"
+"Format (@file{.odt}, @file{.ods}, @file{.odp})), Portable Document Format\n"
+"(@file{.pdf}), HTML and XHTML, RTF, DocBook (@file{.xml}), @file{.doc} and\n"
+"@file{.docx}), @file{.xls} and @file{.xlsx}).\n"
+"\n"
+"All required fonts must be installed on the converting system."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:158
+#: gnu/packages/libreoffice.scm:229
 msgid ""
 "Librevenge is a base library for writing document import\n"
 "filters.  It has interfaces for text documents, vector graphics,\n"
 "spreadsheets and presentations."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:183
-msgid "Library for importing WordPerfect documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:184
+#: gnu/packages/libreoffice.scm:257
 msgid ""
 "Libwpd is a C++ library designed to help process\n"
 "WordPerfect documents.  It is most commonly used to import such documents\n"
 "into other word processors."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:216
-msgid "Library for import of reflowable e-book formats"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:217
+#: gnu/packages/libreoffice.scm:291
 msgid ""
 "Libe-book is a library and a set of tools for reading and\n"
 "converting various reflowable e-book formats.  Currently supported are:\n"
@@ -7341,62 +7998,45 @@ msgid ""
 "ZVR (simple compressed text format)."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:246
-msgid "Library and tools for the WordPerfect Graphics format"
+#: gnu/packages/libreoffice.scm:322
+msgid ""
+"libepubgen is an EPUB generator for librevenge.  It supports\n"
+"librevenge's text document interface and--currently in a very limited\n"
+"way--presentation and vector drawing interfaces."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:247
+#: gnu/packages/libreoffice.scm:349
 msgid ""
 "The libwpg project provides a library and tools for\n"
 "working with graphics in the WPG (WordPerfect Graphics) format."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:288
-msgid "CMIS client library"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:289
+#: gnu/packages/libreoffice.scm:390
 msgid ""
 "LibCMIS is a C++ client library for the CMIS interface.  It\n"
 "allows C++ applications to connect to any ECM behaving as a CMIS server such\n"
 "as Alfresco or Nuxeo."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:320
-msgid "Library for parsing the AbiWord format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:321
+#: gnu/packages/libreoffice.scm:420
 msgid ""
 "Libabw is a library that parses the file format of\n"
 "AbiWord documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:352
-msgid "Library for parsing the CorelDRAW format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:353
+#: gnu/packages/libreoffice.scm:449
 msgid ""
 "Libcdr is a library that parses the file format of\n"
 "CorelDRAW documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:385
-msgid "Library for parsing the Apple Keynote format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:386
+#: gnu/packages/libreoffice.scm:483
 msgid ""
 "Libetonyek is a library that parses the file format of\n"
 "Apple Keynote documents.  It currently supports Keynote versions 2 to 5."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:409
-msgid "Library to access tags for identifying languages"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:410
+#: gnu/packages/libreoffice.scm:506
 msgid ""
 "Liblangtag implements an interface to work with tags\n"
 "for identifying languages as described in RFC 5646.  It supports the\n"
@@ -7405,62 +8045,45 @@ msgid ""
 "standard 21.0.2."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:430
-msgid "Text Categorization library"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:431
+#: gnu/packages/libreoffice.scm:527
 msgid ""
 "Libexttextcat is an N-Gram-Based Text Categorization\n"
 "library primarily intended for language guessing."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:461
-msgid "Library for parsing the FreeHand format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:462
+#: gnu/packages/libreoffice.scm:569
 msgid ""
 "Libfreehand is a library that parses the file format of\n"
 "Aldus/Macromedia/Adobe FreeHand documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:488
-msgid "Library for parsing the Microsoft Publisher format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:489
+#: gnu/packages/libreoffice.scm:596
 msgid ""
 "Libmspub is a library that parses the file format of\n"
 "Microsoft Publisher documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:514
-msgid "Library for parsing the PageMaker format"
+#: gnu/packages/libreoffice.scm:618
+msgid ""
+"The libnumbertext library provides language-neutral @code{NUMBERTEXT}\n"
+"and @code{MONEYTEXT} functions for LibreOffice Calc, available for C++ and\n"
+"Java."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:515
+#: gnu/packages/libreoffice.scm:647
 msgid ""
 "Libpagemaker is a library that parses the file format of\n"
 "Aldus/Adobe PageMaker documents.  Currently it only understands documents\n"
 "created by PageMaker version 6.x and 7."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:545
-msgid "Library for parsing the Microsoft Visio format"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:546
+#: gnu/packages/libreoffice.scm:678
 msgid ""
 "Libvisio is a library that parses the file format of\n"
 "Microsoft Visio documents of all versions."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:574
-msgid "ODF (Open Document Format) library"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:575
+#: gnu/packages/libreoffice.scm:708
 msgid ""
 "Libodfgen is a library for generating documents in the\n"
 "Open Document Format (ODF).  It provides generator implementations for all\n"
@@ -7468,99 +8091,65 @@ msgid ""
 "text documents, vector drawings, presentations and spreadsheets."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:602
-msgid "Import library for some old Macintosh text documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:603
+#: gnu/packages/libreoffice.scm:736
 msgid ""
 "Libmwaw contains some import filters for old Macintosh\n"
 "text documents (MacWrite, ClarisWorks, ... ) and for some graphics and\n"
 "spreadsheet documents."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:626
-msgid "Provides LibreOffice support for old StarOffice documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:627
+#: gnu/packages/libreoffice.scm:760
 msgid ""
 "@code{libstaroffice} is an import filter for the document formats\n"
 "from the old StarOffice (.sdc, .sdw, ...)."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:652
-msgid "Import library for Microsoft Works text documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:653
+#: gnu/packages/libreoffice.scm:786
 msgid ""
 "Libwps is a library for importing files in the Microsoft\n"
 "Works word processor file format."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:680
-msgid "Parses file format of Zoner Callisto/Draw documents"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:681
+#: gnu/packages/libreoffice.scm:817
 msgid ""
 "Libzmf is a library that parses the file format of Zoner\n"
 "Callisto/Draw documents.  Currently it only understands documents created by\n"
 "Zoner Draw version 4 and 5."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:716
+#: gnu/packages/libreoffice.scm:848
 msgid ""
 "Hunspell is a spell checker and morphological analyzer\n"
 "library and program designed for languages with rich morphology and complex\n"
 "word compounding or character encoding."
 msgstr ""
 
-#. TRANSLATORS: In French, this is "Français classique".
-#: gnu/packages/libreoffice.scm:779
-msgid "Hunspell dictionary for ``classic'' French (recommended)"
-msgstr ""
-
-#. TRANSLATORS: In French, this is "Français moderne".
-#: gnu/packages/libreoffice.scm:784
-msgid "Hunspell dictionary for ``modern'' French"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:788
-msgid "Hunspell dictionary for the post @dfn{1990 réforme} French"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:792
-msgid "Hunspell dictionary for all variants of French"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:810
-msgid "Hyphenation library"
+#: gnu/packages/libreoffice.scm:1006
+msgid ""
+"This package provides a dictionary for the Hunspell\n"
+"spell-checking library."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:811
+#: gnu/packages/libreoffice.scm:1028
 msgid ""
 "Hyphen is a hyphenation library using TeX hyphenation\n"
 "patterns, which are pre-processed by a perl script."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:834
-msgid "Thesaurus"
-msgstr ""
-
-#: gnu/packages/libreoffice.scm:835
+#: gnu/packages/libreoffice.scm:1053
 msgid ""
 "MyThes is a simple thesaurus that uses a structured text\n"
 "data file and an index file with binary search to look up words and phrases\n"
 "and to return information on pronunciations, meanings and synonyms."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:1042
-msgid "Office suite"
+#: gnu/packages/libreoffice.scm:1082
+msgid ""
+"libqxp is a library and a set of tools for reading and\n"
+"converting QuarkXPress file format.  It supports versions 3.1 to 4.1."
 msgstr ""
 
-#: gnu/packages/libreoffice.scm:1043
+#: gnu/packages/libreoffice.scm:1309
 msgid ""
 "LibreOffice is a comprehensive office suite.  It contains\n"
 "a number of components: Writer, a word processor; Calc, a spreadsheet\n"
@@ -7569,29 +8158,77 @@ msgid ""
 "Math for editing mathematics."
 msgstr ""
 
-#: gnu/packages/linux.scm:211
-msgid "GNU Linux-Libre kernel headers"
+#: gnu/packages/linux.scm:585
+msgid "Headers of the Linux-Libre kernel."
 msgstr ""
 
-#: gnu/packages/linux.scm:212
-msgid "Headers of the Linux-Libre kernel."
+#: gnu/packages/linux.scm:876
+msgid ""
+"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.\n"
+"It has been modified to remove all non-free binary blobs."
 msgstr ""
 
-#: gnu/packages/linux.scm:363
-msgid "100% free redistribution of a cleaned Linux kernel"
+#: gnu/packages/linux.scm:1159
+msgid ""
+"This simple Linux kernel module allows calls from user space to any\n"
+"@acronym{ACPI, Advanced Configuration and Power Interface} method provided by\n"
+"your computer's firmware, by writing to @file{/proc/acpi/call}.  You can pass\n"
+"any number of parameters of types @code{ACPI_INTEGER}, @code{ACPI_STRING},\n"
+"and @code{ACPI_BUFFER}.\n"
+"\n"
+"It grants direct and undocumented access to your hardware that may cause damage\n"
+"and should be used with caution, especially on untested models."
 msgstr ""
 
-#: gnu/packages/linux.scm:365
+#: gnu/packages/linux.scm:1209
 msgid ""
-"GNU Linux-Libre is a free (as in freedom) variant of the Linux kernel.\n"
-"It has been modified to remove all non-free binary blobs."
+"This is Realtek's rtl8812au Linux driver for USB 802.11n wireless\n"
+"network adapters, modified by the aircrack-ng project to support monitor mode\n"
+"and frame injection.  It provides a @code{88XXau} kernel module that supports\n"
+"RTL8812AU, RTL8821AU, and RTL8814AU chips."
+msgstr ""
+
+#: gnu/packages/linux.scm:1246
+msgid ""
+"This is Realtek's RTL8821CE Linux driver for wireless\n"
+"network adapters."
 msgstr ""
 
-#: gnu/packages/linux.scm:463
-msgid "Pluggable authentication modules for Linux"
+#: gnu/packages/linux.scm:1268
+msgid ""
+"VHBA module provides a Virtual (SCSI) HBA, which is the link\n"
+"between the CDemu userspace daemon and linux kernel."
 msgstr ""
 
-#: gnu/packages/linux.scm:465
+#: gnu/packages/linux.scm:1294
+msgid ""
+"The bbswitch module provides a way to toggle the Nvidia\n"
+"graphics card on Optimus laptops."
+msgstr ""
+
+#: gnu/packages/linux.scm:1336
+msgid ""
+"This package provides two Linux kernel drivers, ddcci and\n"
+"ddcci-backlight, that allows the control of DDC/CI monitors through the sysfs\n"
+"interface.  The ddcci module creates a character device for each DDC/CI\n"
+"monitors in @file{/dev/bus/ddcci/[I²C busnumber]}.  While the ddcci-backlight\n"
+"module allows the control of the backlight level or luminance property when\n"
+"supported under @file{/sys/class/backlight/}."
+msgstr ""
+
+#: gnu/packages/linux.scm:1363
+msgid ""
+"This Linux module creates virtual video devices.  @acronym{V4L2, Video\n"
+"for Linux 2} applications will treat these as ordinary video devices but read\n"
+"video data generated by another application, instead of a hardware device such\n"
+"as a capture card.\n"
+"\n"
+"This lets you apply nifty effects to your Jitsi video, for example, but also\n"
+"allows some more serious things like adding streaming capabilities to an\n"
+"application by hooking GStreamer into the loopback device."
+msgstr ""
+
+#: gnu/packages/linux.scm:1421
 msgid ""
 "A *Free* project to implement OSF's RFC 86.0.\n"
 "Pluggable authentication modules are small shared object files that can\n"
@@ -7599,92 +8236,85 @@ msgid ""
 "at login.  Local and dynamic reconfiguration are its key features."
 msgstr ""
 
-#: gnu/packages/linux.scm:507
-msgid "Small utilities that use the proc file system"
+#: gnu/packages/linux.scm:1482
+msgid "This package provides a PAM interface using @code{ctypes}."
 msgstr ""
 
-#: gnu/packages/linux.scm:509
+#: gnu/packages/linux.scm:1519
+msgid ""
+"Powerstat measures and reports your computer's power consumption in real\n"
+"time.  On mobile PCs, it uses ACPI battery information to measure the power\n"
+"drain of the entire system.\n"
+"\n"
+"Powerstat can also report @acronym{RAPL, Running Average Power Limit} power\n"
+"domain measurements.  These are available only on some hardware such as Intel\n"
+"Sandybridge and newer, and cover only part of the machine's components such as\n"
+"CPU, DRAM, and graphics.  However, they provide accurate and immediate readings\n"
+"and don't require a battery at all.\n"
+"\n"
+"The output is like @command{vmstat} but also shows power consumption statistics:\n"
+"at the end of a run, @command{powerstat} will calculate the average, standard\n"
+"deviation, and minimum and maximum values.  It can show a nice histogram too."
+msgstr ""
+
+#: gnu/packages/linux.scm:1557
 msgid ""
 "This PSmisc package is a set of some small useful utilities that\n"
 "use the proc file system.  We're not about changing the world, but\n"
 "providing the system administrator with some help in common tasks."
 msgstr ""
 
-#: gnu/packages/linux.scm:591
-msgid "Collection of utilities for the Linux kernel"
-msgstr ""
-
-#: gnu/packages/linux.scm:592
+#: gnu/packages/linux.scm:1691
 msgid ""
 "Util-linux is a diverse collection of Linux kernel\n"
 "utilities.  It provides dmesg and includes tools for working with file systems,\n"
 "block devices, UUIDs, TTYs, and many other tools."
 msgstr ""
 
-#: gnu/packages/linux.scm:616
-msgid "PERPETUAL DATE CONVERTER FROM GREGORIAN TO POEE CALENDAR"
-msgstr ""
-
-#: gnu/packages/linux.scm:618
+#: gnu/packages/linux.scm:1729
 msgid ""
 "ddate displays the Discordian date and holidays of a given date.\n"
 "The Discordian calendar was made popular by the \"Illuminatus!\" trilogy\n"
 "by Robert Shea and Robert Anton Wilson."
 msgstr ""
 
-#: gnu/packages/linux.scm:663
-msgid "Utilities that give information about processes"
+#: gnu/packages/linux.scm:1784
+msgid ""
+"The kernel Linux's @dfn{frame buffers} provide a simple interface to\n"
+"different kinds of graphic displays.  The @command{fbset} utility can query and\n"
+"change various device settings such as depth, virtual resolution, and timing\n"
+"parameters."
 msgstr ""
 
-#: gnu/packages/linux.scm:665
+#: gnu/packages/linux.scm:1829
 msgid ""
 "Procps is the package that has a bunch of small useful utilities\n"
 "that give information about processes using the Linux /proc file system.\n"
-"The package includes the programs ps, top, vmstat, w, kill, free,\n"
-"slabtop, and skill."
-msgstr ""
-
-#: gnu/packages/linux.scm:691
-msgid "Tools for working with USB devices, such as lsusb"
+"The package includes the programs free, pgrep, pidof, pkill, pmap, ps, pwdx,\n"
+"slabtop, tload, top, vmstat, w, watch and sysctl."
 msgstr ""
 
-#: gnu/packages/linux.scm:693
+#: gnu/packages/linux.scm:1885
 msgid "Tools for working with USB devices, such as lsusb."
 msgstr ""
 
-#: gnu/packages/linux.scm:769
-msgid "Creating and checking ext2/ext3/ext4 file systems"
-msgstr ""
-
-#: gnu/packages/linux.scm:771
+#: gnu/packages/linux.scm:1963
 msgid "This package provides tools for manipulating ext2/ext3/ext4 file systems."
 msgstr ""
 
-#: gnu/packages/linux.scm:812
-msgid "Statically-linked e2fsck command from e2fsprogs"
-msgstr ""
-
-#: gnu/packages/linux.scm:813
+#: gnu/packages/linux.scm:2006
 msgid ""
 "This package provides statically-linked e2fsck command taken\n"
 "from the e2fsprogs package.  It is meant to be used in initrds."
 msgstr ""
 
-#: gnu/packages/linux.scm:832
-msgid "Recover deleted files from ext2/3/4 partitions"
-msgstr ""
-
-#: gnu/packages/linux.scm:834
+#: gnu/packages/linux.scm:2029
 msgid ""
 "Extundelete is a set of tools that can recover deleted files from an\n"
 "ext3 or ext4 partition."
 msgstr ""
 
-#: gnu/packages/linux.scm:865
-msgid "Zero non-allocated regions in ext2/ext3/ext4 file systems"
-msgstr ""
-
-#: gnu/packages/linux.scm:867
+#: gnu/packages/linux.scm:2062
 msgid ""
 "Zerofree finds the unallocated blocks with non-zero value content in an\n"
 "ext2, ext3, or ext4 file system and fills them with zeroes (or another value).\n"
@@ -7692,46 +8322,26 @@ msgid ""
 "Zerofree requires the file system to be unmounted or mounted read-only."
 msgstr ""
 
-#: gnu/packages/linux.scm:895
-msgid "System call tracer for Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:897
+#: gnu/packages/linux.scm:2102
 msgid ""
 "strace is a system call tracer, i.e. a debugging tool which prints out a\n"
 "trace of all the system calls made by a another process/program."
 msgstr ""
 
-#: gnu/packages/linux.scm:918
-msgid "Library call tracer for Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:920
+#: gnu/packages/linux.scm:2125
 msgid ""
 "ltrace intercepts and records dynamic library calls which are called by\n"
 "an executed process and the signals received by that process.  It can also\n"
 "intercept and print the system calls executed by the program."
 msgstr ""
 
-#: gnu/packages/linux.scm:939
-msgid "The Advanced Linux Sound Architecture libraries"
-msgstr ""
-
-#: gnu/packages/linux.scm:941 gnu/packages/linux.scm:985
+#: gnu/packages/linux.scm:2150 gnu/packages/linux.scm:2202
 msgid ""
 "The Advanced Linux Sound Architecture (ALSA) provides audio and\n"
 "MIDI functionality to the Linux-based operating system."
 msgstr ""
 
-#: gnu/packages/linux.scm:983
-msgid "Utilities for the Advanced Linux Sound Architecture (ALSA)"
-msgstr ""
-
-#: gnu/packages/linux.scm:1043
-msgid "Plugins for the Advanced Linux Sound Architecture (ALSA)"
-msgstr ""
-
-#: gnu/packages/linux.scm:1045
+#: gnu/packages/linux.scm:2271
 msgid ""
 "The Advanced Linux Sound Architecture (ALSA) provides audio and\n"
 "MIDI functionality to the Linux-based operating system.  This package enhances ALSA\n"
@@ -7740,25 +8350,49 @@ msgid ""
 "external rate conversion."
 msgstr ""
 
-#: gnu/packages/linux.scm:1079
-msgid "Program to configure the Linux IP packet filtering rules"
+#: gnu/packages/linux.scm:2308
+msgid ""
+"@command{iptables} is the user-space command line program used to\n"
+"configure the Linux 2.4.x and later IPv4 packet filtering ruleset\n"
+"(@dfn{firewall}), including @dfn{NAT} (Network Address Translation).\n"
+"\n"
+"This package also includes @command{ip6tables}, which is used to configure the\n"
+"IPv6 packet filter.\n"
+"\n"
+"Both commands are targeted at system administrators."
 msgstr ""
 
-#: gnu/packages/linux.scm:1081
+#: gnu/packages/linux.scm:2344
 msgid ""
-"iptables is the userspace command line program used to configure the\n"
-"Linux 2.4.x and later IPv4 packet filtering ruleset (firewall).  It is targeted at\n"
-"system administrators.  Since Network Address Translation is also configured\n"
-"from the packet filter ruleset, iptables is used for this, too.  The iptables\n"
-"package also includes ip6tables.  ip6tables is used for configuring the IPv6\n"
-"packet filter."
+"This simple daemon feeds entropy from the CPU Jitter @acronym{RNG, random\n"
+"number generator} core to the kernel Linux's entropy estimator.  This prevents\n"
+"the @file{/dev/random} device from blocking and should benefit users of the\n"
+"preferred @file{/dev/urandom} and @code{getrandom()} interfaces too.\n"
+"\n"
+"The CPU Jitter RNG itself is part of the kernel and claims to provide good\n"
+"entropy by collecting and magnifying differences in CPU execution time as\n"
+"measured by the high-resolution timer built into modern CPUs.  It requires no\n"
+"additional hardware or external entropy source.\n"
+"\n"
+"The random bit stream generated by @command{jitterentropy-rngd} is not processed\n"
+"by a cryptographically secure whitening function.  Nonetheless, its authors\n"
+"believe it to be a suitable source of cryptographically secure key material or\n"
+"other cryptographically sensitive data.\n"
+"\n"
+"If you agree with them, start this daemon as early as possible to provide\n"
+"properly seeded random numbers to services like SSH or those using TLS during\n"
+"early boot when entropy may be low, especially in virtualised environments."
 msgstr ""
 
-#: gnu/packages/linux.scm:1135
-msgid "Ethernet bridge frame table administration"
+#: gnu/packages/linux.scm:2380
+msgid ""
+"@command{lsscsi} lists SCSI logical units or SCSI targets.  It can\n"
+"also list NVMe namespaces or controllers and show the relationship between a\n"
+"device's primary node name, its SCSI generic (sg) node name and its kernel\n"
+"name."
 msgstr ""
 
-#: gnu/packages/linux.scm:1138
+#: gnu/packages/linux.scm:2405
 msgid ""
 "ebtables is an application program used to set up and maintain the\n"
 "tables of rules (inside the Linux kernel) that inspect Ethernet frames.  It is\n"
@@ -7766,11 +8400,7 @@ msgid ""
 "that the Ethernet protocol is much simpler than the IP protocol."
 msgstr ""
 
-#: gnu/packages/linux.scm:1186
-msgid "Utilities for controlling TCP/IP networking and traffic in Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:1188
+#: gnu/packages/linux.scm:2472
 msgid ""
 "Iproute2 is a collection of utilities for controlling TCP/IP networking\n"
 "and traffic with the Linux kernel.  The most important of these are\n"
@@ -7782,11 +8412,7 @@ msgid ""
 "inadequately in modern network environments, and both should be deprecated."
 msgstr ""
 
-#: gnu/packages/linux.scm:1274
-msgid "Tools for controlling the network subsystem in Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:1276
+#: gnu/packages/linux.scm:2552
 msgid ""
 "This package includes the important tools for controlling the network\n"
 "subsystem of the Linux kernel.  This includes arp, ifconfig, netstat, rarp and\n"
@@ -7795,21 +8421,13 @@ msgid ""
 "configuration (iptunnel, ipmaddr)."
 msgstr ""
 
-#: gnu/packages/linux.scm:1415
-msgid "Library for working with POSIX capabilities"
-msgstr ""
-
-#: gnu/packages/linux.scm:1417
+#: gnu/packages/linux.scm:2592
 msgid ""
 "Libcap2 provides a programming interface to POSIX capabilities on\n"
 "Linux-based operating systems."
 msgstr ""
 
-#: gnu/packages/linux.scm:1460
-msgid "Manipulate Ethernet bridges"
-msgstr ""
-
-#: gnu/packages/linux.scm:1462
+#: gnu/packages/linux.scm:2667
 msgid ""
 "Utilities for Linux's Ethernet bridging facilities.  A bridge is a way\n"
 "to connect two Ethernet segments together in a protocol independent way.\n"
@@ -7818,11 +8436,7 @@ msgid ""
 "transparently through a bridge."
 msgstr ""
 
-#: gnu/packages/linux.scm:1530
-msgid "NetLink protocol library suite"
-msgstr ""
-
-#: gnu/packages/linux.scm:1532
+#: gnu/packages/linux.scm:2718
 msgid ""
 "The libnl suite is a collection of libraries providing APIs to netlink\n"
 "protocol based Linux kernel interfaces.  Netlink is an IPC mechanism primarily\n"
@@ -7831,21 +8445,13 @@ msgid ""
 "configuration and monitoring interfaces."
 msgstr ""
 
-#: gnu/packages/linux.scm:1562
-msgid "Tool for configuring wireless devices"
-msgstr ""
-
-#: gnu/packages/linux.scm:1564
+#: gnu/packages/linux.scm:2796
 msgid ""
 "iw is a new nl80211 based CLI configuration utility for wireless\n"
 "devices.  It replaces @code{iwconfig}, which is deprecated."
 msgstr ""
 
-#: gnu/packages/linux.scm:1610
-msgid "Analyze power consumption on Intel-based laptops"
-msgstr ""
-
-#: gnu/packages/linux.scm:1612
+#: gnu/packages/linux.scm:2842
 msgid ""
 "PowerTOP is a Linux tool to diagnose issues with power consumption and\n"
 "power management.  In addition to being a diagnostic tool, PowerTOP also has\n"
@@ -7854,31 +8460,19 @@ msgid ""
 "settings."
 msgstr ""
 
-#: gnu/packages/linux.scm:1634
-msgid "Audio mixer for X and the console"
-msgstr ""
-
-#: gnu/packages/linux.scm:1636
+#: gnu/packages/linux.scm:2866
 msgid ""
 "Aumix adjusts an audio mixer from X, the console, a terminal,\n"
 "the command line or a script."
 msgstr ""
 
-#: gnu/packages/linux.scm:1660
-msgid "Displays the IO activity of running processes"
-msgstr ""
-
-#: gnu/packages/linux.scm:1662
+#: gnu/packages/linux.scm:2897
 msgid ""
 "Iotop is a Python program with a top like user interface to show the\n"
 "processes currently causing I/O."
 msgstr ""
 
-#: gnu/packages/linux.scm:1716
-msgid "Support file systems implemented in user space"
-msgstr ""
-
-#: gnu/packages/linux.scm:1718
+#: gnu/packages/linux.scm:2954
 msgid ""
 "As a consequence of its monolithic design, file system code for Linux\n"
 "normally goes into the kernel itself---which is not only a robustness issue,\n"
@@ -7888,11 +8482,7 @@ msgid ""
 "user-space processes."
 msgstr ""
 
-#: gnu/packages/linux.scm:1752
-msgid "User-space union file system"
-msgstr ""
-
-#: gnu/packages/linux.scm:1754
+#: gnu/packages/linux.scm:2987
 msgid ""
 "UnionFS-FUSE is a flexible union file system implementation in user\n"
 "space, using the FUSE library.  Mounting a union file system allows you to\n"
@@ -7900,15 +8490,7 @@ msgid ""
 "UnionFS-FUSE additionally supports copy-on-write."
 msgstr ""
 
-#: gnu/packages/linux.scm:1779
-msgid "User-space union file system (statically linked)"
-msgstr ""
-
-#: gnu/packages/linux.scm:1827
-msgid "Mount remote file systems over SSH"
-msgstr ""
-
-#: gnu/packages/linux.scm:1829
+#: gnu/packages/linux.scm:3067
 msgid ""
 "This is a file system client based on the SSH File Transfer Protocol.\n"
 "Since most SSH servers already support this protocol it is very easy to set\n"
@@ -7916,11 +8498,7 @@ msgid ""
 "file system is as easy as logging into the server with an SSH client."
 msgstr ""
 
-#: gnu/packages/linux.scm:1852
-msgid "Tool for mounting archive files with FUSE"
-msgstr ""
-
-#: gnu/packages/linux.scm:1853
+#: gnu/packages/linux.scm:3095
 msgid ""
 "archivemount is a FUSE-based file system for Unix variants,\n"
 "including Linux.  Its purpose is to mount archives (i.e. tar, tar.gz, etc.) to a\n"
@@ -7929,59 +8507,39 @@ msgid ""
 "compressed, transparent to other programs, without decompressing them."
 msgstr ""
 
-#: gnu/packages/linux.scm:1883
-msgid "Tools for non-uniform memory access (NUMA) machines"
-msgstr ""
-
-#: gnu/packages/linux.scm:1885
+#: gnu/packages/linux.scm:3126
 msgid ""
 "NUMA stands for Non-Uniform Memory Access, in other words a system whose\n"
-"memory is not all in one place.  The numactl program allows you to run your\n"
-"application program on specific CPU's and memory nodes.  It does this by\n"
-"supplying a NUMA memory policy to the operating system before running your\n"
+"memory is not all in one place.  The @command{numactl} program allows you to\n"
+"run your application program on specific CPUs and memory nodes.  It does this\n"
+"by supplying a NUMA memory policy to the operating system before running your\n"
 "program.\n"
 "\n"
-"The package contains other commands, such as numademo, numastat and memhog.\n"
-"The numademo command provides a quick overview of NUMA performance on your\n"
-"system."
-msgstr ""
-
-#: gnu/packages/linux.scm:1921
-msgid "Neo2 console layout"
+"The package contains other commands, such as @command{numastat},\n"
+"@command{memhog}, and @command{numademo} which provides a quick overview of\n"
+"NUMA performance on your system."
 msgstr ""
 
-#: gnu/packages/linux.scm:1923
+#: gnu/packages/linux.scm:3164
 msgid ""
 "Kbd-neo provides the Neo2 keyboard layout for use with\n"
 "@command{loadkeys(1)} from @code{kbd(4)}."
 msgstr ""
 
-#: gnu/packages/linux.scm:1986
-msgid "Linux keyboard utilities and keyboard maps"
-msgstr ""
-
-#: gnu/packages/linux.scm:1988
+#: gnu/packages/linux.scm:3232
 msgid ""
 "This package contains keytable files and keyboard utilities compatible\n"
 "for systems using the Linux kernel.  This includes commands such as\n"
-"'loadkeys', 'setfont', 'kbdinfo', and 'chvt'."
-msgstr ""
-
-#: gnu/packages/linux.scm:2007
-msgid "Monitor file accesses"
+"@code{loadkeys}, @code{setfont}, @code{kbdinfo}, and @code{chvt}."
 msgstr ""
 
-#: gnu/packages/linux.scm:2009
+#: gnu/packages/linux.scm:3298
 msgid ""
 "The inotify-tools packages provides a C library and command-line tools\n"
 "to use Linux' inotify mechanism, which allows file accesses to be monitored."
 msgstr ""
 
-#: gnu/packages/linux.scm:2047
-msgid "Kernel module tools"
-msgstr ""
-
-#: gnu/packages/linux.scm:2048
+#: gnu/packages/linux.scm:3347
 msgid ""
 "Kmod is a set of tools to handle common tasks with Linux\n"
 "kernel modules like insert, remove, list, check properties, resolve\n"
@@ -7992,83 +8550,102 @@ msgid ""
 "from the module-init-tools project."
 msgstr ""
 
-#: gnu/packages/linux.scm:2092
-msgid "Userspace device management"
+#: gnu/packages/linux.scm:3395
+msgid ""
+"Early OOM is a minimalist out of memory (OOM) daemon that\n"
+"runs in user space and provides a more responsive and configurable alternative\n"
+"to the in-kernel OOM killer."
 msgstr ""
 
-#: gnu/packages/linux.scm:2093
+#: gnu/packages/linux.scm:3493
 msgid ""
 "Udev is a daemon which dynamically creates and removes\n"
 "device nodes from /dev/, handles hotplug events and loads drivers at boot\n"
 "time."
 msgstr ""
 
-#: gnu/packages/linux.scm:2168
-msgid "Logical volume management for Linux"
+#: gnu/packages/linux.scm:3525
+msgid ""
+"Python-evdev provides bindings to the generic input event interface in\n"
+"Linux.  The @code{evdev} interface serves the purpose of passing events\n"
+"generated in the kernel directly to userspace through character devices that\n"
+"are typically located in @file{/dev/input/}.\n"
+"\n"
+"This package also comes with bindings to @code{uinput}, the userspace input\n"
+"subsystem.  @code{uinput} allows userspace programs to create and handle input\n"
+"devices that can inject events directly into the input subsystem."
+msgstr ""
+
+#: gnu/packages/linux.scm:3569
+msgid ""
+"Interception Tools provides a composable infrastructure on top of\n"
+"@code{libudev} and @code{libevdev}.  The following utilities are provided:\n"
+"\n"
+"@itemize\n"
+"@item @command{udevmon} --- monitor input devices for launching tasks\n"
+"@item @command{intercept} --- redirect device input events to stdout\n"
+"@item @command{uinput} --- redirect device input events from stding to virtual device\n"
+"@item @command{mux} --- mux streams of input events\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/linux.scm:3618
+msgid ""
+"Dual Function Keys is a plugin for @code{interception-tools} that allows\n"
+"one to send arbitrary keycodes when a given key is tapped or held."
 msgstr ""
 
-#: gnu/packages/linux.scm:2170
+#: gnu/packages/linux.scm:3696
 msgid ""
 "LVM2 is the logical volume management tool set for Linux-based systems.\n"
 "This package includes the user-space libraries and tools, including the device\n"
 "mapper.  Kernel components are part of Linux-libre."
 msgstr ""
 
-#: gnu/packages/linux.scm:2192
-msgid "Logical volume management for Linux (statically linked)"
-msgstr ""
-
-#: gnu/packages/linux.scm:2222
-msgid "Tools for manipulating Linux Wireless Extensions"
+#: gnu/packages/linux.scm:3764
+msgid ""
+"A suite of tools for manipulating the metadata of the\n"
+"dm-thin, dm-cache and dm-era device-mapper targets."
 msgstr ""
 
-#: gnu/packages/linux.scm:2223
+#: gnu/packages/linux.scm:3810
 msgid ""
 "Wireless Tools are used to manipulate the now-deprecated\n"
-"Linux Wireless Extensions; consider using 'iw' instead.  The Wireless\n"
+"Linux Wireless Extensions; consider using @code{iw} instead.  The Wireless\n"
 "Extension was an interface allowing you to set Wireless LAN specific\n"
 "parameters and get the specific stats.  It is deprecated in favor the nl80211\n"
 "interface."
 msgstr ""
 
-#: gnu/packages/linux.scm:2295
-msgid "Central regulatory domain agent (CRDA) for WiFi"
-msgstr ""
-
-#: gnu/packages/linux.scm:2297
+#: gnu/packages/linux.scm:3902
 msgid ""
 "The Central Regulatory Domain Agent (CRDA) acts as the udev helper for\n"
 "communication between the kernel Linux and user space for regulatory\n"
 "compliance."
 msgstr ""
 
-#: gnu/packages/linux.scm:2343
-msgid "Wireless regulatory database"
-msgstr ""
-
-#: gnu/packages/linux.scm:2345
+#: gnu/packages/linux.scm:3972
 msgid ""
 "This package contains the wireless regulatory database Central\n"
 "Regulatory Database Agent (CRDA) daemon.  The database contains information on\n"
 "country-specific regulations for the wireless spectrum."
 msgstr ""
 
-#: gnu/packages/linux.scm:2422
-msgid "Utilities to read temperature/voltage/fan sensors"
-msgstr ""
-
-#: gnu/packages/linux.scm:2424
+#: gnu/packages/linux.scm:4051
 msgid ""
 "Lm-sensors is a hardware health monitoring package for Linux.  It allows\n"
 "you to access information from temperature, voltage, and fan speed sensors.\n"
 "It works with most newer systems."
 msgstr ""
 
-#: gnu/packages/linux.scm:2451
-msgid "I2C tools for Linux"
+#: gnu/packages/linux.scm:4071
+msgid ""
+"@command{iucode_tool} is a utility to work with microcode packages for\n"
+"Intel processors.  It can convert between formats, extract specific versions,\n"
+"create a firmware image suitable for the Linux kernel, and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:2453
+#: gnu/packages/linux.scm:4102
 msgid ""
 "The i2c-tools package contains a heterogeneous set of I2C tools for\n"
 "Linux: a bus probing tool, a chip dumper, register-level SMBus access helpers,\n"
@@ -8076,35 +8653,23 @@ msgid ""
 "SMBus access."
 msgstr ""
 
-#: gnu/packages/linux.scm:2490
-msgid "Hardware health information viewer"
-msgstr ""
-
-#: gnu/packages/linux.scm:2492
+#: gnu/packages/linux.scm:4141
 msgid ""
 "Xsensors reads data from the libsensors library regarding hardware\n"
 "health such as temperature, voltage and fan speed and displays the information\n"
 "in a digital read-out."
 msgstr ""
 
-#: gnu/packages/linux.scm:2542
-msgid "Linux profiling with performance counters"
-msgstr ""
-
-#: gnu/packages/linux.scm:2544
+#: gnu/packages/linux.scm:4195
 msgid ""
 "perf is a tool suite for profiling using hardware performance counters,\n"
 "with support in the Linux kernel.  perf can instrument CPU performance\n"
 "counters, tracepoints, kprobes, and uprobes (dynamic tracing).  It is capable\n"
 "of lightweight profiling.  This package contains the user-land tools and in\n"
-"particular the 'perf' command."
-msgstr ""
-
-#: gnu/packages/linux.scm:2567
-msgid "Simple tool for creating Linux namespace containers"
+"particular the @code{perf} command."
 msgstr ""
 
-#: gnu/packages/linux.scm:2568
+#: gnu/packages/linux.scm:4220
 msgid ""
 "pflask is a simple tool for creating Linux namespace\n"
 "containers.  It can be used for running a command or even booting an OS inside\n"
@@ -8113,11 +8678,15 @@ msgid ""
 "thanks to the use of namespaces."
 msgstr ""
 
-#: gnu/packages/linux.scm:2597
-msgid "View and tune ATA disk drive parameters"
+#: gnu/packages/linux.scm:4305
+msgid ""
+"Singularity is a container platform supporting a number of\n"
+"container image formats.  It can build SquashFS container images or import\n"
+"existing Docker images.  Singularity requires kernel support for container\n"
+"isolation or root privileges."
 msgstr ""
 
-#: gnu/packages/linux.scm:2599
+#: gnu/packages/linux.scm:4338
 msgid ""
 "@command{hdparm} is a command-line utility to control ATA controllers and\n"
 "disk drives.  It can increase performance and/or reliability by careful tuning\n"
@@ -8127,26 +8696,25 @@ msgid ""
 "\n"
 "@command{hdparm} provides a command line interface to various Linux kernel\n"
 "interfaces provided by the SATA/ATA/SAS @code{libata} subsystem, and the older\n"
-"IDE driver subsystem.  Many external USB drive enclosures with @dfn{SCSI-ATA\n"
-"Command Translation} (SAT) are also supported."
+"IDE driver subsystem.  Many external USB drive enclosures with SCSI-ATA Command\n"
+"Translation (@dfn{SAT}) are also supported."
 msgstr ""
 
-#: gnu/packages/linux.scm:2630
-msgid "Tool for enabling and disabling wireless devices"
+#: gnu/packages/linux.scm:4377
+msgid ""
+"Nvme-cli is a utility to provide standards compliant tooling\n"
+"for NVM-Express drives.  It was made specifically for Linux as it relies on the\n"
+"IOCTLs defined by the mainline kernel driver."
 msgstr ""
 
-#: gnu/packages/linux.scm:2632
+#: gnu/packages/linux.scm:4403
 msgid ""
 "rfkill is a simple tool for accessing the rfkill device interface,\n"
 "which is used to enable and disable wireless networking devices, typically\n"
 "WLAN, Bluetooth and mobile broadband."
 msgstr ""
 
-#: gnu/packages/linux.scm:2651
-msgid "Display information on ACPI devices"
-msgstr ""
-
-#: gnu/packages/linux.scm:2652
+#: gnu/packages/linux.scm:4425
 msgid ""
 "@code{acpi} attempts to replicate the functionality of the\n"
 "\"old\" @code{apm} command on ACPI systems, including battery and thermal\n"
@@ -8154,11 +8722,7 @@ msgid ""
 "about ACPI devices."
 msgstr ""
 
-#: gnu/packages/linux.scm:2671
-msgid "Daemon for delivering ACPI events to user-space programs"
-msgstr ""
-
-#: gnu/packages/linux.scm:2673
+#: gnu/packages/linux.scm:4446
 msgid ""
 "acpid is designed to notify user-space programs of Advanced\n"
 "Configuration and Power Interface (ACPI) events.  acpid should be started\n"
@@ -8167,37 +8731,21 @@ msgid ""
 "specified in /etc/acpi/events and execute the rules that match the event."
 msgstr ""
 
-#: gnu/packages/linux.scm:2695
-msgid "System utilities based on Linux sysfs"
-msgstr ""
-
-#: gnu/packages/linux.scm:2697
+#: gnu/packages/linux.scm:4470
 msgid ""
 "These are a set of utilities built upon sysfs, a virtual file system in\n"
 "Linux kernel versions 2.5+ that exposes a system's device tree.  The package\n"
 "also contains the libsysfs library."
 msgstr ""
 
-#: gnu/packages/linux.scm:2726
-msgid "System utilities based on Linux sysfs (version 1.x)"
-msgstr ""
-
-#: gnu/packages/linux.scm:2749
-msgid "Utilities to get and set CPU frequency on Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:2751
+#: gnu/packages/linux.scm:4523
 msgid ""
 "The cpufrequtils suite contains utilities to retrieve CPU frequency\n"
 "information, and set the CPU frequency if supported, using the cpufreq\n"
 "capabilities of the Linux kernel."
 msgstr ""
 
-#: gnu/packages/linux.scm:2770
-msgid "Interface library for the Linux IEEE1394 drivers"
-msgstr ""
-
-#: gnu/packages/linux.scm:2772
+#: gnu/packages/linux.scm:4544
 msgid ""
 "Libraw1394 is the only supported interface to the kernel side raw1394 of\n"
 "the Linux IEEE-1394 subsystem, which provides direct access to the connected\n"
@@ -8206,46 +8754,26 @@ msgid ""
 "protocol in question."
 msgstr ""
 
-#: gnu/packages/linux.scm:2796
-msgid "AV/C protocol library for IEEE 1394"
-msgstr ""
-
-#: gnu/packages/linux.scm:2798
+#: gnu/packages/linux.scm:4570
 msgid ""
 "Libavc1394 is a programming interface to the AV/C specification from\n"
 "the 1394 Trade Association.  AV/C stands for Audio/Video Control."
 msgstr ""
 
-#: gnu/packages/linux.scm:2820
-msgid "Isochronous streaming media library for IEEE 1394"
-msgstr ""
-
-#: gnu/packages/linux.scm:2822
+#: gnu/packages/linux.scm:4594
 msgid ""
 "The libiec61883 library provides a higher level API for streaming DV,\n"
 "MPEG-2 and audio over Linux IEEE 1394."
 msgstr ""
 
-#: gnu/packages/linux.scm:2871
-msgid "Tool for managing Linux Software RAID arrays"
-msgstr ""
-
-#: gnu/packages/linux.scm:2873
+#: gnu/packages/linux.scm:4647
 msgid ""
 "mdadm is a tool for managing Linux Software RAID arrays.  It can create,\n"
 "assemble, report on, and monitor arrays.  It can also move spares between raid\n"
 "arrays when needed."
 msgstr ""
 
-#: gnu/packages/linux.scm:2905
-msgid "Statically-linked 'mdadm' command for use in an initrd"
-msgstr ""
-
-#: gnu/packages/linux.scm:2970
-msgid "Access block devices through multiple paths"
-msgstr ""
-
-#: gnu/packages/linux.scm:2972
+#: gnu/packages/linux.scm:4781
 msgid ""
 "This package provides the following binaries to drive the\n"
 "Linux Device Mapper multipathing driver:\n"
@@ -8258,95 +8786,104 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3004
-msgid "Linux-native asynchronous I/O access library"
-msgstr ""
-
-#: gnu/packages/linux.scm:3006
+#: gnu/packages/linux.scm:4821
 msgid ""
 "This library enables userspace to use Linux kernel asynchronous I/O\n"
 "system calls, important for the performance of databases and other advanced\n"
 "applications."
 msgstr ""
 
-#: gnu/packages/linux.scm:3028
-msgid "Bluetooth subband audio codec"
+#: gnu/packages/linux.scm:4864
+msgid ""
+"Blktrace is a block layer IO tracing mechanism which provides\n"
+"detailed information about request queue operations to user space.  It extracts\n"
+"event traces from the kernel (via the relaying through the debug file system)."
 msgstr ""
 
-#: gnu/packages/linux.scm:3030
+#: gnu/packages/linux.scm:4889
 msgid ""
 "The SBC is a digital audio encoder and decoder used to transfer data to\n"
 "Bluetooth audio output devices like headphones or loudspeakers."
 msgstr ""
 
-#: gnu/packages/linux.scm:3098
-msgid "Linux Bluetooth protocol stack"
-msgstr ""
-
-#: gnu/packages/linux.scm:3100
+#: gnu/packages/linux.scm:4959
 msgid ""
 "BlueZ provides support for the core Bluetooth layers and protocols.  It\n"
 "is flexible, efficient and uses a modular implementation."
 msgstr ""
 
-#: gnu/packages/linux.scm:3122
-msgid "Mount exFAT file systems"
-msgstr ""
-
-#: gnu/packages/linux.scm:3124
+#: gnu/packages/linux.scm:4983
 msgid ""
 "This package provides a FUSE-based file system that provides read and\n"
 "write access to exFAT devices."
 msgstr ""
 
-#: gnu/packages/linux.scm:3166
-msgid "Mouse support for the Linux console"
+#: gnu/packages/linux.scm:5008
+msgid ""
+"FuseISO is a FUSE module to mount ISO file system images (.iso, .nrg,\n"
+".bin, .mdf and .img files).  It supports plain ISO9660 Level 1 and 2, Rock\n"
+"Ridge, Joliet, and zisofs."
 msgstr ""
 
-#: gnu/packages/linux.scm:3168
+#: gnu/packages/linux.scm:5053
 msgid ""
 "The GPM (general-purpose mouse) daemon is a mouse server for\n"
 "applications running on the Linux console.  It allows users to select items\n"
 "and copy/paste text in the console and in xterm."
 msgstr ""
 
-#: gnu/packages/linux.scm:3225
-msgid "Create and manage btrfs copy-on-write file systems"
-msgstr ""
-
-#: gnu/packages/linux.scm:3226
+#: gnu/packages/linux.scm:5126
 msgid ""
 "Btrfs is a @dfn{copy-on-write} (CoW) file system for Linux\n"
 "aimed at implementing advanced features while focusing on fault tolerance,\n"
 "repair and easy administration."
 msgstr ""
 
-#: gnu/packages/linux.scm:3258
-msgid "Statically-linked btrfs command from btrfs-progs"
-msgstr ""
-
-#: gnu/packages/linux.scm:3259
+#: gnu/packages/linux.scm:5160
 msgid ""
 "This package provides the statically-linked @command{btrfs}\n"
 "from the btrfs-progs package.  It is meant to be used in initrds."
 msgstr ""
 
-#: gnu/packages/linux.scm:3290
-msgid "Userland tools for f2fs"
+#: gnu/packages/linux.scm:5192
+msgid ""
+"Cramfs is a Linux file system designed to be simple, small,\n"
+"and to compress things well.  It is used on a number of embedded systems and\n"
+"small devices.  This version has additional features such as uncompressed\n"
+"blocks and random block placement."
+msgstr ""
+
+#: gnu/packages/linux.scm:5227
+msgid ""
+"@command{compsize} takes a list of files (given as\n"
+"arguments) on a Btrfs file system and measures used compression types and\n"
+"effective compression ratio, producing a report.\n"
+"\n"
+"A directory has no extents but has a (recursive) list of files.  A non-regular\n"
+"file is silently ignored.\n"
+"\n"
+"As it makes no sense to talk about compression ratio of a partial extent,\n"
+"every referenced extent is counted whole, exactly once -- no matter if you use\n"
+"only a few bytes of a 1GB extent or reflink it a thousand times.  Thus, the\n"
+"uncompressed size will not match the number given by @command{tar} or\n"
+"@command{du}.  On the other hand, the space used should be accurate (although\n"
+"obviously it can be shared with files outside our set)."
 msgstr ""
 
-#: gnu/packages/linux.scm:3292
+#: gnu/packages/linux.scm:5277
 msgid ""
 "F2FS, the Flash-Friendly File System, is a modern file system\n"
 "designed to be fast and durable on flash devices such as solid-state\n"
 "disks and SD cards.  This package provides the userland utilities."
 msgstr ""
 
-#: gnu/packages/linux.scm:3321
-msgid "Free-fall protection for spinning laptop hard drives"
+#: gnu/packages/linux.scm:5367
+msgid ""
+"This package provides statically-linked fsck.f2fs command taken\n"
+"from the f2fs-tools package. It is meant to be used in initrds."
 msgstr ""
 
-#: gnu/packages/linux.scm:3323
+#: gnu/packages/linux.scm:5398
 msgid ""
 "Prevents shock damage to the internal spinning hard drive(s) of some\n"
 "HP and Dell laptops.  When sudden movement is detected, all input/output\n"
@@ -8356,11 +8893,7 @@ msgid ""
 "feature, and a laptop with an accelerometer.  It has no effect on SSDs."
 msgstr ""
 
-#: gnu/packages/linux.scm:3377
-msgid "Simple fan control program"
-msgstr ""
-
-#: gnu/packages/linux.scm:3379
+#: gnu/packages/linux.scm:5457
 msgid ""
 "Thinkfan is a simple fan control program.  It reads temperatures,\n"
 "checks them against configured limits and switches to appropriate (also\n"
@@ -8369,22 +8902,61 @@ msgid ""
 "from userspace."
 msgstr ""
 
-#: gnu/packages/linux.scm:3414
-msgid "Read-write access to NTFS file systems"
+#: gnu/packages/linux.scm:5513
+msgid ""
+"Tpacpi-bat is a command-line interface to control battery charging on\n"
+"@uref{https://github.com/teleshoes/tpacpi-bat/wiki/Supported-Hardware, Lenovo\n"
+"ThinkPad models released after 2011}, starting with the xx20 series.  It can\n"
+"query and set the thresholds at which one or both batteries will start and stop\n"
+"charging, inhibit charging batteries for a set period of time, or force them to\n"
+"discharge when they otherwise would not.\n"
+"\n"
+"This tool merely exposes ACPI calls provided by the @code{acpi_call} Linux\n"
+"kernel module provided by the @code{acpi-call-linux-module} package, which must\n"
+"be installed and loaded separately.  Only the original vendor firmware is\n"
+"supported."
 msgstr ""
 
-#: gnu/packages/linux.scm:3416
+#: gnu/packages/linux.scm:5557
+msgid ""
+"Tmon is a tool to interact with the complex thermal subsystem of the\n"
+"kernel Linux.  It helps visualize thermal relationships and real-time thermal\n"
+"data, tune and test cooling devices and sensors, and collect thermal data for\n"
+"further analysis.\n"
+"\n"
+"As computers become smaller and more thermally constrained, more sensors are\n"
+"added and new cooling capabilities introduced.  Thermal relationships can change\n"
+"dynamically.  Their complexity grows exponentially among cooling devices, zones,\n"
+"sensors, and trip points.\n"
+"\n"
+"Linux exposes this relationship through @file{/sys/class/thermal} with a matrix\n"
+"of symbolic links, trip point bindings, and device instances.  To traverse it\n"
+"by hand is no trivial task: @command{tmon} aims to make it understandable."
+msgstr ""
+
+#: gnu/packages/linux.scm:5599
+msgid ""
+"Turbostat reports x86 processor topology, frequency, idle power state\n"
+"statistics, temperature, and power consumption.  Some information is unavailable\n"
+"on older processors.\n"
+"\n"
+"It can be used to identify machines that are inefficient in terms of power usage\n"
+"or idle time, report the rate of @acronym{SMI, system management interrupt}s\n"
+"occurring on the system, or verify the effects of power management tuning.\n"
+"\n"
+"@command{turbostat} reads hardware counters but doesn't write to them, so it\n"
+"won't interfere with the OS or other running processes---including multiple\n"
+"invocations of itself."
+msgstr ""
+
+#: gnu/packages/linux.scm:5658
 msgid ""
 "NTFS-3G provides read-write access to NTFS file systems, which are\n"
 "commonly found on Microsoft Windows.  It is implemented as a FUSE file system.\n"
 "The package provides additional NTFS tools."
 msgstr ""
 
-#: gnu/packages/linux.scm:3461
-msgid "Utilities and libraries for working with RDMA devices"
-msgstr ""
-
-#: gnu/packages/linux.scm:3463
+#: gnu/packages/linux.scm:5706
 msgid ""
 "This package provides userspace components for the InfiniBand\n"
 "subsystem of the Linux kernel.  Specifically it contains userspace\n"
@@ -8404,49 +8976,62 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3502
-msgid "Random number generator daemon"
+#: gnu/packages/linux.scm:5760
+msgid ""
+"This is a collection of tests written over uverbs intended for\n"
+"use as a performance micro-benchmark. The tests may be used for hardware or\n"
+"software tuning as well as for functional testing.\n"
+"\n"
+"The collection contains a set of bandwidth and latency benchmark such as:\n"
+"@enumerate\n"
+"@item Send        - @code{ib_send_bw} and @code{ib_send_lat}\n"
+"@item RDMA Read   - @code{ib_read_bw} and @code{ib_read_lat}\n"
+"@item RDMA Write  - @code{ib_write_bw} and @code{ib_wriet_lat}\n"
+"@item RDMA Atomic - @code{ib_atomic_bw} and @code{ib_atomic_lat}\n"
+"@item Native Ethernet (when working with MOFED2) - @code{raw_ethernet_bw}, @code{raw_ethernet_lat}\n"
+"@end enumerate"
 msgstr ""
 
-#: gnu/packages/linux.scm:3504
+#: gnu/packages/linux.scm:5804
 msgid ""
 "Monitor a hardware random number generator, and supply entropy\n"
 "from that to the system kernel's @file{/dev/random} machinery."
 msgstr ""
 
-#: gnu/packages/linux.scm:3542
-msgid "CPU frequency and voltage scaling tools for Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:3544
+#: gnu/packages/linux.scm:5846
 msgid ""
 "cpupower is a set of user-space tools that use the cpufreq feature of the\n"
 "Linux kernel to retrieve and control processor features related to power saving,\n"
 "such as frequency and voltage scaling."
 msgstr ""
 
-#: gnu/packages/linux.scm:3563
-msgid "Entropy source for the Linux random number generator"
+#: gnu/packages/linux.scm:5878
+msgid ""
+"@command{x86_energy_perf_policy} displays and updates energy-performance\n"
+"policy settings specific to Intel Architecture Processors.  Settings are\n"
+"accessed via Model Specific Register (MSR) updates, no matter if the Linux\n"
+"cpufreq sub-system is enabled or not."
 msgstr ""
 
-#: gnu/packages/linux.scm:3565
+#: gnu/packages/linux.scm:5901
 msgid ""
 "haveged generates an unpredictable stream of random numbers for use by\n"
 "Linux's @file{/dev/random} and @file{/dev/urandom} devices.  The kernel's\n"
 "standard mechanisms for filling the entropy pool may not be sufficient for\n"
 "systems with high needs or limited user interaction, such as headless servers.\n"
+"\n"
 "@command{haveged} runs as a privileged daemon, harvesting randomness from the\n"
-"indirect effects of hardware events on hidden processor state using the HArdware\n"
-"Volatile Entropy Gathering and Expansion (HAVEGE) algorithm.  It tunes itself to\n"
-"its environment and provides the same built-in test suite for the output stream\n"
-"as used on certified hardware security devices."
-msgstr ""
-
-#: gnu/packages/linux.scm:3604
-msgid "eCryptfs cryptographic file system utilities"
+"indirect effects of hardware events on hidden processor state using the\n"
+"@acronym{HAVEGE, HArdware Volatile Entropy Gathering and Expansion} algorithm.\n"
+"It tunes itself to its environment and provides the same built-in test suite\n"
+"for the output stream as used on certified hardware security devices.\n"
+"\n"
+"The quality of the randomness produced by this algorithm has not been proven.\n"
+"It is recommended to run it together with another entropy source like rngd, and\n"
+"not as a replacement for it."
 msgstr ""
 
-#: gnu/packages/linux.scm:3606
+#: gnu/packages/linux.scm:5988
 msgid ""
 "eCryptfs is a POSIX-compliant stacked cryptographic file system for Linux.\n"
 "Each file's cryptographic meta-data is stored inside the file itself, along\n"
@@ -8456,11 +9041,7 @@ msgid ""
 "2.6.19.  This package contains the userland utilities to manage it."
 msgstr ""
 
-#: gnu/packages/linux.scm:3637
-msgid "NFSv4 support library for name/ID mapping"
-msgstr ""
-
-#: gnu/packages/linux.scm:3638
+#: gnu/packages/linux.scm:6020
 msgid ""
 "Libnfsidmap is a library holding mulitiple methods of\n"
 "mapping names to ids and visa versa, mainly for NFSv4.  It provides an\n"
@@ -8468,43 +9049,27 @@ msgid ""
 "the default @code{nsswitch} and the experimental @code{umich_ldap}."
 msgstr ""
 
-#: gnu/packages/linux.scm:3672
-msgid "Tools for loading and managing Linux kernel modules"
-msgstr ""
-
-#: gnu/packages/linux.scm:3674
+#: gnu/packages/linux.scm:6056
 msgid ""
-"Tools for loading and managing Linux kernel modules, such as `modprobe',\n"
-"`insmod', `lsmod', and more."
+"Tools for loading and managing Linux kernel modules, such as\n"
+"@code{modprobe}, @code{insmod}, @code{lsmod}, and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:3708
-msgid "Machine check monitor for x86 Linux systems"
-msgstr ""
-
-#: gnu/packages/linux.scm:3710
+#: gnu/packages/linux.scm:6096
 msgid ""
-"The mcelog daemon is required by the Linux kernel to log memory, I/O, CPU,\n"
-"and other hardware errors on x86 systems.  It can also perform user-defined\n"
-"tasks, such as bringing bad pages off-line, when configurable error thresholds\n"
-"are exceeded."
+"The mcelog daemon logs memory, I/O, CPU, and other hardware errors on x86\n"
+"systems running the kernel Linux.  It can also perform user-defined tasks, such\n"
+"as bringing bad pages off-line, when configurable error thresholds are\n"
+"exceeded."
 msgstr ""
 
-#: gnu/packages/linux.scm:3739
-msgid "MTD Flash Storage Utilities"
-msgstr ""
-
-#: gnu/packages/linux.scm:3740
+#: gnu/packages/linux.scm:6128
 msgid ""
 "This package provides utilities for testing, partitioning, etc\n"
 "of flash storage."
 msgstr ""
 
-#: gnu/packages/linux.scm:3763
-msgid "Interface to Linux's seccomp syscall filtering mechanism"
-msgstr ""
-
-#: gnu/packages/linux.scm:3764
+#: gnu/packages/linux.scm:6162
 msgid ""
 "The libseccomp library provides an easy to use, platform\n"
 "independent, interface to the Linux Kernel's syscall filtering mechanism.  The\n"
@@ -8514,11 +9079,7 @@ msgid ""
 "developers."
 msgstr ""
 
-#: gnu/packages/linux.scm:3806
-msgid "Usage monitor for AMD Radeon graphics"
-msgstr ""
-
-#: gnu/packages/linux.scm:3807
+#: gnu/packages/linux.scm:6209
 msgid ""
 "RadeonTop monitors resource consumption on supported AMD\n"
 "Radeon Graphics Processing Units (GPUs), either in real time as bar graphs on\n"
@@ -8528,21 +9089,13 @@ msgid ""
 "under OpenGL graphics workloads."
 msgstr ""
 
-#: gnu/packages/linux.scm:3842
-msgid "Tool and library to manipulate EFI variables"
-msgstr ""
-
-#: gnu/packages/linux.scm:3843
+#: gnu/packages/linux.scm:6246
 msgid ""
 "This package provides a library and a command line\n"
 "interface to the variable facility of UEFI boot firmware."
 msgstr ""
 
-#: gnu/packages/linux.scm:3884
-msgid "Modify the Extensible Firmware Interface (EFI) boot manager"
-msgstr ""
-
-#: gnu/packages/linux.scm:3886
+#: gnu/packages/linux.scm:6284
 msgid ""
 "@code{efibootmgr} is a user-space application to modify the Intel\n"
 "Extensible Firmware Interface (EFI) Boot Manager.  This application can\n"
@@ -8550,11 +9103,7 @@ msgid ""
 "running boot option, and more."
 msgstr ""
 
-#: gnu/packages/linux.scm:3922
-msgid "Performance monitoring tools for Linux"
-msgstr ""
-
-#: gnu/packages/linux.scm:3923
+#: gnu/packages/linux.scm:6321
 msgid ""
 "The sysstat utilities are a collection of performance\n"
 "monitoring tools for Linux.  These include @code{mpstat}, @code{iostat},\n"
@@ -8562,11 +9111,7 @@ msgid ""
 "@code{sadf} and @code{sa}."
 msgstr ""
 
-#: gnu/packages/linux.scm:3955
-msgid "GNU/Linux application to control backlights"
-msgstr ""
-
-#: gnu/packages/linux.scm:3957
+#: gnu/packages/linux.scm:6362
 msgid ""
 "Light is a program to send commands to screen backlight controllers\n"
 "under GNU/Linux.  Features include:\n"
@@ -8576,17 +9121,21 @@ msgid ""
 "@item Light can automatically figure out the best controller to use, making\n"
 "full use of underlying hardware.\n"
 "@item It is possible to set a minimum brightness value, as some controllers\n"
-"set the screen to be pitch black at a vaĺue of 0 (or higher).\n"
+"set the screen to be pitch black at a value of 0 (or higher).\n"
 "@end itemize\n"
-"\n"
-"Light is the successor of lightscript."
 msgstr ""
 
-#: gnu/packages/linux.scm:4059
-msgid "Power management tool for Linux"
+#: gnu/packages/linux.scm:6402
+msgid ""
+"This program allows you read and control device brightness.  Devices\n"
+"include backlight and LEDs.  It can also preserve current brightness before\n"
+"applying the operation, such as on lid close.\n"
+"\n"
+"The appropriate permissions must be set on the backlight or LED control\n"
+"interface in sysfs, which can be accomplished with the included udev rules."
 msgstr ""
 
-#: gnu/packages/linux.scm:4060
+#: gnu/packages/linux.scm:6526
 msgid ""
 "TLP is a power management tool for Linux.  It comes with\n"
 "a default configuration already optimized for battery life.  Nevertheless,\n"
@@ -8594,11 +9143,7 @@ msgid ""
 "every time the power supply source is changed."
 msgstr ""
 
-#: gnu/packages/linux.scm:4087
-msgid "List hardware information"
-msgstr ""
-
-#: gnu/packages/linux.scm:4089
+#: gnu/packages/linux.scm:6554
 msgid ""
 "@command{lshw} (Hardware Lister) is a small tool to provide\n"
 "detailed information on the hardware configuration of the machine.\n"
@@ -8608,11 +9153,7 @@ msgid ""
 "machines (PowerMac G4 is known to work)."
 msgstr ""
 
-#: gnu/packages/linux.scm:4112
-msgid "Netlink utility library"
-msgstr ""
-
-#: gnu/packages/linux.scm:4113
+#: gnu/packages/linux.scm:6578
 msgid ""
 "Libmnl is a minimalistic user-space library oriented to\n"
 "Netlink developers.  There are a lot of common tasks in parsing, validating,\n"
@@ -8621,11 +9162,7 @@ msgid ""
 "re-use code and to avoid re-inventing the wheel."
 msgstr ""
 
-#: gnu/packages/linux.scm:4138
-msgid "Netlink programming interface to the Linux nf_tables subsystem"
-msgstr ""
-
-#: gnu/packages/linux.scm:4139
+#: gnu/packages/linux.scm:6603
 msgid ""
 "Libnftnl is a userspace library providing a low-level netlink\n"
 "programming interface to the in-kernel nf_tables subsystem.  The library\n"
@@ -8633,11 +9170,7 @@ msgid ""
 "used by nftables."
 msgstr ""
 
-#: gnu/packages/linux.scm:4166
-msgid "Userspace utility for Linux packet filtering"
-msgstr ""
-
-#: gnu/packages/linux.scm:4167
+#: gnu/packages/linux.scm:6634
 msgid ""
 "nftables is the project that aims to replace the existing\n"
 "{ip,ip6,arp,eb}tables framework.  Basically, this project provides a new packet\n"
@@ -8647,16 +9180,12 @@ msgid ""
 "userspace queueing component and the logging subsystem."
 msgstr ""
 
-#: gnu/packages/linux.scm:4265
-msgid "Unprivileged chroot, bind mount, and binfmt_misc"
-msgstr ""
-
-#: gnu/packages/linux.scm:4267
+#: gnu/packages/linux.scm:6744
 msgid ""
 "PRoot is a user-space implementation of @code{chroot}, @code{mount --bind},\n"
 "and @code{binfmt_misc}.  This means that users don't need any privileges or\n"
 "setup to do things like using an arbitrary directory as the new root\n"
-"filesystem, making files accessible somewhere else in the file system\n"
+"file system, making files accessible somewhere else in the file system\n"
 "hierarchy, or executing programs built for another CPU architecture\n"
 "transparently through QEMU user-mode.  Also, developers can use PRoot as a\n"
 "generic process instrumentation engine thanks to its extension mechanism.\n"
@@ -8664,15 +9193,7 @@ msgid ""
 "available in the kernel Linux."
 msgstr ""
 
-#: gnu/packages/linux.scm:4283
-msgid "Unprivileged chroot, bind mount, and binfmt_misc (statically linked)"
-msgstr ""
-
-#: gnu/packages/linux.scm:4329
-msgid "Linux tool to dump x86 CPUID information about the CPU(s)"
-msgstr ""
-
-#: gnu/packages/linux.scm:4330
+#: gnu/packages/linux.scm:6808
 msgid ""
 "cpuid dumps detailed information about the CPU(s) gathered\n"
 "from the CPUID instruction, and also determines the exact model of CPU(s).  It\n"
@@ -8680,22 +9201,14 @@ msgid ""
 "NexGen, Rise, and SiS CPUs."
 msgstr ""
 
-#: gnu/packages/linux.scm:4357
-msgid "Use a FUSE filesystem to access data over MTP"
-msgstr ""
-
-#: gnu/packages/linux.scm:4358
+#: gnu/packages/linux.scm:6837
 msgid ""
-"jmtpfs uses FUSE (filesystem in userspace) to provide access\n"
+"jmtpfs uses FUSE (file system in userspace) to provide access\n"
 "to data over the Media Transfer Protocol (MTP).  Unprivileged users can mount\n"
-"the MTP device as a filesystem."
+"the MTP device as a file system."
 msgstr ""
 
-#: gnu/packages/linux.scm:4380
-msgid "Utility to show process environment"
-msgstr ""
-
-#: gnu/packages/linux.scm:4381
+#: gnu/packages/linux.scm:6868
 msgid ""
 "Procenv is a command-line tool that displays as much detail about\n"
 "itself and its environment as possible.  It can be used as a test\n"
@@ -8703,11 +9216,7 @@ msgid ""
 "comparing system environments."
 msgstr ""
 
-#: gnu/packages/linux.scm:4408
-msgid "Open Fabric Interfaces"
-msgstr ""
-
-#: gnu/packages/linux.scm:4410
+#: gnu/packages/linux.scm:6897
 msgid ""
 "OpenFabrics Interfaces (OFI) is a framework focused on exporting fabric\n"
 "communication services to applications.  OFI is best described as a collection\n"
@@ -8721,11 +9230,7 @@ msgid ""
 "libraries, which are often integrated directly into libfabric."
 msgstr ""
 
-#: gnu/packages/linux.scm:4456
-msgid "Intel Performance Scaled Messaging (PSM) Libraries"
-msgstr ""
-
-#: gnu/packages/linux.scm:4458
+#: gnu/packages/linux.scm:6954
 msgid ""
 "The PSM Messaging API, or PSM API, is Intel's low-level user-level\n"
 "communications interface for the True Scale family of products.  PSM users are\n"
@@ -8733,11 +9238,248 @@ msgid ""
 "interfaces in parallel environments."
 msgstr ""
 
-#: gnu/packages/lout.scm:109
-msgid "Document layout system"
+#: gnu/packages/linux.scm:6997
+msgid ""
+"snapscreenshot saves a screenshot of one or more Linux text consoles as a\n"
+"Targa (@dfn{.tga}) image.  It can be used by anyone with read access to the\n"
+"relevant @file{/dev/vcs*} file(s)."
+msgstr ""
+
+#: gnu/packages/linux.scm:7053
+msgid ""
+"fbcat saves the contents of the Linux framebuffer (@file{/dev/fb*}), or\n"
+"a dump therof.  It supports a wide range of drivers and pixel formats.\n"
+"@command{fbcat} can take screenshots of virtually any application that can be\n"
+"made to write its output to the framebuffer, including (but not limited to)\n"
+"text-mode or graphical applications that don't use a display server.\n"
+"\n"
+"Also included is @command{fbgrab}, a wrapper around @command{fbcat} that\n"
+"emulates the behaviour of Gunnar Monell's older fbgrab utility."
+msgstr ""
+
+#: gnu/packages/linux.scm:7085
+msgid ""
+"Control groups is Linux kernel method for process resource\n"
+"restriction, permission handling and more.  This package provides userspace\n"
+"interface to this kernel feature."
+msgstr ""
+
+#: gnu/packages/linux.scm:7120
+msgid ""
+"mbpfan is a fan control daemon for Apple Macbooks.  It uses input from\n"
+"the @code{coretemp} module and sets the fan speed using the @code{applesmc}\n"
+"module.  It can be executed as a daemon or in the foreground with root\n"
+"privileges."
+msgstr ""
+
+#: gnu/packages/linux.scm:7165
+msgid ""
+"This package is low-level user-level Intel's communications interface.\n"
+"The PSM2 API is a high-performance vendor-specific protocol that provides a\n"
+"low-level communications interface for the Intel Omni-Path family of\n"
+"high-speed networking devices."
+msgstr ""
+
+#: gnu/packages/linux.scm:7207
+msgid ""
+"This package provides a library called libpfm4, which is used to develop\n"
+"monitoring tools exploiting the performance monitoring events such as those\n"
+"provided by the Performance Monitoring Unit (PMU) of modern processors.\n"
+"\n"
+"Libpfm4 helps convert from an event name, expressed as a string, to the event\n"
+"encoding that is either the raw event as documented by the hardware vendor or\n"
+"the OS-specific encoding.  In the latter case, the library is able to prepare\n"
+"the OS-specific data structures needed by the kernel to setup the event.\n"
+"\n"
+"libpfm4 provides support for the @code{perf_events} interface, which was\n"
+"introduced in Linux 2.6.31."
+msgstr ""
+
+#: gnu/packages/linux.scm:7237
+msgid ""
+"@code{libnfnetlink} is the low-level library for netfilter related\n"
+"kernel/userspace communication.  It provides a generic messaging\n"
+"infrastructure for in-kernel netfilter subsystems (such as nfnetlink_log,\n"
+"nfnetlink_queue, nfnetlink_conntrack) and their respective users and/or\n"
+"management tools in userspace."
+msgstr ""
+
+#: gnu/packages/linux.scm:7265
+msgid ""
+"The netlink package provides a simple netlink library for\n"
+"Go.  Netlink is the interface a user-space program in Linux uses to\n"
+"communicate with the kernel.  It can be used to add and remove interfaces, set\n"
+"IP addresses and routes, and configure IPsec."
+msgstr ""
+
+#: gnu/packages/linux.scm:7289
+msgid ""
+"The inih (INI Not Invented Here) library is a simple .INI file\n"
+"parser written in C.  It's only a couple of pages of code, and it was designed to\n"
+"be small and simple, so it's good for embedded systems.  It's also more or less\n"
+"compatible with Python's ConfigParser style of .INI files, including RFC\n"
+"822-style multi-line syntax and name: value entries."
+msgstr ""
+
+#: gnu/packages/linux.scm:7336
+msgid ""
+"This package provides commands to create and check XFS\n"
+"file systems."
+msgstr ""
+
+#: gnu/packages/linux.scm:7375
+msgid ""
+"This package provides a program to generate an ext2\n"
+"file system as a normal (non-root) user.  It does not require you to mount\n"
+"the image file to copy files on it, nor does it require that you become\n"
+"the superuser to make device nodes."
+msgstr ""
+
+#: gnu/packages/linux.scm:7461
+msgid ""
+"@command{fakeroot} runs a command in an environment where\n"
+"it appears to have root privileges for file manipulation. This is useful\n"
+"for allowing users to create archives (tar, ar, .deb etc.) with files in\n"
+"them with root permissions/ownership. Without fakeroot one would have to\n"
+"have root privileges to create the constituent files of the archives with\n"
+"the correct permissions and ownership, and then pack them up, or one would\n"
+"have to construct the archives directly, without using the archiver."
+msgstr ""
+
+#: gnu/packages/linux.scm:7491
+msgid ""
+"@command{fakechroot} runs a command in an environment were is additional\n"
+"possibility to use @code{chroot} command without root privileges.  This is\n"
+"useful for allowing users to create own chrooted environment with possibility\n"
+"to install another packages without need for root privileges.\n"
+"\n"
+"It works by providing @file{libfakechroot.so}, a shared library meant to be\n"
+"set as @code{LD_PRELOAD} to override the C library file system functions."
+msgstr ""
+
+#: gnu/packages/linux.scm:7539
+msgid ""
+"inputattach dispatches input events from several device\n"
+"types and interfaces and translates so that the X server can use them."
+msgstr ""
+
+#: gnu/packages/linux.scm:7574
+msgid ""
+"PipeWire is a project that aims to greatly improve handling of audio and\n"
+"video under Linux.  It aims to support the usecases currently handled by both\n"
+"PulseAudio and Jack and at the same time provide same level of powerful handling\n"
+"of Video input and output.  It also introduces a security model that makes\n"
+"interacting with audio and video devices from containerized applications easy,\n"
+"with supporting Flatpak applications being the primary goal.  Alongside Wayland\n"
+"and Flatpak we expect PipeWire to provide a core building block for the future\n"
+"of Linux application development."
+msgstr ""
+
+#: gnu/packages/linux.scm:7648
+msgid ""
+"The Embedded Linux* Library (ELL) provides core, low-level\n"
+"functionality for system daemons.  It typically has no dependencies other than\n"
+"the Linux kernel, C standard library, and libdl (for dynamic linking).  While\n"
+"ELL is designed to be efficient and compact enough for use on embedded Linux\n"
+"platforms, it is not limited to resource-constrained systems."
+msgstr ""
+
+#: gnu/packages/linux.scm:7674
+msgid ""
+"The user space tracing library, liblttng-ust, is the LTTng\n"
+"user space tracer.  It receives commands from a session daemon, for example to\n"
+"enable and disable specific instrumentation points, and writes event records\n"
+"to ring buffers shared with a consumer daemon."
+msgstr ""
+
+#: gnu/packages/linux.scm:7697
+msgid ""
+"This package provides the @code{kexec} program and ancillary\n"
+"utilities.  Using @code{kexec}, it is possible to boot directly into a new\n"
+"kernel from the context of an already-running kernel, bypassing the normal\n"
+"system boot process."
 msgstr ""
 
-#: gnu/packages/lout.scm:111
+#: gnu/packages/linux.scm:7730
+msgid ""
+"@code{cachefilesd} is a userspace daemon that manages the\n"
+"cache data store that is used by network file systems such as @code{AFS} and\n"
+"@code{NFS} to cache data locally on disk.  The content of the cache is\n"
+"persistent over reboots."
+msgstr ""
+
+#: gnu/packages/linux.scm:7775
+msgid ""
+"Libbpf supports building BPF CO-RE-enabled applications, which, in\n"
+"contrast to BCC, do not require the Clang/LLVM runtime or linux kernel\n"
+"headers."
+msgstr ""
+
+#: gnu/packages/linux.scm:7855
+msgid ""
+"BCC is a toolkit for creating efficient kernel tracing and manipulation\n"
+"programs, and includes several useful tools and examples.  It makes use of\n"
+"extended BPF (Berkeley Packet Filters), formally known as eBPF, a new feature\n"
+"that was first added to Linux 3.15.  Much of what BCC uses requires Linux 4.1\n"
+"and above."
+msgstr ""
+
+#: gnu/packages/linux.scm:7896
+msgid ""
+"bpftrace is a high-level tracing language for Linux enhanced Berkeley\n"
+"Packet Filter (eBPF) available in recent Linux kernels (4.x).  bpftrace uses\n"
+"LLVM as a backend to compile scripts to BPF-bytecode and makes use of BCC for\n"
+"interacting with the Linux BPF system, as well as existing Linux tracing\n"
+"capabilities: kernel dynamic tracing (kprobes), user-level dynamic\n"
+"tracing (uprobes), and tracepoints.  The bpftrace language is inspired by awk\n"
+"and C, and predecessor tracers such as DTrace and SystemTap.  bpftrace was\n"
+"created by Alastair Robertson."
+msgstr ""
+
+#: gnu/packages/linux.scm:7928
+msgid ""
+"This package provides a Linux kernel module that will\n"
+"provide a serial device @code{/dev/ttyebus} with almost no latency upon\n"
+"receiving.  It is dedicated to the PL011 UART of the Raspberry Pi."
+msgstr ""
+
+#: gnu/packages/linux.scm:7953
+msgid ""
+"IP sets are a framework inside the Linux 2.4.x and 2.6.x kernel which\n"
+"can be administered by the ipset utility.  Depending on the type,\n"
+"currently an IP set may store IP addresses, (TCP/UDP) port numbers or\n"
+"IP addresses with MAC addresses in a way which ensures lightning speed\n"
+"when matching an entry against a set.\n"
+"\n"
+"If you want to\n"
+"@itemize @bullet\n"
+"@item store multiple IP addresses or port numbers and match against the entire\n"
+"collection using a single iptables rule.\n"
+"@item dynamically update iptables rules against IP addresses or ports without\n"
+"performance penalty.\n"
+"@item express complex IP address and ports based rulesets with a single\n"
+"iptables rule and benefit from the speed of IP sets.\n"
+"@end itemize\n"
+"\n"
+"then IP sets may be the proper tool for you."
+msgstr ""
+
+#: gnu/packages/linux.scm:8000
+msgid ""
+"This is the io_uring library, liburing. liburing provides\n"
+"helpers to setup and teardown io_uring instances, and also a simplified\n"
+"interface for applications that don't need (or want) to deal with the full\n"
+"kernel side implementation."
+msgstr ""
+
+#: gnu/packages/linux.scm:8030
+msgid ""
+"EROFS (Enhanced Read-Only File System) is a compressed,\n"
+"read-only file system optimized for resource-scarce devices.  This package\n"
+"provides user-space tools for creating EROFS file systems."
+msgstr ""
+
+#: gnu/packages/lout.scm:102
 msgid ""
 "The Lout document formatting system reads a high-level description of\n"
 "a document similar in style to LaTeX and produces a PostScript or plain text\n"
@@ -8756,28 +9498,68 @@ msgid ""
 "beginning."
 msgstr ""
 
-#: gnu/packages/messaging.scm:115
-msgid "Off-the-Record (OTR) Messaging Library and Toolkit"
+#: gnu/packages/messaging.scm:191
+msgid ""
+"Psi is a capable XMPP client aimed at experienced users.\n"
+"Its design goals are simplicity and stability."
 msgstr ""
 
-#: gnu/packages/messaging.scm:117
+#: gnu/packages/messaging.scm:252
 msgid ""
-"OTR allows you to have private conversations over instant messaging by\n"
-"providing: (1) Encryption: No one else can read your instant messages.  (2)\n"
-"Authentication: You are assured the correspondent is who you think it is.  (3)\n"
-"Deniability: The messages you send do not have digital signatures that are\n"
-"checkable by a third party.  Anyone can forge messages after a conversation to\n"
-"make them look like they came from you.  However, during a conversation, your\n"
-"correspondent is assured the messages he sees are authentic and\n"
-"unmodified.  (4) Perfect forward secrecy: If you lose control of your private\n"
-"keys, no previous conversation is compromised."
+"GNT is an ncurses toolkit for creating text-mode graphical\n"
+"user interfaces in a fast and easy way.  It is based on GLib and ncurses."
 msgstr ""
 
-#: gnu/packages/messaging.scm:151
-msgid "Implementation of a ratcheting forward secrecy protocol"
+#: gnu/packages/messaging.scm:304
+msgid ""
+"LibGadu is library for handling Gadu-Gadu instant messenger\n"
+"protocol.  The library is written in C and aims to be operating system and\n"
+"environment independent."
+msgstr ""
+
+#: gnu/packages/messaging.scm:343
+msgid ""
+"SILC (Secure Internet Live Conferencing) is a modern and secure\n"
+"conferencing protocol.  It provides all the common conferencing services like\n"
+"private messages, instant messages, channels and groups, and video and audio\n"
+"conferencing."
 msgstr ""
 
-#: gnu/packages/messaging.scm:152
+#: gnu/packages/messaging.scm:380
+msgid ""
+"Meanwhile is a library for connecting to a LIM (Lotus Instant\n"
+"Messaging, formerly Lotus Sametime, formerly VPBuddy) community.  It uses a\n"
+"protocol based in part off of the IMPP draft(*1), and in part off of traces of\n"
+"TCP sessions from existing clients."
+msgstr ""
+
+#: gnu/packages/messaging.scm:428
+msgid ""
+"Poezio is a free console XMPP client (the protocol on which\n"
+"the Jabber IM network is built).\n"
+"Its goal is to let you connect very easily (no account creation needed) to the\n"
+"network and join various chatrooms, immediately.  It tries to look like the\n"
+"most famous IRC clients (weechat, irssi, etc).  Many commands are identical and\n"
+"you won't be lost if you already know these clients.  Configuration can be\n"
+"made in a configuration file or directly from the client.\n"
+"You'll find the light, fast, geeky and anonymous spirit of IRC while using a\n"
+"powerful, standard and open protocol."
+msgstr ""
+
+#: gnu/packages/messaging.scm:461
+msgid ""
+"OTR allows you to have private conversations over instant\n"
+"messaging by providing: (1) Encryption: No one else can read your instant\n"
+"messages.  (2) Authentication: You are assured the correspondent is who you\n"
+"think it is.  (3) Deniability: The messages you send do not have digital\n"
+"signatures that are checkable by a third party.  Anyone can forge messages\n"
+"after a conversation to make them look like they came from you.  However,\n"
+"during a conversation, your correspondent is assured the messages he sees are\n"
+"authentic and unmodified.  (4) Perfect forward secrecy: If you lose control of\n"
+"your private keys, no previous conversation is compromised."
+msgstr ""
+
+#: gnu/packages/messaging.scm:501
 msgid ""
 "libsignal-protocol-c is an implementation of a ratcheting\n"
 "forward secrecy protocol that works in synchronous and asynchronous\n"
@@ -8785,11 +9567,7 @@ msgid ""
 "end-to-end encryption."
 msgstr ""
 
-#: gnu/packages/messaging.scm:190
-msgid "IRC to instant messaging gateway"
-msgstr ""
-
-#: gnu/packages/messaging.scm:191
+#: gnu/packages/messaging.scm:546
 msgid ""
 "BitlBee brings IM (instant messaging) to IRC clients, for\n"
 "people who have an IRC client running all the time and don't want to run an\n"
@@ -8799,11 +9577,20 @@ msgid ""
 "identi.ca and status.net)."
 msgstr ""
 
-#: gnu/packages/messaging.scm:252
-msgid "Graphical IRC Client"
+#: gnu/packages/messaging.scm:616
+msgid ""
+"Bitlbee-discord is a plugin for Bitlbee which provides\n"
+"access to servers running the Discord protocol."
+msgstr ""
+
+#: gnu/packages/messaging.scm:665
+msgid ""
+"Purple-Mattermost is a plug-in for Purple, the instant messaging library\n"
+"used by Pidgin and Bitlbee, among others, to access\n"
+"@uref{https://mattermost.com/, Mattermost} servers."
 msgstr ""
 
-#: gnu/packages/messaging.scm:254
+#: gnu/packages/messaging.scm:714
 msgid ""
 "HexChat lets you connect to multiple IRC networks at once.  The main\n"
 "window shows the list of currently connected networks and their channels, the\n"
@@ -8812,11 +9599,7 @@ msgid ""
 "dictionaries.  HexChat can be extended with multiple addons."
 msgstr ""
 
-#: gnu/packages/messaging.scm:319
-msgid "Lightweight Internet Relay Chat server for small networks"
-msgstr ""
-
-#: gnu/packages/messaging.scm:321
+#: gnu/packages/messaging.scm:782
 msgid ""
 "ngIRCd is a lightweight @dfn{Internet Relay Chat} (IRC) server for small\n"
 "or private networks.  It is easy to configure, can cope with dynamic IP\n"
@@ -8824,86 +9607,69 @@ msgid ""
 "authentication."
 msgstr ""
 
-#: gnu/packages/messaging.scm:393
-msgid "Graphical multi-protocol instant messaging client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:395
+#: gnu/packages/messaging.scm:899
 msgid ""
-"Pidgin is a modular instant messaging client that supports many popular\n"
-"chat protocols."
+"Pidgin is a modular instant messaging client that supports\n"
+"many popular chat protocols."
 msgstr ""
 
-#: gnu/packages/messaging.scm:433
-msgid "Off-the-Record Messaging plugin for Pidgin"
-msgstr ""
-
-#: gnu/packages/messaging.scm:435
+#: gnu/packages/messaging.scm:941
 msgid ""
-"Pidgin-OTR is a plugin that adds support for OTR to the Pidgin instant\n"
-"messaging client.  OTR (Off-the-Record) Messaging allows you to have private\n"
-"conversations over instant messaging by providing: (1) Encryption: No one else\n"
-"can read your instant messages.  (2) Authentication: You are assured the\n"
-"correspondent is who you think it is.  (3) Deniability: The messages you send\n"
-"do not have digital signatures that are checkable by a third party.  Anyone\n"
+"Pidgin-OTR is a plugin that adds support for OTR to the Pidgin\n"
+"instant messaging client.  OTR (Off-the-Record) Messaging allows you to have\n"
+"private conversations over instant messaging by providing: (1) Encryption: No\n"
+"one else can read your instant messages.  (2) Authentication: You are assured\n"
+"the correspondent is who you think it is.  (3) Deniability: The messages you\n"
+"send do not have digital signatures that are checkable by a third party.  Anyone\n"
 "can forge messages after a conversation to make them look like they came from\n"
-"you.  However, during a conversation, your correspondent is assured the\n"
-"messages he sees are authentic and unmodified.  (4) Perfect forward secrecy:\n"
-"If you lose control of your private keys, no previous conversation is\n"
-"compromised."
-msgstr ""
-
-#: gnu/packages/messaging.scm:486
-msgid "IRC network bouncer"
+"you.  However, during a conversation, your correspondent is assured the messages\n"
+"he sees are authentic and unmodified.  (4) Perfect forward secrecy: If you lose\n"
+"control of your private keys, no previous conversation is compromised."
 msgstr ""
 
-#: gnu/packages/messaging.scm:487
+#: gnu/packages/messaging.scm:995
 msgid ""
-"ZNC is an IRC network bouncer or BNC.  It can detach the\n"
-"client from the actual IRC server, and also from selected channels.  Multiple\n"
-"clients from different locations can connect to a single ZNC account\n"
+"ZNC is an @dfn{IRC network bouncer} or @dfn{BNC}.  It can\n"
+"detach the client from the actual IRC server, and also from selected channels.\n"
+"Multiple clients from different locations can connect to a single ZNC account\n"
 "simultaneously and therefore appear under the same nickname on IRC."
 msgstr ""
 
-#: gnu/packages/messaging.scm:508
-msgid "Non-blocking Jabber/XMPP module"
-msgstr ""
-
-#: gnu/packages/messaging.scm:510
+#: gnu/packages/messaging.scm:1024
 msgid ""
-"The goal of this python library is to provide a way for Python\n"
-"applications to use Jabber/XMPP networks in a non-blocking way.  This library\n"
-"was initially a fork of xmpppy, but uses non-blocking sockets."
+"Python-nbxmpp is a Python library that provides a way for\n"
+"Python applications to use the XMPP network.  This library was initially a fork\n"
+"of xmpppy."
 msgstr ""
 
-#: gnu/packages/messaging.scm:560
-msgid "Jabber (XMPP) client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:561
+#: gnu/packages/messaging.scm:1147
 msgid ""
-"Gajim is a feature-rich and easy to use Jabber/XMPP client.\n"
-"Among its features are: a tabbed chat window and single window modes; support\n"
-"for group chat (with Multi-User Chat protocol), invitation, chat to group chat\n"
-"transformation; audio and video conferences; file transfer; TLS, GPG and\n"
-"end-to-end encryption support; XML console."
+"Gajim aims to be an easy to use and fully-featured XMPP chat\n"
+"client.  It is extensible via plugins, supports end-to-end encryption (OMEMO\n"
+"and OpenPGP) and available in 29 languages."
 msgstr ""
 
-#: gnu/packages/messaging.scm:630
-msgid "Graphical Jabber (XMPP) client"
+#: gnu/packages/messaging.scm:1184
+msgid ""
+"Gajim-OMEMO is a plugin that adds support for the OMEMO\n"
+"Encryption to Gajim.  OMEMO is an XMPP Extension Protocol (XEP) for secure\n"
+"multi-client end-to-end encryption."
 msgstr ""
 
-#: gnu/packages/messaging.scm:631
+#: gnu/packages/messaging.scm:1221
 msgid ""
-"Dino is a Jabber (XMPP) client which aims to fit well into\n"
-"a graphical desktop environment like GNOME."
+"Gajim-OpenPGP is a plugin that adds support for the OpenPGP\n"
+"Encryption to Gajim."
 msgstr ""
 
-#: gnu/packages/messaging.scm:720
-msgid "Jabber (XMPP) server"
+#: gnu/packages/messaging.scm:1276
+msgid ""
+"Dino is a chat client for the desktop.  It focuses on providing\n"
+"a minimal yet reliable Jabber/XMPP experience and having encryption enabled by\n"
+"default."
 msgstr ""
 
-#: gnu/packages/messaging.scm:721
+#: gnu/packages/messaging.scm:1366
 msgid ""
 "Prosody is a modern XMPP communication server.  It aims to\n"
 "be easy to set up and configure, and efficient with system resources.\n"
@@ -8912,56 +9678,43 @@ msgid ""
 "protocols."
 msgstr ""
 
-#: gnu/packages/messaging.scm:763 gnu/packages/messaging.scm:793
-msgid "Library for the Tox encrypted messenger protocol"
+#: gnu/packages/messaging.scm:1401
+msgid ""
+"This module implements XEP-0363: it allows clients to\n"
+"upload files over HTTP."
 msgstr ""
 
-#: gnu/packages/messaging.scm:765
+#: gnu/packages/messaging.scm:1433
+msgid ""
+"This module implements XEP-0198: when supported by both\n"
+"the client and server, it can allow clients to resume a disconnected session,\n"
+"and prevent message loss."
+msgstr ""
+
+#: gnu/packages/messaging.scm:1468
 msgid "C library implementation of the Tox encrypted messenger protocol."
 msgstr ""
 
-#: gnu/packages/messaging.scm:795
+#: gnu/packages/messaging.scm:1502
 msgid ""
 "Official fork of the C library implementation of the Tox encrypted\n"
 "messenger protocol."
 msgstr ""
 
-#: gnu/packages/messaging.scm:847
-msgid "Lightweight Tox client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:849
+#: gnu/packages/messaging.scm:1558
 msgid ""
-"Utox is a lightweight Tox client.  Tox is a distributed and secure\n"
+"uTox is a lightweight Tox client.  Tox is a distributed and secure\n"
 "instant messenger with audio and video chat capabilities."
 msgstr ""
 
-#: gnu/packages/messaging.scm:898
-msgid "Tox chat client using Qt"
-msgstr ""
-
-#: gnu/packages/messaging.scm:899
+#: gnu/packages/messaging.scm:1624
 msgid ""
 "qTox is a Tox client that follows the Tox design\n"
 "guidelines.  It provides an easy to use application that allows you to\n"
 "connect with friends and family without anyone else listening in."
 msgstr ""
 
-#: gnu/packages/messaging.scm:991
-msgid ""
-"Distributed and trustless peer-to-peer communications protocol\n"
-"for sending encrypted messages to one person or many subscribers."
-msgstr ""
-
-#: gnu/packages/messaging.scm:993
-msgid "Distributed peer-to-peer communication"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1012
-msgid "Multi-user chat program"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1013
+#: gnu/packages/messaging.scm:1646
 msgid ""
 "Ytalk is a replacement for the BSD talk program.  Its main\n"
 "advantage is the ability to communicate with any arbitrary number of users at\n"
@@ -8969,11 +9722,7 @@ msgid ""
 "with several different talk daemons at the same time."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1038
-msgid "Portable high-level Jabber/XMPP library for C++"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1040
+#: gnu/packages/messaging.scm:1672
 msgid ""
 "gloox is a full-featured Jabber/XMPP client library,\n"
 "written in ANSI C++.  It makes writing spec-compliant clients easy\n"
@@ -8981,34 +9730,22 @@ msgid ""
 "into existing applications."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1113
+#: gnu/packages/messaging.scm:1743
 msgid ""
 "@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select} and\n"
 "Gtk2 event loops.  This package includes 12 applications and additional scripts:\n"
-"psycion (a @uref{http://about.psyc.eu,PSYC} chat client), remotor (a control console\n"
+"psycion (a @uref{https://about.psyc.eu,PSYC} chat client), remotor (a control console\n"
 "for @uref{https://torproject.org,tor} router) and many more."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1117
-msgid "Perl implementation of PSYC protocol"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1156
+#: gnu/packages/messaging.scm:1786
 msgid ""
 "@code{libpsyc} is a PSYC library in C which implements\n"
 "core aspects of PSYC, useful for all kinds of clients and servers\n"
 "including psyced."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1159
-msgid "PSYC library in C"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1226
-msgid "psycLPC is a multi-user network server programming language"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1228
+#: gnu/packages/messaging.scm:1858
 msgid ""
 "LPC is a bytecode language, invented to specifically implement\n"
 "multi user virtual environments on the internet.  This technology is used for\n"
@@ -9017,7 +9754,7 @@ msgid ""
 "many bug fixes."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1259
+#: gnu/packages/messaging.scm:1902
 msgid ""
 "Loudmouth is a lightweight and easy-to-use C library for programming\n"
 "with the XMPP (formerly known as Jabber) protocol.  It is designed to be\n"
@@ -9025,11 +9762,7 @@ msgid ""
 "protocol allows."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1263
-msgid "Asynchronous XMPP library"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1295
+#: gnu/packages/messaging.scm:1944
 msgid ""
 "Mcabber is a small XMPP (Jabber) console client, which includes features\n"
 "such as SASL and TLS support, @dfn{Multi-User Chat} (MUC) support, logging,\n"
@@ -9037,15 +9770,7 @@ msgid ""
 "support, and more."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1299
-msgid "Small XMPP console client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1345
-msgid "Extensible console-based Jabber client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1347
+#: gnu/packages/messaging.scm:1993
 msgid ""
 "GNU Freetalk is a command-line Jabber/XMPP chat client.  It notably uses\n"
 "the Readline library to handle input, so it features convenient navigation of\n"
@@ -9053,39 +9778,27 @@ msgid ""
 "is also scriptable and extensible via Guile."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1381 gnu/packages/messaging.scm:1416
-msgid "C library for writing XMPP clients"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1382
+#: gnu/packages/messaging.scm:2032
 msgid ""
 "Libmesode is a fork of libstrophe for use with Profanity\n"
 "XMPP Client.  In particular, libmesode provides extra TLS functionality such as\n"
 "manual SSL certificate verification."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1417
+#: gnu/packages/messaging.scm:2071
 msgid ""
 "Libstrophe is a minimal XMPP library written in C.  It has\n"
 "almost no external dependencies, only an XML parsing library (expat or libxml\n"
 "are both supported)."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1453
-msgid "Console-based XMPP client"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1454
+#: gnu/packages/messaging.scm:2129
 msgid ""
 "Profanity is a console based XMPP client written in C\n"
 "using ncurses and libmesode, inspired by Irssi."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1484
-msgid "Library implementing the client IRC protocol"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1485
+#: gnu/packages/messaging.scm:2159
 msgid ""
 "Libircclient is a library which implements the client IRC\n"
 "protocol.  It is designed to be small, fast, portable and compatible with the\n"
@@ -9093,32 +9806,134 @@ msgid ""
 "building the IRC clients and bots."
 msgstr ""
 
-#: gnu/packages/messaging.scm:1535
-msgid "Tox chat client using ncurses"
-msgstr ""
-
-#: gnu/packages/messaging.scm:1536
+#: gnu/packages/messaging.scm:2217
 msgid ""
 "Toxic is a console-based instant messaging client, using\n"
 "c-toxcore and ncurses.  It provides audio calls, sound and desktop\n"
 "notifications, and Python scripting support."
 msgstr ""
 
-#: gnu/packages/mpd.scm:70
-msgid "Music Player Daemon client library"
+#: gnu/packages/messaging.scm:2244
+msgid ""
+"libqmatrixclient is a Qt5 library to write clients for the\n"
+"Matrix instant messaging protocol.  Quaternion is the reference client\n"
+"implementation.  Quaternion and libqmatrixclient together form the\n"
+"QMatrixClient project."
 msgstr ""
 
-#: gnu/packages/mpd.scm:71
+#: gnu/packages/messaging.scm:2296
 msgid ""
-"A stable, documented, asynchronous API library for\n"
-"interfacing MPD in the C, C++ & Objective C languages."
+"@code{mtxclient} is a C++ library that implements client API\n"
+"for the Matrix protocol.  It is built on to of @code{Boost.Asio}."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2355
+msgid ""
+"@code{Nheko} want to provide a native desktop app for the\n"
+"Matrix protocol that feels more like a mainstream chat app and less like an IRC\n"
+"client.\n"
+"\n"
+"There is support for:\n"
+"@itemize\n"
+"@item E2E encryption (text messages only: attachments are currently sent unencrypted).\n"
+"@item User registration.\n"
+"@item Creating, joining & leaving rooms.\n"
+"@item Sending & receiving invites.\n"
+"@item Sending & receiving files and emoji.\n"
+"@item Typing notifications.\n"
+"@item Username auto-completion.\n"
+"@item Message & mention notifications.\n"
+"@item Redacting messages.\n"
+"@item Read receipts.\n"
+"@item Basic communities support.\n"
+"@item Room switcher (@key{ctrl-K}).\n"
+"@item Light, Dark & System themes.\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/mpd.scm:142
-msgid "Music Player Daemon"
+#: gnu/packages/messaging.scm:2406
+msgid ""
+"Quaternion is a Qt5 desktop client for the Matrix instant\n"
+"messaging protocol.  It uses libqmatrixclient and is its reference client\n"
+"implementation.  Quaternion and libqmatrixclient together form the\n"
+"QMatrixClient project."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2456
+msgid ""
+"Hangups is an instant messaging client for Google Hangouts.  It includes\n"
+"both a Python library and a reference client with a text-based user interface.\n"
+"\n"
+"Hangups is implements a reverse-engineered version of Hangouts' proprietary,\n"
+"non-interoperable protocol, which allows it to support features like group\n"
+"messaging that aren’t available to clients that connect over XMPP."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2538
+msgid ""
+"Telegram-purple is a plugin for Libpurple, the communication library\n"
+"used by the Pidgin instant messaging client, that adds support for the\n"
+"Telegram messenger."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2583
+msgid ""
+"Tdlib is a cross-platform library for creating custom\n"
+"Telegram clients following the official Telegram API.  It can be easily used\n"
+"from almost any programming language with a C-FFI and features first-class\n"
+"support for high performance Telegram Bot creation."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2622
+msgid "Plugin for libpurple to allow sending SMS using ModemManager."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2666
+msgid ""
+"Chatty is a chat program for XMPP and SMS.  It works on mobile\n"
+"as well as on desktop platforms.  It's based on libpurple and ModemManager."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2687
+msgid ""
+"This package provides Eclipse Mosquitto, a message broker\n"
+"that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1.  Mosquitto\n"
+"is lightweight and is suitable for use on all devices from low power single\n"
+"board computers to full servers.\n"
+"\n"
+"The MQTT protocol provides a lightweight method of carrying out messaging\n"
+"using a publish/subscribe model. This makes it suitable for Internet of\n"
+"Things messaging such as with low power sensors or mobile devices such\n"
+"as phones, embedded computers or microcontrollers."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2739
+msgid ""
+"Movim-Desktop is a desktop application, relying on Qt, for the Movim\n"
+"social and chat platform."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2874
+msgid ""
+"Psi+ is a spin-off of Psi XMPP client.  It is a powerful XMPP client\n"
+"designed for experienced users."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2922
+msgid "This package provides Python bindings to Zulip's API."
+msgstr ""
+
+#: gnu/packages/messaging.scm:2973
+msgid "This package contains Zulip's official terminal client."
+msgstr ""
+
+#: gnu/packages/mpd.scm:100
+msgid ""
+"A stable, documented, asynchronous API library for\n"
+"interfacing MPD in the C, C++ & Objective C languages."
 msgstr ""
 
-#: gnu/packages/mpd.scm:143
+#: gnu/packages/mpd.scm:165
 msgid ""
 "Music Player Daemon (MPD) is a flexible, powerful,\n"
 "server-side application for playing music.  Through plugins and libraries it\n"
@@ -9126,31 +9941,19 @@ msgid ""
 "protocol."
 msgstr ""
 
-#: gnu/packages/mpd.scm:166
-msgid "Music Player Daemon client"
-msgstr ""
-
-#: gnu/packages/mpd.scm:167
+#: gnu/packages/mpd.scm:191
 msgid ""
 "MPC is a minimalist command line interface to MPD, the music\n"
 "player daemon."
 msgstr ""
 
-#: gnu/packages/mpd.scm:190
-msgid "Curses Music Player Daemon client"
-msgstr ""
-
-#: gnu/packages/mpd.scm:191
+#: gnu/packages/mpd.scm:224
 msgid ""
 "ncmpc is a fully featured MPD client, which runs in a\n"
 "terminal using ncurses."
 msgstr ""
 
-#: gnu/packages/mpd.scm:221
-msgid "Featureful ncurses based MPD client inspired by ncmpc"
-msgstr ""
-
-#: gnu/packages/mpd.scm:222
+#: gnu/packages/mpd.scm:255
 msgid ""
 "Ncmpcpp is an mpd client with a UI very similar to ncmpc,\n"
 "but it provides new useful features such as support for regular expressions\n"
@@ -9158,42 +9961,57 @@ msgid ""
 "sort playlists, and a local file system browser."
 msgstr ""
 
-#: gnu/packages/mpd.scm:245
-msgid "MPD client for track scrobbling"
-msgstr ""
-
-#: gnu/packages/mpd.scm:246
+#: gnu/packages/mpd.scm:280
 msgid ""
 "mpdscribble is a Music Player Daemon client which submits\n"
 "information about tracks being played to a scrobbler, such as Libre.FM."
 msgstr ""
 
-#: gnu/packages/mpd.scm:271
-msgid "Python MPD client library"
-msgstr ""
-
-#: gnu/packages/mpd.scm:272
+#: gnu/packages/mpd.scm:306
 msgid ""
 "Python-mpd2 is a Python library which provides a client\n"
 "interface for the Music Player Daemon."
 msgstr ""
 
-#: gnu/packages/mpd.scm:321
-msgid "Elegant client for the Music Player Daemon"
-msgstr ""
-
-#: gnu/packages/mpd.scm:322
+#: gnu/packages/mpd.scm:353
 msgid ""
 "Sonata is an elegant graphical client for the Music Player\n"
 "Daemon (MPD).  It supports playlists, multiple profiles (connecting to different\n"
 "MPD servers, search and multimedia key support."
 msgstr ""
 
-#: gnu/packages/netpbm.scm:178
-msgid "Toolkit for manipulation of images"
+#: gnu/packages/mpd.scm:377
+msgid ""
+"ashuffle is an application for automatically shuffling your\n"
+"MPD library in a similar way to many other music players' 'shuffle library'\n"
+"feature. ashuffle works like any other MPD client, and can be used alongside\n"
+"other MPD frontends."
+msgstr ""
+
+#: gnu/packages/mpd.scm:421
+msgid ""
+"Client for the Music Player Daemon providing MPRIS 2\n"
+"support"
+msgstr ""
+
+#: gnu/packages/mpd.scm:456
+msgid ""
+"Cantata is a graphical client for the Music Player Daemon\n"
+"(MPD), using the Qt5 toolkit.  Its user interface is highly customizable,\n"
+"supporting multiple collections, ratings, and dynamic playlists.  A local cache\n"
+"of the music library will be created to provide a hierarchy of albums and\n"
+"artists along with albumart."
+msgstr ""
+
+#: gnu/packages/mpd.scm:510
+msgid ""
+"mcg (CoverGrid) is a client for the Music Player Daemon (MPD), focusing\n"
+"on albums instead of single tracks.  It is not intended to be a replacement\n"
+"for your favorite MPD client but an addition to get a better\n"
+"album-experience."
 msgstr ""
 
-#: gnu/packages/netpbm.scm:180
+#: gnu/packages/netpbm.scm:191
 msgid ""
 "Netpbm is a toolkit for the manipulation of graphic images, including\n"
 "the conversion of images between a variety of different formats.\n"
@@ -9201,11 +10019,7 @@ msgid ""
 "about 100 graphics formats."
 msgstr ""
 
-#: gnu/packages/nettle.scm:51
-msgid "C library for low-level cryptographic functionality"
-msgstr ""
-
-#: gnu/packages/nettle.scm:53
+#: gnu/packages/nettle.scm:69
 msgid ""
 "GNU Nettle is a low-level cryptographic library.  It is designed to\n"
 "fit in easily in almost any context.  It can be easily included in\n"
@@ -9213,11 +10027,94 @@ msgid ""
 "themselves."
 msgstr ""
 
-#: gnu/packages/networking.scm:99
-msgid "Viewing and manipulating MAC addresses of network interfaces"
+#: gnu/packages/networking.scm:170
+msgid ""
+"UsrSCTP is a portable SCTP userland stack.  SCTP is a message\n"
+"oriented, reliable transport protocol with direct support for multihoming that\n"
+"runs on top of IP or UDP, and supports both v4 and v6 versions."
+msgstr ""
+
+#: gnu/packages/networking.scm:196
+msgid ""
+"Axel tries to accelerate the download process by using multiple\n"
+"connections per file, and can also balance the load between different\n"
+"servers.  It tries to be as light as possible, so it might be useful\n"
+"on byte-critical systems.  It supports HTTP, HTTPS, FTP and FTPS\n"
+"protocols."
+msgstr ""
+
+#: gnu/packages/networking.scm:261
+msgid ""
+"LibCamera is a complex camera support library for GNU+Linux,\n"
+"Android, and ChromeOS."
+msgstr ""
+
+#: gnu/packages/networking.scm:317
+msgid ""
+"LibNice is a library that implements the Interactive\n"
+"Connectivity Establishment (ICE) standard (RFC 5245 & RFC 8445).  It provides a\n"
+"GLib-based library, libnice, as well as GStreamer elements to use it."
+msgstr ""
+
+#: gnu/packages/networking.scm:377
+msgid ""
+"RTMPdump is a toolkit for RTMP streams.  All forms of RTMP are\n"
+"supported, including rtmp://, rtmpt://, rtmpe://, rtmpte://, and rtmps://."
+msgstr ""
+
+#: gnu/packages/networking.scm:417
+msgid ""
+"SRT is a transport technology that optimizes streaming\n"
+"performance across unpredictable networks, such as the Internet."
 msgstr ""
 
-#: gnu/packages/networking.scm:100
+#: gnu/packages/networking.scm:465
+msgid ""
+"Lksctp-tools project provides a user space library for SCTP\n"
+"(libsctp) including C language header files (netinet/sctp.h) for accessing SCTP\n"
+"specific application programming interfaces not provided by the standard\n"
+"sockets, and also some helper utilities around SCTP."
+msgstr ""
+
+#: gnu/packages/networking.scm:505
+msgid ""
+"@code{pysctp} implements the SCTP socket API.  You need a\n"
+"SCTP-aware kernel (most are)."
+msgstr ""
+
+#: gnu/packages/networking.scm:525
+msgid ""
+"@command{knockd} is a port-knock daemon.  It listens to all traffic on\n"
+"an ethernet or PPP interface, looking for special \"knock\" sequences of @dfn{port-hits}\n"
+"(UDP/TCP packets sent to a server port).  This port need not be open, since knockd listens\n"
+"at the link-layer level."
+msgstr ""
+
+#: gnu/packages/networking.scm:565
+msgid ""
+"NNG project is a rewrite of the scalability protocols library\n"
+"known as libnanomsg, and adds significant new capabilities, while retaining\n"
+"compatibility with the original.  It is a lightweight, broker-less library,\n"
+"offering a simple API to solve common recurring messaging problems, such as\n"
+"publish/subscribe, RPC-style request/reply, or service discovery."
+msgstr ""
+
+#: gnu/packages/networking.scm:608
+msgid ""
+"Nanomsg is a socket library that provides several common\n"
+"communication patterns.  It aims to make the networking layer fast, scalable,\n"
+"and easy to use.  Implemented in C, it works on a wide range of operating\n"
+"systems with no further dependencies."
+msgstr ""
+
+#: gnu/packages/networking.scm:723
+msgid ""
+"Blueman is a Bluetooth management utility using the Bluez\n"
+"D-Bus backend.  It is designed to be easy to use for most common Bluetooth\n"
+"tasks."
+msgstr ""
+
+#: gnu/packages/networking.scm:748
 msgid ""
 "GNU MAC Changer is a utility for viewing and changing MAC\n"
 "addresses of networking devices.  New addresses may be set explicitly or\n"
@@ -9225,22 +10122,38 @@ msgid ""
 "or, more generally, MAC addresses of the same category of hardware."
 msgstr ""
 
-#: gnu/packages/networking.scm:128
-msgid "Teredo IPv6 tunneling software"
-msgstr ""
-
-#: gnu/packages/networking.scm:130
+#: gnu/packages/networking.scm:796
 msgid ""
 "Miredo is an implementation (client, relay, server) of the Teredo\n"
 "specification, which provides IPv6 Internet connectivity to IPv6 enabled hosts\n"
 "residing in IPv4-only networks, even when they are behind a NAT device."
 msgstr ""
 
-#: gnu/packages/networking.scm:152
-msgid "Open bidirectional communication channels from the command line"
+#: gnu/packages/networking.scm:816
+msgid ""
+"NDisc6 is a collection of tools for IPv6 networking diagnostics.\n"
+"It includes the following programs:\n"
+"\n"
+"@itemize\n"
+"@item @command{ndisc6}: ICMPv6 Neighbor Discovery tool.\n"
+"@item @command{rdisc6}: ICMPv6 Router Discovery tool.\n"
+"@item @command{tcptraceroute6}: IPv6 traceroute over TCP.\n"
+"@item @command{traceroute6}: IPv6 traceroute over UDP.\n"
+"@item @command{rdnssd}: Recursive DNS Servers discovery daemon.\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/networking.scm:869
+msgid ""
+"@command{parprouted} is a daemon for transparent IP (Layer@tie{}3)\n"
+"proxy ARP bridging.  Unlike standard bridging, proxy ARP bridging can bridge\n"
+"Ethernet networks behind wireless nodes.  Normal layer@tie{}2 bridging does\n"
+"not work between wireless nodes because wireless does not know about MAC\n"
+"addresses used in the wired Ethernet networks.  This daemon can also be\n"
+"useful for making transparent firewalls."
 msgstr ""
 
-#: gnu/packages/networking.scm:154
+#: gnu/packages/networking.scm:896
 msgid ""
 "socat is a relay for bidirectional data transfer between two independent\n"
 "data channels---files, pipes, devices, sockets, etc.  It can create\n"
@@ -9253,22 +10166,14 @@ msgid ""
 "or server shell scripts with network connections."
 msgstr ""
 
-#: gnu/packages/networking.scm:235
-msgid "Monitor and filter incoming requests for network services"
-msgstr ""
-
-#: gnu/packages/networking.scm:236
+#: gnu/packages/networking.scm:979
 msgid ""
 "With this package you can monitor and filter incoming requests for\n"
 "network services.  It includes a library which may be used by daemons to\n"
 "transparently check connection attempts against an access control list."
 msgstr ""
 
-#: gnu/packages/networking.scm:256
-msgid "Library for message-based applications"
-msgstr ""
-
-#: gnu/packages/networking.scm:258
+#: gnu/packages/networking.scm:1001
 msgid ""
 "The 0MQ lightweight messaging kernel is a library which extends the\n"
 "standard socket interfaces with features traditionally provided by specialized\n"
@@ -9278,43 +10183,46 @@ msgid ""
 "more."
 msgstr ""
 
-#: gnu/packages/networking.scm:297
-msgid "Apache Kafka C/C++ client library"
+#: gnu/packages/networking.scm:1043
+msgid ""
+"czmq provides bindings for the ØMQ core API that hides the differences\n"
+"between different versions of ØMQ."
 msgstr ""
 
-#: gnu/packages/networking.scm:299
+#: gnu/packages/networking.scm:1074
 msgid ""
-"librdkafka is a C library implementation of the Apache Kafka protocol,\n"
-"containing both Producer and Consumer support."
+"This package provides header-only C++ bindings for ØMQ.  The header\n"
+"files contain direct mappings of the abstractions provided by the ØMQ C API."
 msgstr ""
 
-#: gnu/packages/networking.scm:316
-msgid "Library for Neighbor Discovery Protocol"
+#: gnu/packages/networking.scm:1108
+msgid ""
+"@code{libnatpmp} is a portable and asynchronous implementation of\n"
+"the Network Address Translation - Port Mapping Protocol (NAT-PMP)\n"
+"written in the C programming language."
 msgstr ""
 
-#: gnu/packages/networking.scm:318
+#: gnu/packages/networking.scm:1146
+msgid ""
+"librdkafka is a C library implementation of the Apache Kafka protocol,\n"
+"containing both Producer and Consumer support."
+msgstr ""
+
+#: gnu/packages/networking.scm:1165
 msgid ""
 "libndp contains a library which provides a wrapper for IPv6 Neighbor\n"
 "Discovery Protocol.  It also provides a tool named ndptool for sending and\n"
 "receiving NDP messages."
 msgstr ""
 
-#: gnu/packages/networking.scm:336
-msgid "Display or change Ethernet device settings"
-msgstr ""
-
-#: gnu/packages/networking.scm:338
+#: gnu/packages/networking.scm:1189
 msgid ""
 "ethtool can be used to query and change settings such as speed,\n"
 "auto-negotiation and checksum offload on many network devices, especially\n"
 "Ethernet devices."
 msgstr ""
 
-#: gnu/packages/networking.scm:375
-msgid "Text based network interface status monitor"
-msgstr ""
-
-#: gnu/packages/networking.scm:377
+#: gnu/packages/networking.scm:1231
 msgid ""
 "IFStatus is a simple, easy-to-use program for displaying commonly\n"
 "needed/wanted real-time traffic statistics of multiple network\n"
@@ -9322,11 +10230,28 @@ msgid ""
 "intended as a substitute for the PPPStatus and EthStatus projects."
 msgstr ""
 
-#: gnu/packages/networking.scm:397
-msgid "Realtime console network usage monitor"
+#: gnu/packages/networking.scm:1282
+msgid ""
+"This package contains a variety of tools for dealing with network\n"
+"configuration, troubleshooting, or servers.  Utilities included are:\n"
+"\n"
+"@itemize @bullet\n"
+"@item @command{arping}: Ping hosts using the @dfn{Address Resolution Protocol}.\n"
+"@item @command{clockdiff}: Compute time difference between network hosts\n"
+"using ICMP TSTAMP messages.\n"
+"@item @command{ninfod}: Daemon that responds to IPv6 Node Information Queries.\n"
+"@item @command{ping}: Use ICMP ECHO messages to measure round-trip delays\n"
+"and packet loss across network paths.\n"
+"@item @command{rarpd}: Answer RARP requests from clients.\n"
+"@item @command{rdisc}: Populate network routing tables with information from\n"
+"the ICMP router discovery protocol.\n"
+"@item @command{tftpd}: Trivial file transfer protocol server.\n"
+"@item @command{tracepath}: Trace network path to an IPv4 or IPv6 address and\n"
+"discover MTU along the way.\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/networking.scm:399
+#: gnu/packages/networking.scm:1323
 msgid ""
 "Nload is a console application which monitors network traffic and\n"
 "bandwidth usage in real time.  It visualizes the in- and outgoing traffic using\n"
@@ -9334,11 +10259,7 @@ msgid ""
 "and min/max network usage."
 msgstr ""
 
-#: gnu/packages/networking.scm:442
-msgid "Tunnel IPv4 data through a DNS server"
-msgstr ""
-
-#: gnu/packages/networking.scm:443
+#: gnu/packages/networking.scm:1369
 msgid ""
 "Iodine tunnels IPv4 data through a DNS server.  This\n"
 "can be useful in different situations where internet access is firewalled, but\n"
@@ -9346,49 +10267,57 @@ msgid ""
 "and up to 1 Mbit/s downstream."
 msgstr ""
 
-#: gnu/packages/networking.scm:481
-msgid "Improved whois client"
-msgstr ""
-
-#: gnu/packages/networking.scm:482
+#: gnu/packages/networking.scm:1410
 msgid ""
-"This whois client is intelligent and can\n"
-"automatically select the appropriate whois server for most queries.\n"
-"Because of historical reasons this also includes a tool called mkpasswd\n"
-"which can be used to encrypt a password with @code{crypt(3)}."
-msgstr ""
-
-#: gnu/packages/networking.scm:535
-msgid "Network traffic analyzer"
+"whois searches for an object in a @dfn{WHOIS} (RFC 3912) database.\n"
+"It is commonly used to look up the registered users or assignees of an Internet\n"
+"resource, such as a domain name, an IP address block, or an autonomous system.\n"
+"It can automatically select the appropriate server for most queries.\n"
+"\n"
+"For historical reasons, this package also includes @command{mkpasswd}, which\n"
+"encrypts passwords using @code{crypt(3)} and is unrelated to the Expect command\n"
+"of the same name."
 msgstr ""
 
-#: gnu/packages/networking.scm:536
+#: gnu/packages/networking.scm:1487
 msgid ""
 "Wireshark is a network protocol analyzer, or @dfn{packet\n"
 "sniffer}, that lets you capture and interactively browse the contents of\n"
 "network frames."
 msgstr ""
 
-#: gnu/packages/networking.scm:556
-msgid "Send ICMP ECHO_REQUEST packets to network hosts"
+#: gnu/packages/networking.scm:1508
+msgid ""
+"fping is a ping-like program which uses @acronym{ICMP, Internet Control\n"
+"Message Protocol} echo requests to determine if a target host is responding.\n"
+"\n"
+"@command{fping} differs from @command{ping} in that you can specify any number\n"
+"of targets on the command line, or specify a file containing the lists of\n"
+"targets to ping.  Instead of sending to one target until it times out or\n"
+"replies, fping will send out a ping packet and move on to the next target in a\n"
+"round-robin fashion."
+msgstr ""
+
+#: gnu/packages/networking.scm:1565
+msgid ""
+"This package provides a command-line client (@command{gandi}) to buy,\n"
+"manage, and delete Internet resources from Gandi.net such as domain names,\n"
+"virtual machines, and certificates."
 msgstr ""
 
-#: gnu/packages/networking.scm:558
+#: gnu/packages/networking.scm:1591
 msgid ""
-"fping is a ping like program which uses the Internet Control Message\n"
-"Protocol (ICMP) echo request to determine if a target host is responding.\n"
-"fping differs from ping in that you can specify any number of targets on the\n"
-"command line, or specify a file containing the lists of targets to ping.\n"
-"Instead of sending to one target until it times out or replies, fping will\n"
-"send out a ping packet and move on to the next target in a round-robin\n"
-"fashion."
+"The netns package provides a simple interface for\n"
+"handling network namespaces in Go."
 msgstr ""
 
-#: gnu/packages/networking.scm:592
-msgid "Web server latency and throughput monitor"
+#: gnu/packages/networking.scm:1618
+msgid ""
+"This library provides methods for using the stream control\n"
+"transmission protocol (SCTP) in a Go application."
 msgstr ""
 
-#: gnu/packages/networking.scm:594
+#: gnu/packages/networking.scm:1649
 msgid ""
 "httping measures how long it takes to connect to a web server, send an\n"
 "HTTP(S) request, and receive the reply headers.  It is somewhat similar to\n"
@@ -9397,11 +10326,7 @@ msgid ""
 "application stack itself."
 msgstr ""
 
-#: gnu/packages/networking.scm:625
-msgid "Visualize curl statistics"
-msgstr ""
-
-#: gnu/packages/networking.scm:627
+#: gnu/packages/networking.scm:1688
 msgid ""
 "@command{httpstat} is a tool to visualize statistics from the\n"
 "@command{curl} HTTP client.  It acts as a wrapper for @command{curl} and\n"
@@ -9409,21 +10334,20 @@ msgid ""
 "TCP connection, TLS handshake and so on) in the terminal."
 msgstr ""
 
-#: gnu/packages/networking.scm:647
-msgid "Console based live network and disk I/O bandwidth monitor"
+#: gnu/packages/networking.scm:1733
+msgid ""
+"Squid is a caching proxy for the Web supporting HTTP, HTTPS,\n"
+"FTP, and more.  It reduces bandwidth and improves response times by caching and\n"
+"reusing frequently-requested web pages."
 msgstr ""
 
-#: gnu/packages/networking.scm:648
+#: gnu/packages/networking.scm:1768
 msgid ""
 "Bandwidth Monitor NG is a small and simple console based\n"
 "live network and disk I/O bandwidth monitor."
 msgstr ""
 
-#: gnu/packages/networking.scm:702
-msgid "Assess WiFi network security"
-msgstr ""
-
-#: gnu/packages/networking.scm:704
+#: gnu/packages/networking.scm:1823
 msgid ""
 "Aircrack-ng is a complete suite of tools to assess WiFi network\n"
 "security.  It focuses on different areas of WiFi security: monitoring,\n"
@@ -9431,105 +10355,94 @@ msgid ""
 "allows for heavy scripting."
 msgstr ""
 
-#: gnu/packages/networking.scm:729
-msgid "Perl Interface to the Domain Name System"
+#: gnu/packages/networking.scm:1852
+msgid ""
+"Pixiewps implements the pixie-dust attack to brute\n"
+"force the Wi-Fi Protected Setup (WPS) PIN by exploiting the low or\n"
+"non-existing entropy of some access points."
+msgstr ""
+
+#: gnu/packages/networking.scm:1899
+msgid ""
+"Reaver performs a brute force attack against an access\n"
+"point's Wi-Fi Protected Setup (WPS) PIN.  Once the PIN is found, the WPA\n"
+"passphrase can be recovered and the AP's wireless settings can be\n"
+"reconfigured."
 msgstr ""
 
-#: gnu/packages/networking.scm:730
-msgid "Net::DNS is the Perl Interface to the Domain Name System."
+#: gnu/packages/networking.scm:1924
+msgid ""
+"Danga::Socket is an abstract base class for objects backed by a socket\n"
+"which provides the basic framework for event-driven asynchronous IO, designed\n"
+"to be fast.  Danga::Socket is both a base class for objects, and an event\n"
+"loop."
+msgstr ""
+
+#: gnu/packages/networking.scm:1950
+msgid ""
+"This module provides several IP address validation subroutines that both\n"
+"validate and untaint their input.  This includes both basic validation\n"
+"(@code{is_ipv4()} and @code{is_ipv6()}) and special cases like checking whether\n"
+"an address belongs to a specific network or whether an address is public or\n"
+"private (reserved)."
 msgstr ""
 
-#: gnu/packages/networking.scm:761
-msgid "IPv6 related part of the C socket.h defines and structure manipulators for Perl"
+#: gnu/packages/networking.scm:1978
+msgid "Net::DNS is the Perl Interface to the Domain Name System."
 msgstr ""
 
-#: gnu/packages/networking.scm:762
+#: gnu/packages/networking.scm:2010
 msgid ""
 "Socket6 binds the IPv6 related part of the C socket header\n"
 "definitions and structure manipulators for Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:788
-msgid "Programmable DNS resolver class for offline emulation of DNS"
-msgstr ""
-
-#: gnu/packages/networking.scm:789
+#: gnu/packages/networking.scm:2037
 msgid ""
 "Net::DNS::Resolver::Programmable is a programmable DNS resolver for\n"
 "offline emulation of DNS."
 msgstr ""
 
-#: gnu/packages/networking.scm:822
-msgid "Manages IPv4 and IPv6 addresses and subnets"
+#: gnu/packages/networking.scm:2059
+msgid ""
+"Net::DNS::Resolver::Mock is a subclass of Net::DNS::Resolver, but returns\n"
+"static data from any provided DNS zone file instead of querying the network.\n"
+"It is intended primarily for use in testing."
 msgstr ""
 
-#: gnu/packages/networking.scm:823
+#: gnu/packages/networking.scm:2094
 msgid "NetAddr::IP manages IPv4 and IPv6 addresses and subsets."
 msgstr ""
 
-#: gnu/packages/networking.scm:847
-msgid "Patricia Trie Perl module for fast IP address lookups"
-msgstr ""
-
-#: gnu/packages/networking.scm:849
+#: gnu/packages/networking.scm:2128
 msgid "Net::Patricia does IP address lookups quickly in Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:872
-msgid "Perl extension for merging IPv4 or IPv6 CIDR addresses"
-msgstr ""
-
-#: gnu/packages/networking.scm:873
+#: gnu/packages/networking.scm:2149
 msgid "Net::CIDR::Lite merges IPv4 or IPv6 CIDR addresses."
 msgstr ""
 
-#: gnu/packages/networking.scm:895
-msgid "Look up location and network information by IP Address in Perl"
-msgstr ""
-
-#: gnu/packages/networking.scm:896
-msgid ""
-"The Perl module 'Geo::IP'.  It looks up location and network\n"
-"information by IP Address."
-msgstr ""
-
-#: gnu/packages/networking.scm:925
-msgid "Perl object interface for AF_INET/AF_INET6 domain sockets"
-msgstr ""
-
-#: gnu/packages/networking.scm:926
+#: gnu/packages/networking.scm:2178
 msgid ""
 "IO::Socket::INET6 is an interface for AF_INET/AF_INET6 domain\n"
 "sockets in Perl."
 msgstr ""
 
-#: gnu/packages/networking.scm:955
-msgid "Library providing automatic proxy configuration management"
-msgstr ""
-
-#: gnu/packages/networking.scm:956
+#: gnu/packages/networking.scm:2207
 msgid ""
 "Libproxy handles the details of HTTP/HTTPS proxy\n"
 "configuration for applications across all scenarios.  Applications using\n"
 "libproxy only have to specify which proxy to use."
 msgstr ""
 
-#: gnu/packages/networking.scm:989
-msgid "Redirect any TCP connection through a proxy or proxy chain"
-msgstr ""
-
-#: gnu/packages/networking.scm:990
+#: gnu/packages/networking.scm:2243
 msgid ""
 "Proxychains-ng is a preloader which hooks calls to sockets\n"
 "in dynamically linked programs and redirects them through one or more SOCKS or\n"
 "HTTP proxies."
 msgstr ""
 
-#: gnu/packages/networking.scm:1011
-msgid "Network communication layer on top of UDP"
-msgstr ""
-
-#: gnu/packages/networking.scm:1013
+#: gnu/packages/networking.scm:2265
 msgid ""
 "ENet's purpose is to provide a relatively thin, simple and robust network\n"
 "communication layer on top of UDP.  The primary feature it provides is optional\n"
@@ -9539,11 +10452,7 @@ msgid ""
 "library remains flexible, portable, and easily embeddable."
 msgstr ""
 
-#: gnu/packages/networking.scm:1076
-msgid "Applicative network protocol demultiplexer"
-msgstr ""
-
-#: gnu/packages/networking.scm:1078
+#: gnu/packages/networking.scm:2332
 msgid ""
 "sslh is a network protocol demultiplexer.  It acts like a switchboard,\n"
 "accepting connections from clients on one port and forwarding them to different\n"
@@ -9555,11 +10464,7 @@ msgid ""
 "that block port 22."
 msgstr ""
 
-#: gnu/packages/networking.scm:1101
-msgid "TCP, UDP and SCTP bandwidth measurement tool"
-msgstr ""
-
-#: gnu/packages/networking.scm:1103
+#: gnu/packages/networking.scm:2357
 msgid ""
 "iPerf is a tool to measure achievable bandwidth on IP networks.  It\n"
 "supports tuning of various parameters related to timing, buffers and\n"
@@ -9567,11 +10472,7 @@ msgid ""
 "the bandwidth, loss, and other parameters."
 msgstr ""
 
-#: gnu/packages/networking.scm:1136
-msgid "Per-process bandwidth monitor"
-msgstr ""
-
-#: gnu/packages/networking.scm:1137
+#: gnu/packages/networking.scm:2395
 msgid ""
 "NetHogs is a small 'net top' tool for Linux.  Instead of\n"
 "breaking the traffic down per protocol or per subnet, like most tools do, it\n"
@@ -9583,11 +10484,7 @@ msgid ""
 "gone wild and are suddenly taking up your bandwidth."
 msgstr ""
 
-#: gnu/packages/networking.scm:1183
-msgid "Usenet binary file downloader"
-msgstr ""
-
-#: gnu/packages/networking.scm:1185
+#: gnu/packages/networking.scm:2443
 msgid ""
 "NZBGet is a binary newsgrabber, which downloads files from Usenet based\n"
 "on information given in @code{nzb} files.  NZBGet can be used in standalone\n"
@@ -9597,11 +10494,7 @@ msgid ""
 "procedure calls (RPCs)."
 msgstr ""
 
-#: gnu/packages/networking.scm:1239
-msgid "Virtual network switch"
-msgstr ""
-
-#: gnu/packages/networking.scm:1242
+#: gnu/packages/networking.scm:2498
 msgid ""
 "Open vSwitch is a multilayer virtual switch.  It is designed to enable\n"
 "massive network automation through programmatic extension, while still\n"
@@ -9609,54 +10502,34 @@ msgid ""
 "IPFIX, RSPAN, CLI, LACP, 802.1ag)."
 msgstr ""
 
-#: gnu/packages/networking.scm:1264
-msgid "Python class and tools for handling IP addresses and networks"
-msgstr ""
-
-#: gnu/packages/networking.scm:1265
+#: gnu/packages/networking.scm:2521
 msgid ""
 "The @code{IP} class allows a comfortable parsing and\n"
 "handling for most notations in use for IPv4 and IPv6 addresses and\n"
 "networks."
 msgstr ""
 
-#: gnu/packages/networking.scm:1285
-msgid "Internet bandwidth tester"
-msgstr ""
-
-#: gnu/packages/networking.scm:1287
+#: gnu/packages/networking.scm:2546
 msgid ""
 "Command line interface for testing internet bandwidth using\n"
 "speedtest.net."
 msgstr ""
 
-#: gnu/packages/networking.scm:1305
-msgid "HPA's tftp client"
-msgstr ""
-
-#: gnu/packages/networking.scm:1307
+#: gnu/packages/networking.scm:2566
 msgid ""
 "This is a tftp client derived from OpenBSD tftp with some extra options\n"
 "added and bugs fixed.  The source includes readline support but it is not\n"
 "enabled due to license conflicts between the BSD advertising clause and the GPL."
 msgstr ""
 
-#: gnu/packages/networking.scm:1335
-msgid "Small Ident Daemon"
-msgstr ""
-
-#: gnu/packages/networking.scm:1337
+#: gnu/packages/networking.scm:2597
 msgid ""
-"@dfn{Pidentd} (Peter's Ident Daemon) is a identd, which implements a\n"
+"@dfn{Pidentd} (Peter's Ident Daemon) is an identd, which implements a\n"
 "identification server.  Pidentd looks up specific TCP/IP connections and\n"
 "returns the user name and other information about the connection."
 msgstr ""
 
-#: gnu/packages/networking.scm:1384
-msgid "Create secure pipes between sockets"
-msgstr ""
-
-#: gnu/packages/networking.scm:1385
+#: gnu/packages/networking.scm:2645
 msgid ""
 "Spiped (pronounced \"ess-pipe-dee\") is a utility for creating\n"
 "symmetrically encrypted and authenticated pipes between socket addresses, so\n"
@@ -9666,11 +10539,7 @@ msgid ""
 "does not use SSH and requires a pre-shared symmetric key."
 msgstr ""
 
-#: gnu/packages/networking.scm:1412
-msgid "Routing Software Suite"
-msgstr ""
-
-#: gnu/packages/networking.scm:1413
+#: gnu/packages/networking.scm:2674
 msgid ""
 "Quagga is a routing software suite, providing implementations\n"
 "of OSPFv2, OSPFv3, RIP v1 and v2, RIPng and BGP-4 for Unix platforms.\n"
@@ -9682,22 +10551,14 @@ msgid ""
 "updates to the zebra daemon."
 msgstr ""
 
-#: gnu/packages/networking.scm:1461
-msgid "IPv6 security research toolkit"
-msgstr ""
-
-#: gnu/packages/networking.scm:1462
+#: gnu/packages/networking.scm:2726
 msgid ""
 "The THC IPv6 Toolkit provides command-line tools and a library\n"
 "for researching IPv6 implementations and deployments.  It requires Linux 2.6 or\n"
 "newer and only works on Ethernet network interfaces."
 msgstr ""
 
-#: gnu/packages/networking.scm:1488
-msgid "Bandwidth monitor"
-msgstr ""
-
-#: gnu/packages/networking.scm:1489
+#: gnu/packages/networking.scm:2753
 msgid ""
 "bmon is a monitoring and debugging tool to capture\n"
 "networking-related statistics and prepare them visually in a human-friendly\n"
@@ -9705,11 +10566,7 @@ msgid ""
 "interface and a programmable text output for scripting."
 msgstr ""
 
-#: gnu/packages/networking.scm:1531
-msgid "Framework for low-level network packet construction"
-msgstr ""
-
-#: gnu/packages/networking.scm:1533
+#: gnu/packages/networking.scm:2792
 msgid ""
 "Libnet provides a fairly portable framework for network packet\n"
 "construction and injection.  It features portable packet creation interfaces\n"
@@ -9718,126 +10575,378 @@ msgid ""
 "can be whipped up with little effort."
 msgstr ""
 
-#: gnu/packages/pdf.scm:127
-msgid "PDF rendering library"
+#: gnu/packages/networking.scm:2819
+msgid ""
+"@acronym{mtr, My TraceRoute} combines the functionality of the\n"
+"@command{traceroute} and @command{ping} programs in a single network diagnostic\n"
+"tool.  @command{mtr} can use several network protocols to detect intermediate\n"
+"routers (or @dfn{hops}) between the local host and a user-specified destination.\n"
+"It then continually measures the response time and packet loss at each hop, and\n"
+"displays the results in real time."
 msgstr ""
 
-#: gnu/packages/pdf.scm:129
-msgid "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+#: gnu/packages/networking.scm:2872
+msgid ""
+"StrongSwan is an IPsec implementation originally based upon\n"
+"the FreeS/WAN project.  It contains support for IKEv1, IKEv2, MOBIKE, IPv6,\n"
+"NAT-T and more."
 msgstr ""
 
-#: gnu/packages/pdf.scm:138
-msgid "Qt4 frontend for the Poppler PDF rendering library"
+#: gnu/packages/networking.scm:2958
+msgid ""
+"aMule is an eMule-like client for the eD2k and Kademlia peer-to-peer\n"
+"file sharing networks.  It includes a graphical user interface (GUI), a daemon\n"
+"allowing you to run a client with no graphical interface, and a Web GUI for\n"
+"remote access.  The @command{amulecmd} command allows you to control aMule\n"
+"remotely."
 msgstr ""
 
-#: gnu/packages/pdf.scm:149
-msgid "Qt5 frontend for the Poppler PDF rendering library"
+#: gnu/packages/networking.scm:2982
+msgid ""
+"Zyre provides reliable group messaging over local area\n"
+"networks using zeromq.  It has these key characteristics:\n"
+"\n"
+"@itemize\n"
+"@item Zyre needs no administration or configuration.\n"
+"@item Peers may join and leave the network at any time.\n"
+"@item Peers talk to each other without any central brokers or servers.\n"
+"@item Peers can talk directly to each other.\n"
+"@item Peers can join groups, and then talk to groups.\n"
+"@item Zyre is reliable, and loses no messages even when the network is heavily loaded.\n"
+"@item Zyre is fast and has low latency, requiring no consensus protocols.\n"
+"@item Zyre is designed for WiFi networks, yet also works well on Ethernet networks.\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/pdf.scm:182
-msgid "Python bindings for Poppler-Qt4"
+#: gnu/packages/networking.scm:3018
+msgid ""
+"This library allows controlling basic functions in SocketCAN\n"
+"from user-space.  It requires a kernel built with SocketCAN support."
 msgstr ""
 
-#: gnu/packages/pdf.scm:184
+#: gnu/packages/networking.scm:3047
 msgid ""
-"This package provides Python bindings for the Qt4 interface of the\n"
-"Poppler PDF rendering library."
+"This package provides CAN utilities in the following areas:\n"
+"\n"
+"@itemize\n"
+"@item Basic tools to display, record, generate and replay CAN traffic\n"
+"@item CAN access via IP sockets\n"
+"@item CAN in-kernel gateway configuration\n"
+"@item CAN bus measurement and testing\n"
+"@item ISO-TP (ISO15765-2:2016 - this means messages with a body larger than\n"
+"eight bytes) tools\n"
+"@item Log file converters\n"
+"@item Serial Line Discipline configuration for slcan driver\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/pdf.scm:229
-msgid "Python bindings for Poppler-Qt5"
+#: gnu/packages/networking.scm:3085
+msgid ""
+"Asio is a cross-platform C++ library for network and\n"
+"low-level I/O programming that provides developers with a consistent\n"
+"asynchronous model using a modern C++ approach."
 msgstr ""
 
-#: gnu/packages/pdf.scm:231
+#: gnu/packages/networking.scm:3136
 msgid ""
-"This package provides Python bindings for the Qt5 interface of the\n"
-"Poppler PDF rendering library."
+"This package is a fast tunnel proxy that helps you bypass firewalls.\n"
+"\n"
+"Features:\n"
+"@itemize\n"
+"@item TCP & UDP support\n"
+"@item User management API\n"
+"@item TCP Fast Open\n"
+"@item Workers and graceful restart\n"
+"@item Destination IP blacklist\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/pdf.scm:268
-msgid "Library for generating PDF files"
+#: gnu/packages/networking.scm:3218
+msgid ""
+"The @dfn{Simple Network Management Protocol} (SNMP) is a\n"
+"widely used protocol for monitoring the health and welfare of network\n"
+"equipment (e.g. routers), computer equipment and even devices like UPSs.\n"
+"Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and\n"
+"SNMP v3 using both IPv4 and IPv6."
 msgstr ""
 
-#: gnu/packages/pdf.scm:270
+#: gnu/packages/networking.scm:3265
 msgid ""
-"libHaru is a library for generating PDF files.  libHaru does not support\n"
-"reading and editing of existing PDF files."
+"uBridge is a simple program to create user-land bridges\n"
+"between various technologies.  Currently, bridging between UDP tunnels,\n"
+"Ethernet and TAP interfaces is supported.  Packet capture is also supported."
 msgstr ""
 
-#: gnu/packages/pdf.scm:317
-msgid "Viewer for PDF files based on the Motif toolkit"
+#: gnu/packages/networking.scm:3300
+msgid ""
+"This package contains a small set of tools to capture and convert\n"
+"packets from wireless devices for use with hashcat or John the Ripper."
 msgstr ""
 
-#: gnu/packages/pdf.scm:319
-msgid "Xpdf is a viewer for Portable Document Format (PDF) files."
+#: gnu/packages/networking.scm:3331
+msgid ""
+"Small tool to capture packets from WLAN devices.  After capturing,\n"
+"upload the \"uncleaned\" cap to @url{https://wpa-sec.stanev.org/?submit} to\n"
+"see if the access point or the client is vulnerable to a dictionary attack.\n"
+"Convert the cap file to hccapx format and/or to WPA-PMKID-PBKDF2\n"
+"hashline (16800) with @command{hcxpcaptool} from the @code{hcxtools} package\n"
+"and check if the WLAN key or the master key was transmitted unencrypted."
+msgstr ""
+
+#: gnu/packages/networking.scm:3359
+msgid ""
+"Dante is a SOCKS client and server implementation.  It can\n"
+"be installed on a machine with access to an external TCP/IP network and will\n"
+"allow all other machines, without direct access to that network, to be relayed\n"
+"through the machine the Dante server is running on.  The external network will\n"
+"never see any machines other than the one Dante is running on."
+msgstr ""
+
+#: gnu/packages/networking.scm:3412
+msgid ""
+"Restbed is a comprehensive and consistent programming\n"
+"model for building applications that require seamless and secure\n"
+"communication over HTTP."
+msgstr ""
+
+#: gnu/packages/networking.scm:3455
+msgid ""
+"RESTinio is a header-only C++14 library that gives you an embedded\n"
+"HTTP/Websocket server.  It is based on standalone version of ASIO\n"
+"and targeted primarily for asynchronous processing of HTTP-requests."
+msgstr ""
+
+#: gnu/packages/networking.scm:3504
+msgid ""
+"OpenDHT is a Distributed Hash Table (DHT) library.  It may\n"
+"be used to manage peer-to-peer network connections as needed for real time\n"
+"communication."
+msgstr ""
+
+#: gnu/packages/networking.scm:3535
+msgid ""
+"FRRouting (FRR) is an IP routing protocol suite which includes\n"
+"protocol daemons for BGP, IS-IS, LDP, OSPF, PIM, and RIP. "
+msgstr ""
+
+#: gnu/packages/networking.scm:3591
+msgid ""
+"iwd is a wireless daemon for Linux that aims to replace WPA\n"
+"Supplicant.  It optimizes resource utilization by not depending on any external\n"
+"libraries and instead utilizing features provided by the Linux kernel to the\n"
+"maximum extent possible."
+msgstr ""
+
+#: gnu/packages/networking.scm:3619
+msgid ""
+"libyang is a YANG data modelling language parser and toolkit\n"
+"written (and providing API) in C.  Current implementation covers YANG 1.0 (RFC\n"
+"6020) as well as YANG 1.1 (RFC 7950)."
+msgstr ""
+
+#: gnu/packages/networking.scm:3652
+msgid ""
+"This package provides a control tool for the\n"
+"B.A.T.M.A.N. mesh networking routing protocol provided by the Linux kernel\n"
+"module @code{batman-adv}, for Layer 2."
+msgstr ""
+
+#: gnu/packages/networking.scm:3689
+msgid ""
+"PageKite implements a tunneled reverse proxy which makes it easy to make\n"
+"a service (such as an HTTP or SSH server) on localhost visible to the wider\n"
+"Internet, even behind NAT or restrictive firewalls.  A managed front-end relay\n"
+"service is available at @url{https://pagekite.net/}, or you can run your own."
+msgstr ""
+
+#: gnu/packages/networking.scm:3733
+msgid ""
+"ipcalc takes an IP address and netmask and calculates the\n"
+"resulting broadcast, network, Cisco wildcard mask, and host range.  By giving\n"
+"a second netmask, you can design subnets and supernets.  It is also intended\n"
+"to be a teaching tool and presents the subnetting results as\n"
+"easy-to-understand binary values."
+msgstr ""
+
+#: gnu/packages/networking.scm:3772
+msgid ""
+"Tunctl is used to set up and maintain persistent TUN/TAP\n"
+"network interfaces, enabling user applications to simulate network traffic.\n"
+"Such interfaces are useful for VPN software, virtualization, emulation,\n"
+"simulation, and a number of other applications."
+msgstr ""
+
+#: gnu/packages/networking.scm:3792
+msgid ""
+"Tool to send a magic packet to wake another host on the\n"
+"network.  This must be enabled on the target host, usually in the BIOS."
+msgstr ""
+
+#: gnu/packages/networking.scm:3815
+msgid ""
+"VDE is a set of programs to provide virtual software-defined\n"
+"Ethernet network interface controllers across multiple virtual or\n"
+"physical, local or remote devices.  The VDE architecture provides\n"
+"virtual counterparts to hardware components such as switches and\n"
+"cables."
+msgstr ""
+
+#: gnu/packages/networking.scm:3860
+msgid ""
+"HAProxy is a free, very fast and reliable solution offering\n"
+"high availability, load balancing, and proxying for TCP and HTTP-based\n"
+"applications.  It is particularly suited for web sites crawling under very\n"
+"high loads while needing persistence or Layer7 processing.  Supporting tens of\n"
+"thousands of connections is clearly realistic with today's hardware."
+msgstr ""
+
+#: gnu/packages/networking.scm:3909
+msgid ""
+"The @dfn{Link Layer Discovery Protocol} (LLDP) is an industry standard\n"
+"protocol designed to supplant proprietary Link-Layer protocols such as EDP or\n"
+"CDP.  The goal of LLDP is to provide an inter-vendor compatible mechanism to\n"
+"deliver Link-Layer notifications to adjacent network devices.  @code{lldpd} is\n"
+"an implementation of LLDP.  It also supports some proprietary protocols."
+msgstr ""
+
+#: gnu/packages/networking.scm:3951
+msgid ""
+"Hashcash is a proof-of-work algorithm, which has been used\n"
+"as a denial-of-service countermeasure technique in a number of systems.\n"
+"\n"
+"A hashcash stamp constitutes a proof-of-work which takes a parametrizable\n"
+"amount of work to compute for the sender.  The recipient can verify received\n"
+"hashcash stamps efficiently.\n"
+"\n"
+"This package contains a command-line tool for computing and verifying hashcash\n"
+"stamps."
+msgstr ""
+
+#: gnu/packages/networking.scm:3981
+msgid ""
+"This package provides the NBD (Network Block Devices)\n"
+"client and server.  It allows you to use remote block devices over a TCP/IP\n"
+"network."
+msgstr ""
+
+#: gnu/packages/networking.scm:4056
+msgid ""
+"Yggdrasil is an early-stage implementation of a fully end-to-end encrypted\n"
+"IPv6 network.  It is lightweight, self-arranging, supported on multiple\n"
+"platforms and allows pretty much any IPv6-capable application to communicate\n"
+"securely with other Yggdrasil nodes.  Yggdrasil does not require you to have\n"
+"IPv6 Internet connectivity - it also works over IPv4."
+msgstr ""
+
+#: gnu/packages/pdf.scm:136
+msgid ""
+"PDFmarks is a technique that accompanies PDF, and that is used to store\n"
+"metadata such as author or title, but also structural information such as\n"
+"bookmarks or hyperlinks.\n"
+"\n"
+"When Ghostscript reads the main PDF generated by the TeX system with embedded\n"
+"PDF files and outputs the final PDF, the PDF page mode and name targets\n"
+"etc. are not preserved.  Therefore, when you open the final PDF, it is not\n"
+"displayed correctly.  Also, remote PDF links do not work correctly.\n"
+"\n"
+"This program is able to extract the page mode and named targets as PDFmark\n"
+"from PDF.  In this way, you can obtain embedded PDF files that have kept this\n"
+"information."
+msgstr ""
+
+#: gnu/packages/pdf.scm:183
+msgid ""
+"@command{flyer-composer} can be used to prepare one- or\n"
+"two-sided flyers for printing on one sheet of paper.\n"
+"\n"
+"Imagine you have designed a flyer in A6 format and want to print it using your\n"
+"A4 printer.  Of course, you want to print four flyers on each sheet.  This is\n"
+"where Flyer Composer steps in, creating a PDF which holds your flyer four\n"
+"times.  If you have a second page, Flyer Composer can arrange it the same way\n"
+"- even if the second page is in a separate PDF file.\n"
+"\n"
+"This package contains both the command line tool and the gui too."
+msgstr ""
+
+#: gnu/packages/pdf.scm:210
+msgid ""
+"@command{flyer-composer} can be used to prepare one- or\n"
+"two-sided flyers for printing on one sheet of paper.\n"
+"\n"
+"Imagine you have designed a flyer in A6 format and want to print it using your\n"
+"A4 printer.  Of course, you want to print four flyers on each sheet.  This is\n"
+"where Flyer Composer steps in, creating a PDF which holds your flyer four\n"
+"times.  If you have a second page, Flyer Composer can arrange it the same way\n"
+"- even if the second page is in a separate PDF file.\n"
+"\n"
+"This package contains only the command line tool.  If you like to use the gui,\n"
+"please install the @code{flyer-composer-gui} package."
+msgstr ""
+
+#: gnu/packages/pdf.scm:268
+msgid "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+msgstr ""
+
+#: gnu/packages/pdf.scm:294
+msgid ""
+"This package provides optional encoding files for Poppler.\n"
+"When present, Poppler is able to correctly render CJK and Cyrillic text."
 msgstr ""
 
 #: gnu/packages/pdf.scm:349
-msgid "Comic book support for zathura (libarchive backend)"
+msgid ""
+"This package provides Python bindings for the Qt5 interface of the\n"
+"Poppler PDF rendering library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:350
+#: gnu/packages/pdf.scm:385
 msgid ""
-"The zathura-cb plugin adds comic book support to zathura\n"
-"using libarchive."
+"libHaru is a library for generating PDF files.  libHaru does not support\n"
+"reading and editing of existing PDF files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:380
-msgid "PS support for zathura (libspectre backend)"
+#: gnu/packages/pdf.scm:409
+msgid "Xpdf is a viewer for Portable Document Format (PDF) files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:381
+#: gnu/packages/pdf.scm:444
 msgid ""
-"The zathura-ps plugin adds PS support to zathura\n"
-"using libspectre."
+"The zathura-cb plugin adds comic book support to zathura\n"
+"using libarchive."
 msgstr ""
 
-#: gnu/packages/pdf.scm:412
-msgid "DjVu support for zathura (DjVuLibre backend)"
+#: gnu/packages/pdf.scm:479
+msgid ""
+"The zathura-ps plugin adds PS support to zathura\n"
+"using libspectre."
 msgstr ""
 
-#: gnu/packages/pdf.scm:413
+#: gnu/packages/pdf.scm:515
 msgid ""
 "The zathura-djvu plugin adds DjVu support to zathura\n"
 "using the DjVuLibre library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:447
-msgid "PDF support for zathura (mupdf backend)"
-msgstr ""
-
-#: gnu/packages/pdf.scm:448
+#: gnu/packages/pdf.scm:565
 msgid ""
 "The zathura-pdf-mupdf plugin adds PDF support to zathura\n"
 "by using the @code{mupdf} rendering library."
 msgstr ""
 
-#: gnu/packages/pdf.scm:480
-msgid "PDF support for zathura (poppler backend)"
-msgstr ""
-
-#: gnu/packages/pdf.scm:481
+#: gnu/packages/pdf.scm:601
 msgid ""
 "The zathura-pdf-poppler plugin adds PDF support to zathura\n"
 "by using the poppler rendering engine."
 msgstr ""
 
-#: gnu/packages/pdf.scm:518
-msgid "Lightweight keyboard-driven PDF viewer"
-msgstr ""
-
-#: gnu/packages/pdf.scm:519
+#: gnu/packages/pdf.scm:658
 msgid ""
 "Zathura is a customizable document viewer.  It provides a\n"
 "minimalistic interface and an interface that mainly focuses on keyboard\n"
 "interaction."
 msgstr ""
 
-#: gnu/packages/pdf.scm:558
-msgid "Tools to work with the PDF file format"
-msgstr ""
-
-#: gnu/packages/pdf.scm:560
+#: gnu/packages/pdf.scm:702
 msgid ""
 "PoDoFo is a C++ library and set of command-line tools to work with the\n"
 "PDF file format.  It can parse PDF files and load them into memory, and makes\n"
@@ -9846,11 +10955,7 @@ msgid ""
 "extracting content or merging files."
 msgstr ""
 
-#: gnu/packages/pdf.scm:609
-msgid "Lightweight PDF viewer and toolkit"
-msgstr ""
-
-#: gnu/packages/pdf.scm:611
+#: gnu/packages/pdf.scm:770
 msgid ""
 "MuPDF is a C library that implements a PDF and XPS parsing and\n"
 "rendering engine.  It is used primarily to render pages into bitmaps,\n"
@@ -9862,11 +10967,7 @@ msgid ""
 "@command{pdfclean}, and examining the file structure @command{pdfshow}."
 msgstr ""
 
-#: gnu/packages/pdf.scm:663
-msgid "Command-line tools and library for transforming PDF files"
-msgstr ""
-
-#: gnu/packages/pdf.scm:665
+#: gnu/packages/pdf.scm:819
 msgid ""
 "QPDF is a command-line program that does structural, content-preserving\n"
 "transformations on PDF files.  It could have been called something like\n"
@@ -9875,32 +10976,64 @@ msgid ""
 "program capable of converting PDF into other formats."
 msgstr ""
 
-#: gnu/packages/pdf.scm:695
-msgid "Notetaking using a stylus"
+#: gnu/packages/pdf.scm:871
+msgid ""
+"@command{qpdfview} is a document viewer for PDF, PS and DJVU\n"
+"files.  It uses the Qt toolkit and features persistent per-file settings,\n"
+"configurable toolbars and shortcuts, continuous and multi‐page layouts,\n"
+"SyncTeX support, and rudimentary support for annotations and forms."
 msgstr ""
 
-#: gnu/packages/pdf.scm:697
+#: gnu/packages/pdf.scm:901
 msgid ""
 "Xournal is an application for notetaking, sketching, keeping a journal\n"
 "using a stylus."
 msgstr ""
 
-#: gnu/packages/pdf.scm:719
-msgid "Python library for generating PDFs and graphics"
+#: gnu/packages/pdf.scm:961
+msgid ""
+"Xournal++ is a hand note taking software written in\n"
+"C++ with the target of flexibility, functionality and speed.  Stroke\n"
+"recognizer and other parts are based on Xournal code.\n"
+"\n"
+"Xournal++ features:\n"
+"\n"
+"@itemize\n"
+"@item Support for Pen pressure, e.g., Wacom Tablet\n"
+"@item Support for annotating PDFs\n"
+"@item Fill shape functionality\n"
+"@item PDF Export (with and without paper style)\n"
+"@item PNG Export (with and without transparent background)\n"
+"@item Map different tools / colors etc. to stylus buttons /\n"
+"mouse buttons\n"
+"@item Sidebar with Page Previews with advanced page sorting, PDF\n"
+"Bookmarks and Layers (can be individually hidden, editing layer can be\n"
+"selected)\n"
+"@item enhanced support for image insertion\n"
+"@item Eraser with multiple configurations\n"
+"@item LaTeX support\n"
+"@item bug reporting, autosave, and auto backup tools\n"
+"@item Customizeable toolbar, with multiple configurations, e.g., to\n"
+"optimize toolbar for portrait / landscape\n"
+"@item Page Template definitions\n"
+"@item Shape drawing (line, arrow, circle, rectangle)\n"
+"@item Shape resizing and rotation\n"
+"@item Rotation snapping every 45 degrees\n"
+"@item Rect snapping to grid\n"
+"@item Audio recording and playback alongside with handwritten notes\n"
+"@item Multi Language Support, Like English, German, Italian...\n"
+"@item Plugins using LUA Scripting\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/pdf.scm:720
+#: gnu/packages/pdf.scm:1040
 msgid ""
 "This is the ReportLab PDF Toolkit.  It allows rapid creation\n"
 "of rich PDF documents, and also creation of charts in a variety of bitmap and\n"
 "vector formats."
 msgstr ""
 
-#: gnu/packages/pdf.scm:773
-msgid "PDF presentation tool with visual effects"
-msgstr ""
-
-#: gnu/packages/pdf.scm:775
+#: gnu/packages/pdf.scm:1095
 msgid ""
 "Impressive is a tool to display PDF files that provides visual effects\n"
 "such as smooth alpha-blended slide transitions.  It provides additional tools\n"
@@ -9908,31 +11041,26 @@ msgid ""
 "the PDF pages."
 msgstr ""
 
-#: gnu/packages/pdf.scm:823
-msgid "Framebuffer and drm-based image viewer"
+#: gnu/packages/pdf.scm:1119
+msgid ""
+"img2pdf converts images to PDF via direct JPEG inclusion.  That\n"
+"conversion is lossless: the image embedded in the PDF has the exact same color\n"
+"information for every pixel as the input."
 msgstr ""
 
-#: gnu/packages/pdf.scm:825
+#: gnu/packages/pdf.scm:1168
 msgid ""
 "fbida contains a few applications for viewing and editing images on\n"
 "the framebuffer."
 msgstr ""
 
-#: gnu/packages/pdf.scm:850
-msgid "PDF to SVG converter"
-msgstr ""
-
-#: gnu/packages/pdf.scm:851
+#: gnu/packages/pdf.scm:1194
 msgid ""
 "@command{pdf2svg} is a simple command-line PDF to SVG\n"
 "converter using the Poppler and Cairo libraries."
 msgstr ""
 
-#: gnu/packages/pdf.scm:882 gnu/packages/pdf.scm:919
-msgid "Pure Python PDF toolkit"
-msgstr ""
-
-#: gnu/packages/pdf.scm:883
+#: gnu/packages/pdf.scm:1226
 msgid ""
 "PyPDF2 is a pure Python PDF library capable of:\n"
 "\n"
@@ -9952,7 +11080,7 @@ msgid ""
 "manage or manipulate PDFs."
 msgstr ""
 
-#: gnu/packages/pdf.scm:920
+#: gnu/packages/pdf.scm:1263
 msgid ""
 "PyPDF2 is a pure Python PDF toolkit.\n"
 "\n"
@@ -9960,14 +11088,19 @@ msgid ""
 "python-pypdf2 instead."
 msgstr ""
 
-#: gnu/packages/pdf.scm:944
-msgid "Scale and tile PDF images/pages to print on multiple pages"
+#: gnu/packages/pdf.scm:1309
+msgid ""
+"PDF Arranger is a small application which allows one to merge or split\n"
+"PDF documents and rotate, crop and rearrange their pages using an interactive\n"
+"and intuitive graphical interface.\n"
+"\n"
+"PDF Arranger was formerly known as PDF-Shuffler."
 msgstr ""
 
-#: gnu/packages/pdf.scm:945
+#: gnu/packages/pdf.scm:1333
 msgid ""
 "@command{pdfposter} can be used to create a large poster by\n"
-"building it from multple pages and/or printing it on large media.  It expects\n"
+"building it from multiple pages and/or printing it on large media.  It expects\n"
 "as input a PDF file, normally printing on a single page.  The output is again\n"
 "a PDF file, maybe containing multiple pages together building the poster.  The\n"
 "input page will be scaled to obtain the desired size.\n"
@@ -9977,11 +11110,7 @@ msgid ""
 "PDF.  Indeed @command{pdfposter} was inspired by @command{poster}."
 msgstr ""
 
-#: gnu/packages/pdf.scm:976
-msgid "Command-line utility to search text in PDF files"
-msgstr ""
-
-#: gnu/packages/pdf.scm:978
+#: gnu/packages/pdf.scm:1366
 msgid ""
 "Pdfgrep searches in pdf files for strings matching a regular expression.\n"
 "Support some GNU grep options as file name output, page number output,\n"
@@ -9989,8 +11118,52 @@ msgid ""
 "multiple files."
 msgstr ""
 
-#: gnu/packages/pem.scm:41
-msgid "Personal expenses manager"
+#: gnu/packages/pdf.scm:1401
+msgid ""
+"pdfpc is a presentation viewer application which uses multi-monitor\n"
+"output to provide meta information to the speaker during the presentation.  It\n"
+"is able to show a normal presentation window on one screen, while showing a\n"
+"more sophisticated overview on the other one providing information like a\n"
+"picture of the next slide, as well as the left over time till the end of the\n"
+"presentation.  The input files processed by pdfpc are PDF documents."
+msgstr ""
+
+#: gnu/packages/pdf.scm:1429
+msgid ""
+"Paps reads a UTF-8 encoded file and generates a PostScript language\n"
+"rendering of the file through the Pango Cairo back end."
+msgstr ""
+
+#: gnu/packages/pdf.scm:1460
+msgid ""
+"Stapler is a pure Python alternative to PDFtk, a tool for\n"
+"manipulating PDF documents from the command line.  It supports\n"
+"\n"
+"@itemize\n"
+"@item cherry-picking pages and concatenating them into a new file\n"
+"@item splitting a PDF document into single pages each in its own file\n"
+"@item merging PDF documents with their pages interleaved\n"
+"@item displaying metadata in a PDF document\n"
+"@item displaying the mapping between logical and physical page numbers\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/pdf.scm:1549
+msgid ""
+"WeasyPrint helps web developers to create PDF documents.  It\n"
+"turns simple HTML pages into gorgeous statistical reports, invoices, tickets,\n"
+"etc.\n"
+"\n"
+"From a technical point of view, WeasyPrint is a visual rendering engine for\n"
+"HTML and CSS that can export to PDF and PNG.  It aims to support web standards\n"
+"for printing.\n"
+"\n"
+"It is based on various libraries but not on a full rendering engine like\n"
+"WebKit or Gecko.  The CSS layout engine is written in Python, designed for\n"
+"pagination, and meant to be easy to hack on.  Weasyprint can also be used as a\n"
+"python library.\n"
+"\n"
+"Keywords: html2pdf, htmltopdf"
 msgstr ""
 
 #: gnu/packages/pem.scm:43
@@ -10002,31 +11175,21 @@ msgid ""
 "feature."
 msgstr ""
 
-#: gnu/packages/perl.scm:148
-msgid "Implementation of the Perl programming language"
-msgstr ""
-
-#: gnu/packages/perl.scm:150
+#: gnu/packages/perl.scm:264
 msgid ""
-"Perl 5 is a highly capable, feature-rich programming language with over\n"
-"24 years of development."
-msgstr ""
-
-#: gnu/packages/perl.scm:169
-msgid "Module for merging hierarchies using the C3 algorithm"
+"Perl is a general-purpose programming language originally developed for\n"
+"text manipulation and now used for a wide range of tasks including system\n"
+"administration, web development, network programming, GUI development, and\n"
+"more."
 msgstr ""
 
-#: gnu/packages/perl.scm:170
+#: gnu/packages/perl.scm:285
 msgid ""
 "This module implements the C3 algorithm, which aims to\n"
 "provide a sane method resolution order under multiple inheritance."
 msgstr ""
 
-#: gnu/packages/perl.scm:188
-msgid "Compute differences between two files or lists"
-msgstr ""
-
-#: gnu/packages/perl.scm:189
+#: gnu/packages/perl.scm:304
 msgid ""
 "This is a module for computing the difference between two\n"
 "files, two strings, or any other two lists of things.  It uses an intelligent\n"
@@ -10035,11 +11198,7 @@ msgid ""
 "differences."
 msgstr ""
 
-#: gnu/packages/perl.scm:211
-msgid "Use shorter versions of class names"
-msgstr ""
-
-#: gnu/packages/perl.scm:212
+#: gnu/packages/perl.scm:327
 msgid ""
 "The alias module loads the class you specify and exports\n"
 "into your namespace a subroutine that returns the class name.  You can\n"
@@ -10047,11 +11206,15 @@ msgid ""
 "implicitly."
 msgstr ""
 
-#: gnu/packages/perl.scm:234
-msgid "Transparently use Moose or Mouse modules"
+#: gnu/packages/perl.scm:384
+msgid ""
+"Alien::SDL can be used to detect and get configuration settings from an\n"
+"installed SDL and related libraries.  Based on your platform it offers the\n"
+"possibility to download and install prebuilt binaries or to build SDL & co.@:\n"
+"from source codes."
 msgstr ""
 
-#: gnu/packages/perl.scm:236
+#: gnu/packages/perl.scm:408
 msgid ""
 "This module facilitates using @code{Moose} or @code{Mouse} modules\n"
 "without changing the code.  By default, Mouse will be provided to libraries,\n"
@@ -10060,35 +11223,19 @@ msgid ""
 "variable ANY_MOOSE to be Moose or Mouse."
 msgstr ""
 
-#: gnu/packages/perl.scm:259
-msgid "Configuration files and command line parsing"
-msgstr ""
-
-#: gnu/packages/perl.scm:260
+#: gnu/packages/perl.scm:432
 msgid ""
 "AppConfig is a bundle of Perl5 modules for reading\n"
 "configuration files and parsing command line arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:278
-msgid "Perl API to zip files"
-msgstr ""
-
-#: gnu/packages/perl.scm:300
-msgid "Small utils for array manipulation"
-msgstr ""
-
-#: gnu/packages/perl.scm:301
+#: gnu/packages/perl.scm:453
 msgid ""
 "@code{Array::Utils} is a small pure-perl module containing\n"
 "list manipulation routines."
 msgstr ""
 
-#: gnu/packages/perl.scm:320
-msgid "Allow C/XS libraries to interrupt perl asynchronously"
-msgstr ""
-
-#: gnu/packages/perl.scm:322
+#: gnu/packages/perl.scm:476
 msgid ""
 "@code{Async::Interrupt} implements a single feature only of interest\n"
 "to advanced perl modules, namely asynchronous interruptions (think \"UNIX\n"
@@ -10106,11 +11253,44 @@ msgid ""
 "sometimes even without using a single syscall."
 msgstr ""
 
-#: gnu/packages/perl.scm:352
-msgid "Lexically disable autovivification"
+#: gnu/packages/perl.scm:507
+msgid ""
+"This package provides various utility functions.  When used\n"
+"without argument, this module provides four universally accessible attributes\n"
+"of general interest as follows:\n"
+"@itemize\n"
+"@item Abstract\n"
+"@item Alias\n"
+"@item Memoize\n"
+"@item Method\n"
+"@item SigHandler\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/perl.scm:353
+#: gnu/packages/perl.scm:543
+msgid ""
+"@code{Authen::DecHpwd} implements the\n"
+"SYS$HASH_PASSWORD password hashing function from VMS (also known as\n"
+"LGI$HPWD) and some associated VMS username and password handling\n"
+"functions.  The password hashing function is implemented in XS with a\n"
+"pure Perl backup version for systems that cannot handle XS."
+msgstr ""
+
+#: gnu/packages/perl.scm:581
+msgid ""
+"@code{Authen-Passphrase} is the base class for a\n"
+"system of objects that encapsulate passphrases.  An object of this\n"
+"type is a passphrase recogniser; its job is to recognise whether an\n"
+"offered passphrase is the right one.  For security such passphrase\n"
+"recognisers usually do not themselves know the passphrase they are\n"
+"looking for; they can merely recognise it when they see it.  There are\n"
+"many schemes in use to achieve this effect and the intent of this\n"
+"class is to provide a consistent interface to them all.  In addition\n"
+"to the base class, this module also contains implementations of\n"
+"several specific passphrase schemes."
+msgstr ""
+
+#: gnu/packages/perl.scm:608
 msgid ""
 "When an undefined variable is dereferenced, it gets silently\n"
 "upgraded to an array or hash reference (depending of the type of the\n"
@@ -10124,23 +11304,11 @@ msgid ""
 "error when it would have happened."
 msgstr ""
 
-#: gnu/packages/perl.scm:379 gnu/packages/perl.scm:6328
-msgid "Establish an ISA relationship with base classes at compile time"
-msgstr ""
-
-#: gnu/packages/perl.scm:380
-msgid ""
-"Allows you to both load one or more modules, while setting\n"
-"up inheritance from those modules at the same time.  Unless you are using the\n"
-"fields pragma, consider this module discouraged in favor of the lighter-weight\n"
-"parent."
-msgstr ""
-
-#: gnu/packages/perl.scm:400
-msgid "Open a browser in a given URL"
+#: gnu/packages/perl.scm:642
+msgid "This module disables bareword filehandles."
 msgstr ""
 
-#: gnu/packages/perl.scm:401
+#: gnu/packages/perl.scm:663
 msgid ""
 "The functions exported by this module allow you to open URLs\n"
 "in the user's browser.  A set of known commands per OS-name is tested for\n"
@@ -10148,21 +11316,17 @@ msgid ""
 "all known commands are checked."
 msgstr ""
 
-#: gnu/packages/perl.scm:426
-msgid "Execute code after a scope finished compilation"
-msgstr ""
-
-#: gnu/packages/perl.scm:427
+#: gnu/packages/perl.scm:689
 msgid ""
 "This module allows you to execute code when perl finished\n"
 "compiling the surrounding scope."
 msgstr ""
 
-#: gnu/packages/perl.scm:445
-msgid "Lists of reserved barewords and symbol names"
+#: gnu/packages/perl.scm:711
+msgid "This module allows you to wrap OP check callbacks."
 msgstr ""
 
-#: gnu/packages/perl.scm:446
+#: gnu/packages/perl.scm:728
 msgid ""
 "@code{B::Keywords} supplies several arrays of exportable\n"
 "keywords: @code{@@Scalars, @@Arrays, @@Hashes, @@Filehandles, @@Symbols,\n"
@@ -10170,11 +11334,7 @@ msgid ""
 "@@ExporterSymbols}."
 msgstr ""
 
-#: gnu/packages/perl.scm:469
-msgid "Benchmarking with statistical confidence"
-msgstr ""
-
-#: gnu/packages/perl.scm:471
+#: gnu/packages/perl.scm:753
 msgid ""
 "The Benchmark::Timer class allows you to time portions of code\n"
 "conveniently, as well as benchmark code by allowing timings of repeated\n"
@@ -10183,11 +11343,7 @@ msgid ""
 "but don't want to go all out and profile your code."
 msgstr ""
 
-#: gnu/packages/perl.scm:496
-msgid "Bit vector library"
-msgstr ""
-
-#: gnu/packages/perl.scm:497
+#: gnu/packages/perl.scm:778
 msgid ""
 "Bit::Vector is an efficient C library which allows you to\n"
 "handle bit vectors, sets (of integers), \"big integer arithmetic\" and boolean\n"
@@ -10197,62 +11353,38 @@ msgid ""
 "library can nevertheless be used stand-alone, without Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:519
-msgid "Boolean support for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:520
+#: gnu/packages/perl.scm:800
 msgid ""
 "This module provides basic Boolean support, by defining two\n"
 "special objects: true and false."
 msgstr ""
 
-#: gnu/packages/perl.scm:538
-msgid "Data files for Business::ISBN"
-msgstr ""
-
-#: gnu/packages/perl.scm:539
+#: gnu/packages/perl.scm:819
 msgid ""
 "This package provides a data pack for @code{Business::ISBN}.\n"
 "These data are generated from the RangeMessage.xml file provided by the ISBN\n"
 "Agency."
 msgstr ""
 
-#: gnu/packages/perl.scm:561
-msgid "Work with International Standard Book Numbers"
-msgstr ""
-
-#: gnu/packages/perl.scm:562
+#: gnu/packages/perl.scm:842
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Book Numbers, including ISBN-10 and ISBN-13."
 msgstr ""
 
-#: gnu/packages/perl.scm:580
-msgid "Work with International Standard Serial Numbers"
-msgstr ""
-
-#: gnu/packages/perl.scm:581
+#: gnu/packages/perl.scm:861
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Serial Numbers."
 msgstr ""
 
-#: gnu/packages/perl.scm:601
-msgid "Work with International Standard Music Numbers"
-msgstr ""
-
-#: gnu/packages/perl.scm:602
+#: gnu/packages/perl.scm:881
 msgid ""
 "This modules provides tools to deal with International\n"
 "Standard Music Numbers."
 msgstr ""
 
-#: gnu/packages/perl.scm:623
-msgid "Cache interface for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:624
+#: gnu/packages/perl.scm:903
 msgid ""
 "The Cache modules are designed to assist a developer in\n"
 "persisting data for a specified period of time.  Often these modules are used\n"
@@ -10263,11 +11395,7 @@ msgid ""
 "easy to use abstraction of the file system or shared memory."
 msgstr ""
 
-#: gnu/packages/perl.scm:647
-msgid "Shared memory interprocess cache via mmap"
-msgstr ""
-
-#: gnu/packages/perl.scm:648
+#: gnu/packages/perl.scm:926
 msgid ""
 "A shared memory cache through an mmap'ed file.  It's core is\n"
 "written in C for performance.  It uses fcntl locking to ensure multiple\n"
@@ -10275,11 +11403,7 @@ msgid ""
 "algorithm to keep the most used entries in the cache."
 msgstr ""
 
-#: gnu/packages/perl.scm:669
-msgid "Capture STDOUT and STDERR from Perl, XS or external programs"
-msgstr ""
-
-#: gnu/packages/perl.scm:671
+#: gnu/packages/perl.scm:949
 msgid ""
 "Capture::Tiny provides a simple, portable way to capture almost anything\n"
 "sent to STDOUT or STDERR, regardless of whether it comes from Perl, from XS\n"
@@ -10287,52 +11411,44 @@ msgid ""
 "is captured while being passed through to the original file handles."
 msgstr ""
 
-#: gnu/packages/perl.scm:690
-msgid "Check compatibility with the installed perl version"
-msgstr ""
-
-#: gnu/packages/perl.scm:692
+#: gnu/packages/perl.scm:970
 msgid ""
 "This module is used by Schmorp's modules during configuration stage\n"
 "to test the installed perl for compatibility with his modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:712
-msgid "Warns and dies noisily with stack backtraces/"
+#: gnu/packages/perl.scm:989
+msgid ""
+"The @code{Carp} routines are useful in your own modules\n"
+"because they act like @code{die()} or @code{warn()}, but with a message\n"
+"which is more likely to be useful to a user of your module.  In the case\n"
+"of @code{cluck}, @code{confess}, and @code{longmess} that context is a\n"
+"summary of every call in the call-stack.  For a shorter message you can use\n"
+"@code{carp} or @code{croak} which report the error as being from where your\n"
+"module was called.  There is no guarantee that that is where the error was,\n"
+"but it is a good educated guess."
 msgstr ""
 
-#: gnu/packages/perl.scm:713
+#: gnu/packages/perl.scm:1015
 msgid ""
 "This module is meant as a debugging aid.  It can be used to\n"
 "make a script complain loudly with stack backtraces when @code{warn()}-ing or\n"
 "@code{die()}ing."
 msgstr ""
 
-#: gnu/packages/perl.scm:732
-msgid "Executable comments for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:733
+#: gnu/packages/perl.scm:1035
 msgid ""
 "Carp::Assert is intended for a purpose like the ANSI C\n"
 "library assert.h."
 msgstr ""
 
-#: gnu/packages/perl.scm:755
-msgid "Convenience wrappers around Carp::Assert"
-msgstr ""
-
-#: gnu/packages/perl.scm:756
+#: gnu/packages/perl.scm:1057
 msgid ""
 "Carp::Assert::More is a set of handy assertion functions for\n"
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:776
-msgid "Report errors from a \"clan\" of modules"
-msgstr ""
-
-#: gnu/packages/perl.scm:777
+#: gnu/packages/perl.scm:1077
 msgid ""
 "This module allows errors from a clan (or family) of modules\n"
 "to appear to originate from the caller of the clan.  This is necessary in\n"
@@ -10340,29 +11456,23 @@ msgid ""
 "the Carp.pm module doesn't help."
 msgstr ""
 
-#: gnu/packages/perl.scm:797
-msgid "Read the CDDB entry for an audio CD in your drive"
-msgstr ""
-
-#: gnu/packages/perl.scm:798
+#: gnu/packages/perl.scm:1098
 msgid "This module can retrieve information from the CDDB."
 msgstr ""
 
-#: gnu/packages/perl.scm:820
-msgid "Automated accessor generation"
+#: gnu/packages/perl.scm:1193
+msgid ""
+"Circos is a program for the generation of publication-quality, circularly\n"
+"composited renditions of genomic data and related annotations."
 msgstr ""
 
-#: gnu/packages/perl.scm:821
+#: gnu/packages/perl.scm:1214
 msgid ""
 "This module automagically generates accessors/mutators for\n"
 "your class."
 msgstr ""
 
-#: gnu/packages/perl.scm:843
-msgid "Faster, but less expandable, chained accessors"
-msgstr ""
-
-#: gnu/packages/perl.scm:844
+#: gnu/packages/perl.scm:1237
 msgid ""
 "A chained accessor is one that always returns the object\n"
 "when called with parameters (to set), and the value of the field when called\n"
@@ -10370,52 +11480,32 @@ msgid ""
 "the same mk_accessors interface."
 msgstr ""
 
-#: gnu/packages/perl.scm:871
-msgid "Build groups of accessors"
-msgstr ""
-
-#: gnu/packages/perl.scm:872
+#: gnu/packages/perl.scm:1264
 msgid ""
 "This class lets you build groups of accessors that will call\n"
 "different getters and setters."
 msgstr ""
 
-#: gnu/packages/perl.scm:892
-msgid "Pragma to use the C3 method resolution order algorithm"
-msgstr ""
-
-#: gnu/packages/perl.scm:893
+#: gnu/packages/perl.scm:1284
 msgid ""
 "This is pragma to change Perl 5's standard method resolution\n"
 "order from depth-first left-to-right (a.k.a - pre-order) to the more\n"
 "sophisticated C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:917
-msgid "Drop-in replacement for NEXT"
-msgstr ""
-
-#: gnu/packages/perl.scm:918
+#: gnu/packages/perl.scm:1310
 msgid ""
 "This module is intended as a drop-in replacement for NEXT,\n"
 "supporting the same interface, but using Class::C3 to do the hard work."
 msgstr ""
 
-#: gnu/packages/perl.scm:943
-msgid "Load mix-ins or components to your C3-based class"
-msgstr ""
-
-#: gnu/packages/perl.scm:944
+#: gnu/packages/perl.scm:1335
 msgid ""
 "This module will inject base classes to your module using\n"
 "the Class::C3 method resolution order."
 msgstr ""
 
-#: gnu/packages/perl.scm:962
-msgid "Inheritable, overridable class data"
-msgstr ""
-
-#: gnu/packages/perl.scm:963
+#: gnu/packages/perl.scm:1354
 msgid ""
 "Class::Data::Inheritable is for creating accessor/mutators\n"
 "to class data.  That is, if you want to store something about your class as a\n"
@@ -10423,21 +11513,13 @@ msgid ""
 "subclasses and can be overridden."
 msgstr ""
 
-#: gnu/packages/perl.scm:984
-msgid "Class for easy date and time manipulation"
-msgstr ""
-
-#: gnu/packages/perl.scm:985
+#: gnu/packages/perl.scm:1375
 msgid ""
 "This module provides a general-purpose date and datetime\n"
 "type for perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1002
-msgid "Base class for error handling"
-msgstr ""
-
-#: gnu/packages/perl.scm:1004
+#: gnu/packages/perl.scm:1394
 msgid ""
 "@code{Class::ErrorHandler} provides an error-handling mechanism that is generic\n"
 "enough to be used as the base class for a variety of OO classes.  Subclasses inherit\n"
@@ -10445,104 +11527,72 @@ msgid ""
 "to the calling program."
 msgstr ""
 
-#: gnu/packages/perl.scm:1025
-msgid "Utility methods for factory classes"
-msgstr ""
-
-#: gnu/packages/perl.scm:1026
+#: gnu/packages/perl.scm:1416
 msgid "This module exports methods useful for factory classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:1043
-msgid "Get information about a class and its structure"
-msgstr ""
-
-#: gnu/packages/perl.scm:1044
+#: gnu/packages/perl.scm:1434
 msgid ""
 "Class::Inspector allows you to get information about a\n"
 "loaded class."
 msgstr ""
 
-#: gnu/packages/perl.scm:1072
-msgid "Working (require \"Class::Name\") and more"
-msgstr ""
-
-#: gnu/packages/perl.scm:1073
+#: gnu/packages/perl.scm:1463
 msgid ""
 "\"require EXPR\" only accepts Class/Name.pm style module\n"
 "names, not Class::Name.  For that, this module provides \"load_class\n"
 "'Class::Name'\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1096
-msgid "XS implementation of parts of Class::Load"
-msgstr ""
-
-#: gnu/packages/perl.scm:1097
+#: gnu/packages/perl.scm:1488
 msgid ""
 "This module provides an XS implementation for portions of\n"
 "Class::Load."
 msgstr ""
 
-#: gnu/packages/perl.scm:1116
-msgid "Create generic methods for OO Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:1117
+#: gnu/packages/perl.scm:1508
 msgid ""
 "This module solves the problem of having to continually\n"
 "write accessor methods for your objects that perform standard tasks."
 msgstr ""
 
-#: gnu/packages/perl.scm:1138
-msgid "Moose-like method modifiers"
-msgstr ""
-
-#: gnu/packages/perl.scm:1139
+#: gnu/packages/perl.scm:1529
 msgid ""
-"Class::Method::Modifiers provides three modifiers: 'before',\n"
-"'around', and 'after'.  'before' and 'after' are run just before and after the\n"
-"method they modify, but can not really affect that original method.  'around'\n"
-"is run in place of the original method, with a hook to easily call that\n"
-"original method."
+"Class::Method::Modifiers provides three modifiers:\n"
+"@code{before}, @code{around}, and @code{after}.  @code{before} and @code{after}\n"
+"are run just before and after the method they modify, but can not really affect\n"
+"that original method.  @code{around} is run in place of the original method,\n"
+"with a hook to easily call that original method."
 msgstr ""
 
-#: gnu/packages/perl.scm:1160
-msgid "Implementation of a singleton class for Perl"
+#: gnu/packages/perl.scm:1558
+msgid ""
+"The @code{mix_class} function provided by this\n"
+"module dynamically generates anonymous classes with specified\n"
+"inheritance.  This is useful where an incomplete class requires use of\n"
+"a mixin in order to become instantiable."
 msgstr ""
 
-#: gnu/packages/perl.scm:1161
+#: gnu/packages/perl.scm:1579
 msgid ""
 "This module implements a Singleton class from which other\n"
 "classes can be derived.  By itself, the Class::Singleton module does very\n"
 "little other than manage the instantiation of a single object."
 msgstr ""
 
-#: gnu/packages/perl.scm:1180
-msgid "Minimalist class construction"
-msgstr ""
-
-#: gnu/packages/perl.scm:1181
+#: gnu/packages/perl.scm:1599
 msgid ""
 "This module offers a minimalist class construction kit.  It\n"
 "uses no non-core modules for any recent Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1201
-msgid "Unload a class"
-msgstr ""
-
-#: gnu/packages/perl.scm:1202
+#: gnu/packages/perl.scm:1621
 msgid ""
 "Class:Unload unloads a given class by clearing out its\n"
 "symbol table and removing it from %INC."
 msgstr ""
 
-#: gnu/packages/perl.scm:1220
-msgid "Generate fast XS accessors without runtime compilation"
-msgstr ""
-
-#: gnu/packages/perl.scm:1221
+#: gnu/packages/perl.scm:1640
 msgid ""
 "Class::XSAccessor implements fast read, write, and\n"
 "read/write accessors in XS.  Additionally, it can provide predicates such as\n"
@@ -10552,18 +11602,21 @@ msgid ""
 "arrays for their internal representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:1241 gnu/packages/perl.scm:1264
-msgid "Recursively copy Perl datatypes"
-msgstr ""
-
-#: gnu/packages/perl.scm:1243
+#: gnu/packages/perl.scm:1662
 msgid ""
 "This module provides a clone() method which makes recursive copies of\n"
 "nested hash, array, scalar and reference types, including tied variables and\n"
 "objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:1265
+#: gnu/packages/perl.scm:1689
+msgid ""
+"This @code{Clone::Choose} module checks several different\n"
+"modules which provide a @code{clone()} function and selects an appropriate\n"
+"one."
+msgstr ""
+
+#: gnu/packages/perl.scm:1708
 msgid ""
 "This module provides a general-purpose @code{clone} function\n"
 "to make deep copies of Perl data structures.  It calls itself recursively to\n"
@@ -10571,42 +11624,49 @@ msgid ""
 "and objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:1285
-msgid "Sane defaults for Perl programs"
-msgstr ""
-
-#: gnu/packages/perl.scm:1286
+#: gnu/packages/perl.scm:1729
 msgid ""
 "This module implements some sane defaults for Perl programs,\n"
 "as defined by two typical specimens of Perl coders."
 msgstr ""
 
-#: gnu/packages/perl.scm:1306
-msgid "Load configuration from different file formats"
+#: gnu/packages/perl.scm:1755
+msgid ""
+"Conf::Libconfig is a Perl interface to the libconfig configuration file\n"
+"library.  It support scalar, array, and hash data structures just like its C/C++\n"
+"counterpart.  It reduces the effort required to implement a configuration file\n"
+"parser in your Perl programme and allows sharing configuration files between\n"
+"languages."
+msgstr ""
+
+#: gnu/packages/perl.scm:1777
+msgid ""
+"Config::Grammar is a module to parse configuration files.  The\n"
+"configuration may consist of multiple-level sections with assignments and\n"
+"tabular data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1307
+#: gnu/packages/perl.scm:1799
 msgid ""
 "Config::Any provides a facility for Perl applications and\n"
 "libraries to load configuration data from multiple different file formats.  It\n"
 "supports XML, YAML, JSON, Apache-style configuration, and Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:1328
-msgid "Module to implement some AutoConf macros in Perl"
+#: gnu/packages/perl.scm:1821
+msgid ""
+"This package provides a way to have readable configuration\n"
+"files outside your Perl script.  Configurations can be imported, sections\n"
+"can be grouped, and settings can be accessed from a tied hash."
 msgstr ""
 
-#: gnu/packages/perl.scm:1329
+#: gnu/packages/perl.scm:1843
 msgid ""
 "Config::AutoConf is intended to provide the same\n"
 "opportunities to Perl developers as GNU Autoconf does for Shell developers."
 msgstr ""
 
-#: gnu/packages/perl.scm:1347
-msgid "Generic Config Module"
-msgstr ""
-
-#: gnu/packages/perl.scm:1348
+#: gnu/packages/perl.scm:1861
 msgid ""
 "This module opens a config file and parses its contents for\n"
 "you.  The format of config files supported by Config::General is inspired by\n"
@@ -10617,64 +11677,105 @@ msgid ""
 "options."
 msgstr ""
 
-#: gnu/packages/perl.scm:1375
-msgid "Simple .ini-file format reader and writer"
+#: gnu/packages/perl.scm:1893
+msgid ""
+"This module handles parsing, modifying and creating configuration files\n"
+"of the style used by the Git version control system."
 msgstr ""
 
-#: gnu/packages/perl.scm:1376
+#: gnu/packages/perl.scm:1916
 msgid ""
 "@code{Config::INI} is a module that facilates the reading\n"
 "and writing of @code{.ini}-style configuration files."
 msgstr ""
 
-#: gnu/packages/perl.scm:1397
-msgid "Preserve context during subroutine call"
-msgstr ""
-
-#: gnu/packages/perl.scm:1398
+#: gnu/packages/perl.scm:1938
 msgid ""
 "This module runs code after a subroutine call, preserving\n"
 "the context the subroutine would have seen if it were the last statement in\n"
 "the caller."
 msgstr ""
 
-#: gnu/packages/perl.scm:1423
-msgid "Extract data from Macintosh BinHex files"
-msgstr ""
-
-#: gnu/packages/perl.scm:1425
+#: gnu/packages/perl.scm:1965
 msgid ""
 "BinHex is a format for transporting files safely through electronic\n"
-"mail, as short-lined, 7-bit, semi-compressed data streams.  Ths module\n"
+"mail, as short-lined, 7-bit, semi-compressed data streams.  This module\n"
 "provides a means of converting those data streams back into into binary\n"
 "data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1447
-msgid "Verify requirements in a CPAN::Meta object"
+#: gnu/packages/perl.scm:1988
+msgid ""
+"@code{CPAN::Changes} helps users programmatically read and write\n"
+"@file{Changes} files that conform to a common specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:1448
+#: gnu/packages/perl.scm:2010
 msgid ""
-"This module verifies if requirements described in a\n"
-"CPAN::Meta object are present."
+"@code{CPAN::DistnameInfo} uses heuristics to extract the distribution\n"
+"name and version from filenames."
 msgstr ""
 
-#: gnu/packages/perl.scm:1468
-msgid "JSON::XS for Cpanel"
+#: gnu/packages/perl.scm:2031
+msgid ""
+"This module verifies if requirements described in a\n"
+"CPAN::Meta object are present."
 msgstr ""
 
-#: gnu/packages/perl.scm:1469 gnu/packages/perl.scm:4193
+#: gnu/packages/perl.scm:2051 gnu/packages/perl.scm:5634
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa."
 msgstr ""
 
-#: gnu/packages/perl.scm:1487
-msgid "Random password generator"
+#: gnu/packages/perl.scm:2073
+msgid ""
+"@code{Crypt::CBC} is a Perl-only implementation of\n"
+"the cryptographic Cipher Block Chaining (CBC) mode.  In combination\n"
+"with a block cipher such as @code{Crypt::Rijndael} you can encrypt and\n"
+"decrypt messages of arbitrarily long length.  The encrypted messages\n"
+"are compatible with the encryption format used by SSLeay."
 msgstr ""
 
-#: gnu/packages/perl.scm:1488
+#: gnu/packages/perl.scm:2098
+msgid ""
+"@code{Crypt::DES} is an XS-based implementation of\n"
+"the DES cryptography algorithm.  The module implements the\n"
+"@code{Crypt::CBC} interface which has blocksize, keysize, encrypt and\n"
+"decrypt functions."
+msgstr ""
+
+#: gnu/packages/perl.scm:2126
+msgid ""
+"Eksblowfish is a variant of the Blowfish cipher,\n"
+"modified to make the key setup very expensive.  This doesn't make it\n"
+"significantly cryptographically stronger but is intended to hinder\n"
+"brute-force attacks.  Eksblowfish is a parameterised (family-keyed)\n"
+"cipher.  It takes a cost parameter that controls how expensive the key\n"
+"scheduling is.  It also takes a family key, known as the \"salt\".\n"
+"Cost and salt parameters together define a cipher family.  Within each\n"
+"family, the key determines the encryption function.  This distribution\n"
+"also includes an implementation of @code{bcrypt}, the Unix crypt()\n"
+"password hashing algorithm based on Eksblowfish."
+msgstr ""
+
+#: gnu/packages/perl.scm:2159
+msgid ""
+"@code{Crypt::MySQL} emulates the MySQL PASSWORD()\n"
+"function.  The module does not depend on an interface to the MySQL\n"
+"database server.  This enables the comparison of encrypted passwords\n"
+"without the need for a real MySQL environment."
+msgstr ""
+
+#: gnu/packages/perl.scm:2183
+msgid ""
+"@code{Crypt::PasswdMD5} provides various\n"
+"crypt()-compatible interfaces to the MD5-based crypt() function found\n"
+"in various *nixes.  It is based on the implementation found on FreeBSD\n"
+"2.2.[56]-RELEASE."
+msgstr ""
+
+#: gnu/packages/perl.scm:2204
 msgid ""
 "Crypt::RandPasswd provides three functions that can be used\n"
 "to generate random passwords, constructed from words, letters, or characters.\n"
@@ -10685,40 +11786,48 @@ msgid ""
 "Password Generator\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:1513
-msgid "Perl implementation of the RC4 encryption algorithm"
+#: gnu/packages/perl.scm:2228
+msgid ""
+"This module implements the Rijndael cipher which has\n"
+"been selected as the Advanced Encryption Standard.  The keysize for\n"
+"Rijndael is 32 bytes.  The blocksize is 16 bytes (128 bits).  The\n"
+"supported encryption modes are:\n"
+"\n"
+"@itemize\n"
+"@item @code{MODE_CBC}---Cipher Block Chaining\n"
+"@item @code{MODE_CFB}---Cipher feedback\n"
+"@item @code{MODE_CTR}---Counter mode\n"
+"@item @code{MODE_ECB}---Electronic cookbook mode\n"
+"@item @code{MODE_OFB}---Output feedback\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/perl.scm:1514
+#: gnu/packages/perl.scm:2259
 msgid "A pure Perl implementation of the RC4 algorithm."
 msgstr ""
 
-#: gnu/packages/perl.scm:1533
-msgid "Temporarily change working directory"
+#: gnu/packages/perl.scm:2278
+msgid ""
+"@code{Crypt::UnixCrypt_XS} implements the DES-based\n"
+"Unix @code{crypt} function.  For those who need to construct\n"
+"non-standard variants of @code{crypt}, the various building blocks\n"
+"used in @code{crypt} are also supplied separately."
 msgstr ""
 
-#: gnu/packages/perl.scm:1535
+#: gnu/packages/perl.scm:2303
 msgid ""
 "@code{Cwd::Guard} changes the current directory using a limited scope.\n"
 "It returns to the previous working directory when the object is destroyed."
 msgstr ""
 
-#: gnu/packages/perl.scm:1573
-msgid "Library for genomic analysis"
-msgstr ""
-
-#: gnu/packages/perl.scm:1574
+#: gnu/packages/perl.scm:2341
 msgid ""
 "Chaolin Zhang's Perl Library (czplib) contains assorted\n"
 "functions and data structures for processing and analysing genomic and\n"
 "bioinformatics data."
 msgstr ""
 
-#: gnu/packages/perl.scm:1603 gnu/packages/perl.scm:1769
-msgid "Base classes wrapping fundamental Perl data types"
-msgstr ""
-
-#: gnu/packages/perl.scm:1604
+#: gnu/packages/perl.scm:2371
 msgid ""
 "Collection of classes that wrap fundamental data types that\n"
 "exist in Perl.  These classes and methods as they exist today are an attempt\n"
@@ -10727,61 +11836,79 @@ msgid ""
 "input."
 msgstr ""
 
-#: gnu/packages/perl.scm:1627
-msgid "Compare Perl data structures"
-msgstr ""
-
-#: gnu/packages/perl.scm:1628
+#: gnu/packages/perl.scm:2395
 msgid ""
 "This module compares arbitrary data structures to see if\n"
 "they are copies of each other."
 msgstr ""
 
-#: gnu/packages/perl.scm:1646
-msgid "Perl extension for generating unique identifiers"
+#: gnu/packages/perl.scm:2424
+msgid ""
+"@code{Data::Entropy} provides modules relating to\n"
+"the generation and use of entropy.  The Data::Entropy::Source class\n"
+"manages the entropy coming from a particular source.  This class acts\n"
+"as a layer over a raw entropy source, which may be a normal I/O handle\n"
+"or a special-purpose class.  The Data::Entropy::RawSource::* classes\n"
+"provide fundamental sources of entropy.  The sources specially\n"
+"supported are an OS-supplied entropy collector, downloads from servers\n"
+"on the Internet, and cryptographic fake entropy.  The\n"
+"Data::Entropy::Algorithms module contains a collection of fundamental\n"
+"algorithms that use entropy.  There are random number generators and\n"
+"functions to shuffle arrays."
 msgstr ""
 
-#: gnu/packages/perl.scm:1647
+#: gnu/packages/perl.scm:2457
 msgid ""
-"@code{Data::Uniqid} provides three simple routines for\n"
-"generating unique ids.  These ids are coded with a Base62 systen to make them\n"
-"short and handy (e.g. to use it as part of a URL)."
+"This module is about the native integer numerical\n"
+"data type.  A native integer is one of the types of datum that can\n"
+"appear in the numeric part of a Perl scalar.  This module supplies\n"
+"constants describing the native integer type.  Both signed and\n"
+"unsigned representations are handled."
 msgstr ""
 
-#: gnu/packages/perl.scm:1666
-msgid "Pretty printing of data structures"
+#: gnu/packages/perl.scm:2479
+msgid ""
+"@code{Data::Uniqid} provides three simple routines for\n"
+"generating unique ids.  These ids are coded with a Base62 system to make them\n"
+"short and handy (e.g. to use it as part of a URL)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1667
+#: gnu/packages/perl.scm:2499
 msgid ""
 "This module provide functions that takes a list of values as\n"
 "their argument and produces a string as its result.  The string contains Perl\n"
 "code that, when \"eval\"ed, produces a deep copy of the original arguments."
 msgstr ""
 
-#: gnu/packages/perl.scm:1686
-msgid "Concise data dumper"
+#: gnu/packages/perl.scm:2519
+msgid ""
+"Given a list of scalars or reference variables,\n"
+"@code{Data::Dumper} writes out their contents in Perl syntax.  The references\n"
+"can also be objects.  The content of each variable is output in a single Perl\n"
+"statement.  It handles self-referential structures correctly."
 msgstr ""
 
-#: gnu/packages/perl.scm:1687
+#: gnu/packages/perl.scm:2540
 msgid ""
 "Data::Dumper::Concise provides a dumper with Less\n"
 "indentation and newlines plus sub deparsing."
 msgstr ""
 
-#: gnu/packages/perl.scm:1709
-msgid "Parse and validate simple name/value option pairs"
+#: gnu/packages/perl.scm:2564
+msgid ""
+"@code{Data::Float} is about the native floating\n"
+"point numerical data type.  A floating point number is one of the\n"
+"types of datum that can appear in the numeric part of a Perl scalar.\n"
+"This module supplies constants describing the native floating point\n"
+"type, classification functions and functions to manipulate floating\n"
+"point values at a low level."
 msgstr ""
 
-#: gnu/packages/perl.scm:1711
+#: gnu/packages/perl.scm:2592
 msgid "Data::OptList provides a simple syntax for name/value option pairs."
 msgstr ""
 
-#: gnu/packages/perl.scm:1733
-msgid "Help when paging through sets of results"
-msgstr ""
-
-#: gnu/packages/perl.scm:1734
+#: gnu/packages/perl.scm:2614
 msgid ""
 "When searching through large amounts of data, it is often\n"
 "the case that a result set is returned that is larger than we want to display\n"
@@ -10789,7 +11916,7 @@ msgid ""
 "The maths behind this is unfortunately fiddly, hence this module."
 msgstr ""
 
-#: gnu/packages/perl.scm:1771
+#: gnu/packages/perl.scm:2651
 msgid ""
 "@code{Data::Perl} is a container class for the following classes:\n"
 "@itemize\n"
@@ -10803,21 +11930,13 @@ msgid ""
 "@end itemize"
 msgstr ""
 
-#: gnu/packages/perl.scm:1802
-msgid "Colored pretty-print of Perl data structures and objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:1803
+#: gnu/packages/perl.scm:2683
 msgid ""
 "Display Perl variables and objects on screen, properly\n"
 "formatted (to be inspected by a human)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1826
-msgid "Conditionally split data into records"
-msgstr ""
-
-#: gnu/packages/perl.scm:1827
+#: gnu/packages/perl.scm:2707
 msgid ""
 "This Perl module allows you to split data into records by\n"
 "not only specifying what you wish to split the data on, but also by specifying\n"
@@ -10826,11 +11945,19 @@ msgid ""
 "like split on newlines unless newlines are embedded in quotes."
 msgstr ""
 
-#: gnu/packages/perl.scm:1850
-msgid "Structured tags datastructures"
+#: gnu/packages/perl.scm:2736
+msgid ""
+"This package provides a Perl library to read multiple hunks\n"
+"of data out of your DATA section."
 msgstr ""
 
-#: gnu/packages/perl.scm:1852
+#: gnu/packages/perl.scm:2757
+msgid ""
+"Data::Section::Simple is a simple module to extract data from __DATA__\n"
+"section of the file."
+msgstr ""
+
+#: gnu/packages/perl.scm:2779
 msgid ""
 "This module is for manipulating data as hierarchical tag/value\n"
 "pairs (Structured TAGs or Simple Tree AGgregates).  These datastructures can\n"
@@ -10838,11 +11965,7 @@ msgid ""
 "Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:1879
-msgid "N at a time iteration API"
-msgstr ""
-
-#: gnu/packages/perl.scm:1880
+#: gnu/packages/perl.scm:2807
 msgid ""
 "This module tries to find middle ground between one at a\n"
 "time and all at once processing of data sets.  The purpose of this module is\n"
@@ -10851,21 +11974,13 @@ msgid ""
 "necessary later on."
 msgstr ""
 
-#: gnu/packages/perl.scm:1905
-msgid "Dynamic generation of nested combinations of variants"
-msgstr ""
-
-#: gnu/packages/perl.scm:1906
+#: gnu/packages/perl.scm:2832
 msgid ""
 "Data::Tumbler - Dynamic generation of nested combinations of\n"
 "variants."
 msgstr ""
 
-#: gnu/packages/perl.scm:1932
-msgid "Visitor style traversal of Perl data structures"
-msgstr ""
-
-#: gnu/packages/perl.scm:1933
+#: gnu/packages/perl.scm:2859
 msgid ""
 "This module is a simple visitor implementation for Perl\n"
 "values.  It has a main dispatcher method, visit, which takes a single perl\n"
@@ -10875,11 +11990,7 @@ msgid ""
 "structures, and all ref types (hashes, arrays, scalars, code, globs)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1958
-msgid "Gregorian calendar date calculations"
-msgstr ""
-
-#: gnu/packages/perl.scm:1959
+#: gnu/packages/perl.scm:2885
 msgid ""
 "This package consists of a Perl module for date calculations\n"
 "based on the Gregorian calendar, thereby complying with all relevant norms and\n"
@@ -10887,32 +11998,20 @@ msgid ""
 "applicable)."
 msgstr ""
 
-#: gnu/packages/perl.scm:1983
-msgid "XS wrapper for Date::Calc"
-msgstr ""
-
-#: gnu/packages/perl.scm:1984
+#: gnu/packages/perl.scm:2910
 msgid ""
 "Date::Calc::XS is an XS wrapper and C library plug-in for\n"
 "Date::Calc."
 msgstr ""
 
-#: gnu/packages/perl.scm:2008
-msgid "Date manipulation routines"
-msgstr ""
-
-#: gnu/packages/perl.scm:2009
+#: gnu/packages/perl.scm:2933
 msgid ""
 "Date::Manip is a series of modules for common date/time\n"
 "operations, such as comparing two times, determining a date a given amount of\n"
 "time from another, or parsing international times."
 msgstr ""
 
-#: gnu/packages/perl.scm:2028
-msgid "Simple date handling"
-msgstr ""
-
-#: gnu/packages/perl.scm:2029
+#: gnu/packages/perl.scm:2953
 msgid ""
 "Dates are complex enough without times and timezones.  This\n"
 "module may be used to create simple date objects.  It handles validation,\n"
@@ -10920,22 +12019,14 @@ msgid ""
 "hours, minutes, seconds, and time zones."
 msgstr ""
 
-#: gnu/packages/perl.scm:2061
-msgid "Date and time object for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:2062
+#: gnu/packages/perl.scm:2985
 msgid ""
 "DateTime is a class for the representation of date/time\n"
 "combinations.  It represents the Gregorian calendar, extended backwards in\n"
 "time before its creation (in 1582)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2084
-msgid "Dates in the Julian calendar"
-msgstr ""
-
-#: gnu/packages/perl.scm:2085
+#: gnu/packages/perl.scm:3007
 msgid ""
 "This package is a companion module to @code{DateTime.pm}.\n"
 "It implements the Julian calendar.  It supports everything that\n"
@@ -10943,11 +12034,7 @@ msgid ""
 "precise."
 msgstr ""
 
-#: gnu/packages/perl.scm:2111
-msgid "DateTime set objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:2112
+#: gnu/packages/perl.scm:3034
 msgid ""
 "The DateTime::Set module provides a date/time sets\n"
 "implementation.  It allows, for example, the generation of groups of dates,\n"
@@ -10955,21 +12042,13 @@ msgid ""
 "within a time range."
 msgstr ""
 
-#: gnu/packages/perl.scm:2135
-msgid "DateTime rfc2445 recurrences"
-msgstr ""
-
-#: gnu/packages/perl.scm:2136
+#: gnu/packages/perl.scm:3058
 msgid ""
 "This module provides convenience methods that let you easily\n"
 "create DateTime::Set objects for RFC 2445 style recurrences."
 msgstr ""
 
-#: gnu/packages/perl.scm:2157
-msgid "DateTime::Set extension for basic recurrences"
-msgstr ""
-
-#: gnu/packages/perl.scm:2158
+#: gnu/packages/perl.scm:3080
 msgid ""
 "This module provides convenience methods that let you easily\n"
 "create DateTime::Set objects for various recurrences, such as \"once a month\"\n"
@@ -10977,11 +12056,7 @@ msgid ""
 "\"every Monday, Wednesday and Thursday at 10:00 AM and 2:00 PM\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:2183
-msgid "Create DateTime parser classes and objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:2184
+#: gnu/packages/perl.scm:3106
 msgid ""
 "DateTime::Format::Builder creates DateTime parsers.  Many\n"
 "string formats of dates and times are simple and just require a basic regular\n"
@@ -10989,43 +12064,33 @@ msgid ""
 "to do this without writing reams of structural code."
 msgstr ""
 
-#: gnu/packages/perl.scm:2211
-msgid "Parse data/time strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2212
+#: gnu/packages/perl.scm:3136
 msgid ""
 "DateTime::Format::Flexible attempts to take any string you\n"
 "give it and parse it into a DateTime object."
 msgstr ""
 
-#: gnu/packages/perl.scm:2238
-msgid "Parse and format iCal datetime and duration strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2239
+#: gnu/packages/perl.scm:3163
 msgid ""
 "This module understands the ICal date/time and duration\n"
 "formats, as defined in RFC 2445.  It can be used to parse these formats in\n"
 "order to create the appropriate objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:2271
-msgid "Machine-readable date/time with natural parsing"
+#: gnu/packages/perl.scm:3192
+msgid ""
+"@code{DateTime::Format::ISO8601} is a DateTime\n"
+"extension that parses almost all ISO8601 date and time formats."
 msgstr ""
 
-#: gnu/packages/perl.scm:2272
+#: gnu/packages/perl.scm:3223
 msgid ""
 "DateTime::Format::Natural takes a string with a human\n"
 "readable date/time and creates a machine readable one by applying natural\n"
 "parsing logic."
 msgstr ""
 
-#: gnu/packages/perl.scm:2299
-msgid "Parse and format strp and strf time patterns"
-msgstr ""
-
-#: gnu/packages/perl.scm:2300
+#: gnu/packages/perl.scm:3250
 msgid ""
 "This module implements most of `strptime(3)`, the POSIX\n"
 "function that is the reverse of `strftime(3)`, for `DateTime`.  While\n"
@@ -11033,21 +12098,13 @@ msgid ""
 "takes a string and a pattern and returns the `DateTime` object associated."
 msgstr ""
 
-#: gnu/packages/perl.scm:2332
-msgid "Localization support for DateTime.pm"
-msgstr ""
-
-#: gnu/packages/perl.scm:2333
+#: gnu/packages/perl.scm:3284
 msgid ""
 "The DateTime::Locale modules provide localization data for\n"
 "the DateTime.pm class."
 msgstr ""
 
-#: gnu/packages/perl.scm:2361
-msgid "Time zone object for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:2362
+#: gnu/packages/perl.scm:3326
 msgid ""
 "This class is the base class for all time zone objects.  A\n"
 "time zone is represented internally as a set of observances, each of which\n"
@@ -11057,32 +12114,20 @@ msgid ""
 "DateTime::TimeZone methods."
 msgstr ""
 
-#: gnu/packages/perl.scm:2392
-msgid "Parse date/time strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2393
+#: gnu/packages/perl.scm:3357
 msgid ""
 "DateTimeX::Easy uses a variety of DateTime::Format packages\n"
 "to create DateTime objects, with some custom tweaks to smooth out the rough\n"
 "edges (mainly concerning timezone detection and selection)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2414
-msgid "Convert between DateTime and RFC2822/822 formats"
-msgstr ""
-
-#: gnu/packages/perl.scm:2415
+#: gnu/packages/perl.scm:3379
 msgid ""
 "RFCs 2822 and 822 specify date formats to be used by email.\n"
 "This module parses and emits such dates."
 msgstr ""
 
-#: gnu/packages/perl.scm:2437
-msgid "Parse and format W3CDTF datetime strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2439
+#: gnu/packages/perl.scm:3403
 msgid ""
 "This module understands the W3CDTF date/time format, an ISO 8601 profile,\n"
 "defined at https://www.w3.org/TR/NOTE-datetime.  This format is the native date\n"
@@ -11090,103 +12135,89 @@ msgid ""
 "the appropriate objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:2461
-msgid "Meatier version of caller"
+#: gnu/packages/perl.scm:3432
+msgid ""
+"This module makes some new features of the Perl\n"
+"5.14.0 C API available to XS modules running on older versions of\n"
+"Perl.  The features are centred around the function\n"
+"@code{cv_set_call_checker}, which allows XS code to attach a magical\n"
+"annotation to a Perl subroutine, resulting in resolvable calls to that\n"
+"subroutine being mutated at compile time by arbitrary C code.  This\n"
+"module makes @code{cv_set_call_checker} and several supporting\n"
+"functions available."
 msgstr ""
 
-#: gnu/packages/perl.scm:2462
+#: gnu/packages/perl.scm:3459
 msgid "Devel::Caller provides meatier version of caller."
 msgstr ""
 
-#: gnu/packages/perl.scm:2480
-msgid "Check that a command is available"
-msgstr ""
-
-#: gnu/packages/perl.scm:2481
+#: gnu/packages/perl.scm:3478
 msgid ""
 "Devel::CheckBin is a perl module that checks whether a\n"
 "particular command is available."
 msgstr ""
 
-#: gnu/packages/perl.scm:2500
-msgid "Check compiler availability"
+#: gnu/packages/perl.scm:3500
+msgid ""
+"@code{Devel::CheckLib} is a Perl module that checks whether a particular\n"
+"C library and its headers are available.  You can also check for the presence of\n"
+"particular functions in a library, or even that those functions return\n"
+"particular results."
 msgstr ""
 
-#: gnu/packages/perl.scm:2501
+#: gnu/packages/perl.scm:3522
 msgid ""
 "@code{Devel::CheckCompiler} is a tiny module to check\n"
 "whether a compiler is available.  It can test for a C99 compiler, or\n"
 "you can tell it to compile a C source file with optional linker flags."
 msgstr ""
 
-#: gnu/packages/perl.scm:2523
-msgid "Find memory cycles in objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:2525
+#: gnu/packages/perl.scm:3546
 msgid ""
 "@code{Devel::Cycle} This is a tool for finding circular references in\n"
 "objects and other types of references.  Because of Perl's reference-count\n"
 "based memory management, circular references will cause memory leaks."
 msgstr ""
 
-#: gnu/packages/perl.scm:2546
-msgid "Provides equivalent of ${^GLOBAL_PHASE} eq 'DESTRUCT' for older perls"
-msgstr ""
-
-#: gnu/packages/perl.scm:2547
+#: gnu/packages/perl.scm:3568
 msgid ""
 "Devel::GlobalDestruction provides a function returning the\n"
 "equivalent of \"$@{^GLOBAL_PHASE@} eq 'DESTRUCT'\" for older perls."
 msgstr ""
 
-#: gnu/packages/perl.scm:2568
-msgid "Forces the unavailability of specified Perl modules (for testing)"
-msgstr ""
-
-#: gnu/packages/perl.scm:2569
+#: gnu/packages/perl.scm:3589
 msgid ""
 "Given a list of Perl modules/filenames, this module makes\n"
 "@code{require} and @code{use} statements fail (no matter whether the specified\n"
 "files/modules are installed or not)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2590
-msgid "Alias lexical variables"
+#: gnu/packages/perl.scm:3610
+msgid ""
+"This module provides a basic way to discover if a piece of perl code is\n"
+"allocating perl data and not releasing them again."
 msgstr ""
 
-#: gnu/packages/perl.scm:2591
+#: gnu/packages/perl.scm:3631
 msgid ""
 "Devel::LexAlias provides the ability to alias a lexical\n"
 "variable in a subroutines scope to one of your choosing."
 msgstr ""
 
-#: gnu/packages/perl.scm:2615
-msgid "Introspect overloaded operators"
-msgstr ""
-
-#: gnu/packages/perl.scm:2616
+#: gnu/packages/perl.scm:3656
 msgid ""
 "Devel::OverloadInfo returns information about overloaded\n"
 "operators for a given class (or object), including where in the inheritance\n"
 "hierarchy the overloads are declared and where the code implementing it is."
 msgstr ""
 
-#: gnu/packages/perl.scm:2643
-msgid "Partial dumping of data structures"
-msgstr ""
-
-#: gnu/packages/perl.scm:2644
+#: gnu/packages/perl.scm:3684
 msgid ""
 "This module is a data dumper optimized for logging of\n"
 "arbitrary parameters."
 msgstr ""
 
-#: gnu/packages/perl.scm:2662
-msgid "Object representing a stack trace"
-msgstr ""
-
-#: gnu/packages/perl.scm:2663
+#: gnu/packages/perl.scm:3702
 msgid ""
 "The Devel::StackTrace module contains two classes,\n"
 "Devel::StackTrace and Devel::StackTrace::Frame.  These objects encapsulate the\n"
@@ -11194,11 +12225,7 @@ msgid ""
 "providing a simple interface to this data."
 msgstr ""
 
-#: gnu/packages/perl.scm:2685
-msgid "Displays stack trace in HTML"
-msgstr ""
-
-#: gnu/packages/perl.scm:2686
+#: gnu/packages/perl.scm:3725
 msgid ""
 "Devel::StackTrace::AsHTML adds as_html method to\n"
 "Devel::StackTrace which displays the stack trace in beautiful HTML, with code\n"
@@ -11207,29 +12234,33 @@ msgid ""
 "each stack frame."
 msgstr ""
 
-#: gnu/packages/perl.scm:2707
-msgid "Dump symbol names or the symbol table"
-msgstr ""
-
-#: gnu/packages/perl.scm:2708
+#: gnu/packages/perl.scm:3747
 msgid "Devel::Symdump provides access to the perl symbol table."
 msgstr ""
 
-#: gnu/packages/perl.scm:2725
-msgid "Keyed-Hashing for Message Authentication"
+#: gnu/packages/perl.scm:3766
+msgid ""
+"The @code{Digest::CRC} module calculates CRC sums of\n"
+"all sorts.  It contains wrapper functions with the correct parameters\n"
+"for CRC-CCITT, CRC-16 and CRC-32."
 msgstr ""
 
-#: gnu/packages/perl.scm:2726
+#: gnu/packages/perl.scm:3785
 msgid ""
 "The Digest::HMAC module follows the common Digest::\n"
 "interface for the RFC 2104 HMAC mechanism."
 msgstr ""
 
-#: gnu/packages/perl.scm:2751
-msgid "Perl interface to the MD-5 algorithm"
+#: gnu/packages/perl.scm:3805
+msgid ""
+"The @code{Digest::MD4} module allows you to use the\n"
+"RSA Data Security Inc.@: MD4 Message Digest algorithm from within Perl\n"
+"programs.  The algorithm takes as input a message of arbitrary length\n"
+"and produces as output a 128-bit \"fingerprint\" or \"message digest\"\n"
+"of the input.  MD4 is described in RFC 1320."
 msgstr ""
 
-#: gnu/packages/perl.scm:2753
+#: gnu/packages/perl.scm:3827
 msgid ""
 "The @code{Digest::MD5} module allows you to use the MD5 Message Digest\n"
 "algorithm from within Perl programs.  The algorithm takes as\n"
@@ -11237,61 +12268,45 @@ msgid ""
 "128-bit \"fingerprint\" or \"message digest\" of the input."
 msgstr ""
 
-#: gnu/packages/perl.scm:2771
-msgid "Perl implementation of the SHA-1 message digest algorithm"
-msgstr ""
-
-#: gnu/packages/perl.scm:2773
+#: gnu/packages/perl.scm:3847
 msgid ""
-"This package provides 'Digest::SHA1', an implementation of the NIST\n"
+"This package provides @code{Digest::SHA1}, an implementation of the NIST\n"
 "SHA-1 message digest algorithm for use by Perl programs."
 msgstr ""
 
-#: gnu/packages/perl.scm:2795
-msgid "Declare version conflicts for your dist"
-msgstr ""
-
-#: gnu/packages/perl.scm:2796
+#: gnu/packages/perl.scm:3869
 msgid ""
 "This module allows you to specify conflicting versions of\n"
 "modules separately and deal with them after the module is done installing."
 msgstr ""
 
-#: gnu/packages/perl.scm:2816
-msgid "Detect the encoding of data"
+#: gnu/packages/perl.scm:3893
+msgid ""
+"This module provides a function-based interface to\n"
+"dynamic loading as used by Perl.  Some details of dynamic loading are\n"
+"very platform-dependent, so correct use of these functions requires\n"
+"the programmer to be mindfulof the space of platform variations."
 msgstr ""
 
-#: gnu/packages/perl.scm:2817
+#: gnu/packages/perl.scm:3916
 msgid ""
 "This package provides a class @code{Encode::Detect} to detect\n"
 "the encoding of data."
 msgstr ""
 
-#: gnu/packages/perl.scm:2835
-msgid "ASCII mapping for eucJP encoding"
-msgstr ""
-
-#: gnu/packages/perl.scm:2836
+#: gnu/packages/perl.scm:3935
 msgid ""
 "This package provides an ASCII mapping for the eucJP\n"
 "encoding."
 msgstr ""
 
-#: gnu/packages/perl.scm:2854
-msgid "JIS X 0212 (aka JIS 2000) encodings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2855
+#: gnu/packages/perl.scm:3954
 msgid ""
 "This package provides encodings for JIS X 0212, which is\n"
 "also known as JIS 2000."
 msgstr ""
 
-#: gnu/packages/perl.scm:2878
-msgid "Additional Chinese encodings"
-msgstr ""
-
-#: gnu/packages/perl.scm:2879
+#: gnu/packages/perl.scm:3978
 msgid ""
 "This Perl module provides Chinese encodings that are not\n"
 "part of Perl by default, including \"BIG5-1984\", \"BIG5-2003\", \"BIG5PLUS\",\n"
@@ -11299,11 +12314,7 @@ msgid ""
 "\"UNISYS\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:2901
-msgid "Advanced operations on path variables"
-msgstr ""
-
-#: gnu/packages/perl.scm:2902
+#: gnu/packages/perl.scm:4001
 msgid ""
 "@code{Env::Path} presents an object-oriented interface to\n"
 "path variables, defined as that subclass of environment variables which name\n"
@@ -11311,11 +12322,7 @@ msgid ""
 "separator."
 msgstr ""
 
-#: gnu/packages/perl.scm:2922
-msgid "OO-ish Error/Exception handling for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:2923
+#: gnu/packages/perl.scm:4022
 msgid ""
 "The Error package provides two interfaces.  Firstly Error\n"
 "provides a procedural interface to exception handling.  Secondly Error is a\n"
@@ -11323,11 +12330,7 @@ msgid ""
 "catch, or can simply be recorded."
 msgstr ""
 
-#: gnu/packages/perl.scm:2948
-msgid "Safely and cleanly create closures via string eval"
-msgstr ""
-
-#: gnu/packages/perl.scm:2949
+#: gnu/packages/perl.scm:4048
 msgid ""
 "String eval is often used for dynamic code generation.  For\n"
 "instance, Moose uses it heavily, to generate inlined versions of accessors and\n"
@@ -11341,32 +12344,27 @@ msgid ""
 "errors are rethrown automatically."
 msgstr ""
 
-#: gnu/packages/perl.scm:2978
-msgid "Allows you to declare real exception classes in Perl"
+#: gnu/packages/perl.scm:4090
+msgid ""
+"The Eval::WithLexicals Perl library provides support for\n"
+"lexical scope evaluation.  This package also includes the @command{tinyrepl}\n"
+"command, which can be used as a minimal Perl read-eval-print loop (REPL)."
 msgstr ""
 
-#: gnu/packages/perl.scm:2979
+#: gnu/packages/perl.scm:4113
 msgid ""
 "Exception::Class allows you to declare exception hierarchies\n"
 "in your modules in a \"Java-esque\" manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:2995
-msgid "Lightweight exporting of functions and variables"
-msgstr ""
-
-#: gnu/packages/perl.scm:2997
+#: gnu/packages/perl.scm:4131
 msgid ""
 "Exporter::Lite is an alternative to Exporter, intended to provide a\n"
 "lightweight subset of the most commonly-used functionality.  It supports\n"
 "import(), @@EXPORT and @@EXPORT_OK and not a whole lot else."
 msgstr ""
 
-#: gnu/packages/perl.scm:3017
-msgid "Exporter with the features of Sub::Exporter but only core dependencies"
-msgstr ""
-
-#: gnu/packages/perl.scm:3018
+#: gnu/packages/perl.scm:4151
 msgid ""
 "Exporter::Tiny supports many of Sub::Exporter's\n"
 "external-facing features including renaming imported functions with the `-as`,\n"
@@ -11375,32 +12373,26 @@ msgid ""
 "only about 40% as many lines of code and with zero non-core dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:3041
-msgid "Build.PL install path logic made easy"
-msgstr ""
-
-#: gnu/packages/perl.scm:3042
+#: gnu/packages/perl.scm:4175
 msgid ""
 "This module tries to make install path resolution as easy as\n"
 "possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:3060
-msgid "Wrapper for perl's configuration"
-msgstr ""
-
-#: gnu/packages/perl.scm:3061
+#: gnu/packages/perl.scm:4194
 msgid ""
 "ExtUtils::Config is an abstraction around the %Config hash.\n"
 "By itself it is not a particularly interesting module by any measure, however\n"
 "it ties together a family of modern toolchain modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3081
-msgid "Easily build XS extensions that depend on XS extensions"
+#: gnu/packages/perl.scm:4222
+msgid ""
+"ExtUtils::CppGuess attempts to guess the C++ compiler that\n"
+"is compatible with the C compiler used to build perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:3083
+#: gnu/packages/perl.scm:4243
 msgid ""
 "This module tries to make it easy to build Perl extensions that use\n"
 "functions and typemaps provided by other perl extensions.  This means that a\n"
@@ -11408,21 +12400,13 @@ msgid ""
 "XS interface besides the perl one."
 msgstr ""
 
-#: gnu/packages/perl.scm:3103
-msgid "Various portability utilities for module builders"
-msgstr ""
-
-#: gnu/packages/perl.scm:3104
+#: gnu/packages/perl.scm:4264
 msgid ""
 "This module provides various portable helper functions for\n"
 "module building modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3124
-msgid "Tool to build C libraries"
-msgstr ""
-
-#: gnu/packages/perl.scm:3125
+#: gnu/packages/perl.scm:4285
 msgid ""
 "Some Perl modules need to ship C libraries together with\n"
 "their Perl code.  Although there are mechanisms to compile and link (or glue)\n"
@@ -11430,11 +12414,14 @@ msgid ""
 "self-contained C libraries.  This module main goal is to help in that task."
 msgstr ""
 
-#: gnu/packages/perl.scm:3146
-msgid "Simplistic interface to pkg-config"
+#: gnu/packages/perl.scm:4309
+msgid ""
+"The package contains the ExtUtils::ParseXS module to\n"
+"convert Perl XS code into C code, the ExtUtils::Typemaps module to\n"
+"handle Perl/XS typemap files, and their submodules."
 msgstr ""
 
-#: gnu/packages/perl.scm:3148
+#: gnu/packages/perl.scm:4331
 msgid ""
 "@code{ExtUtils::PkgConfig} is a very simplistic interface to the\n"
 "@command{pkg-config} utility, intended for use in the @file{Makefile.PL}\n"
@@ -11442,21 +12429,25 @@ msgid ""
 "It is really just boilerplate code that you would have written yourself."
 msgstr ""
 
-#: gnu/packages/perl.scm:3180
-msgid "Watch for changes to files"
+#: gnu/packages/perl.scm:4357
+msgid ""
+"The package provides a number of useful typemaps as\n"
+"submodules of ExtUtils::Typemaps."
 msgstr ""
 
-#: gnu/packages/perl.scm:3181
+#: gnu/packages/perl.scm:4383
 msgid ""
-"This module provides a class to monitor a directory for\n"
-"changes made to any file."
+"This module implements the Perl foreign function\n"
+"interface XS for C++; it is a thin layer over plain XS."
 msgstr ""
 
-#: gnu/packages/perl.scm:3202
-msgid "Get directories of configuration files"
+#: gnu/packages/perl.scm:4414
+msgid ""
+"This module provides a class to monitor a directory for\n"
+"changes made to any file."
 msgstr ""
 
-#: gnu/packages/perl.scm:3203
+#: gnu/packages/perl.scm:4437
 msgid ""
 "This module is a helper for installing, reading and finding\n"
 "configuration file locations.  @code{File::ConfigDir} is a module to help out\n"
@@ -11464,44 +12455,28 @@ msgid ""
 "configuration files from more than one location."
 msgstr ""
 
-#: gnu/packages/perl.scm:3223
-msgid "Recursively copy files and directories"
-msgstr ""
-
-#: gnu/packages/perl.scm:3224
+#: gnu/packages/perl.scm:4458
 msgid ""
 "This module has 3 functions: one to copy files only, one to\n"
 "copy directories only, and one to do either depending on the argument's\n"
 "type."
 msgstr ""
 
-#: gnu/packages/perl.scm:3246
-msgid "Alternative interface to File::Find"
-msgstr ""
-
-#: gnu/packages/perl.scm:3247
+#: gnu/packages/perl.scm:4481
 msgid ""
 "File::Find::Rule is a friendlier interface to File::Find.\n"
 "It allows you to build rules which specify the desired files and\n"
 "directories."
 msgstr ""
 
-#: gnu/packages/perl.scm:3270
-msgid "Common rules for searching for Perl things"
-msgstr ""
-
-#: gnu/packages/perl.scm:3271
+#: gnu/packages/perl.scm:4505
 msgid ""
 "File::Find::Rule::Perl provides methods for finding various\n"
 "types Perl-related files, or replicating search queries run on a distribution\n"
 "in various parts of the CPAN ecosystem."
 msgstr ""
 
-#: gnu/packages/perl.scm:3292
-msgid "Matches patterns in a series of files"
-msgstr ""
-
-#: gnu/packages/perl.scm:3293
+#: gnu/packages/perl.scm:4527
 msgid ""
 "@code{File::Grep} provides similar functionality as perl's\n"
 "builtin @code{grep}, @code{map}, and @code{foreach} commands, but iterating\n"
@@ -11509,34 +12484,22 @@ msgid ""
 "provide a quick dropin when such functionality is needed."
 msgstr ""
 
-#: gnu/packages/perl.scm:3316
-msgid "Find your home and other directories on any platform"
-msgstr ""
-
-#: gnu/packages/perl.scm:3317
+#: gnu/packages/perl.scm:4551
 msgid ""
 "File::HomeDir is a module for locating the directories that\n"
-"are \"owned\" by a user (typically your user) and to solve the various issues\n"
+"are @code{owned} by a user (typically your user) and to solve the various issues\n"
 "that arise trying to find them consistently across a wide variety of\n"
 "platforms."
 msgstr ""
 
-#: gnu/packages/perl.scm:3339
-msgid "Create or remove directory trees"
-msgstr ""
-
-#: gnu/packages/perl.scm:3340
+#: gnu/packages/perl.scm:4573
 msgid ""
 "This module provide a convenient way to create directories\n"
 "of arbitrary depth and to delete an entire directory subtree from the\n"
 "file system."
 msgstr ""
 
-#: gnu/packages/perl.scm:3363
-msgid "Change directory temporarily for a limited scope"
-msgstr ""
-
-#: gnu/packages/perl.scm:3364
+#: gnu/packages/perl.scm:4597
 msgid ""
 "@code{File::pushd} does a temporary @code{chdir} that is\n"
 "easily and automatically reverted, similar to @code{pushd} in some Unix\n"
@@ -11547,36 +12510,34 @@ msgid ""
 "at the end of the scope."
 msgstr ""
 
-#: gnu/packages/perl.scm:3392
-msgid ""
-"Perl extension for crawling directory trees and compiling\n"
-"lists of files"
-msgstr ""
-
-#: gnu/packages/perl.scm:3395
+#: gnu/packages/perl.scm:4628
 msgid ""
 "The File::List module crawls the directory tree starting at the\n"
 "provided base directory and can return files (and/or directories if desired)\n"
 "matching a regular expression."
 msgstr ""
 
-#: gnu/packages/perl.scm:3414
-msgid "Remove files and directories in Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:3415
+#: gnu/packages/perl.scm:4650
 msgid ""
-"File::Remove::remove removes files and directories.  It acts\n"
-"like /bin/rm, for the most part.  Although \"unlink\" can be given a list of\n"
-"files, it will not remove directories; this module remedies that.  It also\n"
-"accepts wildcards, * and ?, as arguments for file names."
+"This module reads a file backwards line by line. It is\n"
+"simple to use, memory efficient and fast.  It supports both an object and a\n"
+"tied handle interface.\n"
+"\n"
+"It is intended for processing log and other similar text files which typically\n"
+"have their newest entries appended to them.  By default files are assumed to\n"
+"be plain text and have a line ending appropriate to the OS.  But you can set\n"
+"the input record separator string on a per file basis."
 msgstr ""
 
-#: gnu/packages/perl.scm:3439
-msgid "Locate per-dist and per-module shared files"
+#: gnu/packages/perl.scm:4677
+msgid ""
+"@code{File::Remove::remove} removes files and directories.\n"
+"It acts like @code{/bin/rm}, for the most part.  Although @code{unlink} can be\n"
+"given a list of files, it will not remove directories; this module remedies\n"
+"that.  It also accepts wildcards, * and ?, as arguments for file names."
 msgstr ""
 
-#: gnu/packages/perl.scm:3440
+#: gnu/packages/perl.scm:4701
 msgid ""
 "The intent of File::ShareDir is to provide a companion to\n"
 "Class::Inspector and File::HomeDir.  Quite often you want or need your Perl\n"
@@ -11586,93 +12547,66 @@ msgid ""
 "the installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:3462
-msgid "Locate per-dist shared files"
-msgstr ""
-
-#: gnu/packages/perl.scm:3463
+#: gnu/packages/perl.scm:4723
 msgid ""
 "File::ShareDir::Dist finds share directories for\n"
 "distributions.  It is a companion module to File::ShareDir."
 msgstr ""
 
-#: gnu/packages/perl.scm:3483
-msgid "Install shared files"
-msgstr ""
-
-#: gnu/packages/perl.scm:3484
+#: gnu/packages/perl.scm:4744
 msgid ""
 "File::ShareDir::Install allows you to install read-only data\n"
 "files from a distribution.  It is a companion module to File::ShareDir, which\n"
 "allows you to locate these files after installation."
 msgstr ""
 
-#: gnu/packages/perl.scm:3503
-msgid "Reading/Writing/Modifying of complete files"
-msgstr ""
-
-#: gnu/packages/perl.scm:3504
+#: gnu/packages/perl.scm:4763
 msgid ""
 "File::Slurp provides subroutines to read or write entire\n"
 "files with a simple call.  It also has a subroutine for reading the list of\n"
 "file names in a directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:3527
-msgid "Simple, sane and efficient module to slurp a file"
-msgstr ""
-
-#: gnu/packages/perl.scm:3528
+#: gnu/packages/perl.scm:4789
 msgid ""
 "This module provides functions for fast and correct file\n"
 "slurping and spewing.  All functions are optionally exported."
 msgstr ""
 
-#: gnu/packages/perl.scm:3545
-msgid "Simple file reader and writer"
-msgstr ""
-
-#: gnu/packages/perl.scm:3547
+#: gnu/packages/perl.scm:4808
 msgid "This module provides functions for fast reading and writing of files."
 msgstr ""
 
-#: gnu/packages/perl.scm:3566
-msgid "Return name and handle of a temporary file safely"
-msgstr ""
-
-#: gnu/packages/perl.scm:3567
+#: gnu/packages/perl.scm:4825
 msgid ""
 "File::Temp can be used to create and open temporary files in\n"
 "a safe way."
 msgstr ""
 
-#: gnu/packages/perl.scm:3584
-msgid "Portable implementation of the `which' utility"
-msgstr ""
-
-#: gnu/packages/perl.scm:3586
+#: gnu/packages/perl.scm:4844
 msgid ""
 "File::Which was created to be able to get the paths to executable\n"
 "programs on systems under which the `which' program wasn't implemented in the\n"
 "shell."
 msgstr ""
 
-#: gnu/packages/perl.scm:3609
-msgid "Extended Unix style glob functionality"
-msgstr ""
-
-#: gnu/packages/perl.scm:3610
+#: gnu/packages/perl.scm:4867
 msgid ""
 "@code{File::Zglob} provides a traditional Unix @code{glob}\n"
 "functionality; it returns a list of file names that match the given pattern.\n"
 "For instance, it supports the @code{**/*.pm} form."
 msgstr ""
 
-#: gnu/packages/perl.scm:3629
-msgid "Module to handle parsing command line options"
+#: gnu/packages/perl.scm:4890
+msgid ""
+"@code{Filesys::Notify::Simple} is a simple but unified interface to get\n"
+"notifications of changes to a given file system path.  It uses inotify2 on\n"
+"Linux, fsevents on OS X, @code{kqueue} on FreeBSD, and\n"
+"@code{FindFirstChangeNotification} on Windows if they're installed, and falls\n"
+"back to a full directory scan if none of these are available."
 msgstr ""
 
-#: gnu/packages/perl.scm:3630
+#: gnu/packages/perl.scm:4911
 msgid ""
 "The @code{Getopt::Long} module implements an extended getopt\n"
 "function called @code{GetOptions()}.  It parses the command line from\n"
@@ -11686,11 +12620,7 @@ msgid ""
 "single-letter approach, is provided but not enabled by default."
 msgstr ""
 
-#: gnu/packages/perl.scm:3664
-msgid "Getopt::Long, but simpler and more powerful"
-msgstr ""
-
-#: gnu/packages/perl.scm:3665
+#: gnu/packages/perl.scm:4946
 msgid ""
 "Getopt::Long::Descriptive is yet another Getopt library.\n"
 "It's built atop Getopt::Long, and gets a lot of its features, but tries to\n"
@@ -11698,31 +12628,19 @@ msgid ""
 "usage (help) messages, data validation, and a few other useful features."
 msgstr ""
 
-#: gnu/packages/perl.scm:3683
-msgid "Table-driven argument parsing for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:3685
+#: gnu/packages/perl.scm:4966
 msgid ""
 "Getopt::Tabular is a Perl 5 module for table-driven argument parsing,\n"
 "vaguely inspired by John Ousterhout's Tk_ParseArgv."
 msgstr ""
 
-#: gnu/packages/perl.scm:3707
-msgid "Graph data structures and algorithms"
-msgstr ""
-
-#: gnu/packages/perl.scm:3708
+#: gnu/packages/perl.scm:4988
 msgid ""
 "This is @code{Graph}, a Perl module for dealing with graphs,\n"
 "the abstract data structures."
 msgstr ""
 
-#: gnu/packages/perl.scm:3725
-msgid "Safe cleanup blocks implemented as guards"
-msgstr ""
-
-#: gnu/packages/perl.scm:3726
+#: gnu/packages/perl.scm:5006
 msgid ""
 "@code{Guard} implements so-called @dfn{guards}.  A guard is\n"
 "something (usually an object) that \"guards\" a resource, ensuring that it is\n"
@@ -11733,11 +12651,7 @@ msgid ""
 "which are tied to the scope exit."
 msgstr ""
 
-#: gnu/packages/perl.scm:3762
-msgid "Lightweight field hash for inside-out objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:3763
+#: gnu/packages/perl.scm:5043
 msgid ""
 "@code{Hash::FieldHash} provides the field hash mechanism\n"
 "which supports the inside-out technique.  It is an alternative to\n"
@@ -11745,11 +12659,7 @@ msgid ""
 "relic support."
 msgstr ""
 
-#: gnu/packages/perl.scm:3783
-msgid "Merge arbitrarily deep hashes into a single hash"
-msgstr ""
-
-#: gnu/packages/perl.scm:3784
+#: gnu/packages/perl.scm:5069
 msgid ""
 "Hash::Merge merges two arbitrarily deep hashes into a single\n"
 "hash.  That is, at any level, it will add non-conflicting key-value pairs from\n"
@@ -11759,21 +12669,22 @@ msgid ""
 "merged."
 msgstr ""
 
-#: gnu/packages/perl.scm:3806
-msgid "Store multiple values per key"
-msgstr ""
-
-#: gnu/packages/perl.scm:3807
+#: gnu/packages/perl.scm:5092
 msgid ""
 "Hash::MultiValue is an object (and a plain hash reference)\n"
 "that may contain multiple values per key, inspired by MultiDict of WebOb."
 msgstr ""
 
-#: gnu/packages/perl.scm:3825
-msgid "Alternative but compatible interface to modules that export symbols"
+#: gnu/packages/perl.scm:5112
+msgid ""
+"Hook::LexWrap allows you to install a pre- or post-wrapper (or\n"
+"both) around an existing subroutine.  Unlike other modules that\n"
+"provide this capacity (e.g., Hook::PreAndPost and Hook::WrapSub),\n"
+"Hook::LexWrap implements wrappers in such a way that the standard\n"
+"caller function works correctly within the wrapped subroutine."
 msgstr ""
 
-#: gnu/packages/perl.scm:3826
+#: gnu/packages/perl.scm:5134
 msgid ""
 "This module acts as a layer between Exporter and modules which\n"
 "consume exports.  It is feature-compatible with Exporter, plus some much needed\n"
@@ -11783,11 +12694,7 @@ msgid ""
 "variables."
 msgstr ""
 
-#: gnu/packages/perl.scm:3850
-msgid "Import packages into other packages"
-msgstr ""
-
-#: gnu/packages/perl.scm:3851
+#: gnu/packages/perl.scm:5159
 msgid ""
 "Writing exporters is a pain.  Some use Exporter, some use\n"
 "Sub::Exporter, some use Moose::Exporter, some use Exporter::Declare ... and\n"
@@ -11797,22 +12704,43 @@ msgid ""
 "compilation.  Import::Into provides global methods to make this painless."
 msgstr ""
 
-#: gnu/packages/perl.scm:3873
-msgid "Use modules in inc/ if newer than installed"
-msgstr ""
-
-#: gnu/packages/perl.scm:3874
+#: gnu/packages/perl.scm:5182
 msgid ""
 "The inc::latest module helps bootstrap configure-time\n"
 "dependencies for CPAN distributions.  These dependencies get bundled into the\n"
 "inc directory within a distribution and are used by Makefile.PL or Build.PL."
 msgstr ""
 
-#: gnu/packages/perl.scm:3895
-msgid "Capture STDOUT and STDERR from Perl code, subprocesses or XS"
+#: gnu/packages/perl.scm:5203
+msgid "Indirect warns about using the indirect method call syntax."
+msgstr ""
+
+#: gnu/packages/perl.scm:5224
+msgid ""
+"The @code{Inline} module allows you to put source code\n"
+"from other programming languages directly (inline) in a Perl script or\n"
+"module.  The code is automatically compiled as needed, and then loaded\n"
+"for immediate access from Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:3896
+#: gnu/packages/perl.scm:5255
+msgid ""
+"The @code{Inline::C} module allows you to write Perl\n"
+"subroutines in C.  Since version 0.30 the @code{Inline} module supports\n"
+"multiple programming languages and each language has its own support module.\n"
+"This document describes how to use Inline with the C programming language.\n"
+"It also goes a bit into Perl C internals."
+msgstr ""
+
+#: gnu/packages/perl.scm:5282
+msgid ""
+"@code{IO::All} combines all of the best Perl IO modules into\n"
+"a single nifty object oriented interface to greatly simplify your everyday\n"
+"Perl IO idioms.  It exports a single function called io, which returns a new\n"
+"@code{IO::All} object.  And that object can do it all!"
+msgstr ""
+
+#: gnu/packages/perl.scm:5304
 msgid ""
 "@code{IO::CaptureOutput} provides routines for capturing\n"
 "@code{STDOUT} and @code{STDERR} from perl subroutines, forked system\n"
@@ -11822,64 +12750,46 @@ msgid ""
 "try @code{Capture::Tiny} instead."
 msgstr ""
 
-#: gnu/packages/perl.scm:3918
-msgid "Utilities for interactive I/O"
-msgstr ""
-
-#: gnu/packages/perl.scm:3919
+#: gnu/packages/perl.scm:5326
 msgid ""
 "This module provides three utility subroutines that make it\n"
 "easier to develop interactive applications: is_interactive(), interactive(),\n"
 "and busy()."
 msgstr ""
 
-#: gnu/packages/perl.scm:3938
-msgid "Emulate file interface for in-core strings"
+#: gnu/packages/perl.scm:5361
+msgid ""
+"@code{IO::Pager} can be used to locate an available pager and use it to\n"
+"display output if a TTY is in use."
 msgstr ""
 
-#: gnu/packages/perl.scm:3939
+#: gnu/packages/perl.scm:5380
 msgid ""
 "IO::String is an IO::File (and IO::Handle) compatible class\n"
 "that reads or writes data from in-core strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:3957
-msgid "IO:: interface for reading/writing an array of lines"
-msgstr ""
-
-#: gnu/packages/perl.scm:3958
+#: gnu/packages/perl.scm:5399
 msgid ""
 "This toolkit primarily provides modules for performing both\n"
 "traditional and object-oriented i/o) on things *other* than normal\n"
 "filehandles; in particular, IO::Scalar, IO::ScalarArray, and IO::Lines."
 msgstr ""
 
-#: gnu/packages/perl.scm:3976
-msgid "Perl interface to pseudo ttys"
-msgstr ""
-
-#: gnu/packages/perl.scm:3978
+#: gnu/packages/perl.scm:5419
 msgid ""
-"This package provides the 'IO::Pty' and 'IO::Tty' Perl interfaces to\n"
-"pseudo ttys."
+"This package provides the @code{IO::Pty} and @code{IO::Tty} Perl\n"
+"interfaces to pseudo ttys."
 msgstr ""
 
-#: gnu/packages/perl.scm:3996
-msgid "Run interactive command-line programs"
-msgstr ""
-
-#: gnu/packages/perl.scm:3997
+#: gnu/packages/perl.scm:5437
 msgid ""
 "@code{IPC::Cmd} allows for the searching and execution of\n"
 "any binary on your system.  It adheres to verbosity settings and is able to\n"
 "run interactively.  It also has an option to capture output/error buffers."
 msgstr ""
 
-#: gnu/packages/perl.scm:4026
-msgid "Run system() and background procs w/ piping, redirs, ptys"
-msgstr ""
-
-#: gnu/packages/perl.scm:4027
+#: gnu/packages/perl.scm:5467
 msgid ""
 "IPC::Run allows you run and interact with child processes\n"
 "using files, pipes, and pseudo-ttys.  Both system()-style and scripted usages\n"
@@ -11887,11 +12797,7 @@ msgid ""
 "both supported and may be mixed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4045
-msgid "Run a subprocess with input/output redirection"
-msgstr ""
-
-#: gnu/packages/perl.scm:4047
+#: gnu/packages/perl.scm:5487
 msgid ""
 "The IPC::Run3 module allows you to run a subprocess and redirect stdin,\n"
 "stdout, and/or stderr to files and perl data structures.  It aims to satisfy\n"
@@ -11899,21 +12805,13 @@ msgid ""
 "Perlish API and none of the bloat and rarely used features of IPC::Run."
 msgstr ""
 
-#: gnu/packages/perl.scm:4071
-msgid "Lightweight interface to shared memory"
-msgstr ""
-
-#: gnu/packages/perl.scm:4072
+#: gnu/packages/perl.scm:5511
 msgid ""
 "IPC::ShareLite provides a simple interface to shared memory,\n"
 "allowing data to be efficiently communicated between processes."
 msgstr ""
 
-#: gnu/packages/perl.scm:4090
-msgid "Run commands simply, with detailed diagnostics"
-msgstr ""
-
-#: gnu/packages/perl.scm:4091
+#: gnu/packages/perl.scm:5530
 msgid ""
 "Calling Perl's in-built @code{system} function is easy,\n"
 "determining if it was successful is hard.  Let's face it, @code{$?} isn't the\n"
@@ -11924,21 +12822,13 @@ msgid ""
 "commands."
 msgstr ""
 
-#: gnu/packages/perl.scm:4116
-msgid "JSON encoder/decoder for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:4117
+#: gnu/packages/perl.scm:5556
 msgid ""
 "This module converts Perl data structures to JSON and vice\n"
 "versa using either JSON::XS or JSON::PP."
 msgstr ""
 
-#: gnu/packages/perl.scm:4142
-msgid "Wrapper for Perl JSON classes"
-msgstr ""
-
-#: gnu/packages/perl.scm:4144
+#: gnu/packages/perl.scm:5583
 msgid ""
 "This module tries to provide a coherent API to bring together the\n"
 "various JSON modules currently on CPAN.  This module will allow you to code to\n"
@@ -11946,11 +12836,7 @@ msgid ""
 "installed."
 msgstr ""
 
-#: gnu/packages/perl.scm:4168
-msgid "Cpanel::JSON::XS with fallback"
-msgstr ""
-
-#: gnu/packages/perl.scm:4169
+#: gnu/packages/perl.scm:5608
 msgid ""
 "This module first checks to see if either Cpanel::JSON::XS\n"
 "or JSON::XS is already loaded, in which case it uses that module.  Otherwise\n"
@@ -11958,15 +12844,17 @@ msgid ""
 "either uses the first module it finds or throws an error."
 msgstr ""
 
-#: gnu/packages/perl.scm:4192
-msgid "JSON serialising/deserialising for Perl"
+#: gnu/packages/perl.scm:5658
+msgid "Lexical::SealRequireHints prevents leakage of lexical hints"
 msgstr ""
 
-#: gnu/packages/perl.scm:4211
-msgid "Bringing loggers and listeners together"
+#: gnu/packages/perl.scm:5683
+msgid ""
+"This module provides lexicon-handling modules to read from other\n"
+"localization formats, such as Gettext, Msgcat, and so on."
 msgstr ""
 
-#: gnu/packages/perl.scm:4212
+#: gnu/packages/perl.scm:5701
 msgid ""
 "@code{Log::Any} provides a standard log production API for\n"
 "modules.  @code{Log::Any::Adapter} allows applications to choose the mechanism\n"
@@ -11979,121 +12867,88 @@ msgid ""
 "\n"
 "@code{Log::Any} has a very tiny footprint and no dependencies beyond Perl\n"
 "itself, which makes it appropriate for even small CPAN modules to use.  It\n"
-"defaults to 'null' logging activity, so a module can safely log without\n"
+"defaults to @code{null} logging activity, so a module can safely log without\n"
 "worrying about whether the application has chosen (or will ever choose) a\n"
 "logging mechanism."
 msgstr ""
 
-#: gnu/packages/perl.scm:4248
-msgid "Log::Any adapter for Log::Log4perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:4249
+#: gnu/packages/perl.scm:5738
 msgid ""
 "@code{Log::Any::Adapter::Log4perl} provides a\n"
 "@code{Log::Any} adapter using @code{Log::Log4perl} for logging."
 msgstr ""
 
-#: gnu/packages/perl.scm:4270
-msgid "Log4j implementation for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:4271
+#: gnu/packages/perl.scm:5760
 msgid ""
 "@code{Log::Log4perl} lets you remote-control and fine-tune\n"
 "the logging behaviour of your system from the outside.  It implements the\n"
 "widely popular (Java-based) Log4j logging package in pure Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:4291
-msgid "Log::Report in the lightest form"
-msgstr ""
-
-#: gnu/packages/perl.scm:4293
+#: gnu/packages/perl.scm:5782
 msgid ""
 "This module allows libraries to have a dependency to a small module\n"
 "instead of the full Log-Report distribution.  The full power of\n"
 "@code{Log::Report} is only released when the main program uses that module.\n"
-"In that case, the module using the 'Optional' will also use the full\n"
+"In that case, the module using the @code{Optional} will also use the full\n"
 "@code{Log::Report}, otherwise the dressed-down @code{Log::Report::Minimal}\n"
 "version."
 msgstr ""
 
-#: gnu/packages/perl.scm:4318
-msgid "Get messages to users and logs"
-msgstr ""
-
-#: gnu/packages/perl.scm:4320
+#: gnu/packages/perl.scm:5809
 msgid ""
 "@code{Log::Report} combines three tasks which are closely related in\n"
 "one: logging, exceptions, and translations."
 msgstr ""
 
-#: gnu/packages/perl.scm:4349
-msgid "High-level interface to Uniforum message translation"
-msgstr ""
-
-#: gnu/packages/perl.scm:4350
+#: gnu/packages/perl.scm:5838
 msgid ""
 "This package is an internationalization library for Perl\n"
 "that aims to be compatible with the Uniforum message translations system as\n"
 "implemented for example in GNU gettext."
 msgstr ""
 
-#: gnu/packages/perl.scm:4369
-msgid "Transliterate text between writing systems"
+#: gnu/packages/perl.scm:5860
+msgid ""
+"The Lingua::EN::Sentence module contains the function get_sentences,\n"
+"which splits text into its constituent sentences, based on a regular\n"
+"expression and a list of abbreviations (built in and given)."
 msgstr ""
 
-#: gnu/packages/perl.scm:4370
+#: gnu/packages/perl.scm:5880
 msgid ""
 "@code{Lingua::Translit} can be used to convert text from one\n"
 "writing system to another, based on national or international transliteration\n"
 "tables.  Where possible a reverse transliteration is supported."
 msgstr ""
 
-#: gnu/packages/perl.scm:4394
-msgid "Combination of List::Util and List::MoreUtils"
-msgstr ""
-
-#: gnu/packages/perl.scm:4395
+#: gnu/packages/perl.scm:5905
 msgid ""
 "This module exports all of the functions that either\n"
 "List::Util or List::MoreUtils defines, with preference to List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:4417
-msgid "Compare elements of two or more lists"
-msgstr ""
-
-#: gnu/packages/perl.scm:4418
+#: gnu/packages/perl.scm:5928
 msgid ""
 "@code{List::Compare} provides a module to perform\n"
 "comparative operations on two or more lists.  Provided operations include\n"
 "intersections, unions, unique elements, complements and many more."
 msgstr ""
 
-#: gnu/packages/perl.scm:4453 gnu/packages/perl.scm:4504
-msgid "Provide the stuff missing in List::Util"
-msgstr ""
-
-#: gnu/packages/perl.scm:4454
+#: gnu/packages/perl.scm:5963
 msgid ""
 "List::MoreUtils provides some trivial but commonly needed\n"
 "functionality on lists which is not going to go into List::Util."
 msgstr ""
 
-#: gnu/packages/perl.scm:4476
-msgid "Provide the stuff missing in List::Util in XS"
-msgstr ""
-
-#: gnu/packages/perl.scm:4477
+#: gnu/packages/perl.scm:5985
 msgid ""
 "@code{List::MoreUtils::XS} provides some trivial but\n"
 "commonly needed functionality on lists which is not going to go into\n"
 "@code{List::Util}."
 msgstr ""
 
-#: gnu/packages/perl.scm:4505
+#: gnu/packages/perl.scm:6012
 msgid ""
 "@code{List::SomeUtils} provides some trivial but commonly\n"
 "needed functionality on lists which is not going to go into @code{List::Util}.\n"
@@ -12105,11 +12960,7 @@ msgid ""
 "portions of this module couldn't be compiled on this machine."
 msgstr ""
 
-#: gnu/packages/perl.scm:4534
-msgid "Bundle of ancient email modules"
-msgstr ""
-
-#: gnu/packages/perl.scm:4535
+#: gnu/packages/perl.scm:6042
 msgid ""
 "MailTools contains the following modules:\n"
 "@table @asis\n"
@@ -12136,54 +12987,67 @@ msgid ""
 "@end table"
 msgstr ""
 
-#: gnu/packages/perl.scm:4574
-msgid "Expiry plug-in for Memoize that adds LRU cache expiration"
+#: gnu/packages/perl.scm:6085
+msgid ""
+"Mail::Sendmail is a pure perl module that provides a\n"
+"simple means to send email from a perl script.  The module only\n"
+"requires Perl5 and a network connection."
+msgstr ""
+
+#: gnu/packages/perl.scm:6105
+msgid ""
+"This module implements the algorithm for the solution of Bezier\n"
+"curves as presented by Robert D Miller in Graphics Gems V, \"Quick and Simple\n"
+"Bezier Curve Drawing\"."
+msgstr ""
+
+#: gnu/packages/perl.scm:6125
+msgid ""
+"@code{Math::Round} provides functions to round numbers,\n"
+"both positive and negative, in various ways."
+msgstr ""
+
+#: gnu/packages/perl.scm:6144
+msgid ""
+"This package provides some basic statistics on numerical\n"
+"vectors.  All the subroutines can take a reference to the vector to be\n"
+"operated on."
+msgstr ""
+
+#: gnu/packages/perl.scm:6164
+msgid ""
+"This package transparently speeds up functions by caching\n"
+"return values, trading space for time."
 msgstr ""
 
-#: gnu/packages/perl.scm:4575
+#: gnu/packages/perl.scm:6183
 msgid ""
 "This module implements an expiry policy for Memoize that\n"
 "follows LRU semantics, that is, the last n results, where n is specified as\n"
 "the argument to the CACHESIZE parameter, will be cached."
 msgstr ""
 
-#: gnu/packages/perl.scm:4593
-msgid "Charset information for MIME messages"
-msgstr ""
-
-#: gnu/packages/perl.scm:4595
+#: gnu/packages/perl.scm:6203
 msgid ""
 "@code{MIME::Charset} provides information about character sets used for\n"
 "MIME messages on Internet."
 msgstr ""
 
-#: gnu/packages/perl.scm:4622
-msgid "Tools to manipulate MIME messages"
-msgstr ""
-
-#: gnu/packages/perl.scm:4624
+#: gnu/packages/perl.scm:6232
 msgid ""
 "MIME-tools is a collection of Perl5 MIME:: modules for parsing,\n"
 "decoding, and generating single- or multipart (even nested multipart) MIME\n"
 "messages."
 msgstr ""
 
-#: gnu/packages/perl.scm:4643
-msgid "Definition of MIME types"
-msgstr ""
-
-#: gnu/packages/perl.scm:4644
+#: gnu/packages/perl.scm:6252
 msgid ""
 "This module provides a list of known mime-types, combined\n"
 "from various sources.  For instance, it contains all IANA types and the\n"
 "knowledge of Apache."
 msgstr ""
 
-#: gnu/packages/perl.scm:4666
-msgid "Write your linewise code for handles; this does the rest"
-msgstr ""
-
-#: gnu/packages/perl.scm:4667
+#: gnu/packages/perl.scm:6275
 msgid ""
 "It's boring to deal with opening files for IO, converting\n"
 "strings to handle-like objects, and all that.  With\n"
@@ -12192,21 +13056,13 @@ msgid ""
 "file names are added for you."
 msgstr ""
 
-#: gnu/packages/perl.scm:4693
-msgid "Enable all of the features of Modern Perl with one import"
-msgstr ""
-
-#: gnu/packages/perl.scm:4694
+#: gnu/packages/perl.scm:6301
 msgid ""
 "@code{Modern::Perl} provides a simple way to enable\n"
 "multiple, by now, standard libraries in a Perl program."
 msgstr ""
 
-#: gnu/packages/perl.scm:4722
-msgid "Tiny replacement for Module::Build"
-msgstr ""
-
-#: gnu/packages/perl.scm:4723
+#: gnu/packages/perl.scm:6330
 msgid ""
 "Many Perl distributions use a Build.PL file instead of a\n"
 "Makefile.PL file to drive distribution configuration, build, test and\n"
@@ -12216,11 +13072,14 @@ msgid ""
 "has less than 120, yet supports the features needed by most distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:4751
-msgid "Module::Build class for building XS modules"
+#: gnu/packages/perl.scm:6363
+msgid ""
+"This subclass of Module::Build adds some tools and\n"
+"processes to make it easier to use for wrapping C++ using XS++\n"
+"(ExtUtils::XSpp)."
 msgstr ""
 
-#: gnu/packages/perl.scm:4753
+#: gnu/packages/perl.scm:6390
 msgid ""
 "@code{Module::Build::XSUtil} is subclass of @code{Module::Build}\n"
 "for support building XS modules.\n"
@@ -12244,11 +13103,7 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/perl.scm:4789
-msgid "Find and use installed modules in a (sub)category"
-msgstr ""
-
-#: gnu/packages/perl.scm:4790
+#: gnu/packages/perl.scm:6427
 msgid ""
 "Module::Find lets you find and use modules in categories.\n"
 "This can be useful for auto-detecting driver or plugin modules.  You can\n"
@@ -12256,11 +13111,7 @@ msgid ""
 "subcategories."
 msgstr ""
 
-#: gnu/packages/perl.scm:4816
-msgid "Loads alternate underlying implementations for a module"
-msgstr ""
-
-#: gnu/packages/perl.scm:4817
+#: gnu/packages/perl.scm:6454
 msgid ""
 "This module abstracts out the process of choosing one of\n"
 "several underlying implementations for a module.  This can be used to provide\n"
@@ -12269,11 +13120,7 @@ msgid ""
 "implementations."
 msgstr ""
 
-#: gnu/packages/perl.scm:4855
-msgid "Standalone, extensible Perl module installer"
-msgstr ""
-
-#: gnu/packages/perl.scm:4856
+#: gnu/packages/perl.scm:6493
 msgid ""
 "Module::Install is a package for writing installers for\n"
 "CPAN (or CPAN-like) distributions that are clean, simple, minimalist, act in a\n"
@@ -12281,52 +13128,42 @@ msgid ""
 "installation version 5.005 or newer."
 msgstr ""
 
-#: gnu/packages/perl.scm:4877
-msgid "Give your Perl module the ability to have plugins"
+#: gnu/packages/perl.scm:6521
+msgid ""
+"@code{Module::Manifest} is a simple utility module created originally for\n"
+"use in @code{Module::Inspector}.\n"
+"\n"
+"It can load a @file{MANIFEST} file that comes in a Perl distribution tarball,\n"
+"examine the contents, and perform some simple tasks.  It can also load the\n"
+"@file{MANIFEST.SKIP} file and check that."
 msgstr ""
 
-#: gnu/packages/perl.scm:4878
+#: gnu/packages/perl.scm:6545
 msgid ""
 "This module provides a simple but extensible way of having\n"
-"'plugins' for your Perl module."
+"@code{plugins} for your Perl module."
 msgstr ""
 
-#: gnu/packages/perl.scm:4897
-msgid "Perl runtime module handling"
-msgstr ""
-
-#: gnu/packages/perl.scm:4898
+#: gnu/packages/perl.scm:6565
 msgid ""
 "The functions exported by this module deal with runtime\n"
 "handling of Perl modules, which are normally handled at compile time."
 msgstr ""
 
-#: gnu/packages/perl.scm:4921
-msgid "Provide information on conflicts for Module::Runtime"
-msgstr ""
-
-#: gnu/packages/perl.scm:4922
+#: gnu/packages/perl.scm:6589
 msgid ""
 "This module provides conflicts checking for Module::Runtime,\n"
 "which had a recent release that broke some versions of Moose.  It is called\n"
 "from Moose::Conflicts and moose-outdated."
 msgstr ""
 
-#: gnu/packages/perl.scm:4943
-msgid "Recursively scan Perl code for dependencies"
-msgstr ""
-
-#: gnu/packages/perl.scm:4944
+#: gnu/packages/perl.scm:6611
 msgid ""
 "Module::ScanDeps is a module to recursively scan Perl\n"
 "programs for dependencies."
 msgstr ""
 
-#: gnu/packages/perl.scm:4964
-msgid "Module name tools and transformations"
-msgstr ""
-
-#: gnu/packages/perl.scm:4965
+#: gnu/packages/perl.scm:6632
 msgid ""
 "This module provides a few useful functions for manipulating\n"
 "module names.  Its main aim is to centralise some of the functions commonly\n"
@@ -12334,11 +13171,7 @@ msgid ""
 "module names to relative paths."
 msgstr ""
 
-#: gnu/packages/perl.scm:4995
-msgid "Minimalist Object Orientation (with Moose compatibility)"
-msgstr ""
-
-#: gnu/packages/perl.scm:4996
+#: gnu/packages/perl.scm:6663
 msgid ""
 "Moo is an extremely light-weight Object Orientation system.\n"
 "It allows one to concisely define objects and roles with a convenient syntax\n"
@@ -12346,11 +13179,7 @@ msgid ""
 "Moose and is optimised for rapid startup."
 msgstr ""
 
-#: gnu/packages/perl.scm:5072
-msgid "Postmodern object system for Perl 5"
-msgstr ""
-
-#: gnu/packages/perl.scm:5074
+#: gnu/packages/perl.scm:6770
 msgid ""
 "Moose is a complete object system for Perl 5.  It provides keywords for\n"
 "attribute declaration, object construction, inheritance, and maybe more.  With\n"
@@ -12361,11 +13190,7 @@ msgid ""
 "sentences."
 msgstr ""
 
-#: gnu/packages/perl.scm:5103
-msgid "Emulate Class::Accessor::Fast behavior using Moose attributes"
-msgstr ""
-
-#: gnu/packages/perl.scm:5104
+#: gnu/packages/perl.scm:6799
 msgid ""
 "This module attempts to emulate the behavior of\n"
 "Class::Accessor::Fast as accurately as possible using the Moose attribute\n"
@@ -12373,21 +13198,13 @@ msgid ""
 "private methods are not."
 msgstr ""
 
-#: gnu/packages/perl.scm:5136
-msgid "Moose role for processing command line options"
-msgstr ""
-
-#: gnu/packages/perl.scm:5137
+#: gnu/packages/perl.scm:6834
 msgid ""
 "This is a Moose role which provides an alternate constructor\n"
 "for creating objects using parameters passed in from the command line."
 msgstr ""
 
-#: gnu/packages/perl.scm:5158
-msgid "Mark overload code symbols as methods"
-msgstr ""
-
-#: gnu/packages/perl.scm:5159
+#: gnu/packages/perl.scm:6856
 msgid ""
 "MooseX::MarkAsMethods allows one to easily mark certain\n"
 "functions as Moose methods.  This will allow other packages such as\n"
@@ -12397,21 +13214,13 @@ msgid ""
 "overloads will \"just work\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:5189
-msgid "Code attribute introspection"
-msgstr ""
-
-#: gnu/packages/perl.scm:5190
+#: gnu/packages/perl.scm:6887
 msgid ""
 "This module allows code attributes of methods to be\n"
 "introspected using Moose meta method objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:5216
-msgid "Subclassing of non-Moose classes"
-msgstr ""
-
-#: gnu/packages/perl.scm:5217
+#: gnu/packages/perl.scm:6914
 msgid ""
 "MooseX::NonMoose allows for easily subclassing non-Moose\n"
 "classes with Moose, taking care of the details connected with doing this, such\n"
@@ -12420,31 +13229,19 @@ msgid ""
 "BUILD methods are called.  It tries to be as non-intrusive as possible."
 msgstr ""
 
-#: gnu/packages/perl.scm:5246
-msgid "Extension of Params::Validate using Moose's types"
-msgstr ""
-
-#: gnu/packages/perl.scm:5247
+#: gnu/packages/perl.scm:6943
 msgid ""
 "This module fills a gap in Moose by adding method parameter\n"
 "validation to Moose."
 msgstr ""
 
-#: gnu/packages/perl.scm:5268
-msgid "Apply roles to a related Perl class"
-msgstr ""
-
-#: gnu/packages/perl.scm:5269
+#: gnu/packages/perl.scm:6965
 msgid ""
 "This module applies roles to make a subclass instead of\n"
 "manually setting up a subclass."
 msgstr ""
 
-#: gnu/packages/perl.scm:5296
-msgid "Moose roles with composition parameters"
-msgstr ""
-
-#: gnu/packages/perl.scm:5297
+#: gnu/packages/perl.scm:6992
 msgid ""
 "Because Moose roles serve many different masters, they\n"
 "usually provide only the least common denominator of functionality.  To\n"
@@ -12454,11 +13251,7 @@ msgid ""
 "Parameterized roles offer a solution to these (and other) kinds of problems."
 msgstr ""
 
-#: gnu/packages/perl.scm:5323
-msgid "Roles which support overloading"
-msgstr ""
-
-#: gnu/packages/perl.scm:5324
+#: gnu/packages/perl.scm:7019
 msgid ""
 "MooseX::Role::WithOverloading allows you to write a\n"
 "Moose::Role which defines overloaded operators and allows those overload\n"
@@ -12466,11 +13259,7 @@ msgid ""
 "where plain Moose::Roles would lose the overloading."
 msgstr ""
 
-#: gnu/packages/perl.scm:5346
-msgid "Name your accessors foo() and set_foo()"
-msgstr ""
-
-#: gnu/packages/perl.scm:5347
+#: gnu/packages/perl.scm:7042
 msgid ""
 "This module does not provide any methods.  Simply loading it\n"
 "changes the default naming policy for the loading class so that accessors are\n"
@@ -12478,82 +13267,50 @@ msgid ""
 "accessor, while set methods are prefixed with \"_set_\"."
 msgstr ""
 
-#: gnu/packages/perl.scm:5373
-msgid "Strict object constructors for Moose"
-msgstr ""
-
-#: gnu/packages/perl.scm:5374
+#: gnu/packages/perl.scm:7069
 msgid ""
 "Simply loading this module makes your constructors\n"
 "\"strict\".  If your constructor is called with an attribute init argument\n"
 "that your class does not declare, then it calls Moose->throw_error()."
 msgstr ""
 
-#: gnu/packages/perl.scm:5402
-msgid "Trait loading and resolution for Moose"
-msgstr ""
-
-#: gnu/packages/perl.scm:5403
+#: gnu/packages/perl.scm:7098
 msgid ""
 "Adds support on top of MooseX::Traits for class precedence\n"
 "search for traits and some extra attributes."
 msgstr ""
 
-#: gnu/packages/perl.scm:5429
-msgid "Organise your Moose types in libraries"
-msgstr ""
-
-#: gnu/packages/perl.scm:5430
+#: gnu/packages/perl.scm:7125
 msgid ""
 "This package lets you declare types using short names, but\n"
 "behind the scenes it namespaces all your type declarations, effectively\n"
 "prevent name clashes between packages."
 msgstr ""
 
-#: gnu/packages/perl.scm:5461
-msgid "DateTime related constraints and coercions for Moose"
-msgstr ""
-
-#: gnu/packages/perl.scm:5462
+#: gnu/packages/perl.scm:7157
 msgid ""
 "This module packages several Moose::Util::TypeConstraints\n"
 "with coercions, designed to work with the DateTime suite of objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:5494
-msgid "Extensions to MooseX::Types::DateTime"
-msgstr ""
-
-#: gnu/packages/perl.scm:5495
+#: gnu/packages/perl.scm:7189
 msgid ""
 "This module builds on MooseX::Types::DateTime to add\n"
 "additional custom types and coercions.  Since it builds on an existing type,\n"
 "all coercions and constraints are inherited."
 msgstr ""
 
-#: gnu/packages/perl.scm:5524
-msgid "ClassName type constraints for Moose"
-msgstr ""
-
-#: gnu/packages/perl.scm:5525
+#: gnu/packages/perl.scm:7218
 msgid ""
 "MooseX::Types::LoadableClass provides a ClassName type\n"
 "constraint with coercion to load the class."
 msgstr ""
 
-#: gnu/packages/perl.scm:5551
-msgid "Using Moo and MooX:: packages the most lazy way"
-msgstr ""
-
-#: gnu/packages/perl.scm:5552
+#: gnu/packages/perl.scm:7245
 msgid "Contains the MooX and MooX::Role packages."
 msgstr ""
 
-#: gnu/packages/perl.scm:5579
-msgid "Giving an easy Moo style way to make command organized CLI apps"
-msgstr ""
-
-#: gnu/packages/perl.scm:5580
+#: gnu/packages/perl.scm:7272
 msgid ""
 "This package eases the writing of command line utilities,\n"
 "accepting commands and subcommands and so on.  These commands can form a tree,\n"
@@ -12562,11 +13319,7 @@ msgid ""
 "most specific one) is instantiated."
 msgstr ""
 
-#: gnu/packages/perl.scm:5613
-msgid "Moo eXtension for initializing objects from config file"
-msgstr ""
-
-#: gnu/packages/perl.scm:5614
+#: gnu/packages/perl.scm:7306
 msgid ""
 "This module is intended to easily load initialization values\n"
 "for attributes on object construction from an appropriate config file.  The\n"
@@ -12574,33 +13327,21 @@ msgid ""
 "@code{MooX::ConfigFromFile} ensures that the role is applied."
 msgstr ""
 
-#: gnu/packages/perl.scm:5638
-msgid "Moo eXtension for @code{File::ConfigDir}"
-msgstr ""
-
-#: gnu/packages/perl.scm:5639
+#: gnu/packages/perl.scm:7330
 msgid ""
 "This module is a helper for easily finding configuration\n"
 "file locations.  This information can be used to find a suitable place for\n"
 "installing configuration files or for finding any piece of settings."
 msgstr ""
 
-#: gnu/packages/perl.scm:5674
-msgid "NativeTrait-like behavior for Moo"
-msgstr ""
-
-#: gnu/packages/perl.scm:5676
+#: gnu/packages/perl.scm:7366
 msgid ""
 "@code{MooX::HandlesVia} is an extension of Moo's @code{handles}\n"
 "attribute functionality.  It provides a means of proxying functionality from\n"
-"an external class to the given atttribute."
+"an external class to the given attribute."
 msgstr ""
 
-#: gnu/packages/perl.scm:5707
-msgid "Easily translate Moose code to Moo"
-msgstr ""
-
-#: gnu/packages/perl.scm:5709
+#: gnu/packages/perl.scm:7396
 msgid ""
 "MooX::late does the following:\n"
 "@enumerate\n"
@@ -12614,11 +13355,7 @@ msgid ""
 "@end enumerate"
 msgstr ""
 
-#: gnu/packages/perl.scm:5764
-msgid "Explicit Options eXtension for Object Class"
-msgstr ""
-
-#: gnu/packages/perl.scm:5765
+#: gnu/packages/perl.scm:7452
 msgid ""
 "Create a command line tool with your Mo, Moo, Moose objects.\n"
 "You have an @code{option} keyword to replace the usual @code{has} to\n"
@@ -12627,32 +13364,27 @@ msgid ""
 "generate a command line tool."
 msgstr ""
 
-#: gnu/packages/perl.scm:5792
-msgid "Moosish types and type builder"
+#: gnu/packages/perl.scm:7483
+msgid ""
+"Loading @code{MooX::StrictConstructor} makes your constructors \"strict\".\n"
+"If your constructor is called with an attribute init argument that your class\n"
+"does not declare, then it dies."
 msgstr ""
 
-#: gnu/packages/perl.scm:5793
+#: gnu/packages/perl.scm:7508
 msgid ""
 "MooX::Types::MooseLike provides a possibility to build your\n"
 "own set of Moose-like types.  These custom types can then be used to describe\n"
 "fields in Moo-based classes."
 msgstr ""
 
-#: gnu/packages/perl.scm:5822
-msgid "Fast Moose-compatible object system for perl5"
-msgstr ""
-
-#: gnu/packages/perl.scm:5824
+#: gnu/packages/perl.scm:7539
 msgid ""
 "Mouse is a @code{Moose} compatible object system that implements a\n"
 "subset of the functionality for reduced startup time."
 msgstr ""
 
-#: gnu/packages/perl.scm:5847
-msgid "Extend attribute interfaces for Mouse"
-msgstr ""
-
-#: gnu/packages/perl.scm:5849
+#: gnu/packages/perl.scm:7564
 msgid ""
 "While @code{Mouse} attributes provide a way to name your accessors,\n"
 "readers, writers, clearers and predicates, @code{MouseX::NativeTraits}\n"
@@ -12660,22 +13392,18 @@ msgid ""
 "of data."
 msgstr ""
 
-#: gnu/packages/perl.scm:5869
-msgid "Mozilla's CA cert bundle in PEM format"
-msgstr ""
-
-#: gnu/packages/perl.scm:5870
+#: gnu/packages/perl.scm:7585
 msgid ""
 "@code{Mozilla::CA} provides a copy of Mozilla's bundle of\n"
 "Certificate Authority certificates in a form that can be consumed by modules\n"
 "and libraries based on OpenSSL."
 msgstr ""
 
-#: gnu/packages/perl.scm:5889
-msgid "MRO interface compatibility for Perls < 5.9.5"
+#: gnu/packages/perl.scm:7613
+msgid "Multidimensional disables multidimensional array emulation."
 msgstr ""
 
-#: gnu/packages/perl.scm:5890
+#: gnu/packages/perl.scm:7631
 msgid ""
 "The \"mro\" namespace provides several utilities for dealing\n"
 "with method resolution order and method caching in general in Perl 5.9.5 and\n"
@@ -12683,11 +13411,7 @@ msgid ""
 "Perl (back to 5.6.0)."
 msgstr ""
 
-#: gnu/packages/perl.scm:5917
-msgid "Keep imports out of your namespace"
-msgstr ""
-
-#: gnu/packages/perl.scm:5918
+#: gnu/packages/perl.scm:7658
 msgid ""
 "The namespace::autoclean pragma will remove all imported\n"
 "symbols at the end of the current package's compile cycle.  Functions called\n"
@@ -12698,11 +13422,7 @@ msgid ""
 "anything that looks like a method."
 msgstr ""
 
-#: gnu/packages/perl.scm:5944
-msgid "Keep imports and functions out of your namespace"
-msgstr ""
-
-#: gnu/packages/perl.scm:5945
+#: gnu/packages/perl.scm:7685
 msgid ""
 "The namespace::clean pragma will remove all previously\n"
 "declared or imported symbols at the end of the current package's compile\n"
@@ -12710,11 +13430,29 @@ msgid ""
 "name, but they won't show up as methods on your class or instances."
 msgstr ""
 
-#: gnu/packages/perl.scm:5972
-msgid "Internationalizing Domain Names in Applications (IDNA)"
+#: gnu/packages/perl.scm:7705
+msgid ""
+"This module is an implementation of the BGP-4 inter-domain routing protocol.\n"
+"It encapsulates all of the functionality needed to establish and maintain a\n"
+"BGP peering session and exchange routing update information with the peer.\n"
+"It aims to provide a simple API to the BGP protocol for the purposes of\n"
+"automation, logging, monitoring, testing, and similar tasks using the\n"
+"power and flexibility of perl.  The module does not implement the\n"
+"functionality of a RIB (Routing Information Base) nor does it modify the\n"
+"kernel routing table of the host system.  However, such operations could be\n"
+"implemented using the API provided by the module."
 msgstr ""
 
-#: gnu/packages/perl.scm:5974
+#: gnu/packages/perl.scm:7732
+msgid ""
+"This class provides several methods for host name resolution.  It is\n"
+"designed to be used with event loops.  Names are resolved by your system's\n"
+"native @code{getaddrinfo(3)} implementation, called in a separate thread to\n"
+"avoid blocking the entire application.  Threading overhead is limited by using\n"
+"system threads instead of Perl threads."
+msgstr ""
+
+#: gnu/packages/perl.scm:7757
 msgid ""
 "Internationalized Domain Names (IDNs) use characters drawn from a large\n"
 "repertoire (Unicode), but IDNA allows the non-ASCII characters to be\n"
@@ -12725,42 +13463,43 @@ msgid ""
 "using whatever IDNA standard is the best choice at the moment."
 msgstr ""
 
-#: gnu/packages/perl.scm:6000
-msgid "Perl client for Etsy's statsd daemon"
-msgstr ""
-
-#: gnu/packages/perl.scm:6001
+#: gnu/packages/perl.scm:7784
 msgid ""
 "This module implement a UDP client for the statsd statistics\n"
 "collector daemon in use at Etsy.com."
 msgstr ""
 
-#: gnu/packages/perl.scm:6019
-msgid "Numeric comparisons"
-msgstr ""
-
-#: gnu/packages/perl.scm:6020
+#: gnu/packages/perl.scm:7803
 msgid ""
 "Number::Compare compiles a simple comparison to an anonymous\n"
 "subroutine, which you can call with a value to be tested against."
 msgstr ""
 
-#: gnu/packages/perl.scm:6040
-msgid "Generate cryptographic signatures for objects"
+#: gnu/packages/perl.scm:7822
+msgid ""
+"@code{Number::Format} is a library for formatting numbers.\n"
+"Functions are provided for converting numbers to strings in a variety of ways,\n"
+"and to convert strings that contain numbers back into numeric form.  The\n"
+"output formats may include thousands separators - characters inserted between\n"
+"each group of three characters counting right to left from the decimal point.\n"
+"The characters used for the decimal point and the thousands separator come from\n"
+"the locale information or can be specified by the user."
+msgstr ""
+
+#: gnu/packages/perl.scm:7847
+msgid ""
+"Number::Range is an object-oriented interface to test if a\n"
+"number exists in a given range, and to be able to manipulate the range."
 msgstr ""
 
-#: gnu/packages/perl.scm:6041
+#: gnu/packages/perl.scm:7867
 msgid ""
 "Object::Signature is an abstract base class that you can\n"
 "inherit from in order to allow your objects to generate unique cryptographic\n"
 "signatures."
 msgstr ""
 
-#: gnu/packages/perl.scm:6062
-msgid "Read and write OLE storage files"
-msgstr ""
-
-#: gnu/packages/perl.scm:6063
+#: gnu/packages/perl.scm:7889
 msgid ""
 "This module allows you to read and write\n"
 "an OLE-Structured file.  @dfn{OLE} (Object Linking and Embedding) is a\n"
@@ -12768,43 +13507,33 @@ msgid ""
 "documents within a single file."
 msgstr ""
 
-#: gnu/packages/perl.scm:6086
-msgid "Anonymous packages"
+#: gnu/packages/perl.scm:7949
+msgid ""
+"The package provides Perl bindings to OpenGL, GLU\n"
+"and FreeGLUT."
 msgstr ""
 
-#: gnu/packages/perl.scm:6087
+#: gnu/packages/perl.scm:7971
 msgid ""
 "This module allows for anonymous packages that are\n"
 "independent of the main namespace and only available through an object\n"
 "instance, not by name."
 msgstr ""
 
-#: gnu/packages/perl.scm:6115
-msgid "Manage deprecation warnings for your distribution"
-msgstr ""
-
-#: gnu/packages/perl.scm:6116
+#: gnu/packages/perl.scm:8000
 msgid ""
 "This module allows you to manage a set of deprecations for\n"
 "one or more modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:6143
-msgid "Routines for manipulating stashes"
-msgstr ""
-
-#: gnu/packages/perl.scm:6144
+#: gnu/packages/perl.scm:8027
 msgid ""
 "Manipulating stashes (Perl's symbol tables) is occasionally\n"
 "necessary, but incredibly messy, and easy to get wrong.  This module hides all\n"
 "of that behind a simple API."
 msgstr ""
 
-#: gnu/packages/perl.scm:6167
-msgid "Faster implementation of the Package::Stash API"
-msgstr ""
-
-#: gnu/packages/perl.scm:6168
+#: gnu/packages/perl.scm:8050
 msgid ""
 "This is a backend for Package::Stash, which provides the\n"
 "functionality in a way that's less buggy and much faster.  It will be used by\n"
@@ -12812,11 +13541,7 @@ msgid ""
 "compiler."
 msgstr ""
 
-#: gnu/packages/perl.scm:6188
-msgid "Play with other peoples' lexical variables"
-msgstr ""
-
-#: gnu/packages/perl.scm:6189
+#: gnu/packages/perl.scm:8070
 msgid ""
 "PadWalker is a module which allows you to inspect (and even\n"
 "change) lexical variables in any subroutine which called you.  It will only\n"
@@ -12824,42 +13549,40 @@ msgid ""
 "is particularly useful for debugging."
 msgstr ""
 
-#: gnu/packages/perl.scm:6213
-msgid "Simple parallel processing fork manager"
-msgstr ""
-
-#: gnu/packages/perl.scm:6214
+#: gnu/packages/perl.scm:8095
 msgid ""
 "@code{Parallel::ForkManager} is intended for use in\n"
 "operations that can be done in parallel where the number of\n"
 "processes to be forked off should be limited."
 msgstr ""
 
-#: gnu/packages/perl.scm:6234
-msgid "Simple, compact and correct param-checking functions"
+#: gnu/packages/perl.scm:8122
+msgid ""
+"This module provides various type-testing functions.\n"
+"These are intended for functions that care what type of data they are\n"
+"operating on.  There are two flavours of function.  Functions of the\n"
+"first flavour provide type classification only.  Functions of the\n"
+"second flavour also check that an argument is of an expected type.\n"
+"The type enforcement functions handle only the simplest requirements\n"
+"for arguments of the types handled by the classification functions.\n"
+"Enforcement of more complex types may be built using the\n"
+"classification functions, or it may be more convenient to use a module\n"
+"designed for the more complex job, such as @code{Params::Validate}"
 msgstr ""
 
-#: gnu/packages/perl.scm:6236
+#: gnu/packages/perl.scm:8151
 msgid ""
 "Params::Util provides a basic set of importable functions that makes\n"
 "checking parameters easier."
 msgstr ""
 
-#: gnu/packages/perl.scm:6260
-msgid "Validate method/function parameters"
-msgstr ""
-
-#: gnu/packages/perl.scm:6261
+#: gnu/packages/perl.scm:8176
 msgid ""
 "The Params::Validate module allows you to validate method or\n"
 "function call parameters to an arbitrary level of specificity."
 msgstr ""
 
-#: gnu/packages/perl.scm:6287
-msgid "Build an optimized subroutine parameter validator"
-msgstr ""
-
-#: gnu/packages/perl.scm:6288
+#: gnu/packages/perl.scm:8204
 msgid ""
 "This module creates a customized, highly efficient\n"
 "parameter checking subroutine.  It can handle named or positional\n"
@@ -12868,79 +13591,67 @@ msgid ""
 "defaults, optional parameters, and extra \"slurpy\" parameters."
 msgstr ""
 
-#: gnu/packages/perl.scm:6309
-msgid "Create and manipulate PAR distributions"
-msgstr ""
-
-#: gnu/packages/perl.scm:6310
+#: gnu/packages/perl.scm:8226
 msgid ""
 "PAR::Dist is a toolkit to create and manipulate PAR\n"
 "distributions."
 msgstr ""
 
-#: gnu/packages/perl.scm:6329
-msgid ""
-"Allows you to both load one or more modules, while setting\n"
-"up inheritance from those modules at the same time."
-msgstr ""
-
-#: gnu/packages/perl.scm:6348
-msgid "Path specification manipulation"
-msgstr ""
-
-#: gnu/packages/perl.scm:6349
+#: gnu/packages/perl.scm:8249
 msgid ""
 "Path::Class is a module for manipulation of file and\n"
 "directory specifications in a cross-platform manner."
 msgstr ""
 
-#: gnu/packages/perl.scm:6373
-msgid "File path utility"
+#: gnu/packages/perl.scm:8280
+msgid ""
+"This package provides functions to work with directory and\n"
+"file names."
 msgstr ""
 
-#: gnu/packages/perl.scm:6374
+#: gnu/packages/perl.scm:8305
 msgid ""
 "This module provides a small, fast utility for working\n"
 "with file paths."
 msgstr ""
 
-#: gnu/packages/perl.scm:6395
-msgid "Fast and correct UTF-8 IO"
+#: gnu/packages/perl.scm:8329
+msgid ""
+"This Perl module facilitates the creation and modification\n"
+"of PDF files."
 msgstr ""
 
-#: gnu/packages/perl.scm:6396
+#: gnu/packages/perl.scm:8351
 msgid ""
 "@code{PerlIO::utf8_strict} provides a fast and correct UTF-8\n"
 "PerlIO layer.  Unlike Perl's default @code{:utf8} layer it checks the input\n"
 "for correctness."
 msgstr ""
 
-#: gnu/packages/perl.scm:6417
-msgid "Check for comprehensive documentation of a module"
+#: gnu/packages/perl.scm:8375
+msgid ""
+"Pegex is an Acmeist parser framework.  It allows you to easily\n"
+"create parsers that will work equivalently in lots of programming languages.\n"
+"The inspiration for Pegex comes from the parsing engine upon which the\n"
+"postmodern programming language Perl 6 is based on.  Pegex brings this beauty\n"
+"to the other justmodern languages that have a normal regular expression engine\n"
+"available."
 msgstr ""
 
-#: gnu/packages/perl.scm:6418
+#: gnu/packages/perl.scm:8400
 msgid ""
 "This module provides a mechanism for determining if the pod\n"
 "for a given module is comprehensive."
 msgstr ""
 
-#: gnu/packages/perl.scm:6435
-msgid "Parsing library for text in Pod format"
-msgstr ""
-
-#: gnu/packages/perl.scm:6436
+#: gnu/packages/perl.scm:8418
 msgid ""
-"Pod::Simple is a Perl library for parsing text in\n"
-"the Pod (plain old documentation) markup language that is typically\n"
+"@code{Pod::Simple} is a Perl library for parsing text in\n"
+"the @dfn{Pod} (plain old documentation) markup language that is typically\n"
 "used for writing documentation for Perl and for Perl modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:6457
-msgid "GNU C library compatible strftime for loggers and servers"
-msgstr ""
-
-#: gnu/packages/perl.scm:6458
+#: gnu/packages/perl.scm:8440
 msgid ""
 "POSIX::strftime::Compiler provides GNU C library compatible\n"
 "strftime(3).  But this module is not affected by the system locale.  This\n"
@@ -12948,32 +13659,26 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/perl.scm:6476
-msgid "Information about the currently running perl"
+#: gnu/packages/perl.scm:8473
+msgid ""
+"The PPI module parses, analyzes and manipulates Perl\n"
+"code."
 msgstr ""
 
-#: gnu/packages/perl.scm:6478
+#: gnu/packages/perl.scm:8491
 msgid ""
 "Probe::Perl provides methods for obtaining information about the\n"
 "currently running perl interpreter.  It originally began life as code in the\n"
 "Module::Build project, but has been externalized here for general use."
 msgstr ""
 
-#: gnu/packages/perl.scm:6506
-msgid "Interface to external editor from Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:6507
+#: gnu/packages/perl.scm:8519
 msgid ""
 "This module provides the ability to supply some text to an\n"
 "external text editor, have it edited by the user, and retrieve the results."
 msgstr ""
 
-#: gnu/packages/perl.scm:6526
-msgid "Create read-only scalars, arrays, hashes"
-msgstr ""
-
-#: gnu/packages/perl.scm:6527
+#: gnu/packages/perl.scm:8539
 msgid ""
 "This module provides a facility for creating non-modifiable\n"
 "variables in Perl.  This is useful for configuration files, headers, etc.  It\n"
@@ -12981,11 +13686,7 @@ msgid ""
 "variables that should not be changed."
 msgstr ""
 
-#: gnu/packages/perl.scm:6547
-msgid "XS implementation for Ref::Util"
-msgstr ""
-
-#: gnu/packages/perl.scm:6548
+#: gnu/packages/perl.scm:8560
 msgid ""
 "@code{Ref::Util::XS} is the XS implementation of\n"
 "@code{Ref::Util}, which provides several functions to help identify references\n"
@@ -12993,13 +13694,9 @@ msgid ""
 "of @code{ref}."
 msgstr ""
 
-#: gnu/packages/perl.scm:6566
-msgid "Provide commonly requested regular expressions"
-msgstr ""
-
-#: gnu/packages/perl.scm:6568
+#: gnu/packages/perl.scm:8580
 msgid ""
-"This module exports a single hash (`%RE') that stores or generates\n"
+"This module exports a single hash (@code{%RE}) that stores or generates\n"
 "commonly needed regular expressions.  Patterns currently provided include:\n"
 "balanced parentheses and brackets, delimited text (with escapes), integers and\n"
 "floating-point numbers in any base (up to 36), comments in 44 languages,\n"
@@ -13007,11 +13704,7 @@ msgid ""
 "codes."
 msgstr ""
 
-#: gnu/packages/perl.scm:6593
-msgid "Selection of general-utility regexp subroutines"
-msgstr ""
-
-#: gnu/packages/perl.scm:6594
+#: gnu/packages/perl.scm:8605
 msgid ""
 "This package provides a selection of regular expression\n"
 "subroutines including @code{is_regexp}, @code{regexp_seen_evals},\n"
@@ -13019,29 +13712,30 @@ msgid ""
 "and @code{deserialize_regexp}."
 msgstr ""
 
-#: gnu/packages/perl.scm:6619
-msgid "Roles, as a slice of Moose"
-msgstr ""
-
-#: gnu/packages/perl.scm:6620
+#: gnu/packages/perl.scm:8631
 msgid "Role::Tiny is a minimalist role composition tool."
 msgstr ""
 
-#: gnu/packages/perl.scm:6637
-msgid "Call isa, can, does, and DOES safely"
-msgstr ""
-
-#: gnu/packages/perl.scm:6638
+#: gnu/packages/perl.scm:8662
 msgid ""
 "This module allows you to call isa, can, does, and DOES\n"
 "safely on things that may not be objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:6656
-msgid "Lexically-scoped resource management"
+#: gnu/packages/perl.scm:8686
+msgid ""
+"@code{Scalar::String} is about the string part of\n"
+"plain Perl scalars.  A scalar has a string value, which is notionally\n"
+"a sequence of Unicode codepoints but may be internally encoded in\n"
+"either ISO-8859-1 or UTF-8.  In places, more so in older versions of\n"
+"Perl, the internal encoding shows through.  To fully understand Perl\n"
+"strings it is necessary to understand these implementation details.\n"
+"This module provides functions to classify a string by encoding and to\n"
+"encode a string in a desired way.  The module is implemented in XS,\n"
+"with a pure Perl backup version for systems that cannot handle XS."
 msgstr ""
 
-#: gnu/packages/perl.scm:6657
+#: gnu/packages/perl.scm:8712
 msgid ""
 "This module provides a convenient way to perform cleanup or\n"
 "other forms of resource management at the end of a scope.  It is particularly\n"
@@ -13052,29 +13746,23 @@ msgid ""
 "collector."
 msgstr ""
 
-#: gnu/packages/perl.scm:6680
-msgid "Infinite sets"
-msgstr ""
-
-#: gnu/packages/perl.scm:6681
+#: gnu/packages/perl.scm:8736
 msgid "Set::Infinite is a set theory module for infinite sets."
 msgstr ""
 
-#: gnu/packages/perl.scm:6701
-msgid "Unordered collections of Perl Objects"
+#: gnu/packages/perl.scm:8754
+msgid ""
+"@code{Set::IntSpan} manages sets of integers.  It is\n"
+"optimized for sets that have long runs of consecutive integers."
 msgstr ""
 
-#: gnu/packages/perl.scm:6702
+#: gnu/packages/perl.scm:8775
 msgid ""
 "Set::Object provides efficient sets, unordered collections\n"
 "of Perl objects without duplicates for scalars and references."
 msgstr ""
 
-#: gnu/packages/perl.scm:6720
-msgid "Set operations for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:6721
+#: gnu/packages/perl.scm:8794
 msgid ""
 "The first priority of Set::Scalar is to be a convenient\n"
 "interface to sets (as in: unordered collections of Perl scalars).  While not\n"
@@ -13082,21 +13770,13 @@ msgid ""
 "compact."
 msgstr ""
 
-#: gnu/packages/perl.scm:6741
-msgid "Sort arrays by one or multiple calculated keys"
-msgstr ""
-
-#: gnu/packages/perl.scm:6742
+#: gnu/packages/perl.scm:8815
 msgid ""
 "This Perl module provides various functions to quickly sort\n"
 "arrays by one or multiple calculated keys."
 msgstr ""
 
-#: gnu/packages/perl.scm:6760
-msgid "Sort lexically, but sort numeral parts numerically"
-msgstr ""
-
-#: gnu/packages/perl.scm:6761
+#: gnu/packages/perl.scm:8834
 msgid ""
 "This module exports two functions, @code{nsort} and\n"
 "@code{ncmp}; they are used in implementing a \"natural sorting\" algorithm.\n"
@@ -13104,11 +13784,7 @@ msgid ""
 "word-characters are compared lexically."
 msgstr ""
 
-#: gnu/packages/perl.scm:6789
-msgid "Classes for representing type constraints and coercion"
-msgstr ""
-
-#: gnu/packages/perl.scm:6790
+#: gnu/packages/perl.scm:8863
 msgid ""
 "The Specio distribution provides classes for representing type\n"
 "constraints and coercion, along with syntax sugar for declaring them.  Note that\n"
@@ -13119,11 +13795,7 @@ msgid ""
 "coerce values to that type."
 msgstr ""
 
-#: gnu/packages/perl.scm:6813
-msgid "Spiffy Perl Interface Framework For You"
-msgstr ""
-
-#: gnu/packages/perl.scm:6814
+#: gnu/packages/perl.scm:8887
 msgid ""
 "Spiffy is a framework and methodology for doing object\n"
 "oriented (OO) programming in Perl.  Spiffy combines the best parts of\n"
@@ -13133,11 +13805,33 @@ msgid ""
 "other OO languages like Python, Ruby, Java and Perl 6."
 msgstr ""
 
-#: gnu/packages/perl.scm:6836
-msgid "Temporary buffer to save bytes"
+#: gnu/packages/perl.scm:8910
+msgid ""
+"This module generalises the mechanism of the\n"
+"@code{wantarray} function, allowing a function to determine in some detail how\n"
+"its return value is going to be immediately used."
+msgstr ""
+
+#: gnu/packages/perl.scm:8932
+msgid ""
+"This module provides a collection of named blocks that allow\n"
+"a return statement to return different values depending on the context in\n"
+"which it is called."
+msgstr ""
+
+#: gnu/packages/perl.scm:8954
+msgid ""
+"This package provides basic statistics functions like\n"
+"@code{median()}, @code{mean()}, @code{variance()} and @code{stddev()}."
 msgstr ""
 
-#: gnu/packages/perl.scm:6837
+#: gnu/packages/perl.scm:8980
+msgid ""
+"This package provides the Statistics::PCA module, an\n"
+"implementation of @dfn{Principal Component Analysis} (PCA)."
+msgstr ""
+
+#: gnu/packages/perl.scm:8999
 msgid ""
 "Stream::Buffered is a buffer class to store arbitrary length\n"
 "of byte strings and then get a seekable filehandle once everything is\n"
@@ -13145,62 +13839,60 @@ msgid ""
 "on the length of the size."
 msgstr ""
 
-#: gnu/packages/perl.scm:6857
-msgid "Turn on strict and make all warnings fatal"
-msgstr ""
-
-#: gnu/packages/perl.scm:6858
+#: gnu/packages/perl.scm:9020
 msgid ""
 "Strictures turns on strict and make all warnings fatal when\n"
 "run from within a source-controlled directory."
 msgstr ""
 
-#: gnu/packages/perl.scm:6886
-msgid "Camelcase and de-camelcase"
-msgstr ""
-
-#: gnu/packages/perl.scm:6887
+#: gnu/packages/perl.scm:9061
 msgid ""
 "This module may be used to convert from under_score text to\n"
 "CamelCase and back again."
 msgstr ""
 
-#: gnu/packages/perl.scm:6907
-msgid "Rewrite strings based on a set of known prefixes"
+#: gnu/packages/perl.scm:9081
+msgid ""
+"This module provides a flexible calling interface to some\n"
+"frequently-performed string conversion functions, including applying and\n"
+"expanding standard C/Unix-style backslash escapes like \n"
+" and \t, wrapping and\n"
+"removing double-quotes, and truncating to fit within a desired length."
 msgstr ""
 
-#: gnu/packages/perl.scm:6908
+#: gnu/packages/perl.scm:9108
+msgid ""
+"@code{String::Formatter} is a tool for building sprintf-like formatting\n"
+"routines.  It supports named or positional formatting, custom conversions,\n"
+"fixed string interpolation, and simple width-matching."
+msgstr ""
+
+#: gnu/packages/perl.scm:9130
 msgid ""
 "This module allows you to rewrite strings based on a set of\n"
 "known prefixes."
 msgstr ""
 
-#: gnu/packages/perl.scm:6927
-msgid "String printing alternatives to printf"
+#: gnu/packages/perl.scm:9152
+msgid ""
+"@code{shell-quote} lets you pass arbitrary strings through the shell so\n"
+"that they won't be changed."
 msgstr ""
 
-#: gnu/packages/perl.scm:6929
+#: gnu/packages/perl.scm:9173
 msgid ""
 "This module inserts values into (translated) strings.  It provides\n"
 "@code{printf} and @code{sprintf} alternatives via both an object-oriented and\n"
 "a functional interface."
 msgstr ""
 
-#: gnu/packages/perl.scm:6952
-msgid "Sophisticated exporter for custom-built routines"
-msgstr ""
-
-#: gnu/packages/perl.scm:6954
+#: gnu/packages/perl.scm:9198
 msgid ""
 "Sub::Exporter provides a sophisticated alternative to Exporter.pm for\n"
 "custom-built routines."
 msgstr ""
 
-#: gnu/packages/perl.scm:6973
-msgid "Only use Sub::Exporter if you need it"
-msgstr ""
-
-#: gnu/packages/perl.scm:6974
+#: gnu/packages/perl.scm:9218
 msgid ""
 "Sub::Exporter is an incredibly powerful module, but with\n"
 "that power comes great responsibility, as well as some runtime penalties.\n"
@@ -13210,64 +13902,55 @@ msgid ""
 "renaming exports, if they try to use them."
 msgstr ""
 
-#: gnu/packages/perl.scm:6996
-msgid "Retrieve names of code references"
-msgstr ""
-
-#: gnu/packages/perl.scm:6997
+#: gnu/packages/perl.scm:9241
 msgid ""
 "Sub::Identify allows you to retrieve the real name of code\n"
 "references."
 msgstr ""
 
-#: gnu/packages/perl.scm:7017
-msgid "Tool to inspect subroutines"
-msgstr ""
-
-#: gnu/packages/perl.scm:7018
+#: gnu/packages/perl.scm:9262
 msgid ""
 "This package provides tools for inspecting subroutines\n"
 "in Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:7037
-msgid "Install subroutines into packages easily"
-msgstr ""
-
-#: gnu/packages/perl.scm:7039
+#: gnu/packages/perl.scm:9283
 msgid ""
 "Sub::Install makes it easy to install subroutines into packages without\n"
 "the unsightly mess of C<no strict> or typeglobs lying about where just anyone\n"
 "can see them."
 msgstr ""
 
-#: gnu/packages/perl.scm:7060
-msgid "(Re)name a sub"
-msgstr ""
-
-#: gnu/packages/perl.scm:7061
+#: gnu/packages/perl.scm:9305
 msgid ""
 "Assigns a new name to referenced sub.  If package\n"
 "specification is omitted in the name, then the current package is used.  The\n"
 "return value is the sub."
 msgstr ""
 
-#: gnu/packages/perl.scm:7080
-msgid "Apparently run a function in a higher stack frame"
+#: gnu/packages/perl.scm:9329
+msgid ""
+"Sub::Quote provides an efficient generation of subroutines\n"
+"via string eval."
 msgstr ""
 
-#: gnu/packages/perl.scm:7081
+#: gnu/packages/perl.scm:9348
 msgid ""
 "Like Tcl's uplevel() function, but not quite so dangerous.\n"
 "The idea is just to fool caller().  All the really naughty bits of Tcl's\n"
 "uplevel() are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:7100
-msgid "Perl extension for generating SVG documents"
+#: gnu/packages/perl.scm:9372
+msgid ""
+"When subclassing a class, you may occasionally want to dispatch control to\n"
+"the superclass---at least conditionally and temporarily.  This module provides\n"
+"nicer equivalents to the native Perl syntax for calling superclasses, along with\n"
+"a universal @code{super} method to determine a class' own superclass, and better\n"
+"support for run-time mix-ins and roles."
 msgstr ""
 
-#: gnu/packages/perl.scm:7101
+#: gnu/packages/perl.scm:9393
 msgid ""
 "SVG is a Perl module which generates a nested data structure\n"
 "containing the DOM representation of an SVG (Scalable Vector Graphics) image.\n"
@@ -13276,42 +13959,33 @@ msgid ""
 "animation content."
 msgstr ""
 
-#: gnu/packages/perl.scm:7122
-msgid "Switch statement for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:7123
+#: gnu/packages/perl.scm:9415
 msgid ""
 "Switch is a Perl module which implements a generalized case\n"
 "mechanism.  The module augments the standard Perl syntax with two new\n"
 "statements: @code{switch} and @code{case}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7169
-msgid "Perl extension for getting CPU information"
-msgstr ""
-
-#: gnu/packages/perl.scm:7171
+#: gnu/packages/perl.scm:9464
 msgid ""
 "Sys::CPU is a module for counting the number of CPUs on a system, and\n"
 "determining their type and clock speed."
 msgstr ""
 
-#: gnu/packages/perl.scm:7192
-msgid "Get full hostname in Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:7193
+#: gnu/packages/perl.scm:9485
 msgid ""
 "Sys::Hostname::Long tries very hard to get the full hostname\n"
 "of a system."
 msgstr ""
 
-#: gnu/packages/perl.scm:7220
-msgid "Ensure that a platform has weaken support"
+#: gnu/packages/perl.scm:9506
+msgid ""
+"Sys::Syscall allows one to use epoll and sendfile system calls from\n"
+"Perl.  Support is mostly Linux-only for now, but other syscalls/OSes are\n"
+"planned for the future."
 msgstr ""
 
-#: gnu/packages/perl.scm:7221
+#: gnu/packages/perl.scm:9535
 msgid ""
 "One recurring problem in modules that use Scalar::Util's\n"
 "weaken function is that it is not present in the pure-perl variant.  If\n"
@@ -13321,11 +13995,7 @@ msgid ""
 "error encouraging the user to seek support."
 msgstr ""
 
-#: gnu/packages/perl.scm:7246
-msgid "Template processing system for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:7247
+#: gnu/packages/perl.scm:9561
 msgid ""
 "The Template Toolkit is a collection of modules which\n"
 "implement an extensible template processing system.  It was originally\n"
@@ -13334,42 +14004,36 @@ msgid ""
 "documents: HTML, XML, POD, PostScript, LaTeX, and so on."
 msgstr ""
 
-#: gnu/packages/perl.scm:7270
-msgid "Profiling for Template Toolkit"
-msgstr ""
-
-#: gnu/packages/perl.scm:7271
+#: gnu/packages/perl.scm:9585
 msgid ""
 "Template::Timer provides inline profiling of the template\n"
 "processing in Perl code."
 msgstr ""
 
-#: gnu/packages/perl.scm:7291
-msgid "Detect encoding of the current terminal"
+#: gnu/packages/perl.scm:9607
+msgid ""
+"@code{Template::Tiny} is a reimplementation of a subset of the\n"
+"functionality from Template Toolkit in as few lines of code as possible.\n"
+"\n"
+"It is intended for use in light-usage, low-memory, or low-cpu templating\n"
+"situations, where you may need to upgrade to the full feature set in the\n"
+"future, or if you want the retain the familiarity of TT-style templates."
 msgstr ""
 
-#: gnu/packages/perl.scm:7292
+#: gnu/packages/perl.scm:9632
 msgid ""
 "Term::Encoding is a simple module to detect the encoding of\n"
 "the current terminal expects in various ways."
 msgstr ""
 
-#: gnu/packages/perl.scm:7316
-msgid "Progress meter on a standard terminal"
-msgstr ""
-
-#: gnu/packages/perl.scm:7317
+#: gnu/packages/perl.scm:9657
 msgid ""
 "Term::ProgressBar provides a simple progress bar on the\n"
 "terminal, to let the user know that something is happening, roughly how much\n"
 "stuff has been done, and maybe an estimate at how long remains."
 msgstr ""
 
-#: gnu/packages/perl.scm:7340
-msgid "Progress meter if run interactively"
-msgstr ""
-
-#: gnu/packages/perl.scm:7341
+#: gnu/packages/perl.scm:9681
 msgid ""
 "Term::ProgressBar is a wonderful module for showing progress\n"
 "bars on the terminal.  This module acts very much like that module when it is\n"
@@ -13377,21 +14041,13 @@ msgid ""
 "a cron job) then it does not show the progress bar."
 msgstr ""
 
-#: gnu/packages/perl.scm:7363
-msgid "Simple progress bars"
-msgstr ""
-
-#: gnu/packages/perl.scm:7364
+#: gnu/packages/perl.scm:9704
 msgid ""
 "Term::ProgressBar::Simple tells you how much work has been\n"
 "done, how much is left to do, and estimate how long it will take."
 msgstr ""
 
-#: gnu/packages/perl.scm:7382
-msgid "Simple terminal control"
-msgstr ""
-
-#: gnu/packages/perl.scm:7383
+#: gnu/packages/perl.scm:9723
 msgid ""
 "This module, ReadKey, provides ioctl control for terminals\n"
 "so the input modes can be changed (thus allowing reads of a single character\n"
@@ -13400,11 +14056,15 @@ msgid ""
 "screen size, and retrieval/modification of the control characters."
 msgstr ""
 
-#: gnu/packages/perl.scm:7408
-msgid "Retrieve terminal size"
+#: gnu/packages/perl.scm:9762
+msgid ""
+"This module implements an interface to the GNU Readline\n"
+"library.  It gives you input line editing facilities, input history management\n"
+"facilities, completion facilities, etc.  Term::ReadLine::Gnu is upwards\n"
+"compatible with Term::ReadLine."
 msgstr ""
 
-#: gnu/packages/perl.scm:7409
+#: gnu/packages/perl.scm:9787
 msgid ""
 "This is a unified interface to retrieve terminal size.  It\n"
 "loads one module of a list of known alternatives, each implementing some way\n"
@@ -13412,62 +14072,38 @@ msgid ""
 "the job on behalf of @code{Term::Size::Any}."
 msgstr ""
 
-#: gnu/packages/perl.scm:7429
-msgid "Perl extension for retrieving terminal size (Perl version)"
-msgstr ""
-
-#: gnu/packages/perl.scm:7430
+#: gnu/packages/perl.scm:9807
 msgid ""
 "This is yet another implementation of @code{Term::Size}.\n"
 "Now in pure Perl, with the exception of a C probe run at build time."
 msgstr ""
 
-#: gnu/packages/perl.scm:7450
-msgid "Format a header and rows into a table"
-msgstr ""
-
-#: gnu/packages/perl.scm:7451
+#: gnu/packages/perl.scm:9828
 msgid ""
 "This module is able to generically format rows of data\n"
 "into tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:7470
-msgid "Align text"
-msgstr ""
-
-#: gnu/packages/perl.scm:7471
+#: gnu/packages/perl.scm:9847
 msgid ""
 "Text::Aligner exports a single function, align(), which is\n"
 "used to justify strings to various alignment styles."
 msgstr ""
 
-#: gnu/packages/perl.scm:7489
-msgid "Extract delimited text sequences from strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:7490
+#: gnu/packages/perl.scm:9866
 msgid ""
 "The Text::Balanced module can be used to extract delimited\n"
 "text sequences from strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:7508
-msgid "Manipulate comma-separated values"
-msgstr ""
-
-#: gnu/packages/perl.scm:7509
+#: gnu/packages/perl.scm:9884
 msgid ""
 "Text::CSV provides facilities for the composition and\n"
 "decomposition of comma-separated values.  An instance of the Text::CSV class\n"
 "can combine fields into a CSV string and parse a CSV string into fields."
 msgstr ""
 
-#: gnu/packages/perl.scm:7528
-msgid "Rountines for manipulating CSV files"
-msgstr ""
-
-#: gnu/packages/perl.scm:7529
+#: gnu/packages/perl.scm:9903
 msgid ""
 "@code{Text::CSV_XS} provides facilities for the composition\n"
 "and decomposition of comma-separated values.  An instance of the\n"
@@ -13477,11 +14113,7 @@ msgid ""
 "and escapes."
 msgstr ""
 
-#: gnu/packages/perl.scm:7553
-msgid "Perform diffs on files and record sets"
-msgstr ""
-
-#: gnu/packages/perl.scm:7554
+#: gnu/packages/perl.scm:9928
 msgid ""
 "Text::Diff provides a basic set of services akin to the GNU\n"
 "diff utility.  It is not anywhere near as feature complete as GNU diff, but it\n"
@@ -13490,33 +14122,41 @@ msgid ""
 "generally slower on larger files."
 msgstr ""
 
-#: gnu/packages/perl.scm:7576
-msgid "Match globbing patterns against text"
+#: gnu/packages/perl.scm:9954
+msgid ""
+"This package provides functions to format text in various\n"
+"ways like centering, paragraphing, and converting tabs to spaces and spaces\n"
+"to tabs."
 msgstr ""
 
-#: gnu/packages/perl.scm:7577
+#: gnu/packages/perl.scm:9975
 msgid ""
 "Text::Glob implements glob(3) style matching that can be\n"
 "used to match against text, rather than fetching names from a file system.  If\n"
 "you want to do full file globbing use the File::Glob module instead."
 msgstr ""
 
-#: gnu/packages/perl.scm:7600
-msgid "Fast, middleweight template engine"
+#: gnu/packages/perl.scm:10000
+msgid ""
+"Text::Haml implements Haml\n"
+"@url{http://haml.info/docs/yardoc/file.REFERENCE.html} specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:7602
+#: gnu/packages/perl.scm:10024
 msgid ""
 "Text::NeatTemplate provides a simple, middleweight but fast\n"
 "template engine, for when you need speed rather than complex features,\n"
 "yet need more features than simple variable substitution."
 msgstr ""
 
-#: gnu/packages/perl.scm:7621
-msgid "Convert between Roman and Arabic algorisms"
+#: gnu/packages/perl.scm:10045
+msgid ""
+"Text::Patch combines source text with given\n"
+"diff (difference) data.  Diff data is produced by Text::Diff module or\n"
+"by the standard @code{diff} utility."
 msgstr ""
 
-#: gnu/packages/perl.scm:7622
+#: gnu/packages/perl.scm:10065
 msgid ""
 "This package provides functions to convert between Roman and\n"
 "Arabic algorisms.  It supports both conventional Roman algorisms (which range\n"
@@ -13524,27 +14164,15 @@ msgid ""
 "algorism to indicate multiplication by 1000."
 msgstr ""
 
-#: gnu/packages/perl.scm:7642
-msgid "Simple ASCII tables"
-msgstr ""
-
-#: gnu/packages/perl.scm:7643
+#: gnu/packages/perl.scm:10085
 msgid "Text::SimpleTable draws simple ASCII tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:7664
-msgid "Organize Data in Tables"
-msgstr ""
-
-#: gnu/packages/perl.scm:7665
+#: gnu/packages/perl.scm:10107
 msgid "Text::Table renders plaintext tables."
 msgstr ""
 
-#: gnu/packages/perl.scm:7686
-msgid "Expand template text with embedded Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:7688
+#: gnu/packages/perl.scm:10133
 msgid ""
 "This is a library for generating letters, building HTML pages, or\n"
 "filling in templates generally.  A template is a piece of text that has little\n"
@@ -13552,11 +14180,7 @@ msgid ""
 "evaluate the little programs and replace them with their values."
 msgstr ""
 
-#: gnu/packages/perl.scm:7708
-msgid "Provide plain ASCII transliterations of Unicode text"
-msgstr ""
-
-#: gnu/packages/perl.scm:7709
+#: gnu/packages/perl.scm:10153
 msgid ""
 "Text::Unidecode provides a function, unidecode(...) that\n"
 "takes Unicode data and tries to represent it in US-ASCII characters (i.e., the\n"
@@ -13566,21 +14190,17 @@ msgid ""
 "system."
 msgstr ""
 
-#: gnu/packages/perl.scm:7737
-msgid "Role for classes that can be thrown"
+#: gnu/packages/perl.scm:10175
+msgid "This module exposes interpreter threads to the Perl level."
 msgstr ""
 
-#: gnu/packages/perl.scm:7738
+#: gnu/packages/perl.scm:10199
 msgid ""
 "Throwable is a role for classes that are meant to be thrown\n"
 "as exceptions to standard program flow."
 msgstr ""
 
-#: gnu/packages/perl.scm:7755
-msgid "Perl script tidier"
-msgstr ""
-
-#: gnu/packages/perl.scm:7756
+#: gnu/packages/perl.scm:10217
 msgid ""
 "This package contains a Perl script which indents and\n"
 "reformats Perl scripts to make them easier to read.   The formatting can be\n"
@@ -13588,21 +14208,13 @@ msgid ""
 "approximately follow the suggestions in the Perl Style Guide."
 msgstr ""
 
-#: gnu/packages/perl.scm:7776
-msgid "Cycle through a list of values"
-msgstr ""
-
-#: gnu/packages/perl.scm:7777
+#: gnu/packages/perl.scm:10238
 msgid ""
 "You use @code{Tie::Cycle} to go through a list over and over\n"
 "again.  Once you get to the end of the list, you go back to the beginning."
 msgstr ""
 
-#: gnu/packages/perl.scm:7796
-msgid "Ordered associative arrays for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:7797
+#: gnu/packages/perl.scm:10258
 msgid ""
 "This Perl module implements Perl hashes that preserve the\n"
 "order in which the hash elements were added.  The order is not affected when\n"
@@ -13611,42 +14223,51 @@ msgid ""
 "operations can also be performed on the IxHash."
 msgstr ""
 
-#: gnu/packages/perl.scm:7820
-msgid "Tie to an existing Perl object"
+#: gnu/packages/perl.scm:10283
+msgid ""
+"This modules provides a file handle that hides the beginning of a file,\n"
+"by modifying the @code{seek()} and @code{tell()} calls."
+msgstr ""
+
+#: gnu/packages/perl.scm:10302
+msgid ""
+"This module adds the ability to quickly create new types of tie objects\n"
+"without creating a complete class.  It does so in such a way as to try and\n"
+"make the programmers life easier when it comes to single-use ties that I find\n"
+"myself wanting to use from time-to-time.\n"
+"\n"
+"The Tie::Simple package is actually a front-end to other classes which really\n"
+"do all the work once tied, but this package does the dwimming to automatically\n"
+"figure out what you're trying to do."
 msgstr ""
 
-#: gnu/packages/perl.scm:7821
+#: gnu/packages/perl.scm:10329
 msgid ""
 "This class provides a tie constructor that returns the\n"
 "object it was given as it's first argument.  This way side effects of calling\n"
 "$object->TIEHASH are avoided."
 msgstr ""
 
-#: gnu/packages/perl.scm:7844
-msgid "English expression of durations"
-msgstr ""
-
-#: gnu/packages/perl.scm:7845
+#: gnu/packages/perl.scm:10352
 msgid ""
 "This module provides functions for expressing durations in\n"
 "rounded or exact terms."
 msgstr ""
 
-#: gnu/packages/perl.scm:7867
-msgid "Parse time duration strings"
-msgstr ""
-
-#: gnu/packages/perl.scm:7868
+#: gnu/packages/perl.scm:10374
 msgid ""
 "Time::Duration::Parse is a module to parse human readable\n"
 "duration strings like \"2 minutes\" and \"3 seconds\" to seconds."
 msgstr ""
 
-#: gnu/packages/perl.scm:7886
-msgid "Efficiently compute time from local and GMT time"
+#: gnu/packages/perl.scm:10393
+msgid ""
+"This package implements @code{usleep}, @code{ualarm}, and\n"
+"@code{gettimeofday} for Perl, as well as wrappers to implement @code{time},\n"
+"@code{sleep}, and @code{alarm} that know about non-integral seconds."
 msgstr ""
 
-#: gnu/packages/perl.scm:7887
+#: gnu/packages/perl.scm:10413
 msgid ""
 "This module provides functions that are the inverse of\n"
 "built-in perl functions localtime() and gmtime().  They accept a date as a\n"
@@ -13654,62 +14275,46 @@ msgid ""
 "the system epoch."
 msgstr ""
 
-#: gnu/packages/perl.scm:7907
-msgid "Date parsing/formatting subroutines"
+#: gnu/packages/perl.scm:10435
+msgid ""
+"This module replaces the standard @code{localtime} and @code{gmtime}\n"
+"functions with implementations that return objects.  It does so in a\n"
+"backwards-compatible manner, so that using these functions as documented will\n"
+"still work as expected."
 msgstr ""
 
-#: gnu/packages/perl.scm:7908
+#: gnu/packages/perl.scm:10455
 msgid ""
 "This module provides routines for parsing date string into\n"
 "time values and formatting dates into ASCII strings."
 msgstr ""
 
-#: gnu/packages/perl.scm:7930
-msgid "Shift and scale time"
-msgstr ""
-
-#: gnu/packages/perl.scm:7931
+#: gnu/packages/perl.scm:10478
 msgid ""
 "This module allows you to speed up your sleep(), alarm(),\n"
 "and time() calls."
 msgstr ""
 
-#: gnu/packages/perl.scm:7954
-msgid "Simple tree object"
-msgstr ""
-
-#: gnu/packages/perl.scm:7955
+#: gnu/packages/perl.scm:10501
 msgid ""
 "This module in a fully object-oriented implementation of a\n"
 "simple n-ary tree."
 msgstr ""
 
-#: gnu/packages/perl.scm:7979
-msgid "Factory object for dispensing Visitor objects"
-msgstr ""
-
-#: gnu/packages/perl.scm:7980
+#: gnu/packages/perl.scm:10524
 msgid ""
 "This module is a factory for dispensing\n"
 "Tree::Simple::Visitor::* objects."
 msgstr ""
 
-#: gnu/packages/perl.scm:7998
-msgid "Minimal try/catch with proper preservation of $@@"
-msgstr ""
-
-#: gnu/packages/perl.scm:7999
+#: gnu/packages/perl.scm:10543
 msgid ""
 "This module provides bare bones try/catch/finally statements\n"
 "that are designed to minimize common mistakes with eval blocks, and nothing\n"
 "else."
 msgstr ""
 
-#: gnu/packages/perl.scm:8024
-msgid "Tie a variable to a type constraint"
-msgstr ""
-
-#: gnu/packages/perl.scm:8025
+#: gnu/packages/perl.scm:10568
 msgid ""
 "This module exports a single function: @code{ttie}.  It ties\n"
 "a variable to a type constraint, ensuring that whatever values stored in the\n"
@@ -13718,11 +14323,7 @@ msgid ""
 "variable conform."
 msgstr ""
 
-#: gnu/packages/perl.scm:8058
-msgid "Tiny, yet Moo(se)-compatible type constraint"
-msgstr ""
-
-#: gnu/packages/perl.scm:8059
+#: gnu/packages/perl.scm:10601
 msgid ""
 "@code{Type::Tiny} is a small class for writing type\n"
 "constraints, inspired by Moose's type constraint API.  It has only one\n"
@@ -13731,11 +14332,7 @@ msgid ""
 "be used with Moose, Mouse and Moo (or none of the above)."
 msgstr ""
 
-#: gnu/packages/perl.scm:8080
-msgid "Provides an XS boost for some of Type::Tiny's built-in type constraints"
-msgstr ""
-
-#: gnu/packages/perl.scm:8081
+#: gnu/packages/perl.scm:10622
 msgid ""
 "This module is optionally used by @code{Type::Tiny} to\n"
 "provide faster, C-based implementations of some type constraints.  This\n"
@@ -13743,11 +14340,7 @@ msgid ""
 "so other data validation frameworks might also consider using it."
 msgstr ""
 
-#: gnu/packages/perl.scm:8106
-msgid "Types and coercions for Moose and Moo"
-msgstr ""
-
-#: gnu/packages/perl.scm:8107
+#: gnu/packages/perl.scm:10647
 msgid ""
 "This module provides @code{Path::Tiny} types for Moose, Moo,\n"
 "etc.  It handles two important types of coercion: coercing objects with\n"
@@ -13755,80 +14348,55 @@ msgid ""
 "to ensure that files or directories exist."
 msgstr ""
 
-#: gnu/packages/perl.scm:8129
-msgid "Data types for common serialisation formats"
-msgstr ""
-
-#: gnu/packages/perl.scm:8130
+#: gnu/packages/perl.scm:10670
 msgid ""
 "This module provides some extra datatypes that are used by\n"
 "common serialisation formats such as JSON or CBOR."
 msgstr ""
 
-#: gnu/packages/perl.scm:8157
-msgid "Unicode normalization forms"
-msgstr ""
-
-#: gnu/packages/perl.scm:8158
+#: gnu/packages/perl.scm:10698
 msgid "This Perl module provides Unicode normalization forms."
 msgstr ""
 
-#: gnu/packages/perl.scm:8187
-msgid "Unicode collation algorithm"
-msgstr ""
-
-#: gnu/packages/perl.scm:8188
+#: gnu/packages/perl.scm:10727
 msgid ""
 "This package provides tools for sorting and comparing\n"
 "Unicode data."
 msgstr ""
 
-#: gnu/packages/perl.scm:8209
-msgid "Unicode line breaking algorithm"
-msgstr ""
-
-#: gnu/packages/perl.scm:8211
+#: gnu/packages/perl.scm:10750
 msgid ""
 "@code{Unicode::LineBreak} implements the line breaking algorithm\n"
 "described in Unicode Standard Annex #14.  The @code{East_Asian_Width} property\n"
 "defined by Annex #11 is used to determine breaking positions."
 msgstr ""
 
-#: gnu/packages/perl.scm:8234
-msgid "Encoding and decoding of UTF-8 encoding form"
-msgstr ""
-
-#: gnu/packages/perl.scm:8236
+#: gnu/packages/perl.scm:10778
 msgid ""
 "This module provides functions to encode and decode UTF-8 encoding form\n"
 "as specified by Unicode and ISO/IEC 10646:2011."
 msgstr ""
 
-#: gnu/packages/perl.scm:8254
-msgid "UNIVERSAL::can() reimplementation"
-msgstr ""
-
-#: gnu/packages/perl.scm:8255
+#: gnu/packages/perl.scm:10797
 msgid ""
 "This module attempts to work around people calling\n"
 "UNIVERSAL::can() as a function, which it is not."
 msgstr ""
 
-#: gnu/packages/perl.scm:8275
-msgid "UNIVERSAL::isa() reimplementation"
-msgstr ""
-
-#: gnu/packages/perl.scm:8276
+#: gnu/packages/perl.scm:10818
 msgid ""
 "This module attempts to recover from people calling\n"
 "UNIVERSAL::isa as a function."
 msgstr ""
 
-#: gnu/packages/perl.scm:8294
-msgid "Associate user-defined magic to variables from Perl"
+#: gnu/packages/perl.scm:10838
+msgid ""
+"This module lets you require other modules where the module\n"
+"name is in a variable, something you can't do with the @code{require}\n"
+"built-in."
 msgstr ""
 
-#: gnu/packages/perl.scm:8295
+#: gnu/packages/perl.scm:10858
 msgid ""
 "Magic is Perl's way of enhancing variables.  This mechanism\n"
 "lets the user add extra data to any variable and hook syntactical\n"
@@ -13837,11 +14405,7 @@ msgid ""
 "having to write a single line of XS."
 msgstr ""
 
-#: gnu/packages/perl.scm:8318
-msgid "Easily generate well-formed, namespace-aware XML"
-msgstr ""
-
-#: gnu/packages/perl.scm:8319
+#: gnu/packages/perl.scm:10882
 msgid ""
 "@code{XML::Writer} is a simple Perl module for writing XML\n"
 "documents: it takes care of constructing markup and escaping data correctly.\n"
@@ -13851,11 +14415,7 @@ msgid ""
 "attribute names."
 msgstr ""
 
-#: gnu/packages/perl.scm:8346
-msgid "Opaque, extensible XS pointer backed objects using sv_magic"
-msgstr ""
-
-#: gnu/packages/perl.scm:8348
+#: gnu/packages/perl.scm:10911
 msgid ""
 "This way of associating structs with Perl space objects is designed to\n"
 "supersede Perl's builtin @code{T_PTROBJ} with something that is extensible\n"
@@ -13863,62 +14423,38 @@ msgid ""
 "neither visible nor modifiable from Perl space)."
 msgstr ""
 
-#: gnu/packages/perl.scm:8370
-msgid "YAML for Perl"
-msgstr ""
-
-#: gnu/packages/perl.scm:8371
+#: gnu/packages/perl.scm:10933
 msgid ""
 "The YAML.pm module implements a YAML Loader and Dumper based\n"
 "on the YAML 1.0 specification."
 msgstr ""
 
-#: gnu/packages/perl.scm:8393
-msgid "Perl YAML Serialization using XS and libyaml"
-msgstr ""
-
-#: gnu/packages/perl.scm:8395
+#: gnu/packages/perl.scm:10953
 msgid ""
 "@code{YAML::XS} is a Perl XS binding to libyaml which offers Perl the\n"
 "best YAML support to date."
 msgstr ""
 
-#: gnu/packages/perl.scm:8418
-msgid "Read/Write YAML files"
-msgstr ""
-
-#: gnu/packages/perl.scm:8419
+#: gnu/packages/perl.scm:10977
 msgid ""
 "YAML::Tiny is a perl class for reading and writing\n"
 "YAML-style files, written with as little code as possible, reducing load time\n"
 "and memory overhead."
 msgstr ""
 
-#: gnu/packages/perl.scm:8443
-msgid "Generate recursive-descent parsers"
-msgstr ""
-
-#: gnu/packages/perl.scm:8445
+#: gnu/packages/perl.scm:11003
 msgid ""
 "@code{Parse::RecDescent} can incrementally generate top-down\n"
 "recursive-descent text parsers from simple yacc-like grammar specifications."
 msgstr ""
 
-#: gnu/packages/perl.scm:8465
-msgid "Generate and use LALR parsers"
-msgstr ""
-
-#: gnu/packages/perl.scm:8466
+#: gnu/packages/perl.scm:11024
 msgid ""
 "This package compiles yacc-like @dfn{Look Ahead LR} (LALR)\n"
 "grammars to generate Perl object oriented parser modules."
 msgstr ""
 
-#: gnu/packages/perl.scm:8492
-msgid "Distribution metadata for a CPAN dist"
-msgstr ""
-
-#: gnu/packages/perl.scm:8493
+#: gnu/packages/perl.scm:11051
 msgid ""
 "Software distributions released to the CPAN include a\n"
 "META.json or, for older distributions, META.yml, which describes the\n"
@@ -13929,11 +14465,7 @@ msgid ""
 "methods for interrogating that data."
 msgstr ""
 
-#: gnu/packages/perl.scm:8516
-msgid "Set of version requirements for a CPAN dist"
-msgstr ""
-
-#: gnu/packages/perl.scm:8517
+#: gnu/packages/perl.scm:11075
 msgid ""
 "A CPAN::Meta::Requirements object models a set of version\n"
 "constraints like those specified in the META.yml or META.json files in CPAN\n"
@@ -13942,22 +14474,14 @@ msgid ""
 "representation."
 msgstr ""
 
-#: gnu/packages/perl.scm:8540
-msgid "Read and write a subset of YAML for CPAN Meta files"
-msgstr ""
-
-#: gnu/packages/perl.scm:8541
+#: gnu/packages/perl.scm:11099
 msgid ""
 "This module implements a subset of the YAML specification\n"
 "for use in reading and writing CPAN metadata files like META.yml and\n"
 "MYMETA.yml."
 msgstr ""
 
-#: gnu/packages/perl.scm:8562
-msgid "Build and install Perl modules"
-msgstr ""
-
-#: gnu/packages/perl.scm:8563
+#: gnu/packages/perl.scm:11121
 msgid ""
 "@code{Module::Build} is a system for building, testing, and\n"
 "installing Perl modules; it used to be part of Perl itself until version 5.22,\n"
@@ -13968,21 +14492,13 @@ msgid ""
 "system---most of the @code{Module::Build} code is pure-Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:8589
-msgid "Parse META.yml and META.json CPAN metadata files"
-msgstr ""
-
-#: gnu/packages/perl.scm:8590
+#: gnu/packages/perl.scm:11148
 msgid ""
 "Parse::CPAN::Meta is a parser for META.json and META.yml\n"
 "files, using JSON::PP and/or CPAN::Meta::YAML."
 msgstr ""
 
-#: gnu/packages/perl.scm:8608
-msgid "Common Scalar and List utility subroutines"
-msgstr ""
-
-#: gnu/packages/perl.scm:8609
+#: gnu/packages/perl.scm:11166
 msgid ""
 "This package contains a selection of subroutines that people\n"
 "have expressed would be nice to have in the perl core, but the usage would not\n"
@@ -13990,50 +14506,70 @@ msgid ""
 "such that being individual extensions would be wasteful."
 msgstr ""
 
-#: gnu/packages/perl.scm:8633
-msgid "Cross-platform functions emulating common shell commands"
+#: gnu/packages/perl.scm:11206
+msgid ""
+"SDL Perl is a package of Perl modules that provide both functional and\n"
+"object oriented interfaces to the Simple DirectMedia Layer for Perl5.  This\n"
+"package takes some liberties with the SDL API, and attempts to adhere to the\n"
+"spirit of both the SDL and Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:8635
-msgid "Shell::Command is a thin wrapper around ExtUtils::Command."
+#: gnu/packages/perl.scm:11239
+msgid ""
+"This package contains @code{SGMLS.pm}, a perl5 class library\n"
+"for parsing the output from an SGML parser such as OpenSP.  It also includes\n"
+"the @command{sgmlspl} command, an Perl script showcasing how the library can\n"
+"be used."
 msgstr ""
 
-#: gnu/packages/perl.scm:8662
-msgid "Object-oriented File::Find replacement in Perl"
+#: gnu/packages/perl.scm:11265
+msgid "Shell::Command is a thin wrapper around ExtUtils::Command."
 msgstr ""
 
-#: gnu/packages/perl.scm:8663
+#: gnu/packages/perl.scm:11292
 msgid ""
 "File::Find::Object is an object-oriented\n"
 "File::Find replacement in Perl."
 msgstr ""
 
-#: gnu/packages/perl.scm:8692
-msgid "Alternative interface to File::Find::Object"
-msgstr ""
-
-#: gnu/packages/perl.scm:8693
+#: gnu/packages/perl.scm:11321
 msgid ""
 "File::Find::Object::Rule is an alternative Perl\n"
 "interface to File::Find::Object."
 msgstr ""
 
-#: gnu/packages/perl.scm:8723
-msgid "Collection of Perl modules for time/date manipulation"
+#: gnu/packages/perl.scm:11344
+msgid ""
+"@code{File::Find} is great, but constructing the wanted routine can\n"
+"sometimes be a pain.  @code{File::Finder} provides a wanted-writer, using\n"
+"syntax that is directly mappable to the @code{find(1)} command's syntax.\n"
+"\n"
+"A @code{File::Finder} object contains a hash of @code{File::Find} options, and\n"
+"a series of steps that mimic find's predicates.  Initially, a\n"
+"@code{File::Finder} object has no steps.  Each step method clones the previous\n"
+"object's options and steps, and then adds the new step, returning the new\n"
+"object.  In this manner, an object can be grown, step by step, by chaining\n"
+"method calls.  Furthermore, a partial sequence can be created and held, and\n"
+"used as the head of many different sequences."
 msgstr ""
 
-#: gnu/packages/perl.scm:8724
+#: gnu/packages/perl.scm:11374
+msgid ""
+"This package provides a Perl module for TrueType/OpenType\n"
+"font hacking.  It supports reading, processing and writing of the following\n"
+"tables: GDEF, GPOS, GSUB, LTSH, OS/2, PCLT, bsln, cmap, cvt, fdsc, feat,\n"
+"fpgm, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, mort, name, post, prep,\n"
+"prop, vhea, vmtx and the reading and writing of all other table types."
+msgstr ""
+
+#: gnu/packages/perl.scm:11413
 msgid ""
 "Provides several perl modules for date/time manipulation:\n"
 "@code{Time::CTime.pm}, @code{Time::JulianDay.pm}, @code{Time::ParseDate.pm},\n"
 "@code{Time::Timezone.pm}, and @code{Time::DaysInMonth.pm}."
 msgstr ""
 
-#: gnu/packages/perl.scm:8753
-msgid "Perl library for testing if a time() is in a specific period"
-msgstr ""
-
-#: gnu/packages/perl.scm:8754
+#: gnu/packages/perl.scm:11443
 msgid ""
 "This Perl library provides a function which tells whether a\n"
 "specific time falls within a specified time period.  Its syntax for specifying\n"
@@ -14043,86 +14579,124 @@ msgid ""
 "1998\"."
 msgstr ""
 
-#: gnu/packages/photo.scm:78
-msgid "Raw image decoder"
+#: gnu/packages/perl.scm:11475
+msgid ""
+"Path::Iterator::Rule iterates over files and directories to\n"
+"identify ones matching a user-defined set of rules.  The API is based heavily\n"
+"on File::Find::Rule, but with more explicit distinction between matching rules\n"
+"and options that influence how directories are searched.  A\n"
+"Path::Iterator::Rule object is a collection of rules (match criteria) with\n"
+"methods to add additional criteria.  Options that control directory traversal\n"
+"are given as arguments to the method that generates an iterator.\n"
+"\n"
+"A summary of features for comparison to other file finding modules:\n"
+"\n"
+"@itemize\n"
+"@item provides many helper methods for specifying rules\n"
+"@item offers (lazy) iterator and flattened list interfaces\n"
+"@item custom rules implemented with callbacks\n"
+"@item breadth-first (default) or pre- or post-order depth-first searching\n"
+"@item follows symlinks (by default, but can be disabled)\n"
+"@item directories visited only once (no infinite loop; can be disabled)\n"
+"@item doesn't chdir during operation\n"
+"@item provides an API for extensions\n"
+"@end itemize\n"
+"\n"
+"As a convenience, the PIR module is an empty subclass of this one that is less\n"
+"arduous to type for one-liners."
+msgstr ""
+
+#: gnu/packages/perl.scm:11516
+msgid ""
+"This module allows you to specify those constants that\n"
+"should be documented in your POD, and pull them out a run time in a fairly\n"
+"arbitrary fashion.\n"
+"\n"
+"Pod::Constants uses Pod::Parser to do the parsing of the source file.  It has\n"
+"to open the source file it is called from, and does so directly either by\n"
+"lookup in %INC or by assuming it is $0 if the caller is @code{main}\n"
+"(or it can't find %INC{caller()})."
 msgstr ""
 
-#: gnu/packages/photo.scm:80
+#: gnu/packages/perl.scm:11542
 msgid ""
-"LibRaw is a library for reading RAW files obtained from digital photo\n"
-"cameras (CRW/CR2, NEF, RAF, DNG, and others)."
+"Soundex is a phonetic algorithm for indexing names by sound,\n"
+"as pronounced in English.  The goal is for names with the same pronunciation to\n"
+"be encoded to the same representation so that they can be matched despite\n"
+"minor differences in spelling.\n"
+"\n"
+"This module implements the original soundex algorithm developed by Robert\n"
+"Russell and Margaret Odell, patented in 1918 and 1922, as well as a variation\n"
+"called \"American Soundex\" used for US census data, and current maintained by\n"
+"the National Archives and Records Administration (NARA)."
 msgstr ""
 
-#: gnu/packages/photo.scm:97
-msgid "Read and manipulate EXIF data in digital photographs"
+#: gnu/packages/perl.scm:11570
+msgid ""
+"Regexp::Pattern is a convention for organizing reusable\n"
+"regexp patterns in modules."
 msgstr ""
 
-#: gnu/packages/photo.scm:99
+#: gnu/packages/perl.scm:11595
 msgid ""
-"The libexif C library allows applications to read, edit, and save EXIF\n"
-"data as produced by digital cameras."
+"Data::SExpression parses Lisp S-Expressions into Perl data\n"
+"structures."
 msgstr ""
 
-#: gnu/packages/photo.scm:125
-msgid "Accessing digital cameras"
+#: gnu/packages/photo.scm:173
+msgid ""
+"Import photos and videos from cameras, phones and memory\n"
+"cards and generate meaningful file and folder names."
 msgstr ""
 
-#: gnu/packages/photo.scm:127
+#: gnu/packages/photo.scm:198
+msgid ""
+"LibRaw is a library for reading RAW files obtained from digital photo\n"
+"cameras (CRW/CR2, NEF, RAF, DNG, and others)."
+msgstr ""
+
+#: gnu/packages/photo.scm:236
+msgid ""
+"The libexif C library allows applications to read, edit, and save EXIF\n"
+"data as produced by digital cameras."
+msgstr ""
+
+#: gnu/packages/photo.scm:264
 msgid ""
 "This is the library backend for gphoto2.  It contains the code for PTP,\n"
 "MTP, and other vendor specific protocols for controlling and transferring data\n"
 "from digital cameras."
 msgstr ""
 
-#: gnu/packages/photo.scm:169
-msgid "Command-line tools to access digital cameras"
-msgstr ""
-
-#: gnu/packages/photo.scm:171
+#: gnu/packages/photo.scm:308
 msgid ""
 "Gphoto2 is a set of command line utilities for manipulating a large\n"
 "number of different digital cameras.  Through libgphoto2, it supports PTP,\n"
 "MTP, and much more."
 msgstr ""
 
-#: gnu/packages/photo.scm:204
-msgid "Program and Perl library to manipulate EXIF and other metadata"
-msgstr ""
-
-#: gnu/packages/photo.scm:205
+#: gnu/packages/photo.scm:350
 msgid ""
 "This package provides the @code{exiftool} command and the\n"
 "@code{Image::ExifTool} Perl library to manipulate EXIF tags of digital images\n"
 "and a wide variety of other metadata."
 msgstr ""
 
-#: gnu/packages/photo.scm:229
-msgid "Library for panoramic images"
-msgstr ""
-
-#: gnu/packages/photo.scm:231
+#: gnu/packages/photo.scm:377
 msgid ""
 "The libpano13 package contains the backend library written by the\n"
 "Panorama Tools project for building panoramic images from a set of\n"
 "overlapping images, as well as some command line tools."
 msgstr ""
 
-#: gnu/packages/photo.scm:275
-msgid "Tools for combining and blending images"
-msgstr ""
-
-#: gnu/packages/photo.scm:277
+#: gnu/packages/photo.scm:423
 msgid ""
 "Enblend blends away the seams in a panoramic image mosaic using a\n"
 "multi-resolution spline.  Enfuse merges different exposures of the same\n"
 "scene to produce an image that looks much like a tone-mapped image."
 msgstr ""
 
-#: gnu/packages/photo.scm:308
-msgid "Library to correct optical lens defects with a lens database"
-msgstr ""
-
-#: gnu/packages/photo.scm:309
+#: gnu/packages/photo.scm:455
 msgid ""
 "Digital photographs are not ideal.  Of course, the better is\n"
 "your camera, the better the results will be, but in any case if you look\n"
@@ -14136,11 +14710,7 @@ msgid ""
 "photographic equipment."
 msgstr ""
 
-#: gnu/packages/photo.scm:385
-msgid "Virtual lighttable and darkroom for photographers"
-msgstr ""
-
-#: gnu/packages/photo.scm:386
+#: gnu/packages/photo.scm:577
 msgid ""
 "Darktable is a photography workflow application and RAW\n"
 "developer.  It manages your digital negatives in a database, lets you view\n"
@@ -14148,22 +14718,42 @@ msgid ""
 "and enhance them."
 msgstr ""
 
-#: gnu/packages/photo.scm:457
-msgid "Panorama photo stitcher"
+#: gnu/packages/photo.scm:622
+msgid ""
+"Photoflare is a cross-platform image editor with an aim\n"
+"to balance between powerful features and a very friendly graphical user\n"
+"interface.  It suits a wide variety of different tasks and users who value a\n"
+"more nimble workflow.  Features include basic image editing capabilities,\n"
+"paint brushes, image filters, colour adjustments and more advanced features\n"
+"such as Batch image processing."
+msgstr ""
+
+#: gnu/packages/photo.scm:689
+msgid ""
+"Entangle is an application which uses GTK and libgphoto2 to provide a\n"
+"graphical interface for tethered photography with digital cameras.  It\n"
+"includes control over camera shooting and configuration settings and 'hands\n"
+"off' shooting directly from the controlling computer."
 msgstr ""
 
-#: gnu/packages/photo.scm:459
+#: gnu/packages/photo.scm:760
 msgid ""
 "Hugin is an easy to use panoramic imaging toolchain with a graphical\n"
 "user interface.  It can be used to assemble a mosaic of photographs into\n"
 "a complete panorama and stitch any series of overlapping pictures."
 msgstr ""
 
-#: gnu/packages/ratpoison.scm:86
-msgid "Simple mouse-free tiling window manager"
+#: gnu/packages/photo.scm:813
+msgid ""
+"RawTherapee is a raw image processing suite.  It comprises a\n"
+"subset of image editing operations specifically aimed at non-destructive raw\n"
+"photo post-production and is primarily focused on improving a photographer's\n"
+"workflow by facilitating the handling of large numbers of images.  Most raw\n"
+"formats are supported, including Pentax Pixel Shift, Canon Dual-Pixel, and those\n"
+"from Foveon and X-Trans sensors."
 msgstr ""
 
-#: gnu/packages/ratpoison.scm:88
+#: gnu/packages/ratpoison.scm:87
 msgid ""
 "Ratpoison is a simple window manager with no fat library\n"
 "dependencies, no fancy graphics, no window decorations, and no\n"
@@ -14179,11 +14769,7 @@ msgid ""
 "cripples Emacs and other quality pieces of software."
 msgstr ""
 
-#: gnu/packages/readline.scm:82
-msgid "Edit command lines while typing, with history support"
-msgstr ""
-
-#: gnu/packages/readline.scm:84
+#: gnu/packages/readline.scm:106
 msgid ""
 "The GNU readline library allows users to edit command lines as they\n"
 "are typed in.  It can maintain a searchable history of previously entered\n"
@@ -14192,11 +14778,7 @@ msgid ""
 "comfortable for anyone."
 msgstr ""
 
-#: gnu/packages/readline.scm:121
-msgid "Wrapper to allow the editing of keyboard commands"
-msgstr ""
-
-#: gnu/packages/readline.scm:123
+#: gnu/packages/readline.scm:164
 msgid ""
 "Rlwrap is a 'readline wrapper', a small utility that uses the GNU\n"
 "readline library to allow the editing of keyboard input for any command.  You\n"
@@ -14205,11 +14787,7 @@ msgid ""
 "'special effects' using the filter mechanism."
 msgstr ""
 
-#: gnu/packages/scanner.scm:87
-msgid "Raster image scanner library and drivers, without scanner support"
-msgstr ""
-
-#: gnu/packages/scanner.scm:88
+#: gnu/packages/scanner.scm:140
 msgid ""
 "SANE stands for \"Scanner Access Now Easy\" and is an API\n"
 "proving access to any raster image scanner hardware (flatbed scanner,\n"
@@ -14217,11 +14795,7 @@ msgid ""
 "package contains the library, but no drivers."
 msgstr ""
 
-#: gnu/packages/scanner.scm:126
-msgid "Raster image scanner library and drivers, with scanner support"
-msgstr ""
-
-#: gnu/packages/scanner.scm:127
+#: gnu/packages/scanner.scm:188
 msgid ""
 "SANE stands for \"Scanner Access Now Easy\" and is an API\n"
 "proving access to any raster image scanner hardware (flatbed scanner,\n"
@@ -14229,38 +14803,37 @@ msgid ""
 "package contains the library and drivers."
 msgstr ""
 
-#: gnu/packages/scheme.scm:191
-msgid "A Scheme implementation with integrated editor and debugger"
+#: gnu/packages/scanner.scm:267
+msgid ""
+"XSane is a graphical interface for controlling a scanner and acquiring\n"
+"images from it.  You can photocopy multi-page documents and save, fax, print,\n"
+"or e-mail your scanned images.  It is highly configurable and exposes all\n"
+"device settings, letting you fine-tune the final result.  It can also be used\n"
+"as a GIMP plugin to acquire images directly from a scanner.\n"
+"\n"
+"XSane talks to scanners through the @acronym{SANE, Scanner Access Now Easy}\n"
+"back-end library, which supports almost all existing scanners."
 msgstr ""
 
-#: gnu/packages/scheme.scm:193
+#: gnu/packages/scheme.scm:224
 msgid ""
 "GNU/MIT Scheme is an implementation of the Scheme programming\n"
 "language.  It provides an interpreter, a compiler and a debugger.  It also\n"
 "features an integrated Emacs-like editor and a large runtime library."
 msgstr ""
 
-#: gnu/packages/scheme.scm:276
-msgid "Efficient Scheme compiler"
-msgstr ""
-
-#: gnu/packages/scheme.scm:278
+#: gnu/packages/scheme.scm:317
 msgid ""
-"Bigloo is a Scheme implementation devoted to one goal: enabling\n"
-"Scheme based programming style where C(++) is usually\n"
-"required.  Bigloo attempts to make Scheme practical by offering\n"
-"features usually presented by traditional programming languages\n"
-"but not offered by Scheme and functional programming.  Bigloo\n"
-"compiles Scheme modules.  It delivers small and fast stand alone\n"
-"binary executables.  Bigloo enables full connections between\n"
-"Scheme and C programs and between Scheme and Java programs."
-msgstr ""
-
-#: gnu/packages/scheme.scm:327
-msgid "Multi-tier programming language for the Web 2.0"
+"Bigloo is a Scheme implementation devoted to one goal: enabling Scheme\n"
+"based programming style where C(++) is usually required.  Bigloo attempts to\n"
+"make Scheme practical by offering features usually presented by traditional\n"
+"programming languages but not offered by Scheme and functional programming.\n"
+"Bigloo compiles Scheme modules.  It delivers small and fast stand alone binary\n"
+"executables.  Bigloo enables full connections between Scheme and C programs\n"
+"and between Scheme and Java programs."
 msgstr ""
 
-#: gnu/packages/scheme.scm:329
+#: gnu/packages/scheme.scm:370
 msgid ""
 "HOP is a multi-tier programming language for the Web 2.0 and the\n"
 "so-called diffuse Web.  It is designed for programming interactive web\n"
@@ -14269,45 +14842,38 @@ msgid ""
 "mashups, office (web agendas, mail clients, ...), etc."
 msgstr ""
 
-#: gnu/packages/scheme.scm:373
-msgid "R5RS Scheme implementation that compiles native code via C"
-msgstr ""
-
-#: gnu/packages/scheme.scm:375
-msgid ""
-"CHICKEN is a compiler for the Scheme programming language.  CHICKEN\n"
-"produces portable and efficient C, supports almost all of the R5RS Scheme\n"
-"language standard, and includes many enhancements and extensions."
-msgstr ""
-
-#: gnu/packages/scheme.scm:394
-msgid "Scheme implementation using a bytecode interpreter"
-msgstr ""
-
-#: gnu/packages/scheme.scm:396
+#: gnu/packages/scheme.scm:393
 msgid ""
 "Scheme 48 is an implementation of Scheme based on a byte-code\n"
 "interpreter and is designed to be used as a testbed for experiments in\n"
 "implementation techniques and as an expository tool."
 msgstr ""
 
-#: gnu/packages/scheme.scm:509
-msgid "Implementation of Scheme and related languages"
-msgstr ""
-
-#: gnu/packages/scheme.scm:511
+#: gnu/packages/scheme.scm:549
 msgid ""
-"Racket is an implementation of the Scheme programming language (R5RS and\n"
-"R6RS) and related languages, such as Typed Racket.  It features a compiler and\n"
-"a virtual machine with just-in-time native compilation, as well as a large set\n"
-"of libraries."
+"Racket is a general-purpose programming language in the Scheme family,\n"
+"with a large set of libraries and a compiler based on Chez Scheme.  Racket is\n"
+"also a platform for language-oriented programming, from small domain-specific\n"
+"languages to complete language implementations.\n"
+"\n"
+"The main Racket distribution comes with many bundled packages, including\n"
+"the DrRacket IDE, libraries for GUI and web programming, and implementations\n"
+"of languages such as Typed Racket, R5RS and R6RS Scheme, and Datalog."
 msgstr ""
 
-#: gnu/packages/scheme.scm:549
-msgid "Efficient Scheme interpreter and compiler"
+#: gnu/packages/scheme.scm:585
+msgid ""
+"Racket is a general-purpose programming language in the Scheme family,\n"
+"with a large set of libraries and a compiler based on Chez Scheme.  Racket is\n"
+"also a platform for language-oriented programming, from small domain-specific\n"
+"languages to complete language implementations.\n"
+"\n"
+"The ``minimal Racket'' distribution includes just enough of Racket for you to\n"
+"use @command{raco pkg} to install more.  Bundled packages, such as the\n"
+"Dr. Racket IDE, are not included."
 msgstr ""
 
-#: gnu/packages/scheme.scm:551
+#: gnu/packages/scheme.scm:617
 msgid ""
 "Gambit consists of two main programs: gsi, the Gambit Scheme\n"
 "interpreter, and gsc, the Gambit Scheme compiler.  The interpreter contains\n"
@@ -14318,11 +14884,7 @@ msgid ""
 "mixed."
 msgstr ""
 
-#: gnu/packages/scheme.scm:585
-msgid "Small embeddable Scheme implementation"
-msgstr ""
-
-#: gnu/packages/scheme.scm:587
+#: gnu/packages/scheme.scm:653
 msgid ""
 "Chibi-Scheme is a very small library with no external dependencies\n"
 "intended for use as an extension and scripting language in C programs.  In\n"
@@ -14331,23 +14893,7 @@ msgid ""
 "threads."
 msgstr ""
 
-#: gnu/packages/scheme.scm:757
-msgid "Scmutils library for MIT Scheme"
-msgstr ""
-
-#: gnu/packages/scheme.scm:758
-msgid ""
-"The Scmutils system is an integrated library of\n"
-"procedures, embedded in the programming language Scheme, and intended to\n"
-"support teaching and research in mathematical physics and electrical\n"
-"engineering."
-msgstr ""
-
-#: gnu/packages/scheme.scm:808
-msgid "Structure and Interpretation of Computer Programs"
-msgstr ""
-
-#: gnu/packages/scheme.scm:809
+#: gnu/packages/scheme.scm:701
 msgid ""
 "Structure and Interpretation of Computer Programs (SICP) is\n"
 "a textbook aiming to teach the principles of computer programming.\n"
@@ -14357,31 +14903,19 @@ msgid ""
 "metalinguistic abstraction, recursion, interpreters, and modular programming."
 msgstr ""
 
-#: gnu/packages/scheme.scm:850
-msgid "SRE String pattern-matching library for scheme48"
-msgstr ""
-
-#: gnu/packages/scheme.scm:852
+#: gnu/packages/scheme.scm:745
 msgid ""
 "String pattern-matching library for scheme48 based on the SRE\n"
 "regular-expression notation."
 msgstr ""
 
-#: gnu/packages/scheme.scm:884
-msgid "Compatibility and utility library for Scheme"
-msgstr ""
-
-#: gnu/packages/scheme.scm:885
+#: gnu/packages/scheme.scm:779
 msgid ""
 "SLIB is a portable Scheme library providing compatibility and\n"
 "utility functions for all standard Scheme implementations."
 msgstr ""
 
-#: gnu/packages/scheme.scm:946
-msgid "Scheme implementation conforming to R5RS and IEEE P1178"
-msgstr ""
-
-#: gnu/packages/scheme.scm:947
+#: gnu/packages/scheme.scm:836
 msgid ""
 "GNU SCM is an implementation of Scheme.  This\n"
 "implementation includes Hobbit, a Scheme-to-C compiler, which can\n"
@@ -14389,11 +14923,63 @@ msgid ""
 "linked with a SCM executable."
 msgstr ""
 
-#: gnu/packages/search.scm:66
-msgid "Search Engine Library"
+#: gnu/packages/scheme.scm:895
+msgid ""
+"TinyScheme is a light-weight Scheme interpreter that implements as large a\n"
+"subset of R5RS as was possible without getting very large and complicated.\n"
+"\n"
+"It's meant to be used as an embedded scripting interpreter for other programs.\n"
+"As such, it does not offer an Integrated Development Environment (@dfn{IDE}) or\n"
+"extensive toolkits, although it does sport a small (and optional) top-level\n"
+"loop.\n"
+"\n"
+"As an embedded interpreter, it allows multiple interpreter states to coexist in\n"
+"the same program, without any interference between them.  Foreign functions in C\n"
+"can be added and values can be defined in the Scheme environment.  Being quite a\n"
+"small program, it is easy to comprehend, get to grips with, and use."
 msgstr ""
 
-#: gnu/packages/search.scm:68
+#: gnu/packages/scheme.scm:976
+msgid ""
+"Stalin is an aggressively optimizing whole-program compiler\n"
+"for Scheme that does polyvariant interprocedural flow analysis,\n"
+"flow-directed interprocedural escape analysis, flow-directed\n"
+"lightweight CPS conversion, flow-directed lightweight closure\n"
+"conversion, flow-directed interprocedural lifetime analysis, automatic\n"
+"in-lining, unboxing, and flow-directed program-specific and\n"
+"program-point-specific low-level representation selection and code\n"
+"generation."
+msgstr ""
+
+#: gnu/packages/scheme.scm:1031
+msgid ""
+"@code{femtolisp} is a scheme-like lisp implementation with a\n"
+"simple, elegant Scheme dialect.  It is a lisp-1 with lexical scope.\n"
+"The core is 12 builtin special forms and 33 builtin functions."
+msgstr ""
+
+#: gnu/packages/scheme.scm:1097
+msgid ""
+"Gauche is a R7RS Scheme scripting engine aiming at being a\n"
+"handy tool that helps programmers and system administrators to write small to\n"
+"large scripts quickly.  Quick startup, built-in system interface, native\n"
+"multilingual support are some of the goals.  Gauche comes with a package\n"
+"manager/installer @code{gauche-package} which can download, compile, install\n"
+"and list gauche extension packages."
+msgstr ""
+
+#: gnu/packages/scheme.scm:1199
+msgid ""
+"Gerbil is an opinionated dialect of Scheme designed for Systems\n"
+"Programming, with a state of the art macro and module system on top of the Gambit\n"
+"runtime.  The macro system is based on quote-syntax, and provides the full meta-syntactic\n"
+"tower with a native implementation of syntax-case.  It also provides a full-blown module\n"
+"system, similar to PLT Scheme's (sorry, Racket) modules.  The main difference from Racket\n"
+"is that Gerbil modules are single instantiation, supporting high performance ahead of\n"
+"time compilation and compiled macros."
+msgstr ""
+
+#: gnu/packages/search.scm:84
 msgid ""
 "Xapian is a highly adaptable toolkit which allows developers to easily\n"
 "add advanced indexing and search facilities to their own applications.  It\n"
@@ -14401,15 +14987,14 @@ msgid ""
 "rich set of boolean query operators."
 msgstr ""
 
-#: gnu/packages/search.scm:98
-msgid "Python bindings for the Xapian search engine library"
-msgstr ""
-
-#: gnu/packages/search.scm:137
-msgid "Tool for Obsessive Compulsive Classifiers"
+#: gnu/packages/search.scm:139
+msgid ""
+"Search::Xapian wraps most methods of most Xapian classes.  The missing\n"
+"classes and methods should be added in the future.  It also provides a\n"
+"simplified, more 'perlish' interface to some common operations."
 msgstr ""
 
-#: gnu/packages/search.scm:139
+#: gnu/packages/search.scm:182
 msgid ""
 "libtocc is the engine of the Tocc project, a tag-based file management\n"
 "system.  The goal of Tocc is to provide a better system for classifying files\n"
@@ -14417,21 +15002,13 @@ msgid ""
 "files and directories."
 msgstr ""
 
-#: gnu/packages/search.scm:161
-msgid "Command-line interface to libtocc"
-msgstr ""
-
-#: gnu/packages/search.scm:163
+#: gnu/packages/search.scm:206
 msgid ""
 "Tocc is a tag-based file management system.  This package contains the\n"
 "command line tool for interacting with libtocc."
 msgstr ""
 
-#: gnu/packages/search.scm:181
-msgid "Finding text and HTML files that match boolean expressions"
-msgstr ""
-
-#: gnu/packages/search.scm:183
+#: gnu/packages/search.scm:226
 msgid ""
 "GNU Bool is a utility to perform text searches on files using Boolean\n"
 "expressions.  For example, a search for \"hello AND world\" would return a\n"
@@ -14442,24 +15019,16 @@ msgid ""
 "for parsing HTML files."
 msgstr ""
 
-#: gnu/packages/search.scm:213
-msgid "Full-text search system"
-msgstr ""
-
-#: gnu/packages/search.scm:214
+#: gnu/packages/search.scm:257
 msgid ""
 "Hyper Estraier can be used to integrate full-text\n"
 "search into applications, using either the provided command line and CGI\n"
 "interfaces, or a C API."
 msgstr ""
 
-#: gnu/packages/search.scm:232
-msgid "Locate files on the file system"
-msgstr ""
-
-#: gnu/packages/search.scm:234
+#: gnu/packages/search.scm:277
 msgid ""
-"mlocate is a locate/updatedb implementation.  The 'm' stands for\n"
+"mlocate is a locate/updatedb implementation.  The @code{m} stands for\n"
 "\"merging\": @code{updatedb} reuses the existing database to avoid rereading\n"
 "most of the file system, which makes it faster and does not trash the system\n"
 "caches as much.  The locate(1) utility is intended to be completely compatible\n"
@@ -14467,19 +15036,36 @@ msgid ""
 "conflict with slocate compatibility."
 msgstr ""
 
-#: gnu/packages/search.scm:299
-msgid "Web indexing system"
-msgstr ""
-
-#: gnu/packages/search.scm:301
+#: gnu/packages/search.scm:344
 msgid ""
 "Swish-e is Simple Web Indexing System for Humans - Enhanced.  Swish-e\n"
 "can quickly and easily index directories of files or remote web sites and\n"
 "search the generated indexes."
 msgstr ""
 
-#: gnu/packages/serveez.scm:52
-msgid "Framework for implementing IP-based servers"
+#: gnu/packages/search.scm:413
+msgid ""
+"Xapers is a personal document indexing system,\n"
+"geared towards academic journal articles build on the Xapian search engine.\n"
+"Think of it as your own personal document search engine, or a local cache of\n"
+"online libraries.  It provides fast search of document text and\n"
+"bibliographic data and simple document and bibtex retrieval."
+msgstr ""
+
+#: gnu/packages/search.scm:461
+msgid ""
+"Ugrep is a ultra fast searcher of file systems, text\n"
+"and binary files, source code, archives, compressed files, documents, and\n"
+"more.\n"
+"\n"
+"While still being compatible with the standard GNU/BSD grep command-line\n"
+"options, ugrep supports fuzzy search as well as structured and (adjustable)\n"
+"colored output, piped through \"less\" for pagination.  An interactive query\n"
+"UI allows refinement and has a built-in help (press F1).  Ugrep implements\n"
+"multi-threaded and other techniques to speed up search, pattern-matching and\n"
+"decompression.  Many pre-defined regexps ease searching e.g. C typdefs or XML\n"
+"attributes.  Results can be output in several structured or self-defined\n"
+"formats."
 msgstr ""
 
 #: gnu/packages/serveez.scm:54
@@ -14493,11 +15079,7 @@ msgid ""
 "server and an IRC server."
 msgstr ""
 
-#: gnu/packages/shells.scm:79
-msgid "POSIX-compliant shell optimised for size"
-msgstr ""
-
-#: gnu/packages/shells.scm:81
+#: gnu/packages/shells.scm:104
 msgid ""
 "dash is a POSIX-compliant @command{/bin/sh} implementation that aims to be\n"
 "as small as possible, often without sacrificing speed.  It is faster than the\n"
@@ -14505,45 +15087,32 @@ msgid ""
 "direct descendant of NetBSD's Almquist Shell (@command{ash})."
 msgstr ""
 
-#: gnu/packages/shells.scm:136
-msgid "The friendly interactive shell"
-msgstr ""
-
-#: gnu/packages/shells.scm:138
+#: gnu/packages/shells.scm:248
 msgid ""
 "Fish (friendly interactive shell) is a shell focused on interactive use,\n"
 "discoverability, and friendliness.  Fish has very user-friendly and powerful\n"
 "tab-completion, including descriptions of every completion, completion of\n"
 "strings with wildcards, and many completions for specific commands.  It also\n"
-"has extensive and discoverable help.  A special help command gives access to\n"
-"all the fish documentation in your web browser.  Other features include smart\n"
-"terminal handling based on terminfo, an easy to search history, and syntax\n"
-"highlighting."
+"has extensive and discoverable help.  A special @command{help} command gives\n"
+"access to all the fish documentation in your web browser.  Other features\n"
+"include smart terminal handling based on terminfo, an easy to search history,\n"
+"and syntax highlighting."
 msgstr ""
 
-#: gnu/packages/shells.scm:170
-msgid "Fish completions for Guix"
-msgstr ""
-
-#: gnu/packages/shells.scm:172
-msgid "Fish-guix provides completions for Guix for users of the fish shell."
-msgstr ""
-
-#: gnu/packages/shells.scm:213
-msgid "Alternative implementation of the rc shell by Byron Rakitzis"
+#: gnu/packages/shells.scm:302
+msgid ""
+"@code{fish-foreign-env} wraps bash script execution in a way\n"
+"that environment variables that are exported or modified get imported back\n"
+"into fish."
 msgstr ""
 
-#: gnu/packages/shells.scm:215
+#: gnu/packages/shells.scm:342
 msgid ""
 "This is a reimplementation by Byron Rakitzis of the Plan 9 shell.  It\n"
 "has a small feature set similar to a traditional Bourne shell."
 msgstr ""
 
-#: gnu/packages/shells.scm:246
-msgid "Extensible shell with higher-order functions"
-msgstr ""
-
-#: gnu/packages/shells.scm:248
+#: gnu/packages/shells.scm:375
 msgid ""
 "Es is an extensible shell.  The language was derived from the Plan 9\n"
 "shell, rc, and was influenced by functional programming languages, such as\n"
@@ -14552,11 +15121,7 @@ msgid ""
 "written by Paul Haahr and Byron Rakitzis."
 msgstr ""
 
-#: gnu/packages/shells.scm:308
-msgid "Unix shell based on csh"
-msgstr ""
-
-#: gnu/packages/shells.scm:310
+#: gnu/packages/shells.scm:444
 msgid ""
 "Tcsh is an enhanced, but completely compatible version of the Berkeley\n"
 "UNIX C shell (csh).  It is a command language interpreter usable both as an\n"
@@ -14565,11 +15130,7 @@ msgid ""
 "history mechanism, job control and a C-like syntax."
 msgstr ""
 
-#: gnu/packages/shells.scm:359
-msgid "Powerful shell for interactive use and scripting"
-msgstr ""
-
-#: gnu/packages/shells.scm:360
+#: gnu/packages/shells.scm:513
 msgid ""
 "The Z shell (zsh) is a Unix shell that can be used\n"
 "as an interactive login shell and as a powerful command interpreter\n"
@@ -14578,11 +15139,7 @@ msgid ""
 "ksh, and tcsh."
 msgstr ""
 
-#: gnu/packages/shells.scm:399
-msgid "Python-ish shell"
-msgstr ""
-
-#: gnu/packages/shells.scm:401
+#: gnu/packages/shells.scm:563
 msgid ""
 "Xonsh is a Python-ish, BASHwards-looking shell language and command\n"
 "prompt.  The language is a superset of Python 3.4+ with additional shell\n"
@@ -14591,11 +15148,7 @@ msgid ""
 "use of experts and novices alike."
 msgstr ""
 
-#: gnu/packages/shells.scm:448
-msgid "Unix shell embedded in Scheme"
-msgstr ""
-
-#: gnu/packages/shells.scm:450
+#: gnu/packages/shells.scm:609
 msgid ""
 "Scsh is a Unix shell embedded in Scheme.  Scsh has two main\n"
 "components: a process notation for running programs and setting up pipelines\n"
@@ -14603,11 +15156,7 @@ msgid ""
 "operating system."
 msgstr ""
 
-#: gnu/packages/shells.scm:489
-msgid "Minimal zero-config readline replacement"
-msgstr ""
-
-#: gnu/packages/shells.scm:491
+#: gnu/packages/shells.scm:651
 msgid ""
 "Linenoise is a minimal, zero-config, readline replacement.\n"
 "Its features include:\n"
@@ -14621,14 +15170,11 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/shells.scm:551
-msgid "Extremely minimal shell with the simplest syntax possible"
-msgstr ""
-
-#: gnu/packages/shells.scm:553
+#: gnu/packages/shells.scm:715
 msgid ""
-"S is a new shell that aims to be extremely simple.\n"
-"S does not implemnt the POSIX shell standard.\n"
+"S is a new shell that aims to be extremely simple.  It does not\n"
+"implement the POSIX shell standard.\n"
+"\n"
 "There are no globs or \"splatting\" where a variable $FOO turns into multiple\n"
 "command line arguments.  One token stays one token forever.\n"
 "This is a \"no surprises\" straightforward approach.\n"
@@ -14638,42 +15184,210 @@ msgid ""
 "A @code{andglob} program is also provided along with s."
 msgstr ""
 
-#: gnu/packages/shells.scm:581
-msgid "Port of OpenBSD Korn Shell"
-msgstr ""
-
-#: gnu/packages/shells.scm:583
+#: gnu/packages/shells.scm:746
 msgid ""
 "Oksh is a port of the OpenBSD Korn Shell.\n"
 "The OpenBSD Korn Shell is a cleaned up and enhanced ksh."
 msgstr ""
 
-#: gnu/packages/shells.scm:615
-msgid "Korn Shell from OpenBSD"
-msgstr ""
-
-#: gnu/packages/shells.scm:617
+#: gnu/packages/shells.scm:780
 msgid ""
 "loksh is a Linux port of OpenBSD's @command{ksh}.  It is a small,\n"
 "interactive POSIX shell targeted at resource-constrained systems."
 msgstr ""
 
-#: gnu/packages/shells.scm:655
-msgid "Korn Shell from MirBSD"
-msgstr ""
-
-#: gnu/packages/shells.scm:656
+#: gnu/packages/shells.scm:819
 msgid ""
 "mksh is an actively developed free implementation of the\n"
 "Korn Shell programming language and a successor to the Public Domain Korn\n"
 "Shell (pdksh)."
 msgstr ""
 
-#: gnu/packages/telephony.scm:66
-msgid "(u)Common C++ framework for threaded applications"
+#: gnu/packages/shells.scm:861
+msgid ""
+"Oil is a programming language with automatic translation for\n"
+"Bash.  It includes osh, a Unix/POSIX shell that runs unmodified Bash\n"
+"scripts."
+msgstr ""
+
+#: gnu/packages/shells.scm:898
+msgid ""
+"Gash is a POSIX-compatible shell written in Guile\n"
+"Scheme.  It provides both the shell interface, as well as a Guile\n"
+"library for parsing shell scripts.  Gash is designed to bootstrap Bash\n"
+"as part of the Guix bootstrap process."
+msgstr ""
+
+#: gnu/packages/shells.scm:932
+msgid ""
+"Gash-Utils provides Scheme implementations of many\n"
+"common POSIX utilities (there are about 40 of them, ranging in\n"
+"complexity from @command{false} to @command{awk}).  The utilities are\n"
+"designed to be capable of bootstrapping their standard GNU counterparts.\n"
+"Underpinning these utilities are many Scheme interfaces for manipulating\n"
+"files and text."
+msgstr ""
+
+#: gnu/packages/shells.scm:1011
+msgid ""
+"Nu draws inspiration from projects like PowerShell, functional\n"
+"programming languages, and modern CLI tools.  Rather than thinking of files\n"
+"and services as raw streams of text, Nu looks at each input as something with\n"
+"structure.  For example, when you list the contents of a directory, what you\n"
+"get back is a table of rows, where each row represents an item in that\n"
+"directory.  These values can be piped through a series of steps, in a series\n"
+"of commands called a ``pipeline''."
+msgstr ""
+
+#: gnu/packages/shells.scm:1040
+msgid ""
+"This package is a library for ANSI terminal colors and styles (bold,\n"
+"underline)."
+msgstr ""
+
+#: gnu/packages/shells.scm:1165 gnu/packages/shells.scm:1288
+#: gnu/packages/shells.scm:1334
+msgid "CLI for nushell"
+msgstr ""
+
+#: gnu/packages/shells.scm:1394
+msgid "Core commands for nushell"
+msgstr ""
+
+#: gnu/packages/shells.scm:1428
+msgid "Core error subsystem for Nushell"
+msgstr ""
+
+#: gnu/packages/shells.scm:1454
+msgid "This package is a fork of @code{serde-hjson}."
+msgstr ""
+
+#: gnu/packages/shells.scm:1494
+msgid "Nushell parser"
+msgstr ""
+
+#: gnu/packages/shells.scm:1526
+msgid "Nushell Plugin"
+msgstr ""
+
+#: gnu/packages/shells.scm:1557
+msgid "This package provides a binary viewer plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1587
+msgid "This package provides a plugin to display charts in Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1616
+msgid "This package provides a URL fetch plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1645 gnu/packages/shells.scm:1676
+#: gnu/packages/shells.scm:1962 gnu/packages/shells.scm:1993
+msgid ""
+"This package provides a converter plugin to the bson format for\n"
+"Nushell."
 msgstr ""
 
-#: gnu/packages/telephony.scm:67
+#: gnu/packages/shells.scm:1706
+msgid ""
+"This package provides a version incrementer plugin for\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1733
+msgid "This package provides a regex match plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1763
+msgid "This package is an HTTP POST plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1792
+msgid "This package provides a process list plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1818
+msgid "This package is an S3 plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1844
+msgid "This package provides web scraping using CSS selector."
+msgstr ""
+
+#: gnu/packages/shells.scm:1874
+msgid ""
+"This package provides a plugin to open files/URLs directly from\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1904
+msgid "This package provides a system info plugin for Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:1933
+msgid ""
+"This package provides a text viewer plugin for\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:2020
+msgid ""
+"This package provides a tree viewer plugin for\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:2049
+msgid "Traverses XML"
+msgstr ""
+
+#: gnu/packages/shells.scm:2086
+msgid "Core values and protocols for Nushell"
+msgstr ""
+
+#: gnu/packages/shells.scm:2112
+msgid ""
+"This package provides a source string characterizer for\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/shells.scm:2137
+msgid "This package provides Nushell stream."
+msgstr ""
+
+#: gnu/packages/shells.scm:2160
+msgid "Nushell table printing"
+msgstr ""
+
+#: gnu/packages/shells.scm:2193
+msgid ""
+"This package provides support for writing Nushell\n"
+"tests."
+msgstr ""
+
+#: gnu/packages/shells.scm:2222
+msgid ""
+"This package provides @code{Extension} traits for values in\n"
+"Nushell."
+msgstr ""
+
+#: gnu/packages/telephony.scm:120
+msgid ""
+"LibiLBC is a packaging friendly copy of the iLBC codec from\n"
+"the WebRTC project.  It provides a base for distribution packages and can be\n"
+"used as drop-in replacement for the non-free code from RFC 3591."
+msgstr ""
+
+#: gnu/packages/telephony.scm:208
+msgid ""
+"SpanDSP is a library of DSP functions for telephony, in the\n"
+"8000 sample per second world of E1s, T1s, and higher order PCM channels.  It\n"
+"contains low level functions, such as basic filters.  It also contains higher\n"
+"level functions, such as cadenced supervisory tone detection, and a complete\n"
+"software FAX machine."
+msgstr ""
+
+#: gnu/packages/telephony.scm:238
 msgid ""
 "GNU Common C++ is an portable, optimized class framework for\n"
 "threaded applications, supporting concurrent synchronization, inter-process\n"
@@ -14682,11 +15396,7 @@ msgid ""
 "reimplementation."
 msgstr ""
 
-#: gnu/packages/telephony.scm:87
-msgid "Common C++ framework for threaded applications"
-msgstr ""
-
-#: gnu/packages/telephony.scm:88
+#: gnu/packages/telephony.scm:261
 msgid ""
 "GNU uCommon C++ is meant as a very light-weight C++ library\n"
 "to facilitate using C++ design patterns even for very deeply embedded\n"
@@ -14694,11 +15404,7 @@ msgid ""
 "support."
 msgstr ""
 
-#: gnu/packages/telephony.scm:110
-msgid "Implementation of RTP (real-time transport protocol)"
-msgstr ""
-
-#: gnu/packages/telephony.scm:111
+#: gnu/packages/telephony.scm:284
 msgid ""
 "GNU ccRTP is an implementation of RTP, the real-time transport\n"
 "protocol from the IETF.  It is suitable both for high capacity servers and\n"
@@ -14707,22 +15413,21 @@ msgid ""
 "packet-manipulation library."
 msgstr ""
 
-#: gnu/packages/telephony.scm:133
-msgid "Library implementing SIP (RFC-3261)"
+#: gnu/packages/telephony.scm:318
+msgid ""
+"GNU ZRTP C++ provides a library that adds ZRTP support to the\n"
+"GNU ccRTP stack and serves as library for other RTP stacks\n"
+"(PJSIP, GStreamer)."
 msgstr ""
 
-#: gnu/packages/telephony.scm:134
+#: gnu/packages/telephony.scm:338
 msgid ""
 "GNU oSIP is an implementation of the SIP protocol.  It is\n"
 "used to provide multimedia and telecom software developers with an interface\n"
 "to initiate and control SIP sessions."
 msgstr ""
 
-#: gnu/packages/telephony.scm:153
-msgid "Sip abstraction library"
-msgstr ""
-
-#: gnu/packages/telephony.scm:154
+#: gnu/packages/telephony.scm:360
 msgid ""
 "EXosip is a library that hides the complexity of using the\n"
 "SIP protocol for multimedia session establishment.  This protocol is mainly to\n"
@@ -14731,11 +15436,7 @@ msgid ""
 "multiplayer games."
 msgstr ""
 
-#: gnu/packages/telephony.scm:197
-msgid "Secure peer-to-peer VoIP server for the SIP protocol"
-msgstr ""
-
-#: gnu/packages/telephony.scm:198
+#: gnu/packages/telephony.scm:404
 msgid ""
 "GNU SIP Witch is a peer-to-peer Voice-over-IP server that\n"
 "uses the SIP protocol.  Calls can be made from behind NAT firewalls and\n"
@@ -14745,32 +15446,20 @@ msgid ""
 "internet."
 msgstr ""
 
-#: gnu/packages/telephony.scm:243
-msgid "Secure RTP (SRTP) Reference Implementation"
-msgstr ""
-
-#: gnu/packages/telephony.scm:244
+#: gnu/packages/telephony.scm:446
 msgid ""
-"This package provides an implementation of the Secure\n"
-"Real-time Transport Protocol (SRTP), the Universal Security Transform (UST),\n"
-"and a supporting cryptographic kernel."
-msgstr ""
-
-#: gnu/packages/telephony.scm:279
-msgid "Inter-Asterisk-Protocol library"
+"This package provides an implementation of the Secure Real-time Transport\n"
+"Protocol (@dfn{SRTP}), the Universal Security Transform (@dfn{UST}), and a\n"
+"supporting cryptographic kernel."
 msgstr ""
 
-#: gnu/packages/telephony.scm:280
+#: gnu/packages/telephony.scm:475
 msgid ""
 "LibIAX2 implements the Inter-Asterisk-Protocol for relaying\n"
 "Voice-over-IP (VoIP) communications."
 msgstr ""
 
-#: gnu/packages/telephony.scm:311
-msgid "Simple VoIP program to create conferences from the terminal"
-msgstr ""
-
-#: gnu/packages/telephony.scm:313
+#: gnu/packages/telephony.scm:508
 msgid ""
 "Seren is a simple VoIP program based on the Opus codec that allows you\n"
 "to create a voice conference from the terminal, with up to 10 participants,\n"
@@ -14779,11 +15468,7 @@ msgid ""
 "address of one of the participants."
 msgstr ""
 
-#: gnu/packages/telephony.scm:425
-msgid "Low-latency, high quality voice chat software"
-msgstr ""
-
-#: gnu/packages/telephony.scm:427
+#: gnu/packages/telephony.scm:657
 msgid ""
 "Mumble is an low-latency, high quality voice chat\n"
 "software primarily intended for use while gaming.\n"
@@ -14791,12 +15476,27 @@ msgid ""
 "@code{mumble} for the client, and @code{murmur} for the server."
 msgstr ""
 
-#: gnu/packages/tex.scm:192 gnu/packages/tex.scm:3844
-#: gnu/packages/tex.scm:3906
-msgid "TeX Live, a package of the TeX typesetting system"
+#: gnu/packages/telephony.scm:716
+msgid ""
+"Twinkle is a softphone for your voice over IP and instant\n"
+"messaging communcations using the SIP protocol.  You can use it for direct\n"
+"IP phone to IP phone communication or in a network using a SIP proxy to route\n"
+"your calls and messages."
+msgstr ""
+
+#: gnu/packages/telephony.scm:858
+msgid ""
+"PJProject provides an implementation of the Session\n"
+"Initiation Protocol (SIP) and a multimedia framework."
+msgstr ""
+
+#: gnu/packages/telephony.scm:906
+msgid ""
+"A collection of libraries and header files for implementing\n"
+"telephony functionality into custom Telegram clients."
 msgstr ""
 
-#: gnu/packages/tex.scm:194
+#: gnu/packages/tex.scm:451
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -14806,21 +15506,13 @@ msgid ""
 "This package contains the binaries."
 msgstr ""
 
-#: gnu/packages/tex.scm:259
-msgid "DVI to PostScript drivers"
-msgstr ""
-
-#: gnu/packages/tex.scm:260
+#: gnu/packages/tex.scm:471
 msgid ""
-"This package provides files needed for converting DVI files\n"
-"to PostScript."
+"This package provides the docstrip utility to strip\n"
+"documentation from TeX files.  It is part of the LaTeX base."
 msgstr ""
 
-#: gnu/packages/tex.scm:293
-msgid "Unicode data and loaders for TeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:294
+#: gnu/packages/tex.scm:486
 msgid ""
 "This bundle provides generic access to Unicode Consortium\n"
 "data for TeX use.  It contains a set of text files provided by the Unicode\n"
@@ -14833,23 +15525,21 @@ msgid ""
 "out to date by @code{unicode-letters.tex}. "
 msgstr ""
 
-#: gnu/packages/tex.scm:331
-msgid "Hyphenation patterns for German"
-msgstr ""
-
-#: gnu/packages/tex.scm:332
+#: gnu/packages/tex.scm:519
 msgid ""
-"The package provides experimental hyphenation patterns for\n"
-"the German language, covering both traditional and reformed orthography.  The\n"
-"patterns can be used with packages Babel and hyphsubst from the Oberdiek\n"
-"bundle."
+"This package includes Knuth's original @file{hyphen.tex},\n"
+"@file{zerohyph.tex} to disable hyphenation, @file{language.us} which starts\n"
+"the autogenerated files @file{language.dat} and @file{language.def} (and\n"
+"default versions of those), etc."
 msgstr ""
 
-#: gnu/packages/tex.scm:366
-msgid "Files for creating TeX formats"
+#: gnu/packages/tex.scm:540
+msgid ""
+"This package provides files needed for converting DVI files\n"
+"to PostScript."
 msgstr ""
 
-#: gnu/packages/tex.scm:367
+#: gnu/packages/tex.scm:554
 msgid ""
 "This bundle provides a collection of model \".ini\" files\n"
 "for creating TeX formats.  These files are commonly used to introduced\n"
@@ -14858,38 +15548,23 @@ msgid ""
 "to adapt the plain e-TeX source file to work with XeTeX and LuaTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:400
-msgid "Hyphenation patterns expressed in UTF-8"
-msgstr ""
-
-#: gnu/packages/tex.scm:401
-msgid ""
-"Modern native UTF-8 engines such as XeTeX and LuaTeX need\n"
-"hyphenation patterns in UTF-8 format, whereas older systems require\n"
-"hyphenation patterns in the 8-bit encoding of the font in use (such encodings\n"
-"are codified in the LaTeX scheme with names like OT1, T2A, TS1, OML, LY1,\n"
-"etc).  The present package offers a collection of conversions of existing\n"
-"patterns to UTF-8 format, together with converters for use with 8-bit fonts in\n"
-"older systems.  Since hyphenation patterns for Knuthian-style TeX systems are\n"
-"only read at iniTeX time, it is hoped that the UTF-8 patterns, with their\n"
-"converters, will completely supplant the older patterns."
-msgstr ""
-
-#: gnu/packages/tex.scm:476
-msgid "Metafont base files"
-msgstr ""
-
-#: gnu/packages/tex.scm:477
+#: gnu/packages/tex.scm:612
 msgid ""
 "This package provides the Metafont base files needed to\n"
 "build fonts using the Metafont system."
 msgstr ""
 
-#: gnu/packages/tex.scm:508
-msgid "Scheme for naming fonts in TeX"
+#: gnu/packages/tex.scm:698
+msgid ""
+"This package provides TeX macros for converting Adobe Font\n"
+"Metric files to TeX metric and virtual font format.  Fontinst helps mainly\n"
+"with the number crunching and shovelling parts of font installation.  This\n"
+"means in practice that it creates a number of files which give the TeX\n"
+"metrics (and related information) for a font family that TeX needs to do any\n"
+"typesetting in these fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:509
+#: gnu/packages/tex.scm:720
 msgid ""
 "This is Fontname, a naming scheme for (the base part of)\n"
 "external TeX font filenames.  This makes at most eight-character names\n"
@@ -14897,11 +15572,7 @@ msgid ""
 "documents."
 msgstr ""
 
-#: gnu/packages/tex.scm:576
-msgid "Computer Modern fonts for TeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:577
+#: gnu/packages/tex.scm:794
 msgid ""
 "This package provides the Computer Modern fonts by Donald\n"
 "Knuth.  The Computer Modern font family is a large collection of text,\n"
@@ -14909,22 +15580,37 @@ msgid ""
 "8A."
 msgstr ""
 
-#: gnu/packages/tex.scm:640
-msgid "Small library of METAFONT sources"
+#: gnu/packages/tex.scm:826
+msgid ""
+"The CM-Super family provides Adobe Type 1 fonts that replace\n"
+"the T1/TS1-encoded Computer Modern (EC/TC), T1/TS1-encoded Concrete,\n"
+"T1/TS1-encoded CM bright and LH Cyrillic fonts (thus supporting all European\n"
+"languages except Greek), and bringing many ameliorations in typesetting\n"
+"quality.  The fonts exhibit the same metrics as the METAFONT-encoded\n"
+"originals."
+msgstr ""
+
+#: gnu/packages/tex.scm:860
+msgid ""
+"This package provides a drop-in replacements for the Courier\n"
+"font from Adobe's basic set."
+msgstr ""
+
+#: gnu/packages/tex.scm:883
+msgid ""
+"The Latin Modern fonts are derived from the famous Computer\n"
+"Modern fonts designed by Donald E. Knuth and described in Volume E of his\n"
+"Computers & Typesetting series."
 msgstr ""
 
-#: gnu/packages/tex.scm:641
+#: gnu/packages/tex.scm:957
 msgid ""
 "This is a collection of core TeX and METAFONT macro files\n"
 "from Donald Knuth, including the plain format, plain base, and the MF logo\n"
 "fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:713
-msgid "Collection of fonts used in LaTeX distributions"
-msgstr ""
-
-#: gnu/packages/tex.scm:714
+#: gnu/packages/tex.scm:1032
 msgid ""
 "This is a collection of fonts for use with standard LaTeX\n"
 "packages and classes. It includes invisible fonts (for use with the slides\n"
@@ -14932,11 +15618,23 @@ msgid ""
 "symbol fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:791 gnu/packages/tex.scm:821
-msgid "TeX fonts from the American Mathematical Society"
+#: gnu/packages/tex.scm:1055
+msgid ""
+"This package provides LaTeX and font definition files to access the\n"
+"Knuthian mflogo fonts described in The Metafontbook and to typeset Metafont\n"
+"logos in LaTeX documents."
 msgstr ""
 
-#: gnu/packages/tex.scm:793
+#: gnu/packages/tex.scm:1074
+msgid ""
+"These fonts were created in METAFONT by Knuth, for his own publications.\n"
+"At some stage, the letters P and S were added, so that the METAPOST logo could\n"
+"also be expressed.  The fonts were originally issued (of course) as METAFONT\n"
+"source; they have since been autotraced and reissued in Adobe Type 1 format by\n"
+"Taco Hoekwater."
+msgstr ""
+
+#: gnu/packages/tex.scm:1218
 msgid ""
 "This package provides an extended set of fonts for use in mathematics,\n"
 "including: extra mathematical symbols; blackboard bold letters (uppercase\n"
@@ -14950,29 +15648,460 @@ msgid ""
 "details can be found in the documentation."
 msgstr ""
 
-#: gnu/packages/tex.scm:823
+#: gnu/packages/tex.scm:1250
+msgid ""
+"Mkpattern is a general purpose program for the generation of\n"
+"hyphenation patterns, with definition of letter sets and template-like\n"
+"constructions.  It also provides an easy way to handle different input and\n"
+"output encodings, and features generation of clean UTF-8 patterns."
+msgstr ""
+
+#: gnu/packages/tex.scm:1309
+msgid ""
+"This package provides an extended version of TeX (which is capable of\n"
+"running as if it were TeX unmodified).  E-TeX has been specified by the LaTeX\n"
+"team as the engine for the development of LaTeX2e; as a result, LaTeX\n"
+"programmers may assume e-TeX functionality.  The pdftex engine directly\n"
+"incorporates the e-TeX extensions."
+msgstr ""
+
+#: gnu/packages/tex.scm:1327
+msgid ""
+"This package contains files used to build the Plain TeX format, as\n"
+"described in the TeXbook, together with various supporting files (some also\n"
+"discussed in the book)."
+msgstr ""
+
+#: gnu/packages/tex.scm:1353
+msgid ""
+"This package provides a drop-in replacements for the Helvetica\n"
+"font from Adobe's basic set."
+msgstr ""
+
+#: gnu/packages/tex.scm:1366
+msgid ""
+"The package provides hyphenation patterns for the Afrikaans\n"
+"language."
+msgstr ""
+
+#: gnu/packages/tex.scm:1380
+msgid ""
+"The package provides hyphenation patterns for ancient\n"
+"Greek."
+msgstr ""
+
+#: gnu/packages/tex.scm:1393
+msgid ""
+"The package provides hyphenation patterns for the Armenian\n"
+"language."
+msgstr ""
+
+#: gnu/packages/tex.scm:1407
+msgid ""
+"The package provides hyphenation patterns for the Basque\n"
+"language."
+msgstr ""
+
+#: gnu/packages/tex.scm:1421
+msgid ""
+"The package provides hyphenation patterns for the Belarusian\n"
+"language."
+msgstr ""
+
+#: gnu/packages/tex.scm:1435
+msgid ""
+"The package provides hyphenation patterns for the Bulgarian\n"
+"language in T2A and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1449
 msgid ""
-"This package provides basic LaTeX support for the symbol fonts provides\n"
-"by the amsfonts package.  It provides @code{amsfonts.sty}, with names of\n"
-"individual symbols defined in @code{amssymb.sty}."
+"The package provides hyphenation patterns for Catalan in\n"
+"T1/EC and UTF-8 encodings."
 msgstr ""
 
-#: gnu/packages/tex.scm:856
-msgid "Plain TeX format and supporting files"
+#: gnu/packages/tex.scm:1461
+msgid ""
+"The package provides hyphenation patterns for unaccented\n"
+"Chinese pinyin T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1473
+msgid ""
+"The package provides hyphenation patterns for Church\n"
+"Slavonic in UTF-8 encoding."
+msgstr ""
+
+#: gnu/packages/tex.scm:1486
+msgid ""
+"The package provides hyphenation patterns for Coptic in\n"
+"UTF-8 encoding as well as in ASCII-based encoding for 8-bit engines."
+msgstr ""
+
+#: gnu/packages/tex.scm:1499
+msgid ""
+"The package provides hyphenation patterns for Croatian in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1511
+msgid ""
+"The package provides hyphenation patterns for Czech in T1/EC\n"
+"and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1523
+msgid ""
+"The package provides hyphenation patterns for Danish in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1536
+msgid ""
+"The package provides hyphenation patterns for Dutch in T1/EC\n"
+"and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1549
+msgid ""
+"The package provides additional hyphenation patterns for\n"
+"American and British English in ASCII encoding."
+msgstr ""
+
+#: gnu/packages/tex.scm:1563
+msgid ""
+"The package provides hyphenation patterns for Esperanto ISO\n"
+"Latin 3 and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1575
+msgid ""
+"The package provides hyphenation patterns for Estonian in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1589
+msgid ""
+"The package provides hyphenation patterns for languages\n"
+"written using the Ethiopic script for Unicode engines.  They are not supposed\n"
+"to be linguistically relevant in all cases and should, for proper typography,\n"
+"be replaced by files tailored to individual languages."
+msgstr ""
+
+#: gnu/packages/tex.scm:1603
+msgid ""
+"The package provides hyphenation patterns for Finnish in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1615
+msgid ""
+"The package provides hyphenation patterns for French in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1627
+msgid ""
+"The package provides hyphenation patterns for Friulan in\n"
+"ASCII encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1640
+msgid ""
+"The package provides hyphenation patterns for Galician in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1652
+msgid ""
+"The package provides hyphenation patterns for Georgian in\n"
+"T8M, T8K, and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1670
+msgid ""
+"This package provides hyphenation patterns for German in\n"
+"T1/EC and UTF-8 encodings, for traditional and reformed spelling, including\n"
+"Swiss German."
+msgstr ""
+
+#: gnu/packages/tex.scm:1689
+msgid ""
+"This package provides hyphenation patterns for Modern Greek\n"
+"in monotonic and polytonic spelling in LGR and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1703
+msgid ""
+"This package provides hyphenation patterns for Hungarian in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1716
+msgid ""
+"This package provides hyphenation patterns for Icelandic in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1739
+msgid ""
+"This package provides hyphenation patterns for Assamese,\n"
+"Bengali, Gujarati, Hindi, Kannada, Malayalam, Marathi, Oriya, Panjabi, Tamil\n"
+"and Telugu for Unicode engines."
+msgstr ""
+
+#: gnu/packages/tex.scm:1752
+msgid ""
+"This package provides hyphenation patterns for\n"
+"Indonesian (Bahasa Indonesia) in ASCII encoding.  They are probably also\n"
+"usable for Malay (Bahasa Melayu)."
+msgstr ""
+
+#: gnu/packages/tex.scm:1765
+msgid ""
+"This package provides hyphenation patterns for Interlingua\n"
+"in ASCII encoding."
+msgstr ""
+
+#: gnu/packages/tex.scm:1777
+msgid ""
+"This package provides hyphenation patterns for\n"
+"Irish (Gaeilge) in T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1790
+msgid ""
+"This package provides hyphenation patterns for Italian in\n"
+"ASCII encoding.  Compliant with the Recommendation UNI 6461 on hyphenation\n"
+"issued by the Italian Standards Institution (Ente Nazionale di Unificazione\n"
+"UNI)."
+msgstr ""
+
+#: gnu/packages/tex.scm:1804
+msgid ""
+"This package provides hyphenation patterns for\n"
+"Kurmanji (Northern Kurdish) as spoken in Turkey and by the Kurdish diaspora in\n"
+"Europe, in T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1819
+msgid ""
+"This package provides hyphenation patterns for Latin in\n"
+"T1/EC and UTF-8 encodings, mainly in modern spelling (u when u is needed and v\n"
+"when v is needed), medieval spelling with the ligatures @code{\\ae} and\n"
+"@code{\\oe} and the (uncial) lowercase 'v' written as a 'u' is also supported.\n"
+"Apparently there is no conflict between the patterns of modern Latin and those\n"
+"of medieval Latin.  It also includes hyphenation patterns for the Classical\n"
+"Latin in T1/EC and UTF-8 encodings.  Classical Latin hyphenation patterns are\n"
+"different from those of 'plain' Latin, the latter being more adapted to modern\n"
+"Latin.  It also provides hyphenation patterns for the Liturgical Latin in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1840
+msgid ""
+"This package provides hyphenation patterns for Latvian in\n"
+"L7X and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1853
+msgid ""
+"This package provides hyphenation patterns for Lithuanian in\n"
+"L7X and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1868
+msgid ""
+"This package provides hyphenation patterns for Mongolian in\n"
+"T2A, LMC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1883
+msgid ""
+"This package provides hyphenation patterns for Norwegian\n"
+"Bokmal and Nynorsk in T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1897
+msgid ""
+"This package provides hyphenation patterns for Occitan in\n"
+"T1/EC and UTF-8 encodings.  They are supposed to be valid for all the Occitan\n"
+"variants spoken and written in the wide area called 'Occitanie' by the French.\n"
+"It ranges from the Val d'Aran within Catalunya, to the South Western Italian\n"
+"Alps encompassing the southern half of the French pentagon."
+msgstr ""
+
+#: gnu/packages/tex.scm:1912
+msgid ""
+"This package provides hyphenation patterns for Panjabi in\n"
+"T1/EC encoding."
+msgstr ""
+
+#: gnu/packages/tex.scm:1925
+msgid ""
+"This package provides hyphenation patterns for Piedmontese\n"
+"in ASCII encoding.  Compliant with 'Gramatica dla lengua piemonteisa' by\n"
+"Camillo Brero."
+msgstr ""
+
+#: gnu/packages/tex.scm:1938
+msgid ""
+"This package provides hyphenation patterns for Polish in QX\n"
+"and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1951
+msgid ""
+"This package provides hyphenation patterns for Portuguese in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1963
+msgid ""
+"This package provides hyphenation patterns for Romanian in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:1976
+msgid ""
+"This package provides hyphenation patterns for Romansh in\n"
+"ASCII encodings.  They are supposed to comply with the rules indicated by the\n"
+"Lia Rumantscha (Romansh language society)."
+msgstr ""
+
+#: gnu/packages/tex.scm:1989
+msgid ""
+"This package provides hyphenation patterns for Russian in\n"
+"T2A and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2002
+msgid ""
+"This package provides hyphenation patterns for Sanskrit and\n"
+"Prakrit in longdesc transliteration, and in Devanagari, Bengali, Kannada,\n"
+"Malayalam longdesc and Telugu scripts for Unicode engines."
+msgstr ""
+
+#: gnu/packages/tex.scm:2019
+msgid ""
+"This package provides hyphenation patterns for Serbian in\n"
+"T1/EC, T2A and UTF-8 encodings."
 msgstr ""
 
-#: gnu/packages/tex.scm:858
+#: gnu/packages/tex.scm:2032
 msgid ""
-"Contains files used to build the Plain TeX format, as described in the\n"
-"TeXbook, together with various supporting files (some also discussed in the\n"
-"book)."
+"This package provides hyphenation patterns for Slovak in\n"
+"T1/EC and UTF-8 encodings."
 msgstr ""
 
-#: gnu/packages/tex.scm:1004
-msgid "Base sources of LaTeX"
+#: gnu/packages/tex.scm:2044
+msgid ""
+"This package provides hyphenation patterns for Slovenian in\n"
+"T1/EC and UTF-8 encodings."
 msgstr ""
 
-#: gnu/packages/tex.scm:1006
+#: gnu/packages/tex.scm:2060
+msgid ""
+"The package provides hyphenation patterns for Spanish in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2072
+msgid ""
+"This package provides hyphenation patterns for Swedish in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2084
+msgid ""
+"This package provides hyphenation patterns for Thai in LTH\n"
+"and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2097
+msgid ""
+"The package provides hyphenation patterns for Turkish in\n"
+"T1/EC and UTF-8 encodings.  The patterns for Turkish were first produced for\n"
+"the Ottoman Texts Project in 1987 and were suitable for both Modern Turkish\n"
+"and Ottoman Turkish in Latin script, however the required character set didn't\n"
+"fit into EC encoding, so support for Ottoman Turkish had to be dropped to keep\n"
+"compatibility with 8-bit engines."
+msgstr ""
+
+#: gnu/packages/tex.scm:2114
+msgid ""
+"The package provides hyphenation patterns for Turkmen in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2126
+msgid ""
+"This package provides hyphenation patterns for Ukrainian in\n"
+"T2A and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2139
+msgid ""
+"This package provides hyphenation patterns for Upper Sorbian\n"
+"in T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2151
+msgid ""
+"This package provides hyphenation patterns for Welsh in\n"
+"T1/EC and UTF-8 encodings."
+msgstr ""
+
+#: gnu/packages/tex.scm:2272
+msgid ""
+"Modern native UTF-8 engines such as XeTeX and LuaTeX need\n"
+"hyphenation patterns in UTF-8 format, whereas older systems require\n"
+"hyphenation patterns in the 8-bit encoding of the font in use (such encodings\n"
+"are codified in the LaTeX scheme with names like OT1, T2A, TS1, OML, LY1,\n"
+"etc).  The present package offers a collection of conversions of existing\n"
+"patterns to UTF-8 format, together with converters for use with 8-bit fonts in\n"
+"older systems.  Since hyphenation patterns for Knuthian-style TeX systems are\n"
+"only read at iniTeX time, it is hoped that the UTF-8 patterns, with their\n"
+"converters, will completely supplant the older patterns."
+msgstr ""
+
+#: gnu/packages/tex.scm:2318
+msgid ""
+"The package provides experimental hyphenation patterns for\n"
+"the German language, covering both traditional and reformed orthography.  The\n"
+"patterns can be used with packages Babel and hyphsubst from the Oberdiek\n"
+"bundle."
+msgstr ""
+
+#: gnu/packages/tex.scm:2340
+msgid ""
+"The package provides a range of hyphenation patterns for\n"
+"Ukrainian, depending on the encoding of the output font including the standard\n"
+"T2A."
+msgstr ""
+
+#: gnu/packages/tex.scm:2379
+msgid ""
+"The package provides a collection of Russian hyphenation\n"
+"patterns supporting a number of Cyrillic font encodings, including T2,\n"
+"UCY (Omega Unicode Cyrillic), LCY, LWN (OT2), and koi8-r."
+msgstr ""
+
+#: gnu/packages/tex.scm:2422
+msgid ""
+"Kpathsea is a library and utility programs which provide\n"
+"path searching facilities for TeX file types, including the self-locating\n"
+"feature required for movable installations, layered on top of a general search\n"
+"mechanism.  This package provides supporting files."
+msgstr ""
+
+#: gnu/packages/tex.scm:2438
+msgid ""
+"The package provides configuration files for LaTeX-related\n"
+"formats."
+msgstr ""
+
+#: gnu/packages/tex.scm:2656
 msgid ""
 "This bundle comprises the source of LaTeX itself, together with several\n"
 "packages which are considered \"part of the kernel\".  This bundle, together\n"
@@ -14980,11 +16109,7 @@ msgid ""
 "contain."
 msgstr ""
 
-#: gnu/packages/tex.scm:1025
-msgid "Extended filecontents and filecontents* environments"
-msgstr ""
-
-#: gnu/packages/tex.scm:1027
+#: gnu/packages/tex.scm:2678
 msgid ""
 "LaTeX2e's @code{filecontents} and @code{filecontents*} environments\n"
 "enable a LaTeX source file to generate external files as it runs through\n"
@@ -14995,22 +16120,14 @@ msgid ""
 "@code{filecontents*} anywhere."
 msgstr ""
 
-#: gnu/packages/tex.scm:1053
-msgid "Am I running under XeTeX?"
-msgstr ""
-
-#: gnu/packages/tex.scm:1055
+#: gnu/packages/tex.scm:2707
 msgid ""
 "This is a simple package which provides an @code{\\ifxetex} conditional,\n"
 "so that other code can determine that it is running under XeTeX.  The package\n"
 "requires the e-TeX extensions to the TeX primitive set."
 msgstr ""
 
-#: gnu/packages/tex.scm:1086
-msgid "Simple macros for EPS inclusion"
-msgstr ""
-
-#: gnu/packages/tex.scm:1088
+#: gnu/packages/tex.scm:2724
 msgid ""
 "This package provides the original (and now obsolescent) graphics\n"
 "inclusion macros for use with dvips, still widely used by Plain TeX users (in\n"
@@ -15020,11 +16137,7 @@ msgid ""
 "users, via its Plain TeX version.)"
 msgstr ""
 
-#: gnu/packages/tex.scm:1113
-msgid "Sophisticated verbatim text"
-msgstr ""
-
-#: gnu/packages/tex.scm:1115
+#: gnu/packages/tex.scm:2747
 msgid ""
 "This package provides tools for the flexible handling of verbatim text\n"
 "including: verbatim commands in footnotes; a variety of verbatim environments\n"
@@ -15034,11 +16147,21 @@ msgid ""
 "verbatim source)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1177
-msgid "LaTeX standard graphics bundle"
+#: gnu/packages/tex.scm:2767
+msgid ""
+"This bundle is a combined distribution consisting of @file{dvips.def},\n"
+"@file{pdftex.def}, @file{luatex.def}, @file{xetex.def}, @file{dvipdfmx.def},\n"
+"and @file{dvisvgm.def} driver option files for the LaTeX graphics and color\n"
+"packages."
+msgstr ""
+
+#: gnu/packages/tex.scm:2785
+msgid ""
+"This bundle includes @file{color.cfg} and @file{graphics.cfg} files that\n"
+"set default \"driver\" options for the color and graphics packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1179
+#: gnu/packages/tex.scm:2808
 msgid ""
 "This is a collection of LaTeX packages for producing color, including\n"
 "graphics (e.g. PostScript) files, and rotation and scaling of text in LaTeX\n"
@@ -15046,11 +16169,7 @@ msgid ""
 "keyval, and lscape."
 msgstr ""
 
-#: gnu/packages/tex.scm:1200
-msgid "Driver-independent color extensions for LaTeX and pdfLaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1202
+#: gnu/packages/tex.scm:2842
 msgid ""
 "The package starts from the basic facilities of the colorcolor package,\n"
 "and provides easy driver-independent access to several kinds of color tints,\n"
@@ -15061,11 +16180,7 @@ msgid ""
 "tables."
 msgstr ""
 
-#: gnu/packages/tex.scm:1228
-msgid "Extensive support for hypertext in LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1230
+#: gnu/packages/tex.scm:2876
 msgid ""
 "The @code{hyperref} package is used to handle cross-referencing commands\n"
 "in LaTeX to produce hypertext links in the document.  The package provides\n"
@@ -15077,22 +16192,14 @@ msgid ""
 "@code{nameref} packages, which make use of the facilities of @code{hyperref}."
 msgstr ""
 
-#: gnu/packages/tex.scm:1263
-msgid "Bundle of packages submitted by Heiko Oberdiek"
-msgstr ""
-
-#: gnu/packages/tex.scm:1265
+#: gnu/packages/tex.scm:2914
 msgid ""
 "The bundle comprises various LaTeX packages, providing among others:\n"
 "better accessibility support for PDF files; extensible chemists reaction\n"
 "arrows; record information about document class(es) used; and many more."
 msgstr ""
 
-#: gnu/packages/tex.scm:1285
-msgid "LaTeX standard tools bundle"
-msgstr ""
-
-#: gnu/packages/tex.scm:1287
+#: gnu/packages/tex.scm:2937
 msgid ""
 "This package is a collection of (variously) simple tools provided as\n"
 "part of the LaTeX required tools distribution, comprising the following\n"
@@ -15102,11 +16209,7 @@ msgid ""
 "xr, and xspace."
 msgstr ""
 
-#: gnu/packages/tex.scm:1321
-msgid "Verbatim with URL-sensitive line breaks"
-msgstr ""
-
-#: gnu/packages/tex.scm:1322
+#: gnu/packages/tex.scm:2956
 msgid ""
 "The command @code{\\url} is a form of verbatim command that\n"
 "allows linebreaks at certain characters or combinations of characters, accepts\n"
@@ -15118,11 +16221,14 @@ msgid ""
 "of file names."
 msgstr ""
 
-#: gnu/packages/tex.scm:1348
-msgid "LaTeX3 programmers’ interface"
+#: gnu/packages/tex.scm:2983
+msgid ""
+"This package provides font maps that were originally part of\n"
+"the now obsolete teTeX distributions but are still used at the core of the TeX\n"
+"Live distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:1350
+#: gnu/packages/tex.scm:3005
 msgid ""
 "The l3kernel bundle provides an implementation of the LaTeX3\n"
 "programmers’ interface, as a set of packages that run under LaTeX 2e.  The\n"
@@ -15131,11 +16237,7 @@ msgid ""
 "that the LaTeX3 conventions can be used with regular LaTeX 2e packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1387
-msgid "High-level LaTeX3 concepts"
-msgstr ""
-
-#: gnu/packages/tex.scm:1389
+#: gnu/packages/tex.scm:3052
 msgid ""
 "This bundle holds prototype implementations of concepts for a LaTeX\n"
 "designer interface, to be used with the experimental LaTeX kernel as\n"
@@ -15152,11 +16254,7 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/tex.scm:1421
-msgid "Advanced font selection in XeLaTeX and LuaLaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1423
+#: gnu/packages/tex.scm:3114
 msgid ""
 "Fontspec is a package for XeLaTeX and LuaLaTeX.  It provides an\n"
 "automatic and unified interface to feature-rich AAT and OpenType fonts through\n"
@@ -15164,22 +16262,23 @@ msgid ""
 "the l3kernel and xparse bundles from the LaTeX 3 development team."
 msgstr ""
 
-#: gnu/packages/tex.scm:1458
-msgid "Lua modules for general programming (in the (La)TeX world)"
-msgstr ""
-
-#: gnu/packages/tex.scm:1460
+#: gnu/packages/tex.scm:3152
 msgid ""
 "Lualibs is a collection of Lua modules useful for general programming.\n"
 "The bundle is based on Lua modules shipped with ConTeXt, and made available in\n"
 "this bundle for use independent of ConTeXt."
 msgstr ""
 
-#: gnu/packages/tex.scm:1479
-msgid "AMS mathematical facilities for LaTeX"
+#: gnu/packages/tex.scm:3242
+msgid ""
+"Luaotfload is an adaptation of the ConTeXt font loading system for the\n"
+"Plain and LaTeX formats.  It allows OpenType fonts to be loaded with font\n"
+"features accessible using an extended font request syntax while providing\n"
+"compatibilitywith XeTeX.  By indexing metadata in a database it facilitates\n"
+"loading fonts by their proper names instead of file names."
 msgstr ""
 
-#: gnu/packages/tex.scm:1481
+#: gnu/packages/tex.scm:3266
 msgid ""
 "This is the principal package in the AMS-LaTeX distribution.  It adapts\n"
 "for use in LaTeX most of the mathematical features found in AMS-TeX; it is\n"
@@ -15194,11 +16293,7 @@ msgid ""
 "definitions."
 msgstr ""
 
-#: gnu/packages/tex.scm:1508
-msgid "AMS document classes for LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1510
+#: gnu/packages/tex.scm:3296
 msgid ""
 "This bundle contains three AMS classes: @code{amsartamsart} (for writing\n"
 "articles for the AMS), @code{amsbookamsbook} (for books) and\n"
@@ -15207,11 +16302,7 @@ msgid ""
 "distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:1540
-msgid "Multilingual support for Plain TeX or LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1542
+#: gnu/packages/tex.scm:3329
 msgid ""
 "The package manages culturally-determined typographical (and other)\n"
 "rules, and hyphenation patterns for a wide range of languages.  A document may\n"
@@ -15222,11 +16313,7 @@ msgid ""
 "polyglossia package rather than Babel."
 msgstr ""
 
-#: gnu/packages/tex.scm:1565
-msgid "Babel support for English"
-msgstr ""
-
-#: gnu/packages/tex.scm:1567
+#: gnu/packages/tex.scm:3354
 msgid ""
 "This package provides the language definition file for support of\n"
 "English in @code{babel}.  Care is taken to select British hyphenation patterns\n"
@@ -15234,11 +16321,16 @@ msgid ""
 "for Canadian and USA text."
 msgstr ""
 
-#: gnu/packages/tex.scm:1587
-msgid "Support for Cyrillic fonts in LaTeX"
+#: gnu/packages/tex.scm:3376
+msgid ""
+"This package provides the language definition file for support of German\n"
+"in @code{babel}.  It provides all the necessary macros, definitions and\n"
+"settings to typeset German documents.  The bundle includes support for the\n"
+"traditional and reformed German orthography as well as for the Austrian and\n"
+"Swiss varieties of German."
 msgstr ""
 
-#: gnu/packages/tex.scm:1589
+#: gnu/packages/tex.scm:3400
 msgid ""
 "This bundle of macros files provides macro support (including font\n"
 "encoding macros) for the use of Cyrillic characters in fonts encoded under the\n"
@@ -15246,11 +16338,7 @@ msgid ""
 "language that is written in a Cyrillic alphabet."
 msgstr ""
 
-#: gnu/packages/tex.scm:1608
-msgid "Font support for common PostScript fonts"
-msgstr ""
-
-#: gnu/packages/tex.scm:1610
+#: gnu/packages/tex.scm:3422
 msgid ""
 "The PSNFSS collection includes a set of files that provide a complete\n"
 "working setup of the LaTeX font selection scheme (NFSS2) for use with common\n"
@@ -15261,27 +16349,28 @@ msgid ""
 "packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1695
-msgid "Union of TeX Live packages"
+#: gnu/packages/tex.scm:3465 gnu/packages/tex.scm:3603
+msgid ""
+"This is a very limited subset of the TeX Live distribution.\n"
+"It includes little more than the required set of LaTeX packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1696
+#: gnu/packages/tex.scm:3587
 msgid ""
 "This package provides a subset of the TeX Live\n"
 "distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:1711
+#: gnu/packages/tex.scm:3622
 msgid ""
-"This is a very limited subset of the TeX Live distribution.\n"
-"It includes little more than the required set of LaTeX packages."
-msgstr ""
-
-#: gnu/packages/tex.scm:1728
-msgid "LaTeX-based replacement for BibTeX"
+"These fonts are considered the \"ultimate answer\" to IPA\n"
+"typesetting.  The encoding of these 8-bit fonts has been registered as LaTeX\n"
+"standard encoding T3, and the set of addendum symbols as encoding\n"
+"TS3. \"Times-like\" Adobe Type 1 versions are provided for both the T3 and the\n"
+"TS3 fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:1730
+#: gnu/packages/tex.scm:3645
 msgid ""
 "Amsrefs is a LaTeX package for bibliographies that provides an archival\n"
 "data format similar to the format of BibTeX database files, but adapted to\n"
@@ -15289,11 +16378,7 @@ msgid ""
 "conjunction with BibTeX or as a replacement for BibTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:1757
-msgid "Footnotes for critical editions"
-msgstr ""
-
-#: gnu/packages/tex.scm:1759
+#: gnu/packages/tex.scm:3674
 msgid ""
 "This package aims to provide a one-stop solution to requirements for\n"
 "footnotes.  It offers: Multiple footnote apparatus superior to that of\n"
@@ -15307,11 +16392,7 @@ msgid ""
 "@code{suffix} packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:1785
-msgid "Producing 'blind' text for testing"
-msgstr ""
-
-#: gnu/packages/tex.scm:1787
+#: gnu/packages/tex.scm:3702
 msgid ""
 "The package provides the commands @code{\\blindtext} and\n"
 "@code{\\Blindtext} for creating \"blind\" text useful in testing new classes\n"
@@ -15322,11 +16403,7 @@ msgid ""
 "ipsum\" text, see the @code{lipsum} package)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1817
-msgid "German letter DIN style"
-msgstr ""
-
-#: gnu/packages/tex.scm:1819
+#: gnu/packages/tex.scm:3741
 msgid ""
 "This package implements a document layout for writing letters according\n"
 "to the rules of DIN (Deutsches Institut für Normung, German standardisation\n"
@@ -15338,11 +16415,7 @@ msgid ""
 "package."
 msgstr ""
 
-#: gnu/packages/tex.scm:1843
-msgid "Put a grey textual watermark on document pages"
-msgstr ""
-
-#: gnu/packages/tex.scm:1845
+#: gnu/packages/tex.scm:3767
 msgid ""
 "This package provides a means to add a textual, light grey watermark on\n"
 "every page or on the first page of a document.  Typical usage may consist in\n"
@@ -15352,11 +16425,7 @@ msgid ""
 "on everypage."
 msgstr ""
 
-#: gnu/packages/tex.scm:1867
-msgid "New interface for environments in LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:1869
+#: gnu/packages/tex.scm:3791
 msgid ""
 "This package provides the @code{\\collect@@body} command (as in\n"
 "@code{amsmath}), as well as a @code{\\long} version @code{\\Collect@@Body},\n"
@@ -15364,11 +16433,7 @@ msgid ""
 "define a new author interface to creating new environments."
 msgstr ""
 
-#: gnu/packages/tex.scm:1889
-msgid "Create equal-widthed parboxes"
-msgstr ""
-
-#: gnu/packages/tex.scm:1891
+#: gnu/packages/tex.scm:3813
 msgid ""
 "LaTeX users sometimes need to ensure that two or more blocks of text\n"
 "occupy the same amount of horizontal space on the page.  To that end, the\n"
@@ -15382,11 +16447,7 @@ msgid ""
 "also provided."
 msgstr ""
 
-#: gnu/packages/tex.scm:1925
-msgid "Expanded description environments"
-msgstr ""
-
-#: gnu/packages/tex.scm:1927
+#: gnu/packages/tex.scm:3849
 msgid ""
 "The package provides additional features for the LaTeX\n"
 "@code{description} environment, including adjustable left margin.  The package\n"
@@ -15395,11 +16456,7 @@ msgid ""
 "@code{enumerate} lists, and numbered lists remain in sequence)."
 msgstr ""
 
-#: gnu/packages/tex.scm:1960
-msgid "Provide file modification times, and compare them"
-msgstr ""
-
-#: gnu/packages/tex.scm:1962
+#: gnu/packages/tex.scm:3869
 msgid ""
 "This package provides macros to read and compare the modification dates\n"
 "of files.  The files may be @code{.tex} files, images or other files (as long\n"
@@ -15411,11 +16468,7 @@ msgid ""
 "but non-expandable ones."
 msgstr ""
 
-#: gnu/packages/tex.scm:1986
-msgid "Conditionals to test which platform is being used"
-msgstr ""
-
-#: gnu/packages/tex.scm:1988
+#: gnu/packages/tex.scm:3898
 msgid ""
 "This package uses the (La)TeX extension @code{-shell-escape} to\n"
 "establish whether the document is being processed on a Windows or on a\n"
@@ -15426,11 +16479,7 @@ msgid ""
 "classes of systems."
 msgstr ""
 
-#: gnu/packages/tex.scm:2010
-msgid "Flexible bibliography support"
-msgstr ""
-
-#: gnu/packages/tex.scm:2012
+#: gnu/packages/tex.scm:3923
 msgid ""
 "This bundle provides a package that implements both author-year and\n"
 "numbered references, as well as much detailed of support for other\n"
@@ -15440,11 +16489,7 @@ msgid ""
 "designed from the start to be compatible with @code{natbib}."
 msgstr ""
 
-#: gnu/packages/tex.scm:2034
-msgid "Replace strings in encapsulated PostScript figures"
-msgstr ""
-
-#: gnu/packages/tex.scm:2036
+#: gnu/packages/tex.scm:3947
 msgid ""
 "This package allows LaTeX constructions (equations, picture\n"
 "environments, etc.) to be precisely superimposed over Encapsulated PostScript\n"
@@ -15455,11 +16500,7 @@ msgid ""
 "rotated."
 msgstr ""
 
-#: gnu/packages/tex.scm:2072
-msgid "Process PostScript graphisc within pdfLaTeX documents"
-msgstr ""
-
-#: gnu/packages/tex.scm:2074
+#: gnu/packages/tex.scm:3979
 msgid ""
 "This is a package for processing PostScript graphics with @code{psfrag}\n"
 "labels within pdfLaTeX documents.  Every graphic is compiled individually,\n"
@@ -15467,11 +16508,7 @@ msgid ""
 "re-processing."
 msgstr ""
 
-#: gnu/packages/tex.scm:2097
-msgid "Make overhead slides"
-msgstr ""
-
-#: gnu/packages/tex.scm:2100
+#: gnu/packages/tex.scm:4001
 msgid ""
 "This package provides a class that produces overhead\n"
 "slides (transparencies), with many facilities.  Seminar is not nowadays\n"
@@ -15480,11 +16517,7 @@ msgid ""
 "21st-century presentation styles."
 msgstr ""
 
-#: gnu/packages/tex.scm:2132
-msgid "Trim spaces around an argument or within a macro"
-msgstr ""
-
-#: gnu/packages/tex.scm:2134
+#: gnu/packages/tex.scm:4039
 msgid ""
 "This very short package allows you to expandably remove spaces around a\n"
 "token list (commands are provided to remove spaces before, spaces after, or\n"
@@ -15492,21 +16525,23 @@ msgid ""
 "space-stripped macros."
 msgstr ""
 
-#: gnu/packages/tex.scm:2167
-msgid "Captions on more than floats"
-msgstr ""
-
-#: gnu/packages/tex.scm:2169
+#: gnu/packages/tex.scm:4074
 msgid ""
 "This package defines a command @code{\\captionof} for putting a caption\n"
 "to something that's not a float."
 msgstr ""
 
-#: gnu/packages/tex.scm:2200
-msgid "e-TeX tools for LaTeX"
+#: gnu/packages/tex.scm:4090
+msgid ""
+"You can hyperlink DOI numbers to doi.org.  However, some publishers have\n"
+"elected to use nasty characters in their DOI numbering scheme (@code{<},\n"
+"@code{>}, @code{_} and @code{;} have all been spotted).  This will either\n"
+"upset LaTeX, or your PDF reader.  This package contains a single user-level\n"
+"command @code{\\doi{}}, which takes a DOI number, and creates a correct\n"
+"hyperlink to the target of the DOI."
 msgstr ""
 
-#: gnu/packages/tex.scm:2202
+#: gnu/packages/tex.scm:4114
 msgid ""
 "This package is a toolbox of programming facilities geared primarily\n"
 "towards LaTeX class and package authors.  It provides LaTeX frontends to some\n"
@@ -15517,11 +16552,7 @@ msgid ""
 "of the LaTeX kernel."
 msgstr ""
 
-#: gnu/packages/tex.scm:2238
-msgid "Seven predefined chapter heading styles"
-msgstr ""
-
-#: gnu/packages/tex.scm:2240
+#: gnu/packages/tex.scm:4155
 msgid ""
 "This package provides seven predefined chapter heading styles.  Each\n"
 "style can be modified using a set of simple commands.  Optionally one can\n"
@@ -15529,11 +16560,7 @@ msgid ""
 "headings."
 msgstr ""
 
-#: gnu/packages/tex.scm:2273
-msgid "Framed or shaded regions that can break across pages"
-msgstr ""
-
-#: gnu/packages/tex.scm:2275
+#: gnu/packages/tex.scm:4190
 msgid ""
 "The package creates three environments: @code{framed}, which puts an\n"
 "ordinary frame box around the region, @code{shaded}, which shades the region,\n"
@@ -15544,11 +16571,7 @@ msgid ""
 "@code{\\MakeFramed} to make your own framed-style environments."
 msgstr ""
 
-#: gnu/packages/tex.scm:2307
-msgid "Letter document class"
-msgstr ""
-
-#: gnu/packages/tex.scm:2309
+#: gnu/packages/tex.scm:4224
 msgid ""
 "This package is designed for formatting formless letters in German; it\n"
 "can also be used for English (by those who can read the documentation).  There\n"
@@ -15556,21 +16579,13 @@ msgid ""
 "\"old\" and a \"new\" version of g-brief."
 msgstr ""
 
-#: gnu/packages/tex.scm:2329
-msgid "Typeset Galois connections"
-msgstr ""
-
-#: gnu/packages/tex.scm:2331
+#: gnu/packages/tex.scm:4246
 msgid ""
 "The package deals with connections in two-dimensional style, optionally\n"
 "in colour."
 msgstr ""
 
-#: gnu/packages/tex.scm:2349
-msgid "Citations in a reader-friendly style"
-msgstr ""
-
-#: gnu/packages/tex.scm:2351
+#: gnu/packages/tex.scm:4266
 msgid ""
 "The package allows citations in the German style, which is considered by\n"
 "many to be particularly reader-friendly.  The citation provides a small amount\n"
@@ -15580,11 +16595,7 @@ msgid ""
 "BibLaTeX, and is considered experimental."
 msgstr ""
 
-#: gnu/packages/tex.scm:2373
-msgid "Flexible and complete interface to document dimensions"
-msgstr ""
-
-#: gnu/packages/tex.scm:2375
+#: gnu/packages/tex.scm:4292
 msgid ""
 "This package provides an easy and flexible user interface to customize\n"
 "page layout, implementing auto-centering and auto-balancing mechanisms so that\n"
@@ -15595,11 +16606,7 @@ msgid ""
 "ability to communicate the paper size it's set up to the output."
 msgstr ""
 
-#: gnu/packages/tex.scm:2398
-msgid "Miscellaneous tools by Mark Wooding"
-msgstr ""
-
-#: gnu/packages/tex.scm:2400
+#: gnu/packages/tex.scm:4317
 msgid ""
 "This collection of tools includes: @code{atsupport} for short commands\n"
 "starting with @code{@@}, macros to sanitize the OT1 encoding of the\n"
@@ -15609,21 +16616,13 @@ msgid ""
 "array environments; verbatim handling; and syntax diagrams."
 msgstr ""
 
-#: gnu/packages/tex.scm:2422
-msgid "Alternative to babel for XeLaTeX and LuaLaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:2424
+#: gnu/packages/tex.scm:4341
 msgid ""
 "This package provides a complete Babel replacement for users of LuaLaTeX\n"
 "and XeLaTeX; it relies on the @code{fontspec} package, version 2.0 at least."
 msgstr ""
 
-#: gnu/packages/tex.scm:2442
-msgid "Multi-page tables package"
-msgstr ""
-
-#: gnu/packages/tex.scm:2444
+#: gnu/packages/tex.scm:4361
 msgid ""
 "This package was a predecessor of @code{longtable}; the newer\n"
 "package (designed on quite different principles) is easier to use and more\n"
@@ -15631,11 +16630,7 @@ msgid ""
 "situations where longtable has problems."
 msgstr ""
 
-#: gnu/packages/tex.scm:2476
-msgid "TeX macros to handle Texinfo files"
-msgstr ""
-
-#: gnu/packages/tex.scm:2478
+#: gnu/packages/tex.scm:4396
 msgid ""
 "Texinfo is the preferred format for documentation in the GNU project;\n"
 "the format may be used to produce online or printed output from a single\n"
@@ -15644,11 +16639,7 @@ msgid ""
 "hypertext linkages in some cases)."
 msgstr ""
 
-#: gnu/packages/tex.scm:2499
-msgid "Show \"realistic\" quotes in verbatim"
-msgstr ""
-
-#: gnu/packages/tex.scm:2501
+#: gnu/packages/tex.scm:4419
 msgid ""
 "Typewriter-style fonts are best for program listings, but Computer\n"
 "Modern Typewriter prints @code{`} and @code{'} as bent opening and closing\n"
@@ -15662,22 +16653,14 @@ msgid ""
 "does not affect @code{\\tt}, @code{\\texttt}, etc."
 msgstr ""
 
-#: gnu/packages/tex.scm:2539
-msgid "Simple package to set up document margins"
-msgstr ""
-
-#: gnu/packages/tex.scm:2541
+#: gnu/packages/tex.scm:4460
 msgid ""
 "This is a simple package to set up document margins.  This package is\n"
 "considered obsolete; alternatives are the @code{typearea} package from the\n"
 "@code{koma-script} bundle, or the @code{geometry} package."
 msgstr ""
 
-#: gnu/packages/tex.scm:2559
-msgid "Extra control of appendices"
-msgstr ""
-
-#: gnu/packages/tex.scm:2561
+#: gnu/packages/tex.scm:4481
 msgid ""
 "The appendix package provides various ways of formatting the titles of\n"
 "appendices.  Also (sub)appendices environments are provided that can be used,\n"
@@ -15686,44 +16669,28 @@ msgid ""
 "command."
 msgstr ""
 
-#: gnu/packages/tex.scm:2581
-msgid "Generate changebars in LaTeX documents"
-msgstr ""
-
-#: gnu/packages/tex.scm:2583
+#: gnu/packages/tex.scm:4504
 msgid ""
 "Identify areas of text to be marked with changebars with the\n"
 "@code{\\cbstart} and @code{\\cbend} commands; the bars may be coloured.  The\n"
-"package uses 'drivers' to place the bars; the available drivers can work with\n"
-"@code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI\n"
+"package uses @code{drivers} to place the bars; the available drivers can work\n"
+"with @code{dvitoln03}, @code{dvitops}, @code{dvips}, the emTeX and TeXtures DVI\n"
 "drivers, and VTeX and pdfTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:2618
-msgid "CMap support for PDF files"
-msgstr ""
-
-#: gnu/packages/tex.scm:2620
+#: gnu/packages/tex.scm:4541
 msgid ""
 "This package embeds CMap tables into PDF files to make search and\n"
 "copy-and-paste functions work properly."
 msgstr ""
 
-#: gnu/packages/tex.scm:2637
-msgid "Add colour to LaTeX tables"
-msgstr ""
-
-#: gnu/packages/tex.scm:2639
+#: gnu/packages/tex.scm:4561
 msgid ""
 "This package allows rows, columns, and even individual cells in LaTeX\n"
 "tables to be coloured."
 msgstr ""
 
-#: gnu/packages/tex.scm:2669
-msgid "Variants of \\fbox and other games with boxes"
-msgstr ""
-
-#: gnu/packages/tex.scm:2671
+#: gnu/packages/tex.scm:4594
 msgid ""
 "This package provides variants of @code{\\fbox}: @code{\\shadowbox},\n"
 "@code{\\doublebox}, @code{\\ovalbox}, @code{\\Ovalbox}, with helpful tools for\n"
@@ -15731,22 +16698,14 @@ msgid ""
 "floats, center, flushleft, and flushright, lists, and pages."
 msgstr ""
 
-#: gnu/packages/tex.scm:2703
-msgid "Extensive control of page headers and footers in LaTeX2e"
-msgstr ""
-
-#: gnu/packages/tex.scm:2705
+#: gnu/packages/tex.scm:4629
 msgid ""
 "The package provides extensive facilities, both for constructing headers\n"
 "and footers, and for controlling their use (for example, at times when LaTeX\n"
 "would automatically change the heading style in use)."
 msgstr ""
 
-#: gnu/packages/tex.scm:2723
-msgid "Improved interface for floating objects"
-msgstr ""
-
-#: gnu/packages/tex.scm:2725
+#: gnu/packages/tex.scm:4650
 msgid ""
 "This package improves the interface for defining floating objects such\n"
 "as figures and tables.  It introduces the boxed float, the ruled float and the\n"
@@ -15756,11 +16715,7 @@ msgid ""
 "with @code{\\floatplacement{figure}{H}}."
 msgstr ""
 
-#: gnu/packages/tex.scm:2746
-msgid "Range of footnote options"
-msgstr ""
-
-#: gnu/packages/tex.scm:2748
+#: gnu/packages/tex.scm:4674
 msgid ""
 "This is a collection of ways to change the typesetting of footnotes.\n"
 "The package provides means of changing the layout of the footnotes themselves,\n"
@@ -15770,11 +16725,7 @@ msgid ""
 "footnotes with symbols rather than numbers."
 msgstr ""
 
-#: gnu/packages/tex.scm:2771
-msgid "Typeset source code listings using LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:2773
+#: gnu/packages/tex.scm:4700
 msgid ""
 "The package enables the user to typeset programs (programming code)\n"
 "within LaTeX; the source code is read directly by TeX---no front-end processor\n"
@@ -15782,11 +16733,7 @@ msgid ""
 "styles.  Support for @code{hyperref} is provided."
 msgstr ""
 
-#: gnu/packages/tex.scm:2805
-msgid "Miscellaneous packages by Joerg Knappen"
-msgstr ""
-
-#: gnu/packages/tex.scm:2807
+#: gnu/packages/tex.scm:4735
 msgid ""
 "This package provides miscellaneous macros by Joerg Knappen, including:\n"
 "represent counters in greek; Maxwell's non-commutative division;\n"
@@ -15798,11 +16745,7 @@ msgid ""
 "in SGML; use maths minus in text as appropriate; simple Young tableaux."
 msgstr ""
 
-#: gnu/packages/tex.scm:2880
-msgid "Computer modern fonts in T1 and TS1 encodings"
-msgstr ""
-
-#: gnu/packages/tex.scm:2882
+#: gnu/packages/tex.scm:4812
 msgid ""
 "The EC fonts are European Computer Modern Fonts, supporting the complete\n"
 "LaTeX T1 encoding defined at the 1990 TUG conference hold at Cork/Ireland.\n"
@@ -15819,11 +16762,44 @@ msgid ""
 "differs from the EC in a number of particulars."
 msgstr ""
 
-#: gnu/packages/tex.scm:2961
-msgid "Ralph Smith's Formal Script font"
+#: gnu/packages/tex.scm:4845
+msgid ""
+"This package provides a set of virtual fonts which emulates T1 coded\n"
+"fonts using the standard CM fonts.  The package name, AE fonts, supposedly\n"
+"stands for \"Almost European\".  The main use of the package was to produce\n"
+"PDF files using Adobe Type 1 versions of the CM fonts instead of bitmapped EC\n"
+"fonts.  Note that direct substitutes for the bitmapped EC fonts are available,\n"
+"via the CM-super, Latin Modern and (in a restricted way) CM-LGC font sets."
+msgstr ""
+
+#: gnu/packages/tex.scm:4870
+msgid ""
+"Inconsolata is a monospaced font designed by Raph Levien.  This package\n"
+"contains the font (in both Adobe Type 1 and OpenType formats) in regular and\n"
+"bold weights, with additional glyphs and options to control slashed zero,\n"
+"upright quotes and a shapelier lower-case L, plus metric files for use with\n"
+"TeX, and LaTeX font definition and other relevant files."
+msgstr ""
+
+#: gnu/packages/tex.scm:4899
+msgid ""
+"This package provides a drop-in replacements for the Times font from\n"
+"Adobe's basic set."
+msgstr ""
+
+#: gnu/packages/tex.scm:4928
+msgid ""
+"This package provides a drop-in replacements for the Palatino font from\n"
+"Adobe's basic set."
+msgstr ""
+
+#: gnu/packages/tex.scm:4954
+msgid ""
+"This package provides a drop-in replacements for the Zapfding font from\n"
+"Adobe's basic set."
 msgstr ""
 
-#: gnu/packages/tex.scm:2963
+#: gnu/packages/tex.scm:5029
 msgid ""
 "The fonts provide uppercase formal script letters for use as symbols in\n"
 "scientific and mathematical typesetting (in contrast to the informal script\n"
@@ -15833,22 +16809,14 @@ msgid ""
 "one of the packages @code{calrsfs} and @code{mathrsfs}."
 msgstr ""
 
-#: gnu/packages/tex.scm:2984
-msgid "Add picture commands (or backgrounds) to every page"
-msgstr ""
-
-#: gnu/packages/tex.scm:2986
+#: gnu/packages/tex.scm:5053
 msgid ""
 "The package adds one or more user commands to LaTeX's @code{shipout}\n"
 "routine, which may be used to place the output at fixed positions.  The\n"
 "@code{grid} option may be used to find the correct places."
 msgstr ""
 
-#: gnu/packages/tex.scm:3017
-msgid "Extensions to epic and the LaTeX drawing tools"
-msgstr ""
-
-#: gnu/packages/tex.scm:3019
+#: gnu/packages/tex.scm:5087
 msgid ""
 "Extensions to @code{epic} and the LaTeX picture drawing environment,\n"
 "include the drawing of lines at any slope, the drawing of circles in any\n"
@@ -15858,11 +16826,7 @@ msgid ""
 "@code{\\special} commands."
 msgstr ""
 
-#: gnu/packages/tex.scm:3054
-msgid "Customize basic list environments"
-msgstr ""
-
-#: gnu/packages/tex.scm:3056
+#: gnu/packages/tex.scm:5124
 msgid ""
 "This package is intended to ease customizing the three basic list\n"
 "environments: @code{enumerate}, @code{itemize} and @code{description}.  It\n"
@@ -15871,22 +16835,14 @@ msgid ""
 "@code{\\begin{itemize}[itemsep=1ex,leftmargin=1cm]}."
 msgstr ""
 
-#: gnu/packages/tex.scm:3076
-msgid "Create tabular cells spanning multiple rows"
-msgstr ""
-
-#: gnu/packages/tex.scm:3078
+#: gnu/packages/tex.scm:5147
 msgid ""
 "The package provides tools for creating tabular cells spanning multiple\n"
 "rows.  It has a lot of flexibility, including an option for specifying an\n"
 "entry at the \"natural\" width of its text."
 msgstr ""
 
-#: gnu/packages/tex.scm:3109
-msgid "Combine LaTeX commands over included graphics"
-msgstr ""
-
-#: gnu/packages/tex.scm:3111
+#: gnu/packages/tex.scm:5181
 msgid ""
 "The @code{overpic} environment is a cross between the LaTeX\n"
 "@code{picture} environment and the @code{\\includegraphics} command of\n"
@@ -15895,22 +16851,14 @@ msgid ""
 "positions; a grid for orientation is available."
 msgstr ""
 
-#: gnu/packages/tex.scm:3145
-msgid "Layout with zero \\parindent, non-zero \\parskip"
-msgstr ""
-
-#: gnu/packages/tex.scm:3147
+#: gnu/packages/tex.scm:5217
 msgid ""
 "Simply changing @code{\\parskip} and @code{\\parindent} leaves a layout\n"
 "that is untidy; this package (though it is no substitute for a properly\n"
 "designed class) helps alleviate this untidiness."
 msgstr ""
 
-#: gnu/packages/tex.scm:3165
-msgid "Include PDF documents in LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:3167
+#: gnu/packages/tex.scm:5238
 msgid ""
 "This package simplifies the inclusion of external multi-page PDF\n"
 "documents in LaTeX documents.  Pages may be freely selected and it is possible\n"
@@ -15920,11 +16868,7 @@ msgid ""
 "use this package to insert PostScript files, in addition to PDF files."
 msgstr ""
 
-#: gnu/packages/tex.scm:3198
-msgid "St Mary Road symbols for theoretical computer science"
-msgstr ""
-
-#: gnu/packages/tex.scm:3200
+#: gnu/packages/tex.scm:5272
 msgid ""
 "The fonts were originally distributed as Metafont sources only, but\n"
 "Adobe Type 1 versions are also now available.  Macro support is provided for\n"
@@ -15933,11 +16877,7 @@ msgid ""
 "the whole font."
 msgstr ""
 
-#: gnu/packages/tex.scm:3220
-msgid "Figures divided into subfigures"
-msgstr ""
-
-#: gnu/packages/tex.scm:3222
+#: gnu/packages/tex.scm:5295
 msgid ""
 "This (deprecated) package provides support for the manipulation and\n"
 "reference of small or \"sub\" figures and tables within a single figure or\n"
@@ -15950,11 +16890,7 @@ msgid ""
 "the more recent @code{subcaption} package more satisfactory."
 msgstr ""
 
-#: gnu/packages/tex.scm:3247
-msgid "Tabular with variable width columns balanced"
-msgstr ""
-
-#: gnu/packages/tex.scm:3249
+#: gnu/packages/tex.scm:5322
 msgid ""
 "The package defines a @code{tabular*}-like environment, @code{tabulary},\n"
 "taking a \"total width\" argument as well as the column specifications.  The\n"
@@ -15965,11 +16901,7 @@ msgid ""
 "according to the natural width of the widest cell in the column."
 msgstr ""
 
-#: gnu/packages/tex.scm:3284
-msgid "Tables with captions and notes all the same width"
-msgstr ""
-
-#: gnu/packages/tex.scm:3286
+#: gnu/packages/tex.scm:5360
 msgid ""
 "This package facilitates tables with titles (captions) and notes.  The\n"
 "title and notes are given a width equal to the body of the table (a\n"
@@ -15978,11 +16910,7 @@ msgid ""
 "environment."
 msgstr ""
 
-#: gnu/packages/tex.scm:3407
-msgid "Times-like fonts in support of mathematics"
-msgstr ""
-
-#: gnu/packages/tex.scm:3409
+#: gnu/packages/tex.scm:5387
 msgid ""
 "Txfonts supplies virtual text roman fonts using Adobe Times (or URW\n"
 "NimbusRomNo9L) with some modified and additional text symbols in the OT1, T1,\n"
@@ -15998,11 +16926,73 @@ msgid ""
 "TeX metrics (VF and TFM files) and macros for use with LaTeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:3450
-msgid "Select alternative section titles"
+#: gnu/packages/tex.scm:5438
+msgid ""
+"Iwona is a two-element sans-serif typeface. It was created\n"
+"as an alternative version of the Kurier typeface, which was designed in 1975\n"
+"for a diploma in typeface design at the Warsaw Academy of Fine Arts under the\n"
+"supervision of Roman Tomaszewski.  Kurier was designed for linotype\n"
+"typesetting of newspapers and similar periodicals.  The Iwona fonts are an\n"
+"alternative version of the Kurier fonts.  The difference lies in the absence\n"
+"of ink traps which typify the Kurier font."
+msgstr ""
+
+#: gnu/packages/tex.scm:5463
+msgid ""
+"This package contains a collection of macros by Jörg Knappen:\n"
+"@table @code\n"
+"@item greekctr\n"
+"New counterstyles @code{\\greek} and @code{\\Greek}.\n"
+"@item holtpolt\n"
+"Non-commutative fractions\n"
+"@item latin1jk\n"
+"@itemx latin2jk\n"
+"@itemx latin3jk\n"
+"Inputenc definition files that allow verbatim input in the respective ISO\n"
+"Latin codes.\n"
+"@item mathbol\n"
+"Blackboard bold fonts for use in maths.\n"
+"@item mathrsfs\n"
+"Mathematical script letters, as traditionally used in physics for Lagrangian,\n"
+"Hamiltonian, path integral measures, etc.\n"
+"@item parboxx\n"
+"New alignment options for parboxen at top and bottom of the box.\n"
+"@item sans\n"
+"Interchanges the roles of sans serif and roman fonts throughout the document.\n"
+"@item semtrans\n"
+"Support for special latin letters and diacritics used in transliteration of\n"
+"semitic languages\n"
+"@item smartmn\n"
+"Intelligent hyphen/minus, which guesses whether to render as hyphen or minus.\n"
+"@item sgmlcmpt\n"
+"Commands replacing the characters <, >, and &.\n"
+"@item tccompat\n"
+"A compatibility package for users of the older versions of the textcomp package.\n"
+"@item young\n"
+"Simple Young tableaux.\n"
+"@end table"
+msgstr ""
+
+#: gnu/packages/tex.scm:5517
+msgid ""
+"The package provides the Libertine and Biolinum fonts in both Type 1 and\n"
+"OTF styles, together with support macros for their use.  Monospaced and\n"
+"display fonts, and the \"keyboard\" set are also included, in OTF style, only.\n"
+"The @code{mweights} package is used to manage the selection of font weights.\n"
+"The package supersedes both the @code{libertineotf} and the\n"
+"@code{libertine-legacy} packages."
 msgstr ""
 
-#: gnu/packages/tex.scm:3452
+#: gnu/packages/tex.scm:5549
+msgid ""
+"The package contains LaTeX support for the DejaVu fonts, which are\n"
+"derived from the Vera fonts but contain more characters and styles.  The fonts\n"
+"are included in the original TrueType format, and in converted Type 1 format.\n"
+"The (currently) supported encodings are: OT1, T1, IL2, TS1, T2*, X2, QX, and\n"
+"LGR.  The package doesn't (currently) support mathematics."
+msgstr ""
+
+#: gnu/packages/tex.scm:5585
 msgid ""
 "This package provides an interface to sectioning commands for selection\n"
 "from various title styles, e.g. for marginal titles and to change the font of\n"
@@ -16011,11 +17001,7 @@ msgid ""
 "floats in a page.  You may assign headers/footers to individual floats, too."
 msgstr ""
 
-#: gnu/packages/tex.scm:3473
-msgid "Arbitrary size font selection in LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:3475
+#: gnu/packages/tex.scm:5608
 msgid ""
 "LaTeX, by default, restricts the sizes at which you can use its default\n"
 "computer modern fonts, to a fixed set of discrete sizes (effectively, a set\n"
@@ -16024,17 +17010,13 @@ msgid ""
 "fonts (Bakoma, or the versions from BSR/Y&Y, or True Type versions from Kinch,\n"
 "PCTeX, etc.).  In fact, since modern distributions will automatically generate\n"
 "any bitmap font you might need, @code{type1cm} has wider application than just\n"
-"those using scaleable versions of the fonts.  Note that the LaTeX distribution\n"
+"those using scalable versions of the fonts.  Note that the LaTeX distribution\n"
 "now contains a package @code{fix-cm},f which performs the task of\n"
 "@code{type1cm}, as well as doing the same job for T1- and TS1-encoded\n"
 "@code{ec} fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:3501
-msgid "Cyrillic fonts that support LaTeX standard encodings"
-msgstr ""
-
-#: gnu/packages/tex.scm:3503
+#: gnu/packages/tex.scm:5637
 msgid ""
 "The LH fonts address the problem of the wide variety of alphabets that\n"
 "are written with Cyrillic-style characters.  The fonts are the original basis\n"
@@ -16047,66 +17029,59 @@ msgid ""
 "OT2 encoded fonts, CM bright shaped fonts and Concrete shaped fonts."
 msgstr ""
 
-#: gnu/packages/tex.scm:3540
-msgid "Create scalable illustrations"
+#: gnu/packages/tex.scm:5665
+msgid ""
+"The Martin Vogel’s Symbols fonts (marvosym) contains the\n"
+"Euro currency symbol as defined by the European commission, along with symbols\n"
+"for structural engineering, symbols for steel cross-sections, astronomy\n"
+"signs (sun, moon, planets), the 12 signs of the zodiac, scissor symbols, CE\n"
+"sign and others.  This package contains both the original TrueType font and\n"
+"the derived Type 1 font, together with support files for TeX (LaTeX)."
 msgstr ""
 
-#: gnu/packages/tex.scm:3542
+#: gnu/packages/tex.scm:5703
 msgid ""
 "MetaPost uses a language based on that of Metafont to produce precise\n"
 "technical illustrations.  Its output is scalable PostScript or SVG, rather\n"
 "than the bitmaps Metafont creates."
 msgstr ""
 
-#: gnu/packages/tex.scm:3561
-msgid "Class for typesetting publications of ACM"
-msgstr ""
-
-#: gnu/packages/tex.scm:3563
+#: gnu/packages/tex.scm:5724
 msgid ""
 "This package provides a class for typesetting publications of the\n"
 "Association for Computing Machinery (ACM)."
 msgstr ""
 
-#: gnu/packages/tex.scm:3594
-msgid "Variable-width minipage"
-msgstr ""
-
-#: gnu/packages/tex.scm:3596
+#: gnu/packages/tex.scm:5757
 msgid ""
 "The @code{varwidth} environment is superficially similar to\n"
 "@code{minipage}, but the specified width is just a maximum value — the box may\n"
 "get a narrower “natural” width."
 msgstr ""
 
-#: gnu/packages/tex.scm:3614
-msgid "LaTeX support file to use the WASY2 fonts"
-msgstr ""
-
-#: gnu/packages/tex.scm:3616
+#: gnu/packages/tex.scm:5775
 msgid ""
-"The wasy2WASY2 (Waldi Symbol) font by Roland Waldi provides many glyphs\n"
-"like male and female symbols and astronomical symbols, as well as the complete\n"
-"lasy font set and other odds and ends.  The wasysym package implements an easy\n"
-"to use interface for these symbols."
+"This package provides the @code{wasy} (Waldi symbol) fonts,\n"
+"in the Metafont and Adobe Type 1 formats.  Support under LaTeX is provided by\n"
+"the @code{wasysym} package."
 msgstr ""
 
-#: gnu/packages/tex.scm:3649
-msgid "Produces figures which text can flow around"
+#: gnu/packages/tex.scm:5796
+msgid ""
+"The @code{wasy} (Waldi Symbol) font by Roland Waldi provides many glyphs like\n"
+"male and female symbols and astronomical symbols, as well as the complete\n"
+"@code{lasy} font set and other odds and ends.  The @code{wasysym} package\n"
+"implements an easy to use interface for these symbols."
 msgstr ""
 
-#: gnu/packages/tex.scm:3651
+#: gnu/packages/tex.scm:5831
 msgid ""
 "This package allows figures or tables to have text wrapped around them.\n"
 "It does not work in combination with list environments, but can be used in a\n"
 "@code{parbox} or @code{minipage}, and in two-column format."
 msgstr ""
 
-#: gnu/packages/tex.scm:3683
-msgid "Extended UTF-8 input encoding support for LaTeX"
-msgstr ""
-
-#: gnu/packages/tex.scm:3685
+#: gnu/packages/tex.scm:5865
 msgid ""
 "The bundle provides the @code{ucs} package, and @code{utf8x.def},\n"
 "together with a large number of support files.  The @code{utf8x.def}\n"
@@ -16119,11 +17094,7 @@ msgid ""
 "package of that name now exists."
 msgstr ""
 
-#: gnu/packages/tex.scm:3717
-msgid "Extract bits of a LaTeX source for output"
-msgstr ""
-
-#: gnu/packages/tex.scm:3719
+#: gnu/packages/tex.scm:5899
 msgid ""
 "The main purpose of the preview package is the extraction of selected\n"
 "elements from a LaTeX source, like formulas or graphics, into separate\n"
@@ -16134,11 +17105,7 @@ msgid ""
 "files."
 msgstr ""
 
-#: gnu/packages/tex.scm:3742
-msgid "Expand acronyms at least once"
-msgstr ""
-
-#: gnu/packages/tex.scm:3744
+#: gnu/packages/tex.scm:5924
 msgid ""
 "This package ensures that all acronyms used in the text are spelled out\n"
 "in full at least once.  It also provides an environment to build a list of\n"
@@ -16147,17 +17114,13 @@ msgid ""
 "e-TeX."
 msgstr ""
 
-#: gnu/packages/tex.scm:3777
-msgid "TeX extension for direct creation of PDF"
-msgstr ""
-
-#: gnu/packages/tex.scm:3779
+#: gnu/packages/tex.scm:5977
 msgid ""
 "This package provides an extension of TeX which can be configured to\n"
 "directly generate PDF documents instead of DVI."
 msgstr ""
 
-#: gnu/packages/tex.scm:3846
+#: gnu/packages/tex.scm:6049
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -16167,7 +17130,7 @@ msgid ""
 "This package contains the complete tree of texmf-dist data."
 msgstr ""
 
-#: gnu/packages/tex.scm:3908
+#: gnu/packages/tex.scm:6112
 msgid ""
 "TeX Live provides a comprehensive TeX document production system.\n"
 "It includes all the major TeX-related programs, macro packages, and fonts\n"
@@ -16177,11 +17140,7 @@ msgid ""
 "This package contains the complete TeX Live distribution."
 msgstr ""
 
-#: gnu/packages/tex.scm:3951
-msgid "Interface to read and parse BibTeX files"
-msgstr ""
-
-#: gnu/packages/tex.scm:3952
+#: gnu/packages/tex.scm:6156
 msgid ""
 "@code{Text::BibTeX} is a Perl library for reading, parsing,\n"
 "and processing BibTeX files.  @code{Text::BibTeX} gives you access to the data\n"
@@ -16190,21 +17149,13 @@ msgid ""
 "values (strings, macros, or numbers) pasted together."
 msgstr ""
 
-#: gnu/packages/tex.scm:4034
-msgid "Backend for the BibLaTeX citation management tool"
-msgstr ""
-
-#: gnu/packages/tex.scm:4035
+#: gnu/packages/tex.scm:6247
 msgid ""
 "Biber is a BibTeX replacement for users of biblatex.  Among\n"
 "other things it comes with full Unicode support."
 msgstr ""
 
-#: gnu/packages/tex.scm:4059
-msgid "Wrapper for LaTeX and friends"
-msgstr ""
-
-#: gnu/packages/tex.scm:4061
+#: gnu/packages/tex.scm:6281
 msgid ""
 "Rubber is a program whose purpose is to handle all tasks related to the\n"
 "compilation of LaTeX documents.  This includes compiling the document itself,\n"
@@ -16214,32 +17165,577 @@ msgid ""
 "PDF documents."
 msgstr ""
 
-#: gnu/packages/tex.scm:4103
-msgid "LaTeX editor"
-msgstr ""
-
-#: gnu/packages/tex.scm:4104
+#: gnu/packages/tex.scm:6324
 msgid ""
 "Texmaker is a program that integrates many tools needed to\n"
 "develop documents with LaTeX, in a single application."
 msgstr ""
 
-#: gnu/packages/tex.scm:4143
-msgid "Book on TeX, plain TeX and Eplain"
-msgstr ""
-
-#: gnu/packages/tex.scm:4144
+#: gnu/packages/tex.scm:6365
 msgid ""
 "@i{TeX for the Impatient} is a ~350 page book on TeX,\n"
 "plain TeX, and Eplain, originally written by Paul Abrahams, Kathryn Hargreaves,\n"
 "and Karl Berry."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:56
-msgid "The GNU documentation format"
+#: gnu/packages/tex.scm:6432
+msgid ""
+"LyX is a document preparation system.  It excels at letting\n"
+"you create complex technical and scientific articles with mathematics,\n"
+"cross-references, bibliographies, indexes, etc.  It is very good for working\n"
+"with documents of any length in which the usual processing abilities are\n"
+"required: automatic sectioning and pagination, spell checking and so forth."
+msgstr ""
+
+#: gnu/packages/tex.scm:6468
+msgid ""
+"The package provides an interface to embed interactive Flash (SWF) and 3D\n"
+"objects (Adobe U3D & PRC), as well as video and sound files or streams in the\n"
+"popular MP4, FLV and MP3 formats into PDF documents with Acrobat-9/X\n"
+"compatibility.  Playback of multimedia files uses the built-in Flash Player of\n"
+"Adobe Reader and does, therefore, not depend on external plug-ins.  Flash Player\n"
+"supports the efficient H.264 codec for video compression.\n"
+"\n"
+"The package is based on the RichMedia Annotation, an Adobe addition to the PDF\n"
+"specification.  It replaces the now obsolete @code{movie15} package."
+msgstr ""
+
+#: gnu/packages/tex.scm:6508
+msgid ""
+"This package provides OCG (Optional Content Groups) support within a PDF\n"
+"document.\n"
+"\n"
+"It re-implements the functionality of the @code{ocg}, @code{ocgx}, and\n"
+"@code{ocg-p} packages and adds support for all known engines and back-ends\n"
+"including:\n"
+"\n"
+"@itemize\n"
+"@item LaTeX → dvips → @code{ps2pdf}/Distiller\n"
+"@item (Xe)LaTeX(x) → @code{dvipdfmx}\n"
+"@item pdfLaTeX and LuaLaTeX .\n"
+"@end itemize\n"
+"\n"
+"It also ensures compatibility with the @code{media9} and @code{animate} packages."
+msgstr ""
+
+#: gnu/packages/tex.scm:6542
+msgid ""
+"A bundle of LATEX packages by Martin Schröder; the collection comprises:\n"
+"\n"
+"@itemize\n"
+"@item @command{count1to}, make use of fixed TEX counters;\n"
+"@item @command{everysel}, set commands to execute every time a font is selected;\n"
+"@item @command{everyshi}, set commands to execute whenever a page is shipped out;\n"
+"@item @command{multitoc}, typeset the table of contents in multiple columns;\n"
+"@item @command{prelim2e}, mark typeset pages as preliminary; and\n"
+"@item @command{ragged2e}, typeset ragged text and allow hyphenation.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/tex.scm:6574
+msgid ""
+"Provides commands to disable pagebreaking within a given vertical\n"
+"space.  If there is not enough space between the command and the bottom of the\n"
+"page, a new page will be started."
+msgstr ""
+
+#: gnu/packages/tex.scm:6600
+msgid ""
+"The package provides commands to change the page layout in the middle of\n"
+"a document, and to robustly check for typesetting on odd or even pages.\n"
+"Instructions for use are at the end of the file.  The package is an extraction\n"
+"of code from the @code{memoir} class, whose user interface it shares."
+msgstr ""
+
+#: gnu/packages/tex.scm:6636
+msgid ""
+"The package is used to change the format of @code{\\today}’s date,\n"
+"including the weekday, e.g., \"Saturday, 26 June 2008\", the 'UK format', which\n"
+"is preferred in many parts of the world, as distinct from that which is used in\n"
+"@code{\\maketitle} of the article class, \"June 26, 2008\", the 'US format'."
+msgstr ""
+
+#: gnu/packages/tex.scm:6672
+msgid ""
+"The package provides an @code{\\ul} (underline) command which will break\n"
+"over line ends; this technique may be used to replace @code{\\em} (both in that\n"
+"form and as the @code{\\emph} command), so as to make output look as if it comes\n"
+"from a typewriter.  The package also offers double and wavy underlining, and\n"
+"striking out (line through words) and crossing out (/// over words)."
+msgstr ""
+
+#: gnu/packages/tex.scm:6728
+msgid ""
+"PGF is a macro package for creating graphics.  It is platform- and\n"
+"format-independent and works together with the most important TeX backend\n"
+"drivers, including pdfTeX and dvips.  It comes with a user-friendly syntax layer\n"
+"called TikZ.\n"
+"\n"
+"Its usage is similar to pstricks and the standard picture environment.  PGF\n"
+"works with plain (pdf-)TeX, (pdf-)LaTeX, and ConTeXt.  Unlike pstricks, it can\n"
+"produce either PostScript or PDF output."
+msgstr ""
+
+#: gnu/packages/tex.scm:6774
+msgid ""
+"The KOMA-Script bundle provides replacements for the article, report, and\n"
+"book classes with emphasis on typography and versatility.  There is also a\n"
+"letter class.\n"
+"\n"
+"The bundle also offers:\n"
+"\n"
+"@itemize\n"
+"@item a package for calculating type areas in the way laid down by the\n"
+"typographer Jan Tschichold,\n"
+"@item packages for easily changing and defining page styles,\n"
+"@item a package scrdate for getting not only the current date but also the name\n"
+"of the day, and\n"
+"@item a package scrtime for getting the current time.\n"
+"@end itemize\n"
+"\n"
+"All these packages may be used not only with KOMA-Script classes but also with\n"
+"the standard classes.\n"
+"\n"
+"Since every package has its own version number, the version number quoted only\n"
+"refers to the version of scrbook, scrreprt, scrartcl, scrlttr2 and\n"
+"typearea (which are the main parts of the bundle)."
+msgstr ""
+
+#: gnu/packages/tex.scm:6826
+msgid ""
+"This package allows one to capture all the items of a list, for which\n"
+"the parsing character has been selected by the user, and to access any of\n"
+"these items with a simple syntax."
+msgstr ""
+
+#: gnu/packages/tex.scm:6862
+msgid ""
+"This package allows the user to input formatted data into elements of a\n"
+"2-D or 3-D array and to recall that data at will by individual cell number.\n"
+"The data can be but need not be numerical in nature.  It can be, for example,\n"
+"formatted text."
+msgstr ""
+
+#: gnu/packages/tex.scm:6899
+msgid ""
+"The package provides a @code{verbbox} environment to place its contents\n"
+"into a globally available box, or into a box specified by the user.  The\n"
+"global box may then be used in a variety of situations (for example, providing\n"
+"a replica of the @code{boxedverbatim} environment itself).  A valuable use is\n"
+"in places where the standard @code{verbatim} environment (which is based on a\n"
+"@code{trivlist}) may not appear."
+msgstr ""
+
+#: gnu/packages/tex.scm:6936
+msgid ""
+"Examplep provides sophisticated features for typesetting verbatim source\n"
+"code listings, including the display of the source code and its compiled LaTeX\n"
+"or METAPOST output side-by-side, with automatic width detection and enabled\n"
+"page breaks (in the source), without the need for specifying the source twice.\n"
+"Special care is taken that section, page and footnote numbers do not interfere\n"
+"with the main document.  For typesetting short verbatim phrases, a replacement\n"
+"for the @code{\\verb} command is also provided in the package, which can be\n"
+"used inside tables and moving arguments such as footnotes and section\n"
+"titles."
+msgstr ""
+
+#: gnu/packages/tex.scm:6973
+msgid ""
+"This is a package for typesetting a variety of graphs and\n"
+"diagrams with TeX.  Xy-pic works with most formats (including LaTeX,\n"
+"AMS-LaTeX, AMS-TeX, and plain TeX).  The distribution includes Michael Barr's\n"
+"@code{diag} package, which was previously distributed stand-alone."
+msgstr ""
+
+#: gnu/packages/tex.scm:7015
+msgid ""
+"BibTeX allows the user to store his citation data in generic form, while\n"
+"printing citations in a document in the form specified by a BibTeX style, to\n"
+"be specified in the document itself (one often needs a LaTeX citation-style\n"
+"package, such as @command{natbib} as well)."
+msgstr ""
+
+#: gnu/packages/tex.scm:7035
+msgid ""
+"This package provides a copy of the Charter Type-1 fonts\n"
+"which Bitstream contributed to the X consortium, renamed for use with TeX.\n"
+"Support for use with LaTeX is available in @code{freenfss}, part of\n"
+"@command{psnfss}. "
+msgstr ""
+
+#: gnu/packages/tex.scm:7073
+msgid ""
+"A full featured, parameter driven macro package, which fully\n"
+"supports advanced interactive documents.  See the ConTeXt garden for a wealth\n"
+"of support information."
+msgstr ""
+
+#: gnu/packages/tex.scm:7094
+msgid ""
+"The beamer LaTeX class can be used for producing slides.\n"
+"The class works in both PostScript and direct PDF output modes, using the\n"
+"@code{pgf} graphics system for visual effects.  Content is created in the\n"
+"@code{frame} environment, and each frame can be made up of a number of slides\n"
+"using a simple notation for specifying material to appear on each slide within\n"
+"a frame.  Short versions of title, authors, institute can also be specified as\n"
+"optional parameters.  Whole frame graphics are supported by plain frames.  The\n"
+"class supports @code{figure} and @code{table} environments, transparency\n"
+"effects, varying slide transitions and animations."
+msgstr ""
+
+#: gnu/packages/tex.scm:7127
+msgid ""
+"The XMP (eXtensible Metadata platform) is a framework to add metadata to\n"
+"digital material to enhance the workflow in publication.  The essence is that\n"
+"the metadata is stored in an XML file, and this XML stream is then embedded in\n"
+"the file to which it applies."
+msgstr ""
+
+#: gnu/packages/tex.scm:7182
+msgid ""
+"This package helps LaTeX users to create PDF/X, PDF/A and other\n"
+"standards-compliant PDF documents with pdfTeX, LuaTeX and XeTeX."
+msgstr ""
+
+#: gnu/packages/tex.scm:7225
+msgid ""
+"The package provides macros and environments to document\n"
+"LaTeX packages and classes.  It is an (as yet unfinished) alternative to the\n"
+"@code{ltxdoc} class and the @code{doc} or @code{xdoc} packages.  The aim is to\n"
+"provide a different layout and more modern styles (using the @code{xcolor},\n"
+"@code{hyperref} packages, etc.)  This is an alpha release, and should probably\n"
+"not (yet) be used with other packages, since the implementation might\n"
+"change."
+msgstr ""
+
+#: gnu/packages/tex.scm:7253
+msgid ""
+"PSTricks offers an extensive collection of macros for\n"
+"generating PostScript that is usable with most TeX macro formats, including\n"
+"Plain TeX, LaTeX, AMS-TeX, and AMS-LaTeX.  Included are macros for colour,\n"
+"graphics, pie charts, rotation, trees and overlays.  It has many special\n"
+"features, including a wide variety of graphics (picture drawing) macros, with\n"
+"a flexible interface and with colour support.  There are macros for colouring\n"
+"or shading the cells of tables."
+msgstr ""
+
+#: gnu/packages/tex.scm:7278
+msgid ""
+"Pst-text is a PSTricks based package for plotting text along\n"
+"a different path and manipulating characters.  It includes the functionality\n"
+"of the old package @code{pst-char}."
+msgstr ""
+
+#: gnu/packages/tex.scm:7303
+msgid ""
+"This package provides the command @code{\\marginnote} that\n"
+"may be used instead of @code{\\marginpar} at almost every place where\n"
+"@code{\\marginpar} cannot be used, e.g., inside floats, footnotes, or in\n"
+"frames made with the @code{framed} package."
+msgstr ""
+
+#: gnu/packages/tex.scm:7321
+msgid ""
+"This package, which works both for Plain TeX and for\n"
+"LaTeX, defines the @code{\\ifPDFTeX}, @code{\\ifXeTeX}, and @code{\\ifLuaTeX}\n"
+"conditionals for testing which engine is being used for typesetting.  The\n"
+"package also provides the @code{\\RequirePDFTeX}, @code{\\RequireXeTeX}, and\n"
+"@code{\\RequireLuaTeX} commands which throw an error if pdfTeX, XeTeX or\n"
+"LuaTeX (respectively) is not the engine in use."
+msgstr ""
+
+#: gnu/packages/tex.scm:7350
+msgid ""
+"This package provides a collection of simple tools that\n"
+"are part of the LaTeX required tools distribution, comprising the packages:\n"
+"@code{afterpage}, @code{array}, @code{bm}, @code{calc}, @code{dcolumn},\n"
+"@code{delarray}, @code{enumerate}, @code{fileerr}, @code{fontsmpl},\n"
+"@code{ftnright}, @code{hhline}, @code{indentfirst}, @code{layout},\n"
+"@code{longtable}, @code{multicol}, @code{rawfonts}, @code{showkeys},\n"
+"@code{somedefs}, @code{tabularx}, @code{theorem}, @code{trace},\n"
+"@code{varioref}, @code{verbatim}, @code{xr}, and @code{xspace}."
+msgstr ""
+
+#: gnu/packages/tex.scm:7431
+msgid ""
+"This package is an extension of the keyval package and offers additional\n"
+"macros for setting keys and declaring and setting class or package options.\n"
+"The package allows the programmer to specify a prefix to the name of the\n"
+"macros it defines for keys, and to define families of key definitions; these\n"
+"all help use in documents where several packages define their own sets of\n"
+"keys."
+msgstr ""
+
+#: gnu/packages/tex.scm:7459
+msgid ""
+"A class and package is provided which allows TeX pictures or\n"
+"other TeX code to be compiled standalone or as part of a main document.\n"
+"Special support for pictures with beamer overlays is also provided.  The\n"
+"package is used in the main document and skips extra preambles in sub-files.\n"
+"The class may be used to simplify the preamble in sub-files.  By default the\n"
+"@code{preview} package is used to display the typeset code without margins.\n"
+"The behaviour in standalone mode may adjusted using a configuration file\n"
+"@code{standalone.cfg} to redefine the standalone environment."
+msgstr ""
+
+#: gnu/packages/tex.scm:7493
+msgid ""
+"Typesetting values with units requires care to ensure that the combined\n"
+"mathematical meaning of the value plus unit combination is clear.  In\n"
+"particular, the SI units system lays down a consistent set of units with rules\n"
+"on how they are to be used.  However, different countries and publishers have\n"
+"differing conventions on the exact appearance of numbers (and units).  A\n"
+"number of LaTeX packages have been developed to provide consistent application\n"
+"of the various rules.  The @code{siunitx} package takes the best from the\n"
+"existing packages, and adds new features and a consistent interface.  A number\n"
+"of new ideas have been incorporated, to fill gaps in the existing provision.\n"
+"The package also provides backward-compatibility with @code{SIunits},\n"
+"@code{sistyle}, @code{unitsdef} and @code{units}.  The aim is to have one\n"
+"package to handle all of the possible unit-related needs of LaTeX users."
+msgstr ""
+
+#: gnu/packages/tex.scm:7524
+msgid ""
+"This package enhances the quality of tables in LaTeX, providing extra\n"
+"commands as well as behind-the-scenes optimisation.  Guidelines are given as\n"
+"to what constitutes a good table in this context.  The package offers\n"
+"@code{longtable} compatibility."
+msgstr ""
+
+#: gnu/packages/tex.scm:7544
+msgid ""
+"This package provides advanced facilities for inline and\n"
+"display quotations.  It is designed for a wide range of tasks ranging from the\n"
+"most simple applications to the more complex demands of formal quotations.\n"
+"The facilities include commands, environments, and user-definable 'smart\n"
+"quotes' which dynamically adjust to their context.  Quotation marks are\n"
+"switched automatically if quotations are nested and they can be adjusted to\n"
+"the current language if the babel package is available.  There are additional\n"
+"facilities designed to cope with the more specific demands of academic\n"
+"writing, especially in the humanities and the social sciences.  All quote\n"
+"styles as well as the optional active quotes are freely configurable."
+msgstr ""
+
+#: gnu/packages/tex.scm:7570
+msgid ""
+"The package helps to automate a typical LaTeX\n"
+"workflow that involves running LaTeX several times and running tools\n"
+"such as BibTeX or makeindex.  It will log requests like \"please rerun\n"
+"LaTeX\" or \"please run BibTeX on file X\" to an external file in a\n"
+"machine-readable format.  Compiler scripts and integrated LaTeX\n"
+"editing environments may parse this file to determine the next steps\n"
+"in the workflow.  In sum, the package will do two things:\n"
+"\n"
+"@enumerate\n"
+"@item\n"
+"enable package authors to use LaTeX commands to issue requests, and\n"
+"\n"
+"@item\n"
+"collect all requests from all packages and write them to an external\n"
+"XML file.\n"
+"@end enumerate\n"
+msgstr ""
+
+#: gnu/packages/tex.scm:7603
+msgid ""
+"BibLaTeX is a complete reimplementation of the\n"
+"bibliographic facilities provided by LaTeX.  Formatting of the\n"
+"bibliography is entirely controlled by LaTeX macros, facilitating the\n"
+"design of new bibliography and citation styles.  BibLaTeX uses its own\n"
+"data backend program \"biber\" to read and process the bibliographic\n"
+"data.  With biber, the range of features provided by biblatex\n"
+"includes:\n"
+"\n"
+"@enumerate\n"
+"@item\n"
+"full unicode support,\n"
+"\n"
+"@item\n"
+"customisable bibliography labels,\n"
+"\n"
+"@item\n"
+"multiple bibliographies in the same document, and\n"
+"\n"
+"@item\n"
+"subdivided bibliographies, such as bibliographies per chapter or\n"
+"section.\n"
+"@end enumerate\n"
+msgstr ""
+
+#: gnu/packages/tex.scm:7642
+msgid ""
+"The @code{todonotes} package lets the user mark\n"
+"things to do later, in a simple and visually appealing way.  The\n"
+"package takes several options to enable customization and finetuning\n"
+"of the visual appearance."
+msgstr ""
+
+#: gnu/packages/tex.scm:7660
+msgid ""
+"@code{units} is a package for typesetting physical\n"
+"units in a standard-looking way.  The package is based upon\n"
+"@code{nicefrac}, a package for typing fractions.  @code{nicefrac} is\n"
+"included in the @code{units} bundle."
+msgstr ""
+
+#: gnu/packages/tex.scm:7678
+msgid ""
+"@code{microtype} provides a LaTeX interface to the\n"
+"micro-typographic extensions that were introduced by pdfTeX and have\n"
+"since propagated to XeTeX and LuaTeX: most prominently character\n"
+"protrusion and font expansion, the adjustment of kerning and interword\n"
+"spacing, hyphenatable letterspacing and the possibility to disable all\n"
+"or selected ligatures.  These features may be applied to customisable\n"
+"sets of fonts.  All micro-typographic aspects of the fonts can be\n"
+"configured in a straight-forward and flexible way.  Settings for\n"
+"various fonts are provided.  An alternative package\n"
+"@code{letterspace}, which also works with plain TeX, is included in\n"
+"the bundle."
+msgstr ""
+
+#: gnu/packages/tex.scm:7703
+msgid ""
+"The @code{caption} package provides many ways to\n"
+"customise the captions in floating environments like figure and table.\n"
+"Facilities include rotating captions, sideways captions and continued\n"
+"captions (for tables or figures that come in several parts).  A list\n"
+"of compatibility notes, for other packages, is provided in the\n"
+"documentation.  The package also provides the \"caption outside\n"
+"float\" facility, in the same way that simpler packages like\n"
+"@code{capt-ofcapt-of} do.  The package supersedes @code{caption2}.\n"
+"Packages @code{bicaption}, @code{ltcaption}, @code{newfloat},\n"
+"@code{subcaption} and @code{totalcount} are included in the bundle."
+msgstr ""
+
+#: gnu/packages/tex.scm:7732
+msgid ""
+"This package provides a drop-in replacement for the\n"
+"Symbol font from Adobe's basic set."
+msgstr ""
+
+#: gnu/packages/tex.scm:7750
+msgid ""
+"The Pazo Math fonts are a family of PostScript fonts\n"
+"suitable for typesetting mathematics in combination with the Palatino\n"
+"family of text fonts.  The Pazo Math family is made up of five fonts\n"
+"provided in Adobe Type 1 format.  These contain glyphs that are\n"
+"usually not available in Palatino and for which Computer Modern looks\n"
+"odd when combined with Palatino.  These glyphs include the uppercase\n"
+"Greek alphabet in upright and slanted shapes, the lowercase Greek\n"
+"alphabet in slanted shape, several mathematical glyphs and the\n"
+"uppercase letters commonly used to represent various number sets.\n"
+"LaTeX macro support is provided in package @code{psnfss}."
+msgstr ""
+
+#: gnu/packages/tex.scm:7775
+msgid ""
+"The FPL Fonts provide a set of SC/OsF fonts for URW\n"
+"Palladio L which are compatible with the Palatino SC/OsF fonts from\n"
+"Adobe.  LaTeX use is enabled by the mathpazo package, which is part of\n"
+"the @code{psnfss} distribution."
+msgstr ""
+
+#: gnu/packages/tex.scm:7799
+msgid ""
+"The @code{arev} package provides type 1 fonts,\n"
+"virtual fonts and LaTeX packages for using Arev Sans in both text and\n"
+"mathematics.  Arev Sans is a derivative of Bitstream Vera Sans, adding\n"
+"support for Greek and Cyrillic characters and a few variant letters\n"
+"appropriate for mathematics.  The font is primarily used in LaTeX for\n"
+"presentations, particularly when using a computer projector.  Arev\n"
+"Sans has large x-height, \"open letters\", wide spacing and thick\n"
+"stems.  The style is very similar to the SliTeX font lcmss but\n"
+"heavier.  Arev is one of a very small number of sans-font mathematics\n"
+"support packages.  Others are cmbright, hvmath and kerkis."
+msgstr ""
+
+#: gnu/packages/tex.scm:7830
+msgid ""
+"The Math Design project offers free mathematical\n"
+"fonts that match with existing text fonts.  To date, three free font\n"
+"families are available: Adobe Utopia, URW Garamond and Bitstream\n"
+"Charter.  Mathdesign covers the whole LaTeX glyph set including AMS\n"
+"symbols.  Both roman and bold versions of these symbols can be used.\n"
+"Moreover, there is a choice between three greek fonts (two of them\n"
+"created by the Greek Font Society)."
+msgstr ""
+
+#: gnu/packages/tex.scm:7855
+msgid ""
+"The @code{bera} package contains the Bera Type 1\n"
+"fonts and files to use the fonts with LaTeX.  Bera is a set of three\n"
+"font families: Bera Serif (a slab-serif Roman), Bera Sans (a Frutiger\n"
+"descendant) and Bera Mono (monospaced/typewriter).  The Bera family is\n"
+"a repackaging, for use with TeX, of the Bitstream Vera family."
+msgstr ""
+
+#: gnu/packages/tex.scm:7878
+msgid ""
+"Fourier-GUTenberg is a LaTeX typesetting system\n"
+"which uses Adobe Utopia as its standard base font.  Fourier-GUTenberg\n"
+"provides all complementary typefaces needed to allow Utopia based TeX\n"
+"typesetting including an extensive mathematics set and several other\n"
+"symbols.  The system is absolutely stand-alone; apart from Utopia and\n"
+"Fourier no other typefaces are required.  Utopia is a registered\n"
+"trademark of Adobe Systems Incorporated."
+msgstr ""
+
+#: gnu/packages/tex.scm:7901
+msgid ""
+"The Adobe Standard Encoding set of the Utopia font\n"
+"family, as contributed to the X Consortium.  The set comprises upright\n"
+"and italic shapes in medium and bold weights.  Macro support and\n"
+"matching maths fonts are provided by the @code{fourier} and\n"
+"@code{mathdesign} font packages."
+msgstr ""
+
+#: gnu/packages/tex.scm:7925
+msgid ""
+"The @code{fontaxes} package adds several new font\n"
+"axes on top of LaTeX's New Font Selection Scheme (NFSS).  In\n"
+"particular, it splits the shape axis into a primary and a secondary\n"
+"shape axis and it adds three new axes to deal with the different\n"
+"figure versions offered by many professional fonts."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:58
+#: gnu/packages/tex.scm:7943
+msgid ""
+"Many font families available for use with LaTeX are\n"
+"available at multiple weights.  Many Type 1-oriented support packages\n"
+"for such fonts re-define the standard @code{\\mddefault} or\n"
+"@code{\\bfdefault} macros.  This can create difficulties if the weight\n"
+"desired for one font family is not available for another font family,\n"
+"or if it differs from the weight desired for another font family.  The\n"
+"@code{mweights} package provides a solution to these difficulties."
+msgstr ""
+
+#: gnu/packages/tex.scm:7969
+msgid ""
+"Cabin is a humanist sans with four weights, true\n"
+"italics and small capitals.  According to its designer, Pablo\n"
+"Impallari, Cabin was inspired by the typefaces of Edward Johnston and\n"
+"Eric Gill.  Cabin incorporates modern proportions, optical adjustments\n"
+"and some elements of the geometric sans.  @code{cabin.sty} supports\n"
+"use of the font under LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX.  It uses\n"
+"the @code{mweights} package to manage the user's view of all those\n"
+"font weights.  An @code{sfdefault} option is provided to enable Cabin\n"
+"as the default text font.  The @code{fontaxes} package is required for\n"
+"use with [pdf]LaTeX."
+msgstr ""
+
+#: gnu/packages/tex.scm:8000
+msgid ""
+"The @code{newtx} bundle splits\n"
+"@code{txfonts.sty} (from the TX fonts distribution) into two\n"
+"independent packages, @code{newtxtext.sty} and @code{newtxmath.sty},\n"
+"each with fixes and enhancements.  @code{newtxmath}'s metrics have\n"
+"been re-evaluated to provide a less tight appearance and to provide a\n"
+"@code{libertine} option that substitutes Libertine italic and Greek\n"
+"letters for the existing math italic and Greek glyphs, making a\n"
+"mathematics package that matches Libertine text quite well."
+msgstr ""
+
+#: gnu/packages/texinfo.scm:92
 msgid ""
 "Texinfo is the official documentation format of the GNU project.  It\n"
 "uses a single source file using explicit commands to produce a final document\n"
@@ -16249,15 +17745,7 @@ msgid ""
 "is on expressing the content semantically, avoiding physical markup commands."
 msgstr ""
 
-#: gnu/packages/texinfo.scm:139
-msgid "Standalone Info documentation reader"
-msgstr ""
-
-#: gnu/packages/texinfo.scm:169
-msgid "Convert Texinfo to HTML"
-msgstr ""
-
-#: gnu/packages/texinfo.scm:171
+#: gnu/packages/texinfo.scm:222
 msgid ""
 "Texi2HTML is a Perl script which converts Texinfo source files to HTML\n"
 "output.  It now supports many advanced features, such as internationalization\n"
@@ -16272,21 +17760,22 @@ msgid ""
 "Texi2HTML."
 msgstr ""
 
-#: gnu/packages/textutils.scm:76
-msgid "DOS/Mac to Unix and vice versa text file format converter"
+#: gnu/packages/texinfo.scm:290
+msgid ""
+"Pinfo is an Info file viewer.  Pinfo is similar in use to the Lynx web\n"
+"browser.  You just move across info nodes, and select links, follow them, etc.\n"
+"It supports many colors.  Pinfo also supports viewing of manual pages -- they\n"
+"are colorized like in the midnight commander's viewer, and additionally they\n"
+"are hypertextualized."
 msgstr ""
 
-#: gnu/packages/textutils.scm:78
+#: gnu/packages/textutils.scm:94
 msgid ""
 "dos2unix is a tool to convert line breaks in a text file from Unix format\n"
 "to DOS format and vice versa."
 msgstr ""
 
-#: gnu/packages/textutils.scm:111
-msgid "Text encoding converter"
-msgstr ""
-
-#: gnu/packages/textutils.scm:112
+#: gnu/packages/textutils.scm:115
 msgid ""
 "The Recode library converts files between character sets and\n"
 "usages.  It recognises or produces over 200 different character sets (or about\n"
@@ -16296,10 +17785,6 @@ msgid ""
 "handy front-end to the library."
 msgstr ""
 
-#: gnu/packages/textutils.scm:140
-msgid "Text encoding detection tool"
-msgstr ""
-
 #: gnu/packages/textutils.scm:141
 msgid ""
 "Enca (Extremely Naive Charset Analyser) consists of libenca,\n"
@@ -16307,50 +17792,102 @@ msgid ""
 "libenca and several charset conversion libraries and tools."
 msgstr ""
 
-#: gnu/packages/textutils.scm:191
-msgid "C library for processing UTF-8 Unicode data"
-msgstr ""
-
-#: gnu/packages/textutils.scm:192
+#: gnu/packages/textutils.scm:199
 msgid ""
 "utf8proc is a small C library that provides Unicode\n"
 "normalization, case-folding, and other operations for data in the UTF-8\n"
 "encoding, supporting Unicode version 9.0.0."
 msgstr ""
 
-#: gnu/packages/textutils.scm:220
-msgid "Gordon's text utils library"
+#: gnu/packages/textutils.scm:221
+msgid ""
+"libconfuse is a configuration file parser library.  It\n"
+"supports sections and (lists of) values (strings, integers, floats, booleans\n"
+"or other sections), as well as some other features (such as\n"
+"single/double-quoted strings, environment variable expansion, functions and\n"
+"nested include statements)."
 msgstr ""
 
-#: gnu/packages/textutils.scm:222
+#: gnu/packages/textutils.scm:265
 msgid ""
 "libgtextutils is a text utilities library used by the fastx toolkit from\n"
 "the Hannon Lab."
 msgstr ""
 
-#: gnu/packages/textutils.scm:254
-msgid "C++ hash functions for strings"
-msgstr ""
-
-#: gnu/packages/textutils.scm:256
+#: gnu/packages/textutils.scm:299
 msgid ""
 "CityHash provides hash functions for strings.  The functions mix the\n"
 "input bits thoroughly but are not suitable for cryptography."
 msgstr ""
 
-#: gnu/packages/textutils.scm:294
-msgid "String library with very low memory overhead"
+#: gnu/packages/textutils.scm:339
+msgid "Ustr is a string library for C with very low memory overhead."
 msgstr ""
 
-#: gnu/packages/textutils.scm:296
-msgid "Ustr is a string library for C with very low memory overhead."
+#: gnu/packages/textutils.scm:363
+msgid ""
+"The two programs are useful for generating test data, for\n"
+"inspecting binary files, and for interfacing programs that generate textual\n"
+"output to programs that require binary input and conversely.  They can also be\n"
+"useful when it is desired to reformat numbers.\n"
+"\n"
+"@itemize\n"
+"\n"
+"@item @command{ascii2binary} reads input consisting of ascii or hexadecimal\n"
+"   representation numbers separated by whitespace and produces as output\n"
+"   the binary equivalents.  The type and precision of the binary output\n"
+"   is selected using command line flags.\n"
+"\n"
+"@item @command{binary2ascii} reads input consisting of binary numbers\n"
+"   and converts them to their ascii or hexadecimal representation.\n"
+"   Command line flags specify the type and size of the binary numbers\n"
+"   and provide control over the format of the output.\n"
+"   Unsigned integers may be written out in binary, octal, decimal,\n"
+"   or hexadecimal.\n"
+"\n"
+"   Signed integers may be written out only in binary or decimal.  Floating\n"
+"   point numbers may be written out only decimal, either in standard or\n"
+"   scientific notation.  (If you want to examine the binary representation\n"
+"   of floating point numbers, just treat the input as a sequence of unsigned\n"
+"   characters.)\n"
+"\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/textutils.scm:317
-msgid "C/C++ configuration file library"
+#: gnu/packages/textutils.scm:422
+msgid ""
+"Useful tools when working with Unicode files when one\n"
+"doesn't know the writing system, doesn't have the necessary font, needs to\n"
+"inspect invisible characters, needs to find out whether characters have been\n"
+"combined or in what order they occur, or needs statistics on which characters\n"
+"occur.\n"
+"\n"
+"@itemize\n"
+"\n"
+"@item @command{uniname} defaults to printing the character offset of each\n"
+"character, its byte offset, its hex code value, its encoding, the glyph\n"
+"itself, and its name.  It may also be used to validate UTF-8 input.\n"
+"\n"
+"@item @command{unidesc} reports the character ranges to which different\n"
+"portions of the text belong.   It can also be used to identify Unicode encodings\n"
+"(e.g. UTF-16be) flagged by magic numbers.\n"
+"\n"
+"@item @command{unihist} generates a histogram of the characters in its input.\n"
+"\n"
+"@item @command{ExplicateUTF8} is intended for debugging or for learning about\n"
+"Unicode.  It determines and explains the validity of a sequence of bytes as a\n"
+"UTF8 encoding.\n"
+"\n"
+"@item @command{utf8lookup} provides a handy way to look up Unicode characters\n"
+"from the command line.\n"
+"\n"
+"@item @command{unireverse} reverse each line of UTF-8 input\n"
+"character-by-character.\n"
+"\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/textutils.scm:319
+#: gnu/packages/textutils.scm:468
 msgid ""
 "Libconfig is a simple library for manipulating structured configuration\n"
 "files.  This file format is more compact and more readable than XML.  And\n"
@@ -16358,11 +17895,7 @@ msgid ""
 "application code."
 msgstr ""
 
-#: gnu/packages/textutils.scm:339
-msgid "Probabilistic fast file fingerprinting tool"
-msgstr ""
-
-#: gnu/packages/textutils.scm:341
+#: gnu/packages/textutils.scm:491
 msgid ""
 "pfff is a tool for calculating a compact digital fingerprint of a file\n"
 "by sampling randomly from the file instead of reading it in full.\n"
@@ -16371,22 +17904,14 @@ msgid ""
 "as existing hashing techniques, with provably negligible risk of collisions."
 msgstr ""
 
-#: gnu/packages/textutils.scm:362
-msgid "Regular expression library"
-msgstr ""
-
-#: gnu/packages/textutils.scm:363
+#: gnu/packages/textutils.scm:518
 msgid ""
 "Oniguruma is a regular expressions library.  The special\n"
 "characteristic of this library is that different character encoding for every\n"
 "regular expression object can be specified."
 msgstr ""
 
-#: gnu/packages/textutils.scm:396
-msgid "Microsoft Word document reader"
-msgstr ""
-
-#: gnu/packages/textutils.scm:397
+#: gnu/packages/textutils.scm:559
 msgid ""
 "Antiword is an application for displaying Microsoft Word\n"
 "documents.  It can also convert the document to PostScript or XML.  Only\n"
@@ -16396,11 +17921,7 @@ msgid ""
 "runs Word\"."
 msgstr ""
 
-#: gnu/packages/textutils.scm:430
-msgid "MS-Word to TeX or plain text converter"
-msgstr ""
-
-#: gnu/packages/textutils.scm:431
+#: gnu/packages/textutils.scm:593
 msgid ""
 "@command{catdoc} extracts text from MS-Word files, trying to\n"
 "preserve as many special printable characters as possible.  It supports\n"
@@ -16416,21 +17937,13 @@ msgid ""
 "@command{catppt}, which extracts data from PowerPoint presentations."
 msgstr ""
 
-#: gnu/packages/textutils.scm:479
-msgid "Portable C++ library for handling UTF-8"
-msgstr ""
-
-#: gnu/packages/textutils.scm:480
+#: gnu/packages/textutils.scm:635
 msgid ""
 "UTF8-CPP is a C++ library for handling UTF-8 encoded text\n"
 "in a portable way."
 msgstr ""
 
-#: gnu/packages/textutils.scm:546
-msgid "Bayesian text and email classifier"
-msgstr ""
-
-#: gnu/packages/textutils.scm:548
+#: gnu/packages/textutils.scm:705
 msgid ""
 "dbacl is a fast Bayesian text and email classifier.  It builds a variety\n"
 "of language models using maximum entropy (minimum divergence) principles, and\n"
@@ -16438,19 +17951,64 @@ msgid ""
 "categories."
 msgstr ""
 
-#: gnu/packages/textutils.scm:590
-msgid "Configuration file parser library"
-msgstr ""
-
-#: gnu/packages/textutils.scm:592
+#: gnu/packages/textutils.scm:743
 msgid "C library for creating and parsing configuration files."
 msgstr ""
 
-#: gnu/packages/textutils.scm:620
-msgid "Syntax highlighting text component for Java Swing"
+#: gnu/packages/textutils.scm:800
+msgid ""
+"The drm_tools package contains the following commands:\n"
+"@table @command\n"
+"@item accudate\n"
+"An extended version of the \"date\" program that has sub-second accuracy.\n"
+"@item binformat\n"
+"Format complex binary data into text.\n"
+"@item binload\n"
+"Load data into a binary file using simple commands from the input.\n"
+"@item binorder\n"
+"Sort, merge, search, retrieve or generate test data consisting of fixed size\n"
+"binary records.\n"
+"@item binreplace\n"
+"Find or find/replace in binary files.\n"
+"@item binsplit\n"
+"Split test data consisting of fixed size binary records into one or more\n"
+"output streams.\n"
+"@item chardiff\n"
+"Find changes between two files at the character level.  Unlike \"diff\", it\n"
+"lists just the characters that differ, so if the 40,000th character is\n"
+"different only that one character will be shown, not the entire line.\n"
+"@item columnadd\n"
+"Add columns of integers, decimals, and/or times.\n"
+"@item datasniffer\n"
+"A utility for formatting binary data dumps.\n"
+"@item dmath\n"
+"Double precision interactive command line math calculator.\n"
+"@item extract\n"
+"Extract and emit data from text files based on character or token position.\n"
+"@item execinput\n"
+"A utility that reads from STDIN and executes each line as a command in a\n"
+"sub-process.\n"
+"@item indexed_text\n"
+"A utility for rapid retrieval of text by line numbers, in any order, from a\n"
+"text file.\n"
+"@item mdump\n"
+"Format binary data.\n"
+"@item msgqueue\n"
+"Create message queues and send/receive messages.\n"
+"@item mbin\n"
+"@itemx mbout\n"
+"Multiple buffer in and out.  Used for buffering a lot of data between a slow\n"
+"device and a fast device.  Mostly for buffering streaming tape drives for use\n"
+"with slower network connections, so that streaming is maintained as much as\n"
+"possible to minimize wear on the tape device.\n"
+"@item pockmark\n"
+"Corrupt data streams - useful for testing error correction and data recovery.\n"
+"@item tarsieve\n"
+"Filter, list, or split a tar file.\n"
+"@end table"
 msgstr ""
 
-#: gnu/packages/textutils.scm:621
+#: gnu/packages/textutils.scm:876
 msgid ""
 "RSyntaxTextArea is a syntax highlighting, code folding text\n"
 "component for Java Swing.  It extends @code{JTextComponent} so it integrates\n"
@@ -16459,53 +18017,141 @@ msgid ""
 "source code."
 msgstr ""
 
-#: gnu/packages/textutils.scm:658
-msgid "Fast implementation of the edit distance (Levenshtein distance)"
-msgstr ""
-
-#: gnu/packages/textutils.scm:660
+#: gnu/packages/textutils.scm:916
 msgid ""
 "This library simply implements Levenshtein distance algorithm with C++\n"
 "and Cython."
 msgstr ""
 
-#: gnu/packages/version-control.scm:121
-msgid "Version control system supporting both distributed and centralized workflows"
+#: gnu/packages/textutils.scm:942
+msgid ""
+"The @code{runewidth} library provides Go functions for padding,\n"
+"measuring and checking the width of strings, with support for East Asian\n"
+"text."
+msgstr ""
+
+#: gnu/packages/textutils.scm:996
+msgid ""
+"@command{docx2txt} is a Perl based command line utility to convert\n"
+"Microsoft Office @file{.docx} documents to equivalent text documents.  Latest\n"
+"version supports following features during text extraction.\n"
+"\n"
+"@itemize\n"
+"@item Character conversions; currency characters are converted to respective\n"
+"names like Euro.\n"
+"@item Capitalisation of text blocks.\n"
+"@item Center and right justification of text fitting in a line of\n"
+"(configurable) 80 columns.\n"
+"@item Horizontal ruler, line breaks, paragraphs separation, tabs.\n"
+"@item Indicating hyperlinked text along with the hyperlink (configurable).\n"
+"@item Handling (bullet, decimal, letter, roman) lists along with (attempt at)\n"
+"indentation.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/textutils.scm:1041
+msgid ""
+"odt2txt is a command-line tool which extracts the text out\n"
+"of OpenDocument Texts, as produced by OpenOffice.org, KOffice, StarOffice and\n"
+"others.\n"
+"\n"
+"odt2txt can also extract text from some file formats similar to OpenDocument\n"
+"Text, such as OpenOffice.org XML (*.sxw), which was used by OpenOffice.org\n"
+"version 1.x and older StarOffice versions.  To a lesser extent, odt2txt may be\n"
+"useful to extract content from OpenDocument spreadsheets (*.ods) and\n"
+"OpenDocument presentations (*.odp)."
 msgstr ""
 
-#: gnu/packages/version-control.scm:123
+#: gnu/packages/textutils.scm:1130
+msgid ""
+"Open Chinese Convert (OpenCC) converts between Traditional\n"
+"Chinese and Simplified Chinese, supporting character-level conversion,\n"
+"phrase-level conversion, variant conversion, and regional idioms among\n"
+"Mainland China, Taiwan, and Hong-Kong."
+msgstr ""
+
+#: gnu/packages/textutils.scm:1165
+msgid ""
+"Nkf is yet another kanji code converter among networks,\n"
+"hosts and terminals.  It converts input kanji code to designated kanji code\n"
+"such as ISO-2022-JP, Shift_JIS, EUC-JP, UTF-8, UTF-16 or UTF-32."
+msgstr ""
+
+#: gnu/packages/textutils.scm:1183
+msgid ""
+"Pandoc is a powerful utility to transform various\n"
+"input formats into a wide range of output formats.  To alter the\n"
+"exported output document, Pandoc allows the usage of filters, which\n"
+"are pipes that read a JSON serialization of the Pandoc AST from stdin,\n"
+"transform it in some way, and write it to stdout.  It allows therefore\n"
+"to alter the processing of Pandoc's supported input formats, for\n"
+"instance one can add new syntax elements to markdown, etc.\n"
+"\n"
+"This package provides Python bindings."
+msgstr ""
+
+#: gnu/packages/textutils.scm:1218
+msgid ""
+"@command{aha} (Ansi Html Adapter) converts ANSI escape sequences\n"
+"of a Unix terminal to HTML code."
+msgstr ""
+
+#: gnu/packages/textutils.scm:1247
+msgid ""
+"Vale is a fully extensible linter that focuses on your own writing style\n"
+"by making use of rules in individual YAML files.  It is syntax-aware on markup\n"
+"languages such as HTML, Markdown, Asciidoc, and reStructuredText.  The community\n"
+"around it also has a list of style guides implemented with Vale in\n"
+"@url{https://github.com/errata-ai/styles, their styles repo}."
+msgstr ""
+
+#: gnu/packages/version-control.scm:162
 msgid ""
 "GNU Bazaar is a version control system that allows you to record\n"
 "changes to project files over time.  It supports both a distributed workflow\n"
 "as well as the classic centralized workflow."
 msgstr ""
 
-#: gnu/packages/version-control.scm:354
-msgid "Distributed version control system"
-msgstr ""
-
-#: gnu/packages/version-control.scm:356
+#: gnu/packages/version-control.scm:533
 msgid ""
 "Git is a free distributed version control system designed to handle\n"
 "everything from small to very large projects with speed and efficiency."
 msgstr ""
 
-#: gnu/packages/version-control.scm:402
-msgid "Library providing Git core methods"
+#: gnu/packages/version-control.scm:625
+msgid ""
+"@code{git2cl} is a command line tool for converting Git\n"
+"logs to GNU ChangeLog format."
+msgstr ""
+
+#: gnu/packages/version-control.scm:686
+msgid ""
+"Gitless is a Git-compatible version control system that aims to be easy to\n"
+"learn and use.  It simplifies the common workflow by committing changes to\n"
+"tracked files by default and saving any uncommitted changes as part of a branch.\n"
+"\n"
+"The friendly @command{gl} command-line interface gives feedback and helps you\n"
+"figure out what to do next.\n"
+"\n"
+"Gitless is implemented on top of Git and its commits and repositories are\n"
+"indistinguishable from Git's.  You (or other contributors) can always fall back\n"
+"on @command{git}, and use any regular Git hosting service."
+msgstr ""
+
+#: gnu/packages/version-control.scm:714
+msgid ""
+"@code{git-cal} is a script to view commits calendar similar\n"
+"to GitHub contributions calendar."
 msgstr ""
 
-#: gnu/packages/version-control.scm:404
+#: gnu/packages/version-control.scm:778
 msgid ""
 "Libgit2 is a portable, pure C implementation of the Git core methods\n"
 "provided as a re-entrant linkable library with a solid API, allowing you to\n"
 "write native speed custom Git applications in any language with bindings."
 msgstr ""
 
-#: gnu/packages/version-control.scm:440
-msgid "Transparent encryption of files in a git repository"
-msgstr ""
-
-#: gnu/packages/version-control.scm:441
+#: gnu/packages/version-control.scm:847
 msgid ""
 "git-crypt enables transparent encryption and decryption of\n"
 "files in a git repository.  Files which you choose to protect are encrypted when\n"
@@ -16517,11 +18163,7 @@ msgid ""
 "to lock down your entire repository."
 msgstr ""
 
-#: gnu/packages/version-control.scm:476
-msgid "Whole remote repository encryption"
-msgstr ""
-
-#: gnu/packages/version-control.scm:477
+#: gnu/packages/version-control.scm:883
 msgid ""
 "git-remote-gcrypt is a Git remote helper to push and pull from\n"
 "repositories encrypted with GnuPG.  It works with the standard Git transports,\n"
@@ -16540,31 +18182,49 @@ msgid ""
 "collaboration using typical untrusted file hosts or services."
 msgstr ""
 
-#: gnu/packages/version-control.scm:556
-msgid "Web frontend for git repositories"
-msgstr ""
-
-#: gnu/packages/version-control.scm:558
+#: gnu/packages/version-control.scm:1005
 msgid ""
 "CGit is an attempt to create a fast web interface for the Git SCM, using\n"
 "a built-in cache to decrease server I/O pressure."
 msgstr ""
 
-#: gnu/packages/version-control.scm:587
-msgid "Copy directory to the gh-pages branch"
+#: gnu/packages/version-control.scm:1041
+msgid ""
+"This hook sends emails describing changes introduced by pushes to a Git\n"
+"repository.  For each reference that was changed, it emits one ReferenceChange\n"
+"email summarizing how the reference was changed, followed by one Revision\n"
+"email for each new commit that was introduced by the reference change.\n"
+"\n"
+"This script is designed to be used as a post-receive hook in a Git\n"
+"repository"
 msgstr ""
 
-#: gnu/packages/version-control.scm:588
+#: gnu/packages/version-control.scm:1075
 msgid ""
 "Script that copies a directory to the gh-pages branch (by\n"
 "default) of the repository."
 msgstr ""
 
-#: gnu/packages/version-control.scm:633
-msgid "Command-line flags library for shell scripts"
+#: gnu/packages/version-control.scm:1135
+msgid ""
+"GitDB allows you to access @dfn{bare} Git repositories for reading and\n"
+"writing.  It aims at allowing full access to loose objects as well as packs\n"
+"with performance and scalability in mind.  It operates exclusively on streams,\n"
+"allowing to handle large objects with a small memory footprint."
+msgstr ""
+
+#: gnu/packages/version-control.scm:1173
+msgid ""
+"GitPython is a python library used to interact with Git repositories,\n"
+"high-level like git-porcelain, or low-level like git-plumbing.\n"
+"\n"
+"It provides abstractions of Git objects for easy access of repository data,\n"
+"and additionally allows you to access the Git repository more directly using\n"
+"either a pure Python implementation, or the faster, but more resource intensive\n"
+"@command{git} command implementation."
 msgstr ""
 
-#: gnu/packages/version-control.scm:635
+#: gnu/packages/version-control.scm:1211
 msgid ""
 "Shell Flags (shFlags) is a library written to greatly simplify the\n"
 "handling of command-line flags in Bourne based Unix shell scripts (bash, dash,\n"
@@ -16575,11 +18235,7 @@ msgid ""
 "will work."
 msgstr ""
 
-#: gnu/packages/version-control.scm:678
-msgid "Git extensions for Vincent Driessen's branching model"
-msgstr ""
-
-#: gnu/packages/version-control.scm:680
+#: gnu/packages/version-control.scm:1257
 msgid ""
 "Vincent Driessen's branching model is a git branching and release\n"
 "management strategy that helps developers keep track of features, hotfixes,\n"
@@ -16588,11 +18244,7 @@ msgid ""
 "lot easier."
 msgstr ""
 
-#: gnu/packages/version-control.scm:713
-msgid "Stacked Git"
-msgstr ""
-
-#: gnu/packages/version-control.scm:715
+#: gnu/packages/version-control.scm:1309
 msgid ""
 "StGit is a command-line application that provides functionality similar\n"
 "to Quilt (i.e., pushing/popping patches to/from a stack), but using Git\n"
@@ -16601,11 +18253,7 @@ msgid ""
 "manipulate them in various ways."
 msgstr ""
 
-#: gnu/packages/version-control.scm:751
-msgid "Version control system for @code{$HOME}"
-msgstr ""
-
-#: gnu/packages/version-control.scm:753
+#: gnu/packages/version-control.scm:1348
 msgid ""
 "vcsh version-controls configuration files in several Git repositories,\n"
 "all in one single directory.  They all maintain their working trees without\n"
@@ -16614,43 +18262,40 @@ msgid ""
 "though this can be overridden."
 msgstr ""
 
-#: gnu/packages/version-control.scm:788
-msgid "Run a command over a sequence of commits"
-msgstr ""
-
-#: gnu/packages/version-control.scm:790
+#: gnu/packages/version-control.scm:1386
 msgid ""
 "git-test-sequence is similar to an automated git bisect except it’s\n"
 "linear.  It will test every change between two points in the DAG.  It will\n"
 "also walk each side of a merge and test those changes individually."
 msgstr ""
 
-#: gnu/packages/version-control.scm:851
-msgid "Git access control layer"
-msgstr ""
-
-#: gnu/packages/version-control.scm:853
+#: gnu/packages/version-control.scm:1501
 msgid ""
 "Gitolite is an access control layer on top of Git, providing fine access\n"
 "control to Git repositories."
 msgstr ""
 
-#: gnu/packages/version-control.scm:877
-msgid "Decentralized version control system"
+#: gnu/packages/version-control.scm:1620
+msgid ""
+"Pre-commit is a multi-language package manager for pre-commit hooks.  You\n"
+"specify a list of hooks you want and pre-commit manages the installation and\n"
+"execution of any hook written in any language before every commit."
 msgstr ""
 
-#: gnu/packages/version-control.scm:879
+#: gnu/packages/version-control.scm:1700
 msgid ""
 "Mercurial is a free, distributed source control management tool.\n"
 "It efficiently handles projects of any size\n"
 "and offers an easy and intuitive interface."
 msgstr ""
 
-#: gnu/packages/version-control.scm:913
-msgid "HTTP and WebDAV client library"
+#: gnu/packages/version-control.scm:1727
+msgid ""
+"Evolve is a Mercurial extension for faster and safer mutable\n"
+"history.  It implements the changeset evolution concept for Mercurial."
 msgstr ""
 
-#: gnu/packages/version-control.scm:915
+#: gnu/packages/version-control.scm:1763
 msgid ""
 "Neon is an HTTP and WebDAV client library, with a C interface and the\n"
 "following features:\n"
@@ -16672,24 +18317,16 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/version-control.scm:999
-msgid "Revision control system"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1001
+#: gnu/packages/version-control.scm:1859
 msgid ""
-"Subversion exists to be universally recognized and adopted as a\n"
+"@dfn{Subversion} (svn) exists to be recognized and adopted as a\n"
 "centralized version control system characterized by its\n"
 "reliability as a safe haven for valuable data; the simplicity of its model and\n"
 "usage; and its ability to support the needs of a wide variety of users and\n"
 "projects, from individuals to large-scale enterprise operations."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1023
-msgid "Per-file local revision control system"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1025
+#: gnu/packages/version-control.scm:1883
 msgid ""
 "RCS is the original Revision Control System.  It works on a\n"
 "file-by-file basis, in contrast to subsequent version control systems such as\n"
@@ -16698,11 +18335,7 @@ msgid ""
 "machine."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1053
-msgid "Historical centralized version control system"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1055
+#: gnu/packages/version-control.scm:1913
 msgid ""
 "CVS is a version control system, an important component of Source\n"
 "Configuration Management (SCM).  Using it, you can record the history of\n"
@@ -16710,11 +18343,7 @@ msgid ""
 "RCS, PRCS, and Aegis packages."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1096
-msgid "Export an RCS or CVS history as a fast-import stream"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1097
+#: gnu/packages/version-control.scm:1948
 msgid ""
 "This program analyzes a collection of RCS files in a CVS\n"
 "repository (or outside of one) and, when possible, emits an equivalent history\n"
@@ -16727,11 +18356,7 @@ msgid ""
 "masters from remote CVS hosts."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1124
-msgid "Version-control-agnostic ChangeLog diff and commit tool"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1126
+#: gnu/packages/version-control.scm:1978
 msgid ""
 "The vc-dwim package contains two tools, \"vc-dwim\" and \"vc-chlog\".\n"
 "vc-dwim is a tool that simplifies the task of maintaining a ChangeLog and\n"
@@ -16741,33 +18366,21 @@ msgid ""
 "standards-compliant ChangeLog entries based on the changes that it detects."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1151
-msgid "Make histograms from the output of @command{diff}"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1153
+#: gnu/packages/version-control.scm:2005
 msgid ""
 "Diffstat reads the output of @command{diff} and displays a histogram of\n"
 "the insertions, deletions, and modifications per file.  It is useful for\n"
 "reviewing large, complex patch files."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1192
-msgid "File-based version control like SCCS"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1193
+#: gnu/packages/version-control.scm:2045
 msgid ""
 "GNU CSSC provides a replacement for the legacy Unix source\n"
 "code control system SCCS.  This allows old code still under that system to be\n"
 "accessed and migrated on modern systems."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1272
-msgid "Project change supervisor"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1273
+#: gnu/packages/version-control.scm:2137
 msgid ""
 "Aegis is a project change supervisor, and performs some of\n"
 "the Software Configuration Management needed in a CASE environment.  Aegis\n"
@@ -16778,11 +18391,7 @@ msgid ""
 "any project with more than one developer, is one of Aegis's major functions."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1322
-msgid "Edit version-control repository history"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1323
+#: gnu/packages/version-control.scm:2212
 msgid ""
 "Reposurgeon enables risky operations that version-control\n"
 "systems don't want to let you do, such as editing past comments and metadata\n"
@@ -16793,32 +18402,20 @@ msgid ""
 "from Subversion to any supported Distributed Version Control System (DVCS)."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1362
-msgid "Ncurses-based text user interface for Git"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1364
+#: gnu/packages/version-control.scm:2253
 msgid ""
 "Tig is an ncurses text user interface for Git, primarily intended as\n"
 "a history browser.  It can also stage hunks for commit, or colorize the\n"
-"output of the 'git' command."
+"output of the @code{git} command."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1390
-msgid "Print the modification time of the latest file"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1392
+#: gnu/packages/version-control.scm:2277
 msgid ""
 "Recursively find the newest file in a file tree and print its\n"
 "modification time."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1417
-msgid "Multiple repository management tool"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1419
+#: gnu/packages/version-control.scm:2324
 msgid ""
 "Myrepos provides the @code{mr} command, which maps an operation (e.g.,\n"
 "fetching updates) over a collection of version control repositories.  It\n"
@@ -16826,74 +18423,139 @@ msgid ""
 "Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1449
-msgid "Use hubic as a git-annex remote"
+#: gnu/packages/version-control.scm:2363
+msgid ""
+"Grokmirror enables replicating large git repository\n"
+"collections efficiently.  Mirrors decide to clone and update repositories\n"
+"based on a manifest file published by servers."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1451
+#: gnu/packages/version-control.scm:2395
 msgid ""
-"This package allows you to use your hubic account as a \"special\n"
-"repository\" with git-annex."
+"The @code{b4} command is designed to make it easier to participate in\n"
+"patch-based workflows for projects that have public-inbox archives.\n"
+"\n"
+"Features include:\n"
+"@itemize\n"
+"@item downloading a thread's mbox given a message ID\n"
+"@item processing an mbox so that is ready to be fed to @code{git-am}\n"
+"@item creating templated replies for processed patches and pull requests\n"
+"@item submitting cryptographic attestation for patches.\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/version-control.scm:1503
-msgid "Software configuration management system"
+#: gnu/packages/version-control.scm:2445
+msgid ""
+"This wrapper around rclone makes any destination supported\n"
+"by rclone usable with git-annex."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1505
+#: gnu/packages/version-control.scm:2503
 msgid ""
 "Fossil is a distributed source control management system which supports\n"
 "access and administration over HTTP CGI or via a built-in HTTP server.  It has\n"
 "a built-in wiki, built-in file browsing, built-in tickets system, etc."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1533
-msgid "Static git page generator"
-msgstr ""
-
-#: gnu/packages/version-control.scm:1534
+#: gnu/packages/version-control.scm:2532
 msgid ""
 "Stagit creates static pages for git repositories, the results can\n"
 "be served with a HTTP file server of your choice."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1622
-msgid "Distributed Revision Control System"
+#: gnu/packages/version-control.scm:2568
+msgid ""
+"@code{gource} provides a software version control\n"
+"visualization.  The repository is displayed as a tree where the root of the\n"
+"repository is the centre, directories are branches and files are leaves.\n"
+"Contributors to the source code appear and disappear as they contribute to\n"
+"specific files and directories."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1624
+#: gnu/packages/version-control.scm:2617
+#, scheme-format
 msgid ""
-"Darcs is a revision control system.  It is:\n"
-"\n"
-"@enumerate\n"
-"@item Distributed: Every user has access to the full command set, removing boundaries\n"
-"between server and client or committer and non-committers.\n"
-"@item Interactive: Darcs is easy to learn and efficient to use because it asks you\n"
-"questions in response to simple commands, giving you choices in your work flow.\n"
-"You can choose to record one change in a file, while ignoring another.  As you update\n"
-"from upstream, you can review each patch name, even the full diff for interesting\n"
-"patches.\n"
-"@item Smart: Originally developed by physicist David Roundy, darcs is based on a\n"
-"unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.\n"
-"@end enumerate"
+"SRC (or src) is simple revision control, a version-control system for\n"
+"single-file projects by solo developers and authors.  It modernizes the\n"
+"venerable RCS, hence the anagrammatic acronym.  The design is tuned for use\n"
+"cases like all those little scripts in your @file{~/bin} directory, or a\n"
+"directory full of HOWTOs."
+msgstr ""
+
+#: gnu/packages/version-control.scm:2670
+msgid ""
+"This Git extension defines a subcommand,\n"
+"@code{when-merged}, whose core operation is to find the merge that brought a\n"
+"given commit into the specified ref(s).  It has various options that control\n"
+"how information about the merge is displayed."
+msgstr ""
+
+#: gnu/packages/version-control.scm:2715
+msgid ""
+"This Git extension defines a subcommand, @code{imerge},\n"
+"which performs an incremental merge between two branches.  Its two primary\n"
+"design goals are to reduce the pain of resolving merge conflicts by finding\n"
+"the smallest possible conflicts and to allow a merge to be saved, tested,\n"
+"interrupted, published, and collaborated on while in progress."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1676
-msgid "Java library implementing the Git version control system"
+#: gnu/packages/version-control.scm:2766
+msgid ""
+"Git Large File Storage (LFS) replaces large files such as audio samples,\n"
+"videos, datasets, and graphics with text pointers inside Git, while storing the\n"
+"file contents on a remote server."
+msgstr ""
+
+#: gnu/packages/version-control.scm:2801
+msgid ""
+"@code{git open} opens the repository's website from the command-line,\n"
+"guessing the URL pattern from the @code{origin} remote."
+msgstr ""
+
+#: gnu/packages/version-control.scm:2855
+msgid ""
+"GNU Arch, aka. @code{tla}, was one of the first free distributed\n"
+"version-control systems (DVCS).  It saw its last release in 2006.  This\n"
+"package is provided for users who need to recover @code{tla} repositories and\n"
+"for historians."
 msgstr ""
 
-#: gnu/packages/version-control.scm:1677
+#: gnu/packages/version-control.scm:2904
 msgid ""
-"JGit is a lightweight, pure Java library implementing the\n"
-"Git version control system, providing repository access routines, support for\n"
-"network protocols, and core version control algorithms."
+"@code{diff-so-fancy} strives to make your diffs human readable instead\n"
+"of machine readable.  This helps improve code quality and helps you spot\n"
+"defects faster."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:177
-msgid "Machine emulator and virtualizer"
+#: gnu/packages/version-control.scm:2960
+msgid "This package provides a Git implementation library."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:179
+#: gnu/packages/version-control.scm:3011
+msgid ""
+"This package provides a command-line tool to manage\n"
+"multiple Git repos.\n"
+"\n"
+"This tool does two things:\n"
+"@itemize\n"
+"@item display the status of multiple Git repos such as branch, modification,\n"
+"commit message side by side\n"
+"@item (batch) delegate Git commands/aliases from any working directory\n"
+"@end itemize\n"
+"\n"
+"If several repos are related, it helps to see their status together."
+msgstr ""
+
+#: gnu/packages/version-control.scm:3069
+#, scheme-format
+msgid ""
+"@code{ghq} provides a way to organize remote repository clones, like\n"
+"@code{go get} does.  When you clone a remote repository by @code{ghq get}, ghq\n"
+"makes a directory under a specific root directory (by default @file{~/ghq})\n"
+"using the remote repository URL's host and path."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:375
 msgid ""
 "QEMU is a generic machine emulator and virtualizer.\n"
 "\n"
@@ -16908,15 +18570,36 @@ msgid ""
 "server and embedded PowerPC, and S390 guests."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:201
-msgid "Machine emulator and virtualizer (without GUI)"
+#: gnu/packages/virtualization.scm:817
+msgid ""
+"Ganeti is a virtual machine management tool built on top of existing\n"
+"virtualization technologies such as Xen or KVM.  Ganeti controls:\n"
+"\n"
+"@itemize @bullet\n"
+"@item Disk creation management;\n"
+"@item Operating system installation for instances (in co-operation with\n"
+"OS-specific install scripts); and\n"
+"@item Startup, shutdown, and failover between physical systems.\n"
+"@end itemize\n"
+"\n"
+"Ganeti is designed to facilitate cluster management of virtual servers and\n"
+"to provide fast and simple recovery after physical failures, using\n"
+"commodity hardware."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:855
+msgid ""
+"This package provides a guest OS definition for Ganeti that uses\n"
+"Guix to build virtual machines."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:268
-msgid "Operating system information database"
+#: gnu/packages/virtualization.scm:950
+msgid ""
+"This package provides a guest OS definition for Ganeti.  It installs\n"
+"Debian or a derivative using @command{debootstrap}."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:269
+#: gnu/packages/virtualization.scm:1011
 msgid ""
 "libosinfo is a GObject based library API for managing\n"
 "information about operating systems, hypervisors and the (virtual) hardware\n"
@@ -16926,22 +18609,14 @@ msgid ""
 "all common programming languages.  Vala bindings are also provided."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:317
-msgid "Linux container tools"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:320
+#: gnu/packages/virtualization.scm:1063
 msgid ""
 "LXC is a userspace interface for the Linux kernel containment features.\n"
 "Through a powerful API and simple tools, it lets Linux users easily create and\n"
 "manage system or application containers."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:404
-msgid "Simple API for virtualization"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:405
+#: gnu/packages/virtualization.scm:1149
 msgid ""
 "Libvirt is a C toolkit to interact with the virtualization\n"
 "capabilities of recent versions of Linux.  The library aims at providing long\n"
@@ -16949,11 +18624,7 @@ msgid ""
 "to integrate other virtualization mechanisms if needed."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:446
-msgid "GLib wrapper around libvirt"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:447
+#: gnu/packages/virtualization.scm:1185
 msgid ""
 "libvirt-glib wraps the libvirt library to provide a\n"
 "high-level object-oriented API better suited for glib-based applications, via\n"
@@ -16966,21 +18637,13 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/virtualization.scm:489
-msgid "Python bindings to libvirt"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:490
+#: gnu/packages/virtualization.scm:1229
 msgid ""
 "This package provides Python bindings to the libvirt\n"
 "virtualization library."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:585
-msgid "Manage virtual machines"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:587
+#: gnu/packages/virtualization.scm:1345
 msgid ""
 "The virt-manager application is a desktop user interface for managing\n"
 "virtual machines through libvirt.  It primarily targets KVM VMs, but also\n"
@@ -16988,11 +18651,7 @@ msgid ""
 "domains, their live performance and resource utilization statistics."
 msgstr ""
 
-#: gnu/packages/virtualization.scm:677
-msgid "Checkpoint and restore in user space"
-msgstr ""
-
-#: gnu/packages/virtualization.scm:678
+#: gnu/packages/virtualization.scm:1454
 msgid ""
 "Using this tool, you can freeze a running application (or\n"
 "part of it) and checkpoint it to a hard drive as a collection of files.  You\n"
@@ -17001,22 +18660,141 @@ msgid ""
 "mainly implemented in user space."
 msgstr ""
 
-#: gnu/packages/webkit.scm:134
-msgid "Web content engine for GTK+"
+#: gnu/packages/virtualization.scm:1481
+msgid ""
+"qmpbackup is designed to create and restore full and\n"
+"incremental backups of running QEMU virtual machines via QMP, the QEMU\n"
+"Machine Protocol."
 msgstr ""
 
-#: gnu/packages/webkit.scm:136
+#: gnu/packages/virtualization.scm:1546
+msgid ""
+"Looking Glass allows the use of a KVM (Kernel-based Virtual\n"
+"Machine) configured for VGA PCI Pass-through without an attached physical\n"
+"monitor, keyboard or mouse.  It displays the VM's rendered contents on your main\n"
+"monitor/GPU."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1598
+msgid ""
+"@command{runc} is a command line client for running applications\n"
+"packaged according to the\n"
+"@uref{https://github.com/opencontainers/runtime-spec/blob/master/spec.md, Open\n"
+"Container Initiative (OCI) format} and is a compliant implementation of the\n"
+"Open Container Initiative specification."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1647
+msgid ""
+"@command{umoci} is a tool that allows for high-level modification of an\n"
+"Open Container Initiative (OCI) image layout and its tagged images."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1702
+msgid ""
+"@command{skopeo} is a command line utility providing various operations\n"
+"with container images and container image registries.  It can:\n"
+"@enumerate\n"
+"\n"
+"@item Copy container images between various containers image stores,\n"
+"converting them as necessary.\n"
+"\n"
+"@item Convert a Docker schema 2 or schema 1 container image to an OCI image.\n"
+"\n"
+"@item Inspect a repository on a container registry without needlessly pulling\n"
+"the image.\n"
+"\n"
+"@item Sign and verify container images.\n"
+"\n"
+"@item Delete container images from a remote container registry.\n"
+"\n"
+"@end enumerate"
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1738
+msgid ""
+"Python-vagrant is a Python module that provides a thin wrapper around the\n"
+"@code{vagrant} command line executable, allowing programmatic control of Vagrant\n"
+"virtual machines."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1793
+msgid ""
+"Bubblewrap is aimed at running applications in a sandbox,\n"
+"restricting their access to parts of the operating system or user data such as\n"
+"the home directory.  Bubblewrap always creates a new mount namespace, and the\n"
+"user can specify exactly what parts of the file system should be made visible\n"
+"in the sandbox.  These directories are mounted with the @code{nodev} option\n"
+"by default and can be made read-only."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:1820
+msgid ""
+"Bochs is an emulator which can emulate Intel x86 CPU, common I/O\n"
+"devices, and a custom BIOS.  It can also be compiled to emulate many different\n"
+"x86 CPUs, from early 386 to the most recent x86-64 Intel and AMD processors.\n"
+"Bochs can run most Operating Systems inside the emulation including Linux,\n"
+"DOS or Microsoft Windows."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:2024
+msgid ""
+"This package provides the Xen Virtual Machine Monitor\n"
+"which is a hypervisor."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:2060
+msgid ""
+"This package contains a set of tools to assist\n"
+"administrators and developers in managing the database."
+msgstr ""
+
+#: gnu/packages/virtualization.scm:2095
+msgid ""
+"Osinfo-db provides the database files for use with the\n"
+"libosinfo library.  It provides information about guest operating systems for\n"
+"use with virtualization provisioning tools"
+msgstr ""
+
+#: gnu/packages/virtualization.scm:2141
+msgid ""
+"@code{transient} is a wrapper for QEMU allowing the creation of virtual\n"
+"machines with shared folder, ssh, and disk creation support."
+msgstr ""
+
+#: gnu/packages/webkit.scm:89
+msgid ""
+"LibWPE is general-purpose library specifically developed for\n"
+"the WPE-flavored port of WebKit."
+msgstr ""
+
+#: gnu/packages/webkit.scm:118
+msgid ""
+"This package provides a backend implementation for the WPE WebKit\n"
+"engine that uses Wayland for graphics output."
+msgstr ""
+
+#: gnu/packages/webkit.scm:215
+msgid ""
+"WPE WebKit allows embedders to create simple and performant\n"
+"systems based on Web platform technologies.  It is designed with hardware\n"
+"acceleration in mind, leveraging common 3D graphics APIs for best performance."
+msgstr ""
+
+#: gnu/packages/webkit.scm:345
 msgid ""
 "WebKitGTK+ is a full-featured port of the WebKit rendering engine,\n"
 "suitable for projects requiring any kind of web integration, from hybrid\n"
 "HTML/CSS applications to full-fledged web browsers."
 msgstr ""
 
-#: gnu/packages/web.scm:136
-msgid "Featureful HTTP server"
+#: gnu/packages/web.scm:243
+msgid ""
+"Qhttp is a light-weight and asynchronous HTTP library\n"
+"(both server & client) in Qt5 and C++14."
 msgstr ""
 
-#: gnu/packages/web.scm:138
+#: gnu/packages/web.scm:276
 msgid ""
 "The Apache HTTP Server Project is a collaborative software development\n"
 "effort aimed at creating a robust, commercial-grade, featureful, and\n"
@@ -17026,117 +18804,135 @@ msgid ""
 "and its related documentation."
 msgstr ""
 
-#: gnu/packages/web.scm:226
-msgid "HTTP and reverse proxy server"
+#: gnu/packages/web.scm:310
+msgid ""
+"The mod_wsgi module for the Apache HTTPD Server adds support for running\n"
+"applications that support the Python @acronym{WSGI, Web Server Gateway\n"
+"Interface} specification."
+msgstr ""
+
+#: gnu/packages/web.scm:352
+msgid ""
+"Monolith bundles any web page into a single HTML file.\n"
+"\n"
+"Unlike conventional ``Save page as…'', Monolith not only saves the target\n"
+"document, it embeds CSS, image, and JavaScript assets all at once, producing\n"
+"a single HTML5 document.\n"
+"\n"
+"If compared to saving websites with @samp{wget -mpk}, Monolith embeds\n"
+"all assets as data URLs and therefore displays the saved page exactly\n"
+"the same, being completely separated from the Internet."
 msgstr ""
 
-#: gnu/packages/web.scm:228
+#: gnu/packages/web.scm:449
 msgid ""
 "Nginx (\"engine X\") is a high-performance web and reverse proxy server\n"
-"created by Igor Sysoev.  It can be used both as a standalone web server\n"
+"created by Igor Sysoev.  It can be used both as a stand-alone web server\n"
 "and as a proxy to reduce the load on back-end HTTP or mail servers."
 msgstr ""
 
-#: gnu/packages/web.scm:273
-msgid "XSLScript with NGinx specific modifications"
+#: gnu/packages/web.scm:509
+msgid "This package provides HTML documentation for the nginx web server."
+msgstr ""
+
+#: gnu/packages/web.scm:638
+msgid ""
+"This nginx module parses the Accept-Language field in HTTP headers and\n"
+"chooses the most suitable locale for the user from the list of locales\n"
+"supported at your website."
 msgstr ""
 
-#: gnu/packages/web.scm:275
+#: gnu/packages/web.scm:685
 msgid ""
 "XSLScript is a terse notation for writing complex XSLT stylesheets.\n"
 "This is modified version, specifically intended for use with the NGinx\n"
 "documentation."
 msgstr ""
 
-#: gnu/packages/web.scm:328
-msgid "Documentation for nginx web server"
-msgstr ""
-
-#: gnu/packages/web.scm:330
-msgid "This package provides HTML documentation for the nginx web server."
+#: gnu/packages/web.scm:758
+msgid ""
+"This NGINX module provides a scripting support with Lua\n"
+"programming language."
 msgstr ""
 
-#: gnu/packages/web.scm:353
-msgid "Language-independent, high-performant extension to CGI"
+#: gnu/packages/web.scm:816
+msgid ""
+"Lighttpd is a secure, fast, compliant, and very flexible web-server that\n"
+"has been optimized for high-performance environments.  It has a very low\n"
+"memory footprint compared to other webservers.  Its features include FastCGI,\n"
+"CGI, authentication, output compression, URL rewriting and many more."
 msgstr ""
 
-#: gnu/packages/web.scm:354
+#: gnu/packages/web.scm:846
 msgid ""
 "FastCGI is a language-independent, scalable extension to CGI\n"
 "that provides high performance without the limitations of server specific\n"
 "APIs."
 msgstr ""
 
-#: gnu/packages/web.scm:390
-msgid "Simple server for running CGI applications over FastCGI"
-msgstr ""
-
-#: gnu/packages/web.scm:391
+#: gnu/packages/web.scm:886
 msgid ""
 "Fcgiwrap is a simple server for running CGI applications\n"
 "over FastCGI.  It hopes to provide clean CGI support to Nginx (and other web\n"
 "servers that may need it)."
 msgstr ""
 
-#: gnu/packages/web.scm:422
-msgid "PSGI/Plack web server"
-msgstr ""
-
-#: gnu/packages/web.scm:423
+#: gnu/packages/web.scm:917
 msgid ""
 "Starman is a PSGI perl web server that has unique features\n"
 "such as high performance, preforking, signal support, superdaemon awareness,\n"
 "and UNIX socket support."
 msgstr ""
 
-#: gnu/packages/web.scm:455
-msgid "Java Web Start"
-msgstr ""
-
-#: gnu/packages/web.scm:457
+#: gnu/packages/web.scm:951
 msgid ""
 "IcedTea-Web is an implementation of the @dfn{Java Network Launching\n"
 "Protocol}, also known as Java Web Start.  This package provides tools and\n"
 "libraries for working with JNLP applets."
 msgstr ""
 
-#: gnu/packages/web.scm:478
-msgid "JSON C library"
-msgstr ""
-
-#: gnu/packages/web.scm:480
+#: gnu/packages/web.scm:976
 msgid ""
 "Jansson is a C library for encoding, decoding and manipulating JSON\n"
 "data."
 msgstr ""
 
-#: gnu/packages/web.scm:512
-msgid "JSON implementation in C"
-msgstr ""
-
-#: gnu/packages/web.scm:514
+#: gnu/packages/web.scm:997
 msgid ""
 "JSON-C implements a reference counting object model that allows you to\n"
-"easily construct JSON objects in C, output them as JSON formatted strings and\n"
-"parse JSON formatted strings back into the C representation of JSON objects."
+"easily construct JSON objects in C, output them as JSON-formatted strings and\n"
+"parse JSON-formatted strings back into the C representation of JSON objects.\n"
+"It aims to conform to RFC 7159."
 msgstr ""
 
-#: gnu/packages/web.scm:552
-msgid "Library that maps JSON data to QVariant objects"
+#: gnu/packages/web.scm:1073
+msgid ""
+"This package provides a very low footprint JSON parser\n"
+"written in portable ANSI C.\n"
+"\n"
+"@itemize\n"
+"@item BSD licensed with no dependencies (i.e. just drop the C file into your\n"
+"project)\n"
+"@item Never recurses or allocates more memory than it needs\n"
+"@item Very simple API with operator sugar for C++\n"
+"@end itemize"
 msgstr ""
 
-#: gnu/packages/web.scm:553
+#: gnu/packages/web.scm:1118
 msgid ""
 "QJson is a Qt-based library that maps JSON data to\n"
 "@code{QVariant} objects.  JSON arrays will be mapped to @code{QVariantList}\n"
 "instances, while JSON's objects will be mapped to @code{QVariantMap}."
 msgstr ""
 
-#: gnu/packages/web.scm:637
-msgid "Hierarchical data exploration with zoomable HTML5 pie charts"
+#: gnu/packages/web.scm:1170
+msgid ""
+"QOAuth is an attempt to support interaction with\n"
+"OAuth-powered network services in a Qt way, i.e. simply, clearly and\n"
+"efficiently.  It gives the application developer no more than 4 methods."
 msgstr ""
 
-#: gnu/packages/web.scm:639
+#: gnu/packages/web.scm:1255
 msgid ""
 "Krona is a flexible tool for exploring the relative proportions of\n"
 "hierarchical data, such as metagenomic classifications, using a radial,\n"
@@ -17145,42 +18941,68 @@ msgid ""
 "current version of any major web browser."
 msgstr ""
 
-#: gnu/packages/web.scm:672
-msgid "JSON parser/generator for C++ with both SAX/DOM style API"
-msgstr ""
-
-#: gnu/packages/web.scm:674
+#: gnu/packages/web.scm:1299
 msgid ""
 "RapidJSON is a fast JSON parser/generator for C++ with both SAX/DOM\n"
 "style API."
 msgstr ""
 
-#: gnu/packages/web.scm:692
-msgid "C library for parsing JSON"
-msgstr ""
-
-#: gnu/packages/web.scm:694
+#: gnu/packages/web.scm:1328
 msgid ""
 "Yet Another JSON Library (YAJL) is a small event-driven (SAX-style) JSON\n"
 "parser written in ANSI C and a small validating JSON generator."
 msgstr ""
 
-#: gnu/packages/web.scm:724
-msgid "WebSockets library written in C"
-msgstr ""
-
-#: gnu/packages/web.scm:726
+#: gnu/packages/web.scm:1359
 msgid ""
 "Libwebsockets is a library that allows C programs to establish client\n"
 "and server WebSockets connections---a protocol layered above HTTP that allows\n"
 "for efficient socket-like bidirectional reliable communication channels."
 msgstr ""
 
-#: gnu/packages/web.scm:754
-msgid "C library for the Publix Suffix List"
+#: gnu/packages/web.scm:1388
+msgid ""
+"WABT (pronounced: wabbit) is a suite of tools for\n"
+"WebAssembly, including:\n"
+"\n"
+"@enumerate\n"
+"@item @command{wat2wasm} translates from WebAssembly text format to the\n"
+"WebAssembly binary format\n"
+"@item @command{wasm2wat} is the inverse; it translates from the binary format\n"
+"back to the text format (also known as a .wat)\n"
+"@item @command{wasm-objdump} prints information about a wasm binary, similarly\n"
+"to @command{objdump}.\n"
+"@item @command{wasm-interp} decodes ands run a WebAssembly binary file using a\n"
+"stack-based interpreter\n"
+"@item @command{wat-desugar} parses .wat text form as supported by the spec\n"
+"interpreter (s-expressions, flat syntax, or mixed) and prints the canonical\n"
+"flat format\n"
+"@item @command{wasm2c} converts a WebAssembly binary file to a C source and\n"
+"header file.\n"
+"@end enumerate\n"
+"\n"
+"These tools are intended for use in (or for development of) toolchains or\n"
+"other systems that want to manipulate WebAssembly files."
 msgstr ""
 
-#: gnu/packages/web.scm:756
+#: gnu/packages/web.scm:1439
+msgid ""
+"WebSocket++ is a C++ library that can be used to implement\n"
+"WebSocket functionality.  The goals of the project are to provide a WebSocket\n"
+"implementation that is simple, portable, flexible, lightweight, low level, and\n"
+"high performance."
+msgstr ""
+
+#: gnu/packages/web.scm:1471
+msgid ""
+"@code{Wslay} is an event-based C library for the WebSocket\n"
+"protocol version 13, described in RFC 6455.  Besides a high-level API it\n"
+"provides callbacks for sending and receiving frames directly.  @code{Wslay}\n"
+"only supports the data transfer part of WebSocket protocol and does not\n"
+"perform the opening handshake in HTTP."
+msgstr ""
+
+#: gnu/packages/web.scm:1502
 msgid ""
 "A \"public suffix\" is a domain name under which Internet users can\n"
 "directly register own names.\n"
@@ -17190,7 +19012,7 @@ msgid ""
 "highlighting parts of the domain in a user interface, and sorting domain lists\n"
 "by site.\n"
 "\n"
-"Libpsl has built-in PSL data for fast access, allows to load PSL data from\n"
+"Libpsl has built-in PSL data for fast access, allowing to load PSL data from\n"
 "files, checks if a given domain is a public suffix, provides immediate cookie\n"
 "domain verification, finds the longest public part of a given domain, finds\n"
 "the shortest private part of a given domain, works with international\n"
@@ -17198,21 +19020,20 @@ msgid ""
 "UTS#46."
 msgstr ""
 
-#: gnu/packages/web.scm:801
-msgid "HTML validator and tidier"
-msgstr ""
-
-#: gnu/packages/web.scm:802
+#: gnu/packages/web.scm:1549
 msgid ""
 "HTML Tidy is a command-line tool and C library that can be\n"
 "used to validate and fix HTML data."
 msgstr ""
 
-#: gnu/packages/web.scm:837
-msgid "Light-weight HTTP/HTTPS proxy daemon"
+#: gnu/packages/web.scm:1592
+msgid ""
+"The esbuild tool provides a unified bundler, transpiler and\n"
+"minifier.  It packages up JavaScript and TypeScript code, along with JSON\n"
+"and other data, for distribution on the web."
 msgstr ""
 
-#: gnu/packages/web.scm:838
+#: gnu/packages/web.scm:1625
 msgid ""
 "Tinyproxy is a light-weight HTTP/HTTPS proxy\n"
 "daemon.  Designed from the ground up to be fast and yet small, it is an ideal\n"
@@ -17221,22 +19042,14 @@ msgid ""
 "unavailable."
 msgstr ""
 
-#: gnu/packages/web.scm:871
-msgid "Small caching web proxy"
-msgstr ""
-
-#: gnu/packages/web.scm:873
+#: gnu/packages/web.scm:1660
 msgid ""
 "Polipo is a small caching web proxy (web cache, HTTP proxy, and proxy\n"
 "server).  It was primarily designed to be used by one person or a small group\n"
 "of people."
 msgstr ""
 
-#: gnu/packages/web.scm:900
-msgid "WebSockets support for any application/server"
-msgstr ""
-
-#: gnu/packages/web.scm:901
+#: gnu/packages/web.scm:1689
 msgid ""
 "Websockify translates WebSockets traffic to normal socket\n"
 "traffic.  Websockify accepts the WebSockets handshake, parses it, and then\n"
@@ -17244,11 +19057,7 @@ msgid ""
 "directions."
 msgstr ""
 
-#: gnu/packages/web.scm:927
-msgid "Caching web proxy optimized for intermittent internet links"
-msgstr ""
-
-#: gnu/packages/web.scm:928
+#: gnu/packages/web.scm:1716
 msgid ""
 "WWWOFFLE is a proxy web server that is especially good for\n"
 "intermittent internet links.  It can cache HTTP, HTTPS, FTP, and finger\n"
@@ -17257,11 +19066,7 @@ msgid ""
 "changes, and much more."
 msgstr ""
 
-#: gnu/packages/web.scm:953
-msgid "C library implementing the OAuth API"
-msgstr ""
-
-#: gnu/packages/web.scm:955
+#: gnu/packages/web.scm:1743
 msgid ""
 "liboauth is a collection of C functions implementing the OAuth API.\n"
 "liboauth provides functions to escape and encode strings according to OAuth\n"
@@ -17270,42 +19075,29 @@ msgid ""
 "hash/signatures."
 msgstr ""
 
-#: gnu/packages/web.scm:979
-msgid "YAML 1.1 parser and emitter written in C"
-msgstr ""
-
-#: gnu/packages/web.scm:981
+#: gnu/packages/web.scm:1769
 msgid "LibYAML is a YAML 1.1 parser and emitter written in C."
 msgstr ""
 
-#: gnu/packages/web.scm:998 gnu/packages/web.scm:1032
-#: gnu/packages/web.scm:1055
-msgid "Media stream URL parser"
-msgstr ""
-
-#: gnu/packages/web.scm:999
+#: gnu/packages/web.scm:1794
 msgid ""
 "This package contains support scripts called by libquvi to\n"
 "parse media stream properties."
 msgstr ""
 
-#: gnu/packages/web.scm:1033
+#: gnu/packages/web.scm:1828
 msgid ""
 "libquvi is a library with a C API for parsing media stream\n"
 "URLs and extracting their actual media files."
 msgstr ""
 
-#: gnu/packages/web.scm:1056
+#: gnu/packages/web.scm:1851
 msgid ""
 "quvi is a command-line-tool suite to extract media files\n"
 "from streaming URLs.  It is a command-line wrapper for the libquvi library."
 msgstr ""
 
-#: gnu/packages/web.scm:1146
-msgid "High-performance asynchronous HTTP client library"
-msgstr ""
-
-#: gnu/packages/web.scm:1148
+#: gnu/packages/web.scm:1925
 msgid ""
 "serf is a C-based HTTP client library built upon the Apache Portable\n"
 "Runtime (APR) library.  It multiplexes connections, running the read/write\n"
@@ -17313,49 +19105,37 @@ msgid ""
 "minimum to provide high performance operation."
 msgstr ""
 
-#: gnu/packages/web.scm:1202
-msgid "CSS pre-processor"
+#: gnu/packages/web.scm:1962
+msgid ""
+"LibSass is a @acronym{SASS,Syntactically awesome style sheets} compiler\n"
+"library designed for portability and efficiency.  To actually compile SASS\n"
+"stylesheets, you'll need to use another program that uses this library,\n"
+"@var{sassc} for example."
 msgstr ""
 
-#: gnu/packages/web.scm:1203
+#: gnu/packages/web.scm:2011
 msgid ""
 "SassC is a compiler written in C for the CSS pre-processor\n"
 "language known as SASS."
 msgstr ""
 
-#: gnu/packages/web.scm:1232
-msgid "Compile a log format string to perl-code"
-msgstr ""
-
-#: gnu/packages/web.scm:1233
+#: gnu/packages/web.scm:2064
 msgid ""
 "This module provides methods to compile a log format string\n"
 "to perl-code, for faster generation of access_log lines."
 msgstr ""
 
-#: gnu/packages/web.scm:1261
-msgid "SASL authentication framework"
-msgstr ""
-
-#: gnu/packages/web.scm:1262
+#: gnu/packages/web.scm:2093
 msgid "Authen::SASL provides an SASL authentication framework."
 msgstr ""
 
-#: gnu/packages/web.scm:1287
-msgid "Sensible default Catalyst action"
-msgstr ""
-
-#: gnu/packages/web.scm:1288
+#: gnu/packages/web.scm:2119
 msgid ""
 "This Catalyst action implements a sensible default end\n"
 "action, which will forward to the first available view."
 msgstr ""
 
-#: gnu/packages/web.scm:1320
-msgid "Automated REST Method Dispatching"
-msgstr ""
-
-#: gnu/packages/web.scm:1321
+#: gnu/packages/web.scm:2152
 msgid ""
 "This Action handles doing automatic method dispatching for\n"
 "REST requests.  It takes a normal Catalyst action, and changes the dispatch to\n"
@@ -17364,32 +19144,20 @@ msgid ""
 "regular method."
 msgstr ""
 
-#: gnu/packages/web.scm:1358
-msgid "Storage class for Catalyst authentication using DBIx::Class"
-msgstr ""
-
-#: gnu/packages/web.scm:1359
+#: gnu/packages/web.scm:2190
 msgid ""
 "The Catalyst::Authentication::Store::DBIx::Class class\n"
 "provides access to authentication information stored in a database via\n"
 "DBIx::Class."
 msgstr ""
 
-#: gnu/packages/web.scm:1385
-msgid "Create only one instance of Moose component per context"
-msgstr ""
-
-#: gnu/packages/web.scm:1386
+#: gnu/packages/web.scm:2217
 msgid ""
 "Catalyst::Component::InstancePerContext returns a new\n"
 "instance of a component on each request."
 msgstr ""
 
-#: gnu/packages/web.scm:1423
-msgid "Catalyst Development Tools"
-msgstr ""
-
-#: gnu/packages/web.scm:1424
+#: gnu/packages/web.scm:2254
 msgid ""
 "The Catalyst-Devel distribution includes a variety of\n"
 "modules useful for the development of Catalyst applications, but not required\n"
@@ -17399,11 +19167,7 @@ msgid ""
 "modules."
 msgstr ""
 
-#: gnu/packages/web.scm:1453
-msgid "Regex DispatchType for Catalyst"
-msgstr ""
-
-#: gnu/packages/web.scm:1454
+#: gnu/packages/web.scm:2284
 msgid ""
 "Dispatch type managing path-matching behaviour using\n"
 "regexes.  Regex dispatch types have been deprecated and removed from Catalyst\n"
@@ -17413,32 +19177,20 @@ msgid ""
 "when the dispatch type is first seen in your application."
 msgstr ""
 
-#: gnu/packages/web.scm:1503
-msgid "DBIx::Class::Schema Model Class"
-msgstr ""
-
-#: gnu/packages/web.scm:1504
+#: gnu/packages/web.scm:2334
 msgid ""
 "This is a Catalyst Model for DBIx::Class::Schema-based\n"
 "Models."
 msgstr ""
 
-#: gnu/packages/web.scm:1527
-msgid "Request logging from within Catalyst"
-msgstr ""
-
-#: gnu/packages/web.scm:1528
+#: gnu/packages/web.scm:2358
 msgid ""
 "This Catalyst plugin enables you to create \"access logs\"\n"
 "from within a Catalyst application instead of requiring a webserver to do it\n"
 "for you.  It will work even with Catalyst debug logging turned off."
 msgstr ""
 
-#: gnu/packages/web.scm:1562
-msgid "Infrastructure plugin for the Catalyst authentication framework"
-msgstr ""
-
-#: gnu/packages/web.scm:1563
+#: gnu/packages/web.scm:2393
 msgid ""
 "The authentication plugin provides generic user support for\n"
 "Catalyst apps.  It is the basis for both authentication (checking the user is\n"
@@ -17446,52 +19198,32 @@ msgid ""
 "system authorises them to do)."
 msgstr ""
 
-#: gnu/packages/web.scm:1594
-msgid "Role-based authorization for Catalyst"
-msgstr ""
-
-#: gnu/packages/web.scm:1595
+#: gnu/packages/web.scm:2425
 msgid ""
 "Catalyst::Plugin::Authorization::Roles provides role-based\n"
 "authorization for Catalyst based on Catalyst::Plugin::Authentication."
 msgstr ""
 
-#: gnu/packages/web.scm:1618
-msgid "Captchas for Catalyst"
-msgstr ""
-
-#: gnu/packages/web.scm:1619
+#: gnu/packages/web.scm:2449
 msgid ""
 "This plugin creates and validates Captcha images for\n"
 "Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1646
-msgid "Load config files of various types"
-msgstr ""
-
-#: gnu/packages/web.scm:1647
+#: gnu/packages/web.scm:2476
 msgid ""
 "This module will attempt to load find and load configuration\n"
 "files of various types.  Currently it supports YAML, JSON, XML, INI and Perl\n"
 "formats."
 msgstr ""
 
-#: gnu/packages/web.scm:1679
-msgid "Catalyst generic session plugin"
-msgstr ""
-
-#: gnu/packages/web.scm:1680
+#: gnu/packages/web.scm:2508
 msgid ""
 "This plugin links the two pieces required for session\n"
 "management in web applications together: the state, and the store."
 msgstr ""
 
-#: gnu/packages/web.scm:1708
-msgid "Maintain session IDs using cookies"
-msgstr ""
-
-#: gnu/packages/web.scm:1709
+#: gnu/packages/web.scm:2537
 msgid ""
 "In order for Catalyst::Plugin::Session to work, the session\n"
 "ID needs to be stored on the client, and the session data needs to be stored\n"
@@ -17499,22 +19231,14 @@ msgid ""
 "cookie mechanism."
 msgstr ""
 
-#: gnu/packages/web.scm:1739
-msgid "FastMmap session storage backend"
-msgstr ""
-
-#: gnu/packages/web.scm:1740
+#: gnu/packages/web.scm:2568
 msgid ""
 "Catalyst::Plugin::Session::Store::FastMmap is a fast session\n"
 "storage plugin for Catalyst that uses an mmap'ed file to act as a shared\n"
 "memory interprocess cache.  It is based on Cache::FastMmap."
 msgstr ""
 
-#: gnu/packages/web.scm:1765
-msgid "Stack trace on the Catalyst debug screen"
-msgstr ""
-
-#: gnu/packages/web.scm:1766
+#: gnu/packages/web.scm:2594
 msgid ""
 "This plugin enhances the standard Catalyst debug screen by\n"
 "including a stack trace of your application up to the point where the error\n"
@@ -17522,11 +19246,7 @@ msgid ""
 "number, file name, and code context surrounding the line number."
 msgstr ""
 
-#: gnu/packages/web.scm:1794
-msgid "Simple serving of static pages"
-msgstr ""
-
-#: gnu/packages/web.scm:1795
+#: gnu/packages/web.scm:2623
 msgid ""
 "The Static::Simple plugin is designed to make serving static\n"
 "content in your application during development quick and easy, without\n"
@@ -17537,11 +19257,7 @@ msgid ""
 "MIME type directly to the browser, without being processed through Catalyst."
 msgstr ""
 
-#: gnu/packages/web.scm:1863
-msgid "The Catalyst Framework Runtime"
-msgstr ""
-
-#: gnu/packages/web.scm:1864
+#: gnu/packages/web.scm:2687
 msgid ""
 "Catalyst is a modern framework for making web applications.\n"
 "It is designed to make it easy to manage the various tasks you need to do to\n"
@@ -17549,11 +19265,7 @@ msgid ""
 "\"plug in\" existing Perl modules that do what you need."
 msgstr ""
 
-#: gnu/packages/web.scm:1895
-msgid "Replace request base with value passed by HTTP proxy"
-msgstr ""
-
-#: gnu/packages/web.scm:1896
+#: gnu/packages/web.scm:2719
 msgid ""
 "This module is a Moose::Role which allows you more\n"
 "flexibility in your application's deployment configurations when deployed\n"
@@ -17561,42 +19273,26 @@ msgid ""
 "replaced with the contents of the X-Request-Base header."
 msgstr ""
 
-#: gnu/packages/web.scm:1923
-msgid "Download data in many formats"
-msgstr ""
-
-#: gnu/packages/web.scm:1924
+#: gnu/packages/web.scm:2747
 msgid ""
 "The purpose of this module is to provide a method for\n"
 "downloading data into many supportable formats.  For example, downloading a\n"
 "table based report in a variety of formats (CSV, HTML, etc.)."
 msgstr ""
 
-#: gnu/packages/web.scm:1950
-msgid "Catalyst JSON view"
-msgstr ""
-
-#: gnu/packages/web.scm:1951
+#: gnu/packages/web.scm:2774
 msgid ""
 "Catalyst::View::JSON is a Catalyst View handler that returns\n"
 "stash data in JSON format."
 msgstr ""
 
-#: gnu/packages/web.scm:1977
-msgid "Template View Class"
-msgstr ""
-
-#: gnu/packages/web.scm:1978
+#: gnu/packages/web.scm:2800
 msgid ""
 "This module is a Catalyst view class for the Template\n"
 "Toolkit."
 msgstr ""
 
-#: gnu/packages/web.scm:2007
-msgid "Trait Loading and Resolution for Catalyst Components"
-msgstr ""
-
-#: gnu/packages/web.scm:2008
+#: gnu/packages/web.scm:2830
 msgid ""
 "Adds a \"COMPONENT\" in Catalyst::Component method to your\n"
 "Catalyst component base class that reads the optional \"traits\" parameter\n"
@@ -17605,31 +19301,19 @@ msgid ""
 "MooseX::Traits::Pluggable."
 msgstr ""
 
-#: gnu/packages/web.scm:2033
-msgid "Apply roles to Catalyst classes"
-msgstr ""
-
-#: gnu/packages/web.scm:2034
+#: gnu/packages/web.scm:2856
 msgid ""
 "CatalystX::RoleApplicator applies roles to Catalyst\n"
 "application classes."
 msgstr ""
 
-#: gnu/packages/web.scm:2061
-msgid "Catalyst development server with Starman"
-msgstr ""
-
-#: gnu/packages/web.scm:2062
+#: gnu/packages/web.scm:2884
 msgid ""
 "This module provides a Catalyst extension to replace the\n"
 "development server with Starman."
 msgstr ""
 
-#: gnu/packages/web.scm:2086
-msgid "Handle Common Gateway Interface requests and responses"
-msgstr ""
-
-#: gnu/packages/web.scm:2087
+#: gnu/packages/web.scm:2908
 msgid ""
 "CGI.pm is a stable, complete and mature solution for\n"
 "processing and preparing HTTP requests and responses.  Major features include\n"
@@ -17638,62 +19322,44 @@ msgid ""
 "headers."
 msgstr ""
 
-#: gnu/packages/web.scm:2115
-msgid "Persistent session data in CGI applications"
+#: gnu/packages/web.scm:2935
+msgid ""
+"@code{CGI::FormBuilder} provides an easy way to generate and process CGI\n"
+"form-based applications."
 msgstr ""
 
-#: gnu/packages/web.scm:2117
+#: gnu/packages/web.scm:2962
 msgid ""
 "@code{CGI::Session} provides modular session management system across\n"
 "HTTP requests."
 msgstr ""
 
-#: gnu/packages/web.scm:2138
-msgid "CGI interface that is CGI.pm compliant"
-msgstr ""
-
-#: gnu/packages/web.scm:2139
+#: gnu/packages/web.scm:2985
 msgid ""
 "CGI::Simple provides a relatively lightweight drop in\n"
 "replacement for CGI.pm.  It shares an identical OO interface to CGI.pm for\n"
 "parameter parsing, file upload, cookie handling and header generation."
 msgstr ""
 
-#: gnu/packages/web.scm:2160
-msgid "Build structures from CGI data"
-msgstr ""
-
-#: gnu/packages/web.scm:2161
+#: gnu/packages/web.scm:3007
 msgid ""
 "This is a module for building structured data from CGI\n"
 "inputs, in a manner reminiscent of how PHP does."
 msgstr ""
 
-#: gnu/packages/web.scm:2184
-msgid "Date conversion routines"
-msgstr ""
-
-#: gnu/packages/web.scm:2185
+#: gnu/packages/web.scm:3031
 msgid ""
 "This module provides functions that deal with the date\n"
 "formats used by the HTTP protocol."
 msgstr ""
 
-#: gnu/packages/web.scm:2205
-msgid "MD5 sums for files and urls"
-msgstr ""
-
-#: gnu/packages/web.scm:2206
+#: gnu/packages/web.scm:3052
 msgid ""
 "Digest::MD5::File is a Perl extension for getting MD5 sums\n"
 "for files and urls."
 msgstr ""
 
-#: gnu/packages/web.scm:2224
-msgid "Perl locale encoding determination"
-msgstr ""
-
-#: gnu/packages/web.scm:2226
+#: gnu/packages/web.scm:3072
 msgid ""
 "The POSIX locale system is used to specify both the language\n"
 "conventions requested by the user and the preferred character set to\n"
@@ -17705,110 +19371,66 @@ msgid ""
 "with Encode::decode(locale => $string)."
 msgstr ""
 
-#: gnu/packages/web.scm:2261
-msgid "Syndication feed auto-discovery"
-msgstr ""
-
-#: gnu/packages/web.scm:2262
+#: gnu/packages/web.scm:3108
 msgid ""
 "@code{Feed::Find} implements feed auto-discovery for finding\n"
 "syndication feeds, given a URI.  It will discover the following feed formats:\n"
 "RSS 0.91, RSS 1.0, RSS 2.0, Atom."
 msgstr ""
 
-#: gnu/packages/web.scm:2283
-msgid "Perl directory listing parser"
-msgstr ""
-
-#: gnu/packages/web.scm:2285
+#: gnu/packages/web.scm:3131
 msgid ""
 "The File::Listing module exports a single function called parse_dir(),\n"
 "which can be used to parse directory listings."
 msgstr ""
 
-#: gnu/packages/web.scm:2317
-msgid "Stock and mutual fund quotes"
-msgstr ""
-
-#: gnu/packages/web.scm:2319
+#: gnu/packages/web.scm:3164
 msgid ""
 "Finance::Quote gets stock quotes from various internet sources, including\n"
 "Yahoo! Finance, Fidelity Investments, and the Australian Stock Exchange."
 msgstr ""
 
-#: gnu/packages/web.scm:2341
-msgid "Perl extension providing access to the GSSAPIv2 library"
-msgstr ""
-
-#: gnu/packages/web.scm:2342
+#: gnu/packages/web.scm:3187
 msgid ""
 "This is a Perl extension for using GSSAPI C bindings as\n"
 "described in RFC 2744."
 msgstr ""
 
-#: gnu/packages/web.scm:2362
-msgid "Manipulate tables of HTML::Element"
-msgstr ""
-
-#: gnu/packages/web.scm:2364
+#: gnu/packages/web.scm:3209
 msgid ""
 "HTML::Element::Extended is a Perl extension for manipulating a table\n"
 "composed of HTML::Element style components."
 msgstr ""
 
-#: gnu/packages/web.scm:2388
-msgid "Perl class representing an HTML form element"
-msgstr ""
-
-#: gnu/packages/web.scm:2389
+#: gnu/packages/web.scm:3233
 msgid ""
 "Objects of the HTML::Form class represents a single HTML\n"
 "<form> ... </form> instance."
 msgstr ""
 
-#: gnu/packages/web.scm:2419
-msgid "Perl extension for scrubbing/sanitizing html"
-msgstr ""
-
-#: gnu/packages/web.scm:2421
+#: gnu/packages/web.scm:3266
 msgid "@code{HTML::Scrubber} Perl extension for scrubbing/sanitizing HTML."
 msgstr ""
 
-#: gnu/packages/web.scm:2442
-msgid "Check for HTML errors in a string or file"
-msgstr ""
-
-#: gnu/packages/web.scm:2443
+#: gnu/packages/web.scm:3287
 msgid ""
 "HTML::Lint is a pure-Perl HTML parser and checker for\n"
 "syntactic legitmacy."
 msgstr ""
 
-#: gnu/packages/web.scm:2464
-msgid "Extract contents from HTML tables"
-msgstr ""
-
-#: gnu/packages/web.scm:2466
+#: gnu/packages/web.scm:3310
 msgid ""
 "HTML::TableExtract is a Perl module for extracting the content contained\n"
 "in tables within an HTML document, either as text or encoded element trees."
 msgstr ""
 
-#: gnu/packages/web.scm:2491
-msgid "Work with HTML in a DOM-like tree structure"
-msgstr ""
-
-#: gnu/packages/web.scm:2492
+#: gnu/packages/web.scm:3336
 msgid ""
 "This distribution contains a suite of modules for\n"
 "representing, creating, and extracting information from HTML syntax trees."
 msgstr ""
 
-#: gnu/packages/web.scm:2513
-msgid "Perl HTML parser class"
-msgstr ""
-
-#: gnu/packages/web.scm:2515
+#: gnu/packages/web.scm:3359
 msgid ""
 "Objects of the HTML::Parser class will recognize markup and separate\n"
 "it from plain text (alias data content) in HTML documents.  As different\n"
@@ -17816,21 +19438,13 @@ msgid ""
 "are invoked."
 msgstr ""
 
-#: gnu/packages/web.scm:2535
-msgid "Perl data tables useful in parsing HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:2537
+#: gnu/packages/web.scm:3381
 msgid ""
 "The HTML::Tagset module contains several data tables useful in various\n"
 "kinds of HTML parsing operations."
 msgstr ""
 
-#: gnu/packages/web.scm:2556
-msgid "HTML-like templates"
-msgstr ""
-
-#: gnu/packages/web.scm:2558
+#: gnu/packages/web.scm:3402
 msgid ""
 "This module attempts to make using HTML templates simple and natural.\n"
 "It extends standard HTML with a few new HTML-esque tags: @code{<TMPL_VAR>},\n"
@@ -17841,72 +19455,58 @@ msgid ""
 "you to separate design from the data."
 msgstr ""
 
-#: gnu/packages/web.scm:2586
-msgid "HTTP Body Parser"
-msgstr ""
-
-#: gnu/packages/web.scm:2587
+#: gnu/packages/web.scm:3431
 msgid ""
 "HTTP::Body parses chunks of HTTP POST data and supports\n"
 "application/octet-stream, application/json, application/x-www-form-urlencoded,\n"
 "and multipart/form-data."
 msgstr ""
 
-#: gnu/packages/web.scm:2614
-msgid "Minimalist HTTP user agent cookie jar"
-msgstr ""
-
-#: gnu/packages/web.scm:2615
+#: gnu/packages/web.scm:3458
 msgid ""
 "This module implements a minimalist HTTP user agent cookie\n"
 "jar in conformance with RFC 6265 <http://tools.ietf.org/html/rfc6265>."
 msgstr ""
 
-#: gnu/packages/web.scm:2635
-msgid "Perl HTTP cookie jars"
-msgstr ""
-
-#: gnu/packages/web.scm:2637
+#: gnu/packages/web.scm:3480
 msgid ""
 "The HTTP::Cookies class is for objects that represent a cookie jar,\n"
 "that is, a database of all the HTTP cookies that a given LWP::UserAgent\n"
 "object knows about."
 msgstr ""
 
-#: gnu/packages/web.scm:2659
-msgid "Perl simple http server class"
-msgstr ""
-
-#: gnu/packages/web.scm:2661
+#: gnu/packages/web.scm:3504
 msgid ""
 "Instances of the HTTP::Daemon class are HTTP/1.1 servers that listen\n"
 "on a socket for incoming requests.  The HTTP::Daemon is a subclass of\n"
 "IO::Socket::INET, so you can perform socket operations directly on it too."
 msgstr ""
 
-#: gnu/packages/web.scm:2680
-msgid "Perl date conversion routines"
-msgstr ""
-
-#: gnu/packages/web.scm:2682
+#: gnu/packages/web.scm:3525
 msgid ""
 "The HTTP::Date module provides functions that deal with date formats\n"
 "used by the HTTP protocol (and then some more)."
 msgstr ""
 
-#: gnu/packages/web.scm:2706
-msgid "Perl HTTP style message"
+#: gnu/packages/web.scm:3546
+msgid ""
+"@code{HTTP::Lite} is a stand-alone lightweight\n"
+"HTTP/1.1 implementation for perl.  It is intended for use in\n"
+"situations where it is desirable to install the minimal number of\n"
+"modules to achieve HTTP support.  @code{HTTP::Lite} is ideal for\n"
+"CGI (or mod_perl) programs or for bundling for redistribution with\n"
+"larger packages where only HTTP GET and POST functionality are\n"
+"necessary.  @code{HTTP::Lite} is compliant with the Host header,\n"
+"necessary for name based virtual hosting, and supports proxies.\n"
+"Additionally, @code{HTTP::Lite} supports a callback to allow\n"
+"processing of request data as it arrives."
 msgstr ""
 
-#: gnu/packages/web.scm:2708
+#: gnu/packages/web.scm:3582
 msgid "An HTTP::Message object contains some headers and a content body."
 msgstr ""
 
-#: gnu/packages/web.scm:2727
-msgid "Perl http content negotiation"
-msgstr ""
-
-#: gnu/packages/web.scm:2729
+#: gnu/packages/web.scm:3603
 msgid ""
 "The HTTP::Negotiate module provides a complete implementation of the\n"
 "HTTP content negotiation algorithm specified in\n"
@@ -17916,86 +19516,62 @@ msgid ""
 "fields in the request."
 msgstr ""
 
-#: gnu/packages/web.scm:2754
-msgid "Parse HTTP/1.1 requests"
-msgstr ""
-
-#: gnu/packages/web.scm:2755
+#: gnu/packages/web.scm:3629
 msgid ""
 "This is an HTTP request parser.  It takes chunks of text as\n"
-"received and returns a 'hint' as to what is required, or returns the\n"
+"received and returns a @code{hint} as to what is required, or returns the\n"
 "HTTP::Request when a complete request has been read.  HTTP/1.1 chunking is\n"
 "supported."
 msgstr ""
 
-#: gnu/packages/web.scm:2777
-msgid "Fast HTTP request parser"
-msgstr ""
-
-#: gnu/packages/web.scm:2778
+#: gnu/packages/web.scm:3652
 msgid ""
 "HTTP::Parser::XS is a fast, primitive HTTP request/response\n"
 "parser."
 msgstr ""
 
-#: gnu/packages/web.scm:2799
-msgid "Set up a CGI environment from an HTTP::Request"
-msgstr ""
-
-#: gnu/packages/web.scm:2800
+#: gnu/packages/web.scm:3674
 msgid ""
 "This module provides a convenient way to set up a CGI\n"
 "environment from an HTTP::Request."
 msgstr ""
 
-#: gnu/packages/web.scm:2833
-msgid "Lightweight HTTP server"
-msgstr ""
-
-#: gnu/packages/web.scm:2834
+#: gnu/packages/web.scm:3708
 msgid ""
 "HTTP::Server::Simple is a simple standalone HTTP daemon with\n"
 "no non-core module dependencies.  It can be used for building a standalone\n"
 "http-based UI to your existing tools."
 msgstr ""
 
-#: gnu/packages/web.scm:2859
-msgid "HTTP/1.1 client"
-msgstr ""
-
-#: gnu/packages/web.scm:2860
+#: gnu/packages/web.scm:3734
 msgid ""
 "This is a very simple HTTP/1.1 client, designed for doing\n"
 "simple requests without the overhead of a large framework like LWP::UserAgent.\n"
 "It supports proxies and redirection.  It also correctly resumes after EINTR."
 msgstr ""
 
-#: gnu/packages/web.scm:2879
-msgid "Perl module to open an HTML file with automatic charset detection"
+#: gnu/packages/web.scm:3760
+msgid ""
+"@code{HTTP::Tinyish} is a wrapper module for @acronym{LWP,libwww-perl},\n"
+"@code{HTTP::Tiny}, curl and wget.\n"
+"\n"
+"It provides an API compatible to HTTP::Tiny."
 msgstr ""
 
-#: gnu/packages/web.scm:2881
+#: gnu/packages/web.scm:3782
 msgid ""
 "IO::HTML provides an easy way to open a file containing HTML while\n"
 "automatically determining its encoding.  It uses the HTML5 encoding sniffing\n"
 "algorithm specified in section 8.2.2.1 of the draft standard."
 msgstr ""
 
-#: gnu/packages/web.scm:2901
-msgid "Family-neutral IP socket supporting both IPv4 and IPv6"
-msgstr ""
-
-#: gnu/packages/web.scm:2902
+#: gnu/packages/web.scm:3802
 msgid ""
 "This module provides a protocol-independent way to use IPv4\n"
 "and IPv6 sockets, intended as a replacement for IO::Socket::INET."
 msgstr ""
 
-#: gnu/packages/web.scm:2924
-msgid "Nearly transparent SSL encapsulation for IO::Socket::INET"
-msgstr ""
-
-#: gnu/packages/web.scm:2926
+#: gnu/packages/web.scm:3826
 msgid ""
 "IO::Socket::SSL makes using SSL/TLS much easier by wrapping the\n"
 "necessary functionality into the familiar IO::Socket interface and providing\n"
@@ -18004,11 +19580,7 @@ msgid ""
 "select or poll."
 msgstr ""
 
-#: gnu/packages/web.scm:2960
-msgid "Perl modules for the WWW"
-msgstr "用于万维网的 Perl 模块"
-
-#: gnu/packages/web.scm:2962
+#: gnu/packages/web.scm:3867
 msgid ""
 "The libwww-perl collection is a set of Perl modules which provides a\n"
 "simple and consistent application programming interface to the\n"
@@ -18018,11 +19590,7 @@ msgid ""
 "help you implement simple HTTP servers."
 msgstr ""
 
-#: gnu/packages/web.scm:2990
-msgid "Checks whether your process has access to the web"
-msgstr ""
-
-#: gnu/packages/web.scm:2991
+#: gnu/packages/web.scm:3896
 msgid ""
 "This module attempts to answer, as accurately as it can, one\n"
 "of the nastiest technical questions there is: am I on the internet?\n"
@@ -18032,11 +19600,7 @@ msgid ""
 "not have DNS.  We might not have a network card at all!"
 msgstr ""
 
-#: gnu/packages/web.scm:3013
-msgid "Perl module to guess the media type for a file or a URL"
-msgstr ""
-
-#: gnu/packages/web.scm:3015
+#: gnu/packages/web.scm:3922
 #, scheme-format
 msgid ""
 "The LWP::MediaTypes module provides functions for handling media (also\n"
@@ -18045,21 +19609,20 @@ msgid ""
 "exists it is used instead."
 msgstr ""
 
-#: gnu/packages/web.scm:3041
-msgid "HTTPS support for LWP::UserAgent"
-msgstr ""
-
-#: gnu/packages/web.scm:3042
+#: gnu/packages/web.scm:3950
 msgid ""
 "The LWP::Protocol::https module provides support for using\n"
 "https schemed URLs with LWP."
 msgstr ""
 
-#: gnu/packages/web.scm:3062
-msgid "Virtual browser that retries errors"
+#: gnu/packages/web.scm:3971
+msgid ""
+"LWP::UserAgent::Cached is an LWP::UserAgent subclass with\n"
+"cache support.  It returns responses from the local file system, if available,\n"
+"instead of making an HTTP request."
 msgstr ""
 
-#: gnu/packages/web.scm:3063
+#: gnu/packages/web.scm:3993
 msgid ""
 "LWP::UserAgent::Determined works just like LWP::UserAgent,\n"
 "except that when you use it to get a web page but run into a\n"
@@ -18067,19 +19630,21 @@ msgid ""
 "and retry a few times."
 msgstr ""
 
-#: gnu/packages/web.scm:3108
-msgid "Perl interface to Amazon S3"
+#: gnu/packages/web.scm:4020
+msgid ""
+"@code{LWPx::ParanoidAgent} is a class subclassing\n"
+"@code{LWP::UserAgent} but paranoid against attackers.  Its purpose is\n"
+"to vet requests for a remote resource on behalf of a possibly\n"
+"malicious user.  The class can do the same as @code{LWP::UserAgent},\n"
+"except that proxy support has been removed.  Support for URI schemes\n"
+"is limited to http and https."
 msgstr ""
 
-#: gnu/packages/web.scm:3109
+#: gnu/packages/web.scm:4068
 msgid "This module provides a Perlish interface to Amazon S3."
 msgstr ""
 
-#: gnu/packages/web.scm:3129
-msgid "Perl low-level HTTP connection (client)"
-msgstr ""
-
-#: gnu/packages/web.scm:3131
+#: gnu/packages/web.scm:4090
 msgid ""
 "The Net::HTTP class is a low-level HTTP client.  An instance of the\n"
 "Net::HTTP class represents a connection to an HTTP server.  The HTTP protocol\n"
@@ -18087,11 +19652,7 @@ msgid ""
 "HTTP/1.1."
 msgstr ""
 
-#: gnu/packages/web.scm:3151
-msgid "Extensible Perl server engine"
-msgstr ""
-
-#: gnu/packages/web.scm:3152
+#: gnu/packages/web.scm:4111
 msgid ""
 "Net::Server is an extensible, generic Perl server engine.\n"
 "It attempts to be a generic server as in Net::Daemon and NetServer::Generic.\n"
@@ -18105,19 +19666,11 @@ msgid ""
 "or to multiple server ports."
 msgstr ""
 
-#: gnu/packages/web.scm:3180
-msgid "SSL support for Net::SMTP"
-msgstr ""
-
-#: gnu/packages/web.scm:3181
+#: gnu/packages/web.scm:4140
 msgid "SSL support for Net::SMTP."
 msgstr ""
 
-#: gnu/packages/web.scm:3215
-msgid "Perl Superglue for Web frameworks and servers (PSGI toolkit)"
-msgstr ""
-
-#: gnu/packages/web.scm:3216
+#: gnu/packages/web.scm:4175
 msgid ""
 "Plack is a set of tools for using the PSGI stack.  It\n"
 "contains middleware components, a reference server, and utilities for Web\n"
@@ -18125,21 +19678,22 @@ msgid ""
 "WSGI."
 msgstr ""
 
-#: gnu/packages/web.scm:3242
-msgid "Plack::Middleware which sets body for redirect response"
+#: gnu/packages/web.scm:4203
+msgid ""
+"Plack::Middleware::Deflater is a middleware to encode your response body\n"
+"in gzip or deflate, based on \"Accept-Encoding\" HTTP request header.  It\n"
+"would save the bandwidth a little bit but should increase the Plack server\n"
+"load, so ideally you should handle this on the frontend reverse proxy\n"
+"servers."
 msgstr ""
 
-#: gnu/packages/web.scm:3243
+#: gnu/packages/web.scm:4231
 msgid ""
 "This module sets the body in redirect response, if it's not\n"
 "already set."
 msgstr ""
 
-#: gnu/packages/web.scm:3266
-msgid "Override REST methods to Plack apps via POST"
-msgstr ""
-
-#: gnu/packages/web.scm:3267
+#: gnu/packages/web.scm:4254
 msgid ""
 "This middleware allows for POST requests that pretend to be\n"
 "something else: by adding either a header named X-HTTP-Method-Override to the\n"
@@ -18147,72 +19701,44 @@ msgid ""
 "can say what method it actually meant."
 msgstr ""
 
-#: gnu/packages/web.scm:3291
-msgid "Plack::Middleware which removes body for HTTP response"
-msgstr ""
-
-#: gnu/packages/web.scm:3292
+#: gnu/packages/web.scm:4278
 msgid ""
 "This module removes the body in an HTTP response if it's not\n"
 "required."
 msgstr ""
 
-#: gnu/packages/web.scm:3315
-msgid "Supports app to run as a reverse proxy backend"
-msgstr ""
-
-#: gnu/packages/web.scm:3316
+#: gnu/packages/web.scm:4301
 msgid ""
 "Plack::Middleware::ReverseProxy resets some HTTP headers,\n"
 "which are changed by reverse-proxy.  You can specify the reverse proxy address\n"
-"and stop fake requests using 'enable_if' directive in your app.psgi."
-msgstr ""
-
-#: gnu/packages/web.scm:3337
-msgid "Run HTTP tests on external live servers"
+"and stop fake requests using @code{enable_if} directive in your app.psgi."
 msgstr ""
 
-#: gnu/packages/web.scm:3338
+#: gnu/packages/web.scm:4322
 msgid ""
 "This module allows your to run your Plack::Test tests\n"
 "against an external server instead of just against a local application through\n"
 "either mocked HTTP or a locally spawned server."
 msgstr ""
 
-#: gnu/packages/web.scm:3360
-msgid "Testing TCP programs"
-msgstr "测试 TCP 程序"
-
-#: gnu/packages/web.scm:3361
+#: gnu/packages/web.scm:4344
 msgid "Test::TCP is test utilities for TCP/IP programs."
 msgstr ""
 
-#: gnu/packages/web.scm:3391
-msgid "Testing-specific WWW::Mechanize subclass"
-msgstr ""
-
-#: gnu/packages/web.scm:3392
+#: gnu/packages/web.scm:4369
 msgid ""
 "Test::WWW::Mechanize is a subclass of the Perl module\n"
 "WWW::Mechanize that incorporates features for web application testing."
 msgstr ""
 
-#: gnu/packages/web.scm:3426
-msgid "Test::WWW::Mechanize for Catalyst"
-msgstr ""
-
-#: gnu/packages/web.scm:3427
+#: gnu/packages/web.scm:4403
 msgid ""
 "The Test::WWW::Mechanize::Catalyst module meshes the\n"
 "Test::WWW:Mechanize module and the Catalyst web application framework to allow\n"
 "testing of Catalyst applications without needing to start up a web server."
 msgstr ""
 
-#: gnu/packages/web.scm:3451
-msgid "Test PSGI programs using WWW::Mechanize"
-msgstr ""
-
-#: gnu/packages/web.scm:3452
+#: gnu/packages/web.scm:4428
 msgid ""
 "PSGI is a specification to decouple web server environments\n"
 "from web application framework code.  Test::WWW::Mechanize is a subclass of\n"
@@ -18221,33 +19747,21 @@ msgid ""
 "applications."
 msgstr ""
 
-#: gnu/packages/web.scm:3472
-msgid "Perl Uniform Resource Identifiers (absolute and relative)"
-msgstr ""
-
-#: gnu/packages/web.scm:3474
+#: gnu/packages/web.scm:4453
 msgid ""
 "The URI module implements the URI class.  Objects of this class\n"
 "represent \"Uniform Resource Identifier references\" as specified in RFC 2396\n"
 "and updated by RFC 2732."
 msgstr ""
 
-#: gnu/packages/web.scm:3498
-msgid "Smart URI fetching/caching"
-msgstr ""
-
-#: gnu/packages/web.scm:3499
+#: gnu/packages/web.scm:4478
 msgid ""
 "@code{URI::Fetch} is a smart client for fetching HTTP pages,\n"
 "notably syndication feeds (RSS, Atom, and others), in an intelligent, bandwidth-\n"
 "and time-saving way."
 msgstr ""
 
-#: gnu/packages/web.scm:3522
-msgid "Find URIs in arbitrary text"
-msgstr ""
-
-#: gnu/packages/web.scm:3523
+#: gnu/packages/web.scm:4502
 msgid ""
 "This module finds URIs and URLs (according to what URI.pm\n"
 "considers a URI) in plain text.  It only finds URIs which include a\n"
@@ -18255,61 +19769,37 @@ msgid ""
 "URI::Find::Schemeless.  For a command-line interface, urifind is provided."
 msgstr ""
 
-#: gnu/packages/web.scm:3545
-msgid "WebSocket support for URI package"
-msgstr ""
-
-#: gnu/packages/web.scm:3546
+#: gnu/packages/web.scm:4525
 msgid ""
 "With this module, the URI package provides the same set of\n"
 "methods for WebSocket URIs as it does for HTTP URIs."
 msgstr ""
 
-#: gnu/packages/web.scm:3570
-msgid "Object for handling URI templates"
-msgstr ""
-
-#: gnu/packages/web.scm:3571
+#: gnu/packages/web.scm:4550
 msgid ""
 "This perl module provides a wrapper around URI templates as described in\n"
 "RFC 6570."
 msgstr ""
 
-#: gnu/packages/web.scm:3603
-msgid "Perl extension interface for libcurl"
-msgstr ""
-
-#: gnu/packages/web.scm:3605
+#: gnu/packages/web.scm:4584
 msgid ""
 "This is a Perl extension interface for the libcurl file downloading\n"
 "library."
 msgstr ""
 
-#: gnu/packages/web.scm:3639
-msgid "Web browsing in a Perl object"
-msgstr ""
-
-#: gnu/packages/web.scm:3640
+#: gnu/packages/web.scm:4618
 msgid ""
 "WWW::Mechanize is a Perl module for stateful programmatic\n"
 "web browsing, used for automating interaction with websites."
 msgstr ""
 
-#: gnu/packages/web.scm:3676
-msgid "Search A9 OpenSearch compatible engines"
-msgstr ""
-
-#: gnu/packages/web.scm:3678
+#: gnu/packages/web.scm:4656
 msgid ""
 "@code{WWW::OpenSearch} is a module to search @url{A9's OpenSearch,\n"
 "http://opensearch.a9.com} compatible search engines."
 msgstr ""
 
-#: gnu/packages/web.scm:3698
-msgid "Perl database of robots.txt-derived permissions"
-msgstr ""
-
-#: gnu/packages/web.scm:3700
+#: gnu/packages/web.scm:4678
 msgid ""
 "The WWW::RobotRules module parses /robots.txt files as specified in\n"
 "\"A Standard for Robot Exclusion\", at\n"
@@ -18318,150 +19808,34 @@ msgid ""
 "their web site."
 msgstr ""
 
-#: gnu/packages/web.scm:3723
-msgid "Parse feeds in Python"
-msgstr ""
-
-#: gnu/packages/web.scm:3725
+#: gnu/packages/web.scm:4703 gnu/packages/web.scm:4727
 msgid ""
 "Universal feed parser which handles RSS 0.9x, RSS 1.0, RSS 2.0,\n"
 "CDF, Atom 0.3, and Atom 1.0 feeds."
 msgstr ""
 
-#: gnu/packages/web.scm:3746
-msgid "HTTP and WebSocket server library for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3748
+#: gnu/packages/web.scm:4824
 msgid ""
-"The httpuv package provides low-level socket and protocol support for\n"
-"handling HTTP and WebSocket requests directly from within R.  It is primarily\n"
-"intended as a building block for other packages, rather than making it\n"
-"particularly easy to create complete web applications using httpuv alone."
-msgstr ""
-
-#: gnu/packages/web.scm:3769
-msgid "Robust, high performance JSON parser and generator for R"
+"The Guix Data Service stores data about GNU Guix, and provides this\n"
+"through a web interface.  It supports listening to the guix-commits mailing\n"
+"list to find out about new revisions, then loads the data from these in to a\n"
+"PostgreSQL database."
 msgstr ""
 
-#: gnu/packages/web.scm:3771
-msgid ""
-"The jsonlite package provides a fast JSON parser and generator optimized\n"
-"for statistical data and the web.  It offers flexible, robust, high\n"
-"performance tools for working with JSON in R and is particularly powerful for\n"
-"building pipelines and interacting with a web API.  In addition to converting\n"
-"JSON data from/to R objects, jsonlite contains functions to stream, validate,\n"
-"and prettify JSON data.  The unit tests included with the package verify that\n"
-"all edge cases are encoded and decoded consistently for use with dynamic data\n"
-"in systems and applications."
-msgstr ""
-
-#: gnu/packages/web.scm:3799
-msgid "Simple HTTP server to serve static files or dynamic documents"
-msgstr ""
-
-#: gnu/packages/web.scm:3801
-msgid ""
-"Servr provides an HTTP server in R to serve static files, or dynamic\n"
-"documents that can be converted to HTML files (e.g., R Markdown) under a given\n"
-"directory."
-msgstr ""
-
-#: gnu/packages/web.scm:3835
-msgid "R tools for HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:3837
-msgid "This package provides tools for HTML generation and output in R."
-msgstr ""
-
-#: gnu/packages/web.scm:3856
-msgid "HTML Widgets for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3858
-msgid ""
-"HTML widgets is a framework for creating HTML widgets that render in\n"
-"various contexts including the R console, R Markdown documents, and Shiny web\n"
-"applications."
-msgstr ""
-
-#: gnu/packages/web.scm:3883
-msgid "Advanced tables for Markdown/HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:3885
-msgid ""
-"This package provides functions to build tables with advanced layout\n"
-"elements such as row spanners, column spanners, table spanners, zebra\n"
-"striping, and more.  While allowing advanced layout, the underlying\n"
-"CSS-structure is simple in order to maximize compatibility with word\n"
-"processors such as LibreOffice.  The package also contains a few text\n"
-"formatting functions that help outputting text compatible with HTML or\n"
-"LaTeX."
-msgstr ""
-
-#: gnu/packages/web.scm:3922
-msgid "HTTP client for R"
-msgstr "R 的 HTTP 客户端"
-
-#: gnu/packages/web.scm:3924
-msgid ""
-"The @code{curl()} and @code{curl_download()} functions provide highly\n"
-"configurable drop-in replacements for base @code{url()} and\n"
-"@code{download.file()} with better performance, support for encryption, gzip\n"
-"compression, authentication, and other @code{libcurl} goodies.  The core of\n"
-"the package implements a framework for performing fully customized requests\n"
-"where data can be processed either in memory, on disk, or streaming via the\n"
-"callback or connection interfaces."
-msgstr ""
-
-#: gnu/packages/web.scm:3946
-msgid "Output R objects in HTML format"
-msgstr ""
-
-#: gnu/packages/web.scm:3948
-msgid ""
-"This package provides easy-to-use and versatile functions to output R\n"
-"objects in HTML format."
-msgstr ""
-
-#: gnu/packages/web.scm:3965
-msgid "JSON library for R"
-msgstr ""
-
-#: gnu/packages/web.scm:3967
-msgid ""
-"This package provides functions to convert R objects into JSON objects\n"
-"and vice-versa."
-msgstr ""
-
-#: gnu/packages/web.scm:3996
-msgid "HTML5 parsing library"
-msgstr ""
-
-#: gnu/packages/web.scm:3998
+#: gnu/packages/web.scm:4855
 msgid ""
 "Gumbo is an implementation of the HTML5 parsing algorithm implemented as\n"
 "a pure C99 library."
 msgstr ""
 
-#: gnu/packages/web.scm:4069
-msgid "Application container server"
-msgstr ""
-
-#: gnu/packages/web.scm:4071
+#: gnu/packages/web.scm:4928
 msgid ""
 "uWSGI presents a complete stack for networked/clustered web applications,\n"
 "implementing message/object passing, caching, RPC and process management.\n"
 "It uses the uwsgi protocol for all the networking/interprocess communications."
 msgstr ""
 
-#: gnu/packages/web.scm:4101
-msgid "Command-line JSON processor"
-msgstr ""
-
-#: gnu/packages/web.scm:4102
+#: gnu/packages/web.scm:4961
 msgid ""
 "jq is like sed for JSON data – you can use it to slice and\n"
 "filter and map and transform structured data with the same ease that sed, awk,\n"
@@ -18471,106 +19845,83 @@ msgid ""
 "you'd expect."
 msgstr ""
 
-#: gnu/packages/web.scm:4141
-msgid "Library for mocking web service APIs which use HTTP or HTTPS"
+#: gnu/packages/web.scm:4990
+msgid ""
+"@command{pup} is a command line tool for processing HTML.  It reads\n"
+"from stdin, prints to stdout, and allows the user to filter parts of the page\n"
+"using CSS selectors.  Inspired by @command{jq}, @command{pup} aims to be a\n"
+"fast and flexible way of exploring HTML from the terminal."
 msgstr ""
 
-#: gnu/packages/web.scm:4143
+#: gnu/packages/web.scm:5019
 msgid ""
 "Uhttpmock is a project for mocking web service APIs which use HTTP or\n"
 "HTTPS.  It provides a library, libuhttpmock, which implements recording and\n"
 "playback of HTTP request/response traces."
 msgstr ""
 
-#: gnu/packages/web.scm:4178
-msgid "Single file web server"
-msgstr ""
-
-#: gnu/packages/web.scm:4179
+#: gnu/packages/web.scm:5055
 msgid ""
 "Woof (Web Offer One File) is a small simple web server that\n"
 "can easily be invoked on a single file.  Your partner can access the file with\n"
 "tools they trust (e.g. wget)."
 msgstr ""
 
-#: gnu/packages/web.scm:4205
-msgid "Build system for the Netsurf project"
-msgstr ""
-
-#: gnu/packages/web.scm:4207
+#: gnu/packages/web.scm:5083
 msgid ""
 "This package provides the shared build system for Netsurf project\n"
 "libraries."
 msgstr ""
 
-#: gnu/packages/web.scm:4242
-msgid "Parser building library"
-msgstr ""
-
-#: gnu/packages/web.scm:4244
+#: gnu/packages/web.scm:5120
 msgid ""
 "LibParserUtils is a library for building efficient parsers, written in\n"
 "C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4272
-msgid "HTML5 compliant parsing library"
-msgstr "兼容 HTML5 的解析库"
-
-#: gnu/packages/web.scm:4274
+#: gnu/packages/web.scm:5150
 msgid ""
 "Hubbub is an HTML5 compliant parsing library, written in C, which can\n"
 "parse both valid and invalid web content.  It is developed as part of the\n"
 "NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4349
-msgid "Wiki compiler, capable of generating HTML"
-msgstr ""
-
-#: gnu/packages/web.scm:4351
+#: gnu/packages/web.scm:5271
 msgid ""
 "Ikiwiki is a wiki compiler, capable of generating a static set of web\n"
 "pages, but also incorporating dynamic features like a web based editor and\n"
 "commenting."
 msgstr ""
 
-#: gnu/packages/web.scm:4375
-msgid "String internment library"
-msgstr ""
-
-#: gnu/packages/web.scm:4377
+#: gnu/packages/web.scm:5297
 msgid ""
 "LibWapcaplet provides a reference counted string internment system\n"
 "designed to store small strings and allow rapid comparison of them.  It is\n"
 "developed as part of the Netsurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4404
-msgid "CSS parser and selection library"
-msgstr ""
-
-#: gnu/packages/web.scm:4406
+#: gnu/packages/web.scm:5326
 msgid ""
 "LibCSS is a CSS (Cascading Style Sheet) parser and selection engine,\n"
 "written in C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4440
-msgid "Implementation of the W3C DOM"
+#: gnu/packages/web.scm:5362
+msgid ""
+"LibCYAML is a C library written in ISO C11 for reading and writing\n"
+"structured YAML documents.  The fundamental idea behind CYAML is to allow\n"
+"applications to construct schemas which describe both the permissible\n"
+"structure of the YAML documents to read/write, and the C data structure(s)\n"
+"in which the loaded data is arranged in memory."
 msgstr ""
 
-#: gnu/packages/web.scm:4442
+#: gnu/packages/web.scm:5402
 msgid ""
 "LibDOM is an implementation of the W3C DOM, written in C.  It is\n"
 "developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4469
-msgid "Library for parsing SVG files"
-msgstr ""
-
-#: gnu/packages/web.scm:4471
+#: gnu/packages/web.scm:5431
 msgid ""
 "Libsvgtiny takes some SVG as input and returns a list of paths and texts\n"
 "which can be rendered easily, as defined in\n"
@@ -18578,94 +19929,65 @@ msgid ""
 "project."
 msgstr ""
 
-#: gnu/packages/web.scm:4494
-msgid "Decoding library for BMP and ICO files"
-msgstr ""
-
-#: gnu/packages/web.scm:4496
+#: gnu/packages/web.scm:5456
 msgid ""
 "Libnsbmp is a decoding library for BMP and ICO image file formats,\n"
 "written in C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4517
-msgid "Decoding library for GIF files"
-msgstr ""
-
-#: gnu/packages/web.scm:4519
+#: gnu/packages/web.scm:5479
 msgid ""
 "Libnsgif is a decoding library for the GIF image file format, written in\n"
 "C.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4540
-msgid "Utility library for NetSurf"
+#: gnu/packages/web.scm:5506
+msgid ""
+"Libnslog provides a category-based logging library which supports\n"
+"complex logging filters, multiple log levels, and provides context through to\n"
+"client applications.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4542
+#: gnu/packages/web.scm:5530
 msgid ""
 "Libnsutils provides a small number of useful utility routines.  It is\n"
 "developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4563
-msgid "Library to generate a static Public Suffix List"
-msgstr ""
-
-#: gnu/packages/web.scm:4565
+#: gnu/packages/web.scm:5553
 msgid ""
 "Libnspsl is a library to generate a static code representation of the\n"
 "Public Suffix List.  It is developed as part of the NetSurf project."
 msgstr ""
 
-#: gnu/packages/web.scm:4591
-msgid "Generate JavaScript to DOM bindings"
-msgstr ""
-
-#: gnu/packages/web.scm:4593
+#: gnu/packages/web.scm:5581
 msgid ""
 "@code{nsgenbind} is a tool to generate JavaScript to DOM bindings from\n"
 "w3c webidl files and a binding configuration file."
 msgstr ""
 
-#: gnu/packages/web.scm:4704
-msgid "Web browser"
-msgstr "网页浏览器"
-
-#: gnu/packages/web.scm:4706
+#: gnu/packages/web.scm:5704
 msgid ""
 "NetSurf is a lightweight web browser that has its own layout and\n"
 "rendering engine entirely written from scratch.  It is small and capable of\n"
 "handling many of the web standards in use today."
 msgstr ""
 
-#: gnu/packages/web.scm:4739
-msgid "Unix command line interface to the www"
-msgstr ""
-
-#: gnu/packages/web.scm:4740
+#: gnu/packages/web.scm:5746
 msgid ""
 "Surfraw (Shell Users' Revolutionary Front Rage Against the Web)\n"
 "provides a unix command line interface to a variety of popular www search engines\n"
 "and similar services."
 msgstr ""
 
-#: gnu/packages/web.scm:4771
-msgid "Simple static web server"
-msgstr ""
-
-#: gnu/packages/web.scm:4772
+#: gnu/packages/web.scm:5778
 msgid ""
 "darkhttpd is a simple static web server.  It is\n"
 "standalone and does not need inetd or ucspi-tcp.  It does not need any\n"
 "config files---you only have to specify the www root."
 msgstr ""
 
-#: gnu/packages/web.scm:4802
-msgid "Analyze Web server logs in real time"
-msgstr ""
-
-#: gnu/packages/web.scm:4804
+#: gnu/packages/web.scm:5811
 msgid ""
 "GoAccess is a real-time web log analyzer and interactive viewer that\n"
 "runs in a terminal or through your browser.  It provides fast and valuable\n"
@@ -18673,11 +19995,15 @@ msgid ""
 "on the fly."
 msgstr ""
 
-#: gnu/packages/web.scm:4839
-msgid "Tunnel data connections through HTTP requests"
+#: gnu/packages/web.scm:5865
+msgid ""
+"Hitch is a performant TLS proxy based on @code{libev}.  It terminates\n"
+"SSL/TLS connections and forwards the unencrypted traffic to a backend such\n"
+"as a web server.  It is designed to handle many thousand connections on\n"
+"multicore machines."
 msgstr ""
 
-#: gnu/packages/web.scm:4840
+#: gnu/packages/web.scm:5902
 msgid ""
 "httptunnel creates a bidirectional virtual data connection\n"
 "tunnelled through HTTP (HyperText Transfer Protocol) requests.  This can be\n"
@@ -18686,11 +20012,7 @@ msgid ""
 "tools like SSH (Secure Shell) to reach the outside world."
 msgstr ""
 
-#: gnu/packages/web.scm:4865
-msgid "TLS proxy for clients or servers"
-msgstr ""
-
-#: gnu/packages/web.scm:4866
+#: gnu/packages/web.scm:5951
 msgid ""
 "Stunnel is a proxy designed to add TLS encryption\n"
 "functionality to existing clients and servers without any changes in the\n"
@@ -18699,11 +20021,22 @@ msgid ""
 "deployments."
 msgstr ""
 
-#: gnu/packages/web.scm:4890
-msgid "Internet services daemon"
+#: gnu/packages/web.scm:6023
+msgid ""
+"Varnish is a high-performance HTTP accelerator.  It acts as a caching\n"
+"reverse proxy and load balancer.  You install it in front of any server that\n"
+"speaks HTTP and configure it to cache the contents through an extensive\n"
+"configuration language."
+msgstr ""
+
+#: gnu/packages/web.scm:6060
+msgid ""
+"This package provides a collection of modules (@dfn{vmods}) for the Varnish\n"
+"cache server, extending the @acronym{VCL, Varnish Configuration Language} with\n"
+"additional capabilities."
 msgstr ""
 
-#: gnu/packages/web.scm:4891
+#: gnu/packages/web.scm:6090
 msgid ""
 "@code{xinetd}, a more secure replacement for @code{inetd},\n"
 "listens for incoming requests over a network and launches the appropriate\n"
@@ -18712,11 +20045,7 @@ msgid ""
 "used to start services with both privileged and non-privileged port numbers."
 msgstr ""
 
-#: gnu/packages/web.scm:4935
-msgid "HTML Tidy with HTML5 support"
-msgstr ""
-
-#: gnu/packages/web.scm:4937
+#: gnu/packages/web.scm:6137
 msgid ""
 "Tidy is a console application which corrects and cleans up\n"
 "HTML and XML documents by fixing markup errors and upgrading\n"
@@ -18727,22 +20056,14 @@ msgid ""
 "functions of Tidy."
 msgstr ""
 
-#: gnu/packages/web.scm:4993
-msgid "Webserver with focus on security"
-msgstr ""
-
-#: gnu/packages/web.scm:4995
+#: gnu/packages/web.scm:6202
 msgid ""
 "Hiawatha has been written with security in mind.\n"
 "Features include the ability to stop SQL injections, XSS and CSRF attacks and\n"
 "exploit attempts."
 msgstr ""
 
-#: gnu/packages/web.scm:5019
-msgid "HTTP request and response service"
-msgstr ""
-
-#: gnu/packages/web.scm:5020
+#: gnu/packages/web.scm:6227
 msgid ""
 "Testing an HTTP Library can become difficult sometimes.\n"
 "@code{RequestBin} is fantastic for testing POST requests, but doesn't let you control the\n"
@@ -18750,125 +20071,57 @@ msgid ""
 "JSON-encoded."
 msgstr ""
 
-#: gnu/packages/web.scm:5048
-msgid "Test your HTTP library against a local copy of httpbin"
-msgstr ""
-
-#: gnu/packages/web.scm:5050
+#: gnu/packages/web.scm:6254
 msgid ""
 "@code{Pytest-httpbin} creates a @code{pytest} fixture that is dependency-injected\n"
 "into your tests.  It automatically starts up a HTTP server in a separate thread running\n"
 "@code{httpbin} and provides your test with the URL in the fixture."
 msgstr ""
 
-#: gnu/packages/web.scm:5081
-msgid "HTTP request/response parser for C"
-msgstr ""
-
-#: gnu/packages/web.scm:5082
+#: gnu/packages/web.scm:6321
 msgid ""
-"This is a parser for HTTP messages written in C.  It parses\n"
-"both requests and responses.  The parser is designed to be used in\n"
+"This is a parser for HTTP messages written in C.  It\n"
+"parses both requests and responses.  The parser is designed to be used in\n"
 "high-performance HTTP applications.  It does not make any syscalls nor\n"
 "allocations, it does not buffer data, it can be interrupted at anytime.\n"
 "Depending on your architecture, it only requires about 40 bytes of data per\n"
 "message stream (in a web server that is per connection)."
 msgstr ""
 
-#: gnu/packages/web.scm:5134
-msgid "HTTP client mock for Python"
-msgstr ""
-
-#: gnu/packages/web.scm:5135
+#: gnu/packages/web.scm:6359
 msgid ""
 "@code{httpretty} is a helper for faking web requests,\n"
 "inspired by Ruby's @code{fakeweb}."
 msgstr ""
 
-#: gnu/packages/web.scm:5153
-msgid "Output JSON from a shell"
-msgstr ""
-
-#: gnu/packages/web.scm:5154
+#: gnu/packages/web.scm:6377
 msgid ""
 "jo is a command-line utility to create JSON objects or\n"
 "arrays.  It creates a JSON string on stdout from words provided as\n"
 "command-line arguments or read from stdin."
 msgstr ""
 
-#: gnu/packages/web.scm:5203
-msgid "Command-line interface to archive.org"
-msgstr ""
-
-#: gnu/packages/web.scm:5204
+#: gnu/packages/web.scm:6438
 msgid ""
 "@code{ia} is a command-line tool for using\n"
-"@url{archive.org} from the command-line.  It also emplements the\n"
-"internetarchive python module for programatic access to archive.org."
+"@url{archive.org} from the command-line.  It also implements the\n"
+"internetarchive python module for programmatic access to archive.org."
 msgstr ""
 
-#: gnu/packages/web.scm:5259
-msgid "Search code snippets on @url{https://commandlinefu.com}"
-msgstr ""
-
-#: gnu/packages/web.scm:5260
+#: gnu/packages/web.scm:6489
 msgid ""
 "@code{clf} is a command line tool for searching code\n"
 "snippets on @url{https://commandlinefu.com}."
 msgstr ""
 
-#: gnu/packages/web.scm:5362
-msgid "Easy interactive web applications with R"
-msgstr ""
-
-#: gnu/packages/web.scm:5364
-msgid ""
-"Makes it incredibly easy to build interactive web applications\n"
-"with R.  Automatic \"reactive\" binding between inputs and outputs and\n"
-"extensive prebuilt widgets make it possible to build beautiful,\n"
-"responsive, and powerful applications with minimal effort."
-msgstr ""
-
-#: gnu/packages/web.scm:5390
-msgid "Inter-widget interactivity for HTML widgets"
-msgstr ""
-
-#: gnu/packages/web.scm:5392
-msgid ""
-"This package provides building blocks for allowing HTML widgets to\n"
-"communicate with each other, with Shiny or without (i.e.  static @code{.html}\n"
-"files).  It currently supports linked brushing and filtering."
-msgstr ""
-
-#: gnu/packages/web.scm:5412
-msgid "Web server interface for R"
-msgstr "R 的网页服务器界面"
-
-#: gnu/packages/web.scm:5414
-msgid ""
-"This package contains the Rook specification and convenience software\n"
-"for building and running Rook applications.  A Rook application is an R\n"
-"reference class object that implements a @code{call} method or an R closure\n"
-"that takes exactly one argument, an environment, and returns a list with three\n"
-"named elements: the @code{status}, the @code{headers}, and the @code{body}."
-msgstr ""
-
-#: gnu/packages/web.scm:5454
-msgid "Generate Atom feeds for social networking websites"
-msgstr ""
-
-#: gnu/packages/web.scm:5455
+#: gnu/packages/web.scm:6523
 msgid ""
 "rss-bridge generates Atom feeds for social networking\n"
 "websites lacking feeds.  Supported websites include Facebook, Twitter,\n"
 "Instagram and YouTube."
 msgstr ""
 
-#: gnu/packages/web.scm:5487
-msgid "Check websites for broken links"
-msgstr ""
-
-#: gnu/packages/web.scm:5488
+#: gnu/packages/web.scm:6578
 msgid ""
 "LinkChecker is a website validator.  It checks for broken\n"
 "links in websites.  It is recursive and multithreaded providing output in\n"
@@ -18877,99 +20130,68 @@ msgid ""
 "file links."
 msgstr ""
 
-#: gnu/packages/web.scm:5529
-msgid "Command-line WebDAV client"
-msgstr ""
-
-#: gnu/packages/web.scm:5531
+#: gnu/packages/web.scm:6616
 msgid ""
-"Cadaver is a command-line WebDAV client for Unix. It supports\n"
+"Cadaver is a command-line WebDAV client for Unix.  It supports\n"
 "file upload, download, on-screen display, namespace operations (move/copy),\n"
 "collection creation and deletion, and locking operations."
 msgstr ""
 
-#: gnu/packages/web.scm:5549
-msgid "Universal Binary JSON encoder/decoder"
+#: gnu/packages/web.scm:6658
+msgid ""
+"Castor is a graphical client for plain-text protocols written in\n"
+"Rust with GTK.  It currently supports the Gemini, Gopher and Finger\n"
+"protocols."
 msgstr ""
 
-#: gnu/packages/web.scm:5551
+#: gnu/packages/web.scm:6678
 msgid ""
 "Py-ubjson is a Python module providing an Universal Binary JSON\n"
 "encoder/decoder based on the draft-12 specification for UBJSON."
 msgstr ""
 
-#: gnu/packages/web.scm:5599
-msgid ""
-"Java Servlet, JavaServer Pages, Java Expression Language and Java\n"
-"WebSocket"
-msgstr ""
-
-#: gnu/packages/web.scm:5601
+#: gnu/packages/web.scm:6774
 msgid ""
 "Apache Tomcat is a free implementation of the Java\n"
 "Servlet, JavaServer Pages, Java Expression Language and Java WebSocket\n"
 "technologies."
 msgstr ""
 
-#: gnu/packages/web.scm:5651
-msgid "Helper classes for jetty tests"
-msgstr ""
-
-#: gnu/packages/web.scm:5652
+#: gnu/packages/web.scm:6828
 msgid ""
-"This packages contains helper classes for testing the Jetty\n"
+"This package contains helper classes for testing the Jetty\n"
 "Web Server."
 msgstr ""
 
-#: gnu/packages/web.scm:5714
-msgid "Utility classes for Jetty"
-msgstr ""
-
-#: gnu/packages/web.scm:5715
+#: gnu/packages/web.scm:6887
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:5786
-msgid "Jetty :: IO Utility"
-msgstr ""
-
-#: gnu/packages/web.scm:5787
+#: gnu/packages/web.scm:6960
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides IO-related utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:5830
-msgid "Jetty :: Http Utility"
-msgstr ""
-
-#: gnu/packages/web.scm:5831
+#: gnu/packages/web.scm:7005
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides HTTP-related utility classes."
 msgstr ""
 
-#: gnu/packages/web.scm:5864
-msgid "Jetty :: JMX Management"
-msgstr ""
-
-#: gnu/packages/web.scm:5865
+#: gnu/packages/web.scm:7039
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
 "or embedded instantiation.  This package provides the JMX management."
 msgstr ""
 
-#: gnu/packages/web.scm:5951
-msgid "Core jetty server artifact"
-msgstr ""
-
-#: gnu/packages/web.scm:5952
+#: gnu/packages/web.scm:7124
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -18977,11 +20199,7 @@ msgid ""
 "artifact."
 msgstr ""
 
-#: gnu/packages/web.scm:5995
-msgid "Jetty security infrastructure"
-msgstr ""
-
-#: gnu/packages/web.scm:5996
+#: gnu/packages/web.scm:7167
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -18989,11 +20207,7 @@ msgid ""
 "infrastructure"
 msgstr ""
 
-#: gnu/packages/web.scm:6039
-msgid "Jetty Servlet Container"
-msgstr ""
-
-#: gnu/packages/web.scm:6040
+#: gnu/packages/web.scm:7224
 msgid ""
 "The Jetty Web Server provides an HTTP server and Servlet\n"
 "container capable of serving static and dynamic content either from a standalone\n"
@@ -19001,11 +20215,22 @@ msgid ""
 "container."
 msgstr ""
 
-#: gnu/packages/web.scm:6087
-msgid "Validate HTML"
+#: gnu/packages/web.scm:7390
+msgid ""
+"Jsoup is a Java library for working with real-world HTML.  It\n"
+"provides a very convenient API for extracting and manipulating data, using the\n"
+"best of DOM, CSS, and jQuery-like methods."
+msgstr ""
+
+#: gnu/packages/web.scm:7419
+msgid ""
+"Signpost is the easy and intuitive solution for signing\n"
+"HTTP messages on the Java platform in conformance with the OAuth Core 1.0a\n"
+"standard.  Signpost follows a modular and flexible design, allowing you to\n"
+"combine it with different HTTP messaging layers."
 msgstr ""
 
-#: gnu/packages/web.scm:6088
+#: gnu/packages/web.scm:7442
 msgid ""
 "Tidyp is a program that can validate your HTML, as well as\n"
 "modify it to be more clean and standard.  tidyp does not validate HTML 5.\n"
@@ -19015,22 +20240,191 @@ msgid ""
 "based on this library, allowing Perl programmers to easily validate HTML."
 msgstr ""
 
-#: gnu/packages/web.scm:6129
-msgid "(X)HTML validation in a Perl object"
-msgstr ""
-
-#: gnu/packages/web.scm:6130
+#: gnu/packages/web.scm:7484
 msgid ""
 "@code{HTML::Tidy} is an HTML checker in a handy dandy\n"
 "object.  It's meant as a replacement for @code{HTML::Lint}, which is written\n"
 "in Perl but is not nearly as capable as @code{HTML::Tidy}."
 msgstr ""
 
-#: gnu/packages/wordnet.scm:86
-msgid "Lexical database for the English language"
+#: gnu/packages/web.scm:7513
+msgid ""
+"Geomyidae is a server for distributed hypertext protocol Gopher.  Its\n"
+"features include:\n"
+"\n"
+"@enumerate\n"
+"@item Gopher menus (see @file{index.gph} for an example);\n"
+"@item directory listings (if no @file{index.gph} was found);\n"
+"@item CGI support (@file{.cgi} files are executed);\n"
+"@item search support in CGI files;\n"
+"@item logging with multiple log levels.\n"
+"@end enumerate\n"
+msgstr ""
+
+#: gnu/packages/web.scm:7561
+msgid ""
+"Cat avatar generator is a generator of cat pictures optimised\n"
+"to generate random avatars, or defined avatar from a \"seed\".  This is a\n"
+"derivation by David Revoy from the original MonsterID by Andreas Gohr."
+msgstr ""
+
+#: gnu/packages/web.scm:7630
+msgid ""
+"nghttp2 implements the Hypertext Transfer Protocol, version\n"
+"2 (@dfn{HTTP/2}).\n"
+"\n"
+"A reusable C library provides the HTTP/2 framing layer, with several tools built\n"
+"on top of it:\n"
+"\n"
+"@itemize\n"
+"@item @command{nghttp}, a command-line HTTP/2 client.  It exposes many advanced\n"
+"and low-level aspects of the protocol and is useful for debugging.\n"
+"@item @command{nghttpd}, a fast, multi-threaded HTTP/2 static web server that\n"
+"serves files from a local directory.\n"
+"@item @command{nghttpx}, a fast, multi-threaded HTTP/2 reverse proxy that can be\n"
+"deployed in front of existing web servers that don't support HTTP/2.\n"
+"Both @command{nghttpd} and @command{nghttpx} can fall back to HTTP/1.1 for\n"
+"backwards compatibility with clients that don't speak HTTP/2.\n"
+"@item @command{h2load} for benchmarking (only!) your own HTTP/2 servers.\n"
+"@item HTTP/2 uses a header compression method called @dfn{HPACK}.\n"
+"nghttp2 provides a HPACK encoder and decoder as part of its public API.\n"
+"@item @command{deflatehd} converts JSON data or HTTP/1-style header fields to\n"
+"compressed JSON header blocks.\n"
+"@item @command{inflatehd} converts such compressed headers back to JSON pairs.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/web.scm:7732
+msgid ""
+"Hpcguix-web provides a web interface to the list of packages\n"
+"provided by Guix.  The list of packages is searchable and provides\n"
+"instructions on how to use Guix in a shared HPC environment."
+msgstr ""
+
+#: gnu/packages/web.scm:7754
+msgid ""
+"HTTrack allows you to download a World Wide Web site from\n"
+"the Internet to a local directory, building recursively all directories,\n"
+"getting HTML, images, and other files from the server to your computer.\n"
+"\n"
+"HTTrack arranges the original site's relative link-structure.  Simply open\n"
+"a page of the @emph{mirrored} website in your browser, and you can browse the\n"
+"site from link to link, as if you were viewing it online.  HTTrack can also\n"
+"update an existing mirrored site, and resume interrupted downloads.\n"
+"\n"
+"HTTrack is fully configurable, and has an integrated help system."
+msgstr ""
+
+#: gnu/packages/web.scm:7789
+msgid ""
+"buku is a powerful bookmark manager written in Python3 and SQLite3.\n"
+"@command{buku} can auto-import bookmarks from your browser and present them\n"
+"in an interactive command-line interface that lets you compose and update\n"
+"bookmarks directly.  It can also present them in a web interface with\n"
+"@command{bukuserver}."
+msgstr ""
+
+#: gnu/packages/web.scm:7810
+msgid ""
+"Anonip masks the last bits of IPv4 and IPv6 addresses in log files.\n"
+"That way most of the relevant information is preserved, while the IP address\n"
+"does not match a particular individuum anymore.\n"
+"\n"
+"Depending on your Web server, the log entries may be piped to Anonip directly\n"
+"or via a FIFO (named pipe).  Thus the unmasked IP addresses will never be\n"
+"written to any file.\n"
+"\n"
+"It's also possible to rewrite existing log files.\n"
+"\n"
+"Anonip can also be uses as a Python module in your own Python application."
+msgstr ""
+
+#: gnu/packages/web.scm:7845
+msgid ""
+"Poussetaches (which literally means \"push tasks\" in\n"
+"French) is a lightweight asynchronous task execution service that aims to\n"
+"replace Celery and RabbitMQ for small Python applications.\n"
+"\n"
+"The app posts base64-encoded payload to poussetaches and specifies the\n"
+"endpoint that will be used to trigger the task.  Poussetaches makes HTTP\n"
+"requests with the registered payload until the right status code is\n"
+"returned."
+msgstr ""
+
+#: gnu/packages/web.scm:7870
+msgid ""
+"htmlcxx is a simple non-validating CSS1 and HTML parser for\n"
+"C++.  Although there are several other HTML parsers available, htmlcxx has some\n"
+"characteristics that make it unique:\n"
+"@itemize\n"
+"@item STL like navigation of DOM tree, using excelent's tree.hh library from\n"
+"Kasper Peeters\n"
+"@item It is possible to reproduce exactly, character by character, the original\n"
+"document from the parse tree\n"
+"@item Bundled CSS parser\n"
+"@item Optional parsing of attributes\n"
+"@item C++ code that looks like C++ (not so true anymore)\n"
+"@item Offsets of tags/elements in the original document are stored in the nodes\n"
+"of the DOM tree\n"
+"@end itemize"
+msgstr ""
+
+#: gnu/packages/web.scm:7914
+msgid ""
+"libRocket is a C++ user interface package based on the HTML\n"
+"and CSS standards.  libRocket uses the open standards XHTML1.0 and\n"
+"CSS2.0 (while borrowing features from HTML5 and CSS3), and extends them with\n"
+"features suited towards real-time applications.  It is designed as a complete\n"
+"solution for any project's interface needs:\n"
+"\n"
+"@itemize\n"
+"@item Dynamic layout system.\n"
+"@item Efficient application-wide styling, with a custom-built templating engine.\n"
+"@item Fully featured control set: buttons, sliders, drop-downs, etc.\n"
+"@item Runtime visual debugging suite.\n"
+"@item Easily integrated and extensible with Python or Lua scripting.\n"
+"@end itemize\n"
+msgstr ""
+
+#: gnu/packages/web.scm:7962
+msgid "gmnisrv is a simple Gemini protocol server written in C."
+msgstr ""
+
+#: gnu/packages/web.scm:7994
+msgid ""
+"The openZIM project proposes offline storage solutions for\n"
+"content coming from the Web.  The zimlib is the standard implementation of the\n"
+"ZIM specification.  It is a library which implements the read and write method\n"
+"for ZIM files."
+msgstr ""
+
+#: gnu/packages/web.scm:8050
+msgid ""
+"The Kiwix library provides the Kiwix software suite core.\n"
+"It contains the code shared by all Kiwix ports."
+msgstr ""
+
+#: gnu/packages/web.scm:8117
+msgid ""
+"Kiwix Desktop allows you to enjoy a lot of different content\n"
+"offline (such as Wikipedia), without any access to Internet."
+msgstr ""
+
+#: gnu/packages/web.scm:8141
+msgid ""
+"uriparser is a strictly RFC 3986 compliant URI parsing and\n"
+"handling library written in C89 (\"ANSI C\").  uriparser is fast and supports\n"
+"Unicode."
+msgstr ""
+
+#: gnu/packages/web.scm:8175
+msgid ""
+"Quark is an extremely small and simple HTTP GET/HEAD only\n"
+"web server for static content.  TLS is not natively supported and should be\n"
+"provided by a TLS reverse proxy (e.g. tlstunnel, hitch or stunnel)."
 msgstr ""
 
-#: gnu/packages/wordnet.scm:88
+#: gnu/packages/wordnet.scm:94
 msgid ""
 "WordNet is a large lexical database of English.  Nouns, verbs,\n"
 "adjectives and adverbs are grouped into sets of cognitive synonyms (synsets),\n"
@@ -19042,24 +20436,16 @@ msgid ""
 "language processing."
 msgstr ""
 
-#: gnu/packages/xiph.scm:68
-msgid "Library for manipulating the ogg multimedia format"
-msgstr ""
-
-#: gnu/packages/xiph.scm:70
+#: gnu/packages/xiph.scm:77
 msgid ""
-"The libogg library allows to manipulate the ogg multimedia container\n"
+"The libogg library manipulates the ogg multimedia container\n"
 "format, which encapsulates raw compressed data and allows the interleaving of\n"
 "audio and video data.  In addition to encapsulation and interleaving of\n"
 "multiple data streams, ogg provides packet framing, error detection, and\n"
 "periodic timestamps for seeking."
 msgstr ""
 
-#: gnu/packages/xiph.scm:94
-msgid "Library implementing the vorbis audio format"
-msgstr ""
-
-#: gnu/packages/xiph.scm:96
+#: gnu/packages/xiph.scm:104
 msgid ""
 "The libvorbis library implements the ogg vorbis audio format,\n"
 "a fully open, non-proprietary, patent-and-royalty-free, general-purpose\n"
@@ -19068,22 +20454,14 @@ msgid ""
 "128 kbps/channel."
 msgstr ""
 
-#: gnu/packages/xiph.scm:121
-msgid "Library implementing the Theora video format"
-msgstr ""
-
-#: gnu/packages/xiph.scm:123
+#: gnu/packages/xiph.scm:133
 msgid ""
 "The libtheora library implements the ogg theora video format,\n"
 "a fully open, non-proprietary, patent-and-royalty-free, general-purpose\n"
 "compressed video format."
 msgstr ""
 
-#: gnu/packages/xiph.scm:148
-msgid "Library for patent-free audio compression format"
-msgstr ""
-
-#: gnu/packages/xiph.scm:150
+#: gnu/packages/xiph.scm:162
 msgid ""
 "GNU Speex is a patent-free audio compression codec specially designed\n"
 "for speech.  It is well-adapted to internet applications, such as VoIP.  It\n"
@@ -19091,21 +20469,13 @@ msgid ""
 "stereo encoding, and voice activity detection."
 msgstr ""
 
-#: gnu/packages/xiph.scm:176
-msgid "Speex processing library"
-msgstr ""
-
-#: gnu/packages/xiph.scm:178
+#: gnu/packages/xiph.scm:191
 msgid ""
 "SpeexDSP is a @dfn{DSP} (Digital Signal Processing) library based on\n"
 "work from the @code{speex} codec."
 msgstr ""
 
-#: gnu/packages/xiph.scm:205
-msgid "Cross platform audio library"
-msgstr ""
-
-#: gnu/packages/xiph.scm:207
+#: gnu/packages/xiph.scm:225
 msgid ""
 "Libao is a cross-platform audio library that allows programs to\n"
 "output audio using a simple API on a wide variety of platforms.\n"
@@ -19131,21 +20501,13 @@ msgid ""
 "@end enumerate\n"
 msgstr ""
 
-#: gnu/packages/xiph.scm:249
-msgid "Free lossless audio codec"
-msgstr ""
-
-#: gnu/packages/xiph.scm:251
+#: gnu/packages/xiph.scm:270
 msgid ""
 "FLAC stands for Free Lossless Audio Codec, an audio format that is lossless,\n"
 "meaning that audio is compressed in FLAC without any loss in quality."
 msgstr ""
 
-#: gnu/packages/xiph.scm:277
-msgid "Karaoke and text codec for embedding in ogg"
-msgstr ""
-
-#: gnu/packages/xiph.scm:279
+#: gnu/packages/xiph.scm:298
 msgid ""
 "Kate is an overlay codec, originally designed for karaoke and text,\n"
 "that can be multiplixed in Ogg.  Text and images can be carried by a Kate\n"
@@ -19160,11 +20522,7 @@ msgid ""
 "Kate stream."
 msgstr ""
 
-#: gnu/packages/xiph.scm:317
-msgid "Ogg vorbis tools"
-msgstr ""
-
-#: gnu/packages/xiph.scm:319
+#: gnu/packages/xiph.scm:334
 msgid ""
 "Ogg vorbis is a non-proprietary, patent-and-royalty-free,\n"
 "general-purpose compressed audio format.\n"
@@ -19177,11 +20535,7 @@ msgid ""
 "         an ogg vorbis file."
 msgstr ""
 
-#: gnu/packages/xiph.scm:343 gnu/packages/xiph.scm:406
-msgid "Versatile audio codec"
-msgstr ""
-
-#: gnu/packages/xiph.scm:345
+#: gnu/packages/xiph.scm:362
 msgid ""
 "Opus is a totally open, royalty-free, highly versatile audio codec.  Opus\n"
 "is unmatched for interactive speech and music transmission over the Internet,\n"
@@ -19190,29 +20544,27 @@ msgid ""
 "incorporated technology from Skype's SILK codec and Xiph.Org's CELT codec."
 msgstr ""
 
-#: gnu/packages/xiph.scm:379
-msgid "Command line utilities to encode, inspect, and decode .opus files"
-msgstr ""
-
-#: gnu/packages/xiph.scm:380
+#: gnu/packages/xiph.scm:400
 msgid ""
 "Opus is a royalty-free, highly versatile audio codec.\n"
 "Opus-tools provide command line utilities for creating, inspecting and\n"
 "decoding .opus files."
 msgstr ""
 
-#: gnu/packages/xiph.scm:408
+#: gnu/packages/xiph.scm:430
 msgid ""
 "The opusfile library provides seeking, decode, and playback of Opus\n"
 "streams in the Ogg container (.opus files) including over http(s) on posix and\n"
 "windows systems."
 msgstr ""
 
-#: gnu/packages/xiph.scm:438
-msgid "Streaming media server"
+#: gnu/packages/xiph.scm:453
+msgid ""
+"The libopusenc libraries provide a high-level API for\n"
+"encoding Opus files and streams."
 msgstr ""
 
-#: gnu/packages/xiph.scm:439
+#: gnu/packages/xiph.scm:483
 msgid ""
 "Icecast is a streaming media server which currently supports\n"
 "Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams.  It can be used to\n"
@@ -19220,97 +20572,137 @@ msgid ""
 "things in between."
 msgstr ""
 
-#: gnu/packages/xiph.scm:467
-msgid "Audio streaming library for icecast encoders"
-msgstr ""
-
-#: gnu/packages/xiph.scm:469
+#: gnu/packages/xiph.scm:513
 msgid ""
 "Libshout is a library for communicating with and sending data to an\n"
 "icecast server.  It handles the socket connection, the timing of the data,\n"
 "and prevents bad data from getting to the icecast server."
 msgstr ""
 
-#: gnu/services/base.scm:212
+#: gnu/services/base.scm:247
 msgid ""
 "Populate the @file{/etc/fstab} based on the given file\n"
 "system objects."
 msgstr ""
 
-#: gnu/services/base.scm:356
+#: gnu/services/base.scm:285
+msgid ""
+"Take care of syncing the root file\n"
+"system and of remounting it read-only when the system shuts down."
+msgstr ""
+
+#: gnu/services/base.scm:444
 msgid ""
 "Provide Shepherd services to mount and unmount the given\n"
 "file systems, as well as corresponding @file{/etc/fstab} entries."
 msgstr ""
 
-#: gnu/services/base.scm:555
+#: gnu/services/base.scm:542
 msgid ""
 "Seed the @file{/dev/urandom} pseudo-random number\n"
 "generator (RNG) with the value recorded when the system was last shut\n"
 "down."
 msgstr ""
 
-#: gnu/services/base.scm:694
+#: gnu/services/base.scm:578
+msgid ""
+"Run the @command{rngd} random number generation daemon to\n"
+"supply entropy to the kernel's pool."
+msgstr ""
+
+#: gnu/services/base.scm:607
+msgid "Initialize the machine's host name."
+msgstr ""
+
+#: gnu/services/base.scm:637
+msgid "Ensure the Linux virtual terminals run in UTF-8 mode."
+msgstr ""
+
+#: gnu/services/base.scm:650
+msgid ""
+"@emph{This service is deprecated in favor of the\n"
+"@code{keyboard-layout} field of @code{operating-system}.}  Load the given list\n"
+"of console keymaps with @command{loadkeys}."
+msgstr ""
+
+#: gnu/services/base.scm:715
 msgid ""
 "Install the given fonts on the specified ttys (fonts are per\n"
 "virtual console on GNU/Linux).  The value of this service is a list of\n"
-"tty/font pairs like:\n"
+"tty/font pairs.  The font can be the name of a font provided by the @code{kbd}\n"
+"package or any valid argument to @command{setfont}, as in this example:\n"
 "\n"
 "@example\n"
-"'((\"tty1\" . \"LatGrkCyr-8x16\"))\n"
+"`((\"tty1\" . \"LatGrkCyr-8x16\")\n"
+"  (\"tty2\" . ,(file-append\n"
+"                 font-tamzen\n"
+"                 \"/share/kbd/consolefonts/TamzenForPowerline10x20.psf\"))\n"
+"  (\"tty3\" . ,(file-append\n"
+"                 font-terminus\n"
+"                 \"/share/consolefonts/ter-132n\"))) ; for HDPI\n"
 "@end example\n"
 msgstr ""
 
-#: gnu/services/base.scm:737
+#: gnu/services/base.scm:767
 msgid ""
 "Provide a console log-in service as specified by its\n"
 "configuration value, a @code{login-configuration} object."
 msgstr ""
 
-#: gnu/services/base.scm:956
+#: gnu/services/base.scm:1035
 msgid ""
 "Provide console login using the @command{agetty}\n"
 "program."
 msgstr ""
 
-#: gnu/services/base.scm:1010
+#: gnu/services/base.scm:1100
 msgid ""
 "Provide console login using the @command{mingetty}\n"
 "program."
 msgstr ""
 
-#: gnu/services/base.scm:1182
+#: gnu/services/base.scm:1317
 msgid ""
 "Runs libc's @dfn{name service cache daemon} (nscd) with the\n"
 "given configuration---an @code{<nscd-configuration>} object.  @xref{Name\n"
 "Service Switch}, for an example."
 msgstr ""
 
-#: gnu/services/base.scm:1282
+#: gnu/services/base.scm:1356
+msgid ""
+"Run the syslog daemon, @command{syslogd}, which is\n"
+"responsible for logging system messages."
+msgstr ""
+
+#: gnu/services/base.scm:1426
 msgid ""
 "Install the specified resource usage limits by populating\n"
 "@file{/etc/security/limits.conf} and using the @code{pam_limits}\n"
 "authentication module."
 msgstr ""
 
-#: gnu/services/base.scm:1458
+#: gnu/services/base.scm:1771
 msgid "Run the build daemon of GNU@tie{}Guix, aka. @command{guix-daemon}."
 msgstr ""
 
-#: gnu/services/base.scm:1558
+#: gnu/services/base.scm:1928
 msgid ""
 "Add a Shepherd service running @command{guix publish}, a\n"
 "command that allows you to share pre-built binaries with others over HTTP."
 msgstr ""
 
-#: gnu/services/base.scm:1749
+#: gnu/services/base.scm:2147
 msgid ""
 "Run @command{udev}, which populates the @file{/dev}\n"
 "directory dynamically.  Get extra rules from the packages listed in the\n"
 "@code{rules} field of its value, @code{udev-configuration} object."
 msgstr ""
 
-#: gnu/services/base.scm:1824
+#: gnu/services/base.scm:2228
+msgid "Turn on the virtual memory swap area."
+msgstr ""
+
+#: gnu/services/base.scm:2280
 msgid ""
 "Run GPM, the general-purpose mouse daemon, with the given\n"
 "command-line options.  GPM allows users to use the mouse in the console,\n"
@@ -19318,7 +20710,13 @@ msgid ""
 "@code{ps2} protocol, which works for both USB and PS/2 mice."
 msgstr ""
 
-#: gnu/services/networking.scm:258
+#: gnu/services/base.scm:2351
+msgid ""
+"Start the @command{kmscon} virtual terminal emulator for the\n"
+"Linux @dfn{kernel mode setting} (KMS)."
+msgstr ""
+
+#: gnu/services/base.scm:2474
 msgid ""
 "Turn up the specified network interfaces upon startup,\n"
 "with the given IP address, gateway, netmask, and so on.  The value for\n"
@@ -19326,58 +20724,290 @@ msgid ""
 "network interface."
 msgstr ""
 
-#: gnu/services/networking.scm:432
+#: gnu/services/certbot.scm:153
+#, scheme-format
+msgid "~a may need to be run~%"
+msgstr ""
+
+#: gnu/services/certbot.scm:202
+msgid ""
+"Automatically renew @url{https://letsencrypt.org, Let's\n"
+"Encrypt} HTTPS certificates by adjusting the nginx web server configuration\n"
+"and periodically invoking @command{certbot}."
+msgstr ""
+
+#: gnu/services/file-sharing.scm:74
+#, scheme-format
+msgid "salt value must be a string of ~d characters"
+msgstr ""
+
+#: gnu/services/file-sharing.scm:675
+#, scheme-format
+msgid "Wait period expired; killing transmission-daemon (pid ~a).~%"
+msgstr ""
+
+#: gnu/services/file-sharing.scm:678
+msgid ""
+"(If you see this message regularly, you may need to increase the value\n"
+"of 'stop-wait-period' in the service configuration.)\n"
+msgstr ""
+
+#: gnu/services/file-sharing.scm:692
+msgid "Service transmission-daemon has been asked to reload its settings file."
+msgstr ""
+
+#: gnu/services/file-sharing.scm:694
+msgid "Service transmission-daemon is not running."
+msgstr ""
+
+#: gnu/services/file-sharing.scm:798
+msgid "Share files using the BitTorrent protocol."
+msgstr ""
+
+#: gnu/services/networking.scm:298
+msgid ""
+"Run @command{dhcp}, a Dynamic Host Configuration\n"
+"Protocol (DHCP) client, on all the non-loopback network interfaces."
+msgstr ""
+
+#: gnu/services/networking.scm:372
+msgid ""
+"Run a DHCP (Dynamic Host Configuration Protocol) daemon.  The\n"
+"daemon is responsible for allocating IP addresses to its client."
+msgstr ""
+
+#: gnu/services/networking.scm:527
 msgid ""
 "Run the @command{ntpd}, the Network Time Protocol (NTP)\n"
 "daemon of the @uref{http://www.ntp.org, Network Time Foundation}.  The daemon\n"
 "will keep the system clock synchronized with that of the given servers."
 msgstr ""
 
-#: gnu/services/networking.scm:534
+#: gnu/services/networking.scm:651
+msgid ""
+"Run the @command{ntpd}, the Network Time Protocol (NTP)\n"
+"daemon, as implemented by @uref{http://www.openntpd.org, OpenNTPD}.  The\n"
+"daemon will keep the system clock synchronized with that of the given servers."
+msgstr ""
+
+#: gnu/services/networking.scm:739
 msgid ""
 "Start @command{inetd}, the @dfn{Internet superserver}.  It is responsible\n"
 "for listening on Internet sockets and spawning the corresponding services on\n"
 "demand."
 msgstr ""
 
-#: gnu/services/networking.scm:689
+#: gnu/services/networking.scm:926
 msgid ""
 "Run the @uref{https://torproject.org, Tor} anonymous\n"
 "networking daemon."
 msgstr ""
 
-#: gnu/services/networking.scm:712
+#: gnu/services/networking.scm:950
 msgid "Define a new Tor @dfn{hidden service}."
 msgstr ""
 
-#: gnu/services/networking.scm:821
-msgid ""
-"Run @url{http://bitlbee.org,BitlBee}, a daemon that acts as\n"
-"a gateway between IRC and chat networks."
-msgstr ""
-
-#: gnu/services/networking.scm:888
+#: gnu/services/networking.scm:1018
 msgid ""
 "Run @url{https://launchpad.net/wicd,Wicd}, a network\n"
 "management daemon that aims to simplify wired and wireless networking."
 msgstr ""
 
-#: gnu/services/networking.scm:977
+#: gnu/services/networking.scm:1159
 msgid ""
 "Run @uref{https://wiki.gnome.org/Projects/NetworkManager,\n"
 "NetworkManager}, a network management daemon that aims to simplify wired and\n"
 "wireless networking."
 msgstr ""
 
-#: gnu/services/networking.scm:1035
+#: gnu/services/networking.scm:1228
 msgid ""
 "Run @url{https://01.org/connman,Connman},\n"
 "a network connection manager."
 msgstr ""
 
-#: gnu/services/networking.scm:1124
+#: gnu/services/networking.scm:1251
+msgid ""
+"Run @uref{https://wiki.gnome.org/Projects/ModemManager,\n"
+"ModemManager}, a modem management daemon that aims to simplify dialup\n"
+"networking."
+msgstr ""
+
+#: gnu/services/networking.scm:1341
+msgid ""
+"Run @uref{http://www.draisberghof.de/usb_modeswitch/,\n"
+"USB_ModeSwitch}, a mode switching tool for controlling USB devices with\n"
+"multiple @dfn{modes}.  When plugged in for the first time many USB\n"
+"devices (primarily high-speed WAN modems) act like a flash storage containing\n"
+"installers for Windows drivers.  USB_ModeSwitch replays the sequence the\n"
+"Windows drivers would send to switch their mode from storage to modem (or\n"
+"whatever the thing is supposed to do)."
+msgstr ""
+
+#: gnu/services/networking.scm:1412
+msgid ""
+"Run the WPA Supplicant daemon, a service that\n"
+"implements authentication, key negotiation and more for wireless networks."
+msgstr ""
+
+#: gnu/services/networking.scm:1473
+msgid ""
+"Run the @uref{https://w1.fi/hostapd/, hostapd} daemon for Wi-Fi access\n"
+"points and authentication servers."
+msgstr ""
+
+#: gnu/services/networking.scm:1507
+msgid "Run hostapd to simulate WiFi connectivity."
+msgstr ""
+
+#: gnu/services/networking.scm:1567
 msgid ""
 "Run @uref{http://www.openvswitch.org, Open vSwitch}, a multilayer virtual\n"
 "switch designed to enable massive network automation through programmatic\n"
 "extension."
 msgstr ""
+
+#: gnu/services/networking.scm:1613
+msgid "Run @command{iptables-restore}, setting up the specified rules."
+msgstr ""
+
+#: gnu/services/networking.scm:1682
+msgid "Run @command{nft}, setting up the specified ruleset."
+msgstr ""
+
+#: gnu/services/networking.scm:1783
+msgid ""
+"Run @url{https://pagekite.net/,PageKite}, a tunneling solution to make\n"
+"local servers publicly accessible on the web, even behind NATs and firewalls."
+msgstr ""
+
+#: gnu/services/networking.scm:1879
+msgid ""
+"Connect to the Yggdrasil mesh network.\n"
+"See yggdrasil -genconf for config options."
+msgstr ""
+
+#: gnu/services/networking.scm:2017
+msgid ""
+"Run @command{ipfs daemon}, the reference implementation\n"
+"of the IPFS peer-to-peer storage network."
+msgstr ""
+
+#: gnu/services/networking.scm:2056
+msgid ""
+"Run @uref{https://www.keepalived.org/, Keepalived}\n"
+"routing software."
+msgstr ""
+
+#: gnu/services/version-control.scm:160
+msgid ""
+"Expose Git repositories over the insecure @code{git://} TCP-based\n"
+"protocol."
+msgstr ""
+
+#: gnu/services/version-control.scm:379
+msgid ""
+"Setup @command{gitolite}, a Git hosting tool providing access over SSH..\n"
+"By default, the @code{git} user is used, but this is configurable.\n"
+"Additionally, Gitolite can integrate with with tools like gitweb or cgit to\n"
+"provide a web interface to view selected repositories."
+msgstr ""
+
+#~ msgid "Word processing program"
+#~ msgstr "文字处理程序"
+
+#~ msgid "Spell checker"
+#~ msgstr "拼写检查器"
+
+#~ msgid "Hunspell dictionary for English"
+#~ msgstr "英语的 Hunspell 词典"
+
+#~ msgid "Hunspell dictionary for Australian English"
+#~ msgstr "澳大利亚英语的 Hunspell 词典"
+
+#~ msgid "Signal processing language"
+#~ msgstr "信号处理语言"
+
+#~ msgid "Python bindings for liblo"
+#~ msgstr "liblo 的 Python 绑定"
+
+#~ msgid "C++ libraries for LV2 plugins"
+#~ msgstr "LV2 插件的 C++ 库"
+
+#~ msgid "3D audio API"
+#~ msgstr "3D 音频 API"
+
+#~ msgid "Sound processing utility"
+#~ msgstr "声音处理实用工具"
+
+#~ msgid "WAVE audio data processing tool"
+#~ msgstr "WAVE 音频数据处理工具"
+
+#~ msgid "Tar-compatible archiver"
+#~ msgstr "Tar-兼容的归档工具"
+
+#~ msgid "Managing tar archives"
+#~ msgstr "管理 tar 归档"
+
+#~ msgid "Comparing and merging files"
+#~ msgstr "比较和合并文件"
+
+#~ msgid "Core GNU utilities (file, text, shell)"
+#~ msgstr "核心 GNU 工具（文件、文本、shell）"
+
+#~ msgid "Remake files automatically"
+#~ msgstr "自动重命令文件"
+
+#~ msgid "Binary utilities: bfd gas gprof ld"
+#~ msgstr "二进制文件处理实用工具：bfs gas gprof ld"
+
+#~ msgid "The GNU C Library"
+#~ msgstr "GNU C 库"
+
+#~ msgid "The GNU C Library (GNU Hurd variant)"
+#~ msgstr "GNU C 库（GNU Hurd 变种）"
+
+#~ msgid "Universal download manager with GTK+ interface"
+#~ msgstr "带有 GTK+ 界面的通用下载管理器"
+
+#~ msgid "Parallel bzip2 implementation"
+#~ msgstr "可并行的 bzip2 实现"
+
+#~ msgid "General-purpose data compression"
+#~ msgstr "通用数据压缩"
+
+#~ msgid "Java port of snappy"
+#~ msgstr "snappy 的 Java 移植"
+
+#~ msgid "Berkeley database"
+#~ msgstr "Berkeley 数据库"
+
+#~ msgid "Fast key-value storage library"
+#~ msgstr "快速的键值对存储库"
+
+#~ msgid "Python ODBC Library"
+#~ msgstr "Python ODBC 库"
+
+#~ msgid "User interface for gnushogi"
+#~ msgstr "gnushogi 的用户界面"
+
+#~ msgid "Logic puzzle game"
+#~ msgstr "逻辑解谜游戏"
+
+#~ msgid "Perl modules for the WWW"
+#~ msgstr "用于万维网的 Perl 模块"
+
+#~ msgid "Testing TCP programs"
+#~ msgstr "测试 TCP 程序"
+
+#~ msgid "HTTP client for R"
+#~ msgstr "R 的 HTTP 客户端"
+
+#~ msgid "HTML5 compliant parsing library"
+#~ msgstr "兼容 HTML5 的解析库"
+
+#~ msgid "Web browser"
+#~ msgstr "网页浏览器"
+
+#~ msgid "Web server interface for R"
+#~ msgstr "R 的网页服务器界面"