From 49209b3f965f65da8041fa70a30ae3df5b892535 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 1 Mar 2014 16:26:12 +0000
Subject: [PATCH] Version 1.25.39.

---
 BUGS                        |    7 +-
 configure.ac                |    2 +-
 po-docs/ja.po               | 1257 +++++++++++++++++------------------
 po-docs/libguestfs-docs.pot | 1229 +++++++++++++++++-----------------
 po-docs/uk.po               | 1257 +++++++++++++++++------------------
 po/en_GB.po                 |  365 +++++-----
 po/es.po                    |  365 +++++-----
 po/gu.po                    |  365 +++++-----
 po/hi.po                    |  365 +++++-----
 po/kn.po                    |  365 +++++-----
 po/libguestfs.pot           |  367 +++++-----
 po/ml.po                    |  365 +++++-----
 po/mr.po                    |  365 +++++-----
 po/nl.po                    |  365 +++++-----
 po/or.po                    |  365 +++++-----
 po/pa.po                    |  365 +++++-----
 po/pl.po                    |  365 +++++-----
 po/ta.po                    |  365 +++++-----
 po/te.po                    |  365 +++++-----
 po/uk.po                    |  365 +++++-----
 20 files changed, 4779 insertions(+), 4450 deletions(-)

diff --git a/BUGS b/BUGS
index c1b646646..943670d72 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-02-26
+Last updated: 2014-03-01
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -200,9 +200,6 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1019388 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1019388
   firstboot scripts (virt-builder, virt-sysprep) don't work for Debian 6 & 7 guests
 
-1020806 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1020806
-  All libguestfs LVM operations fail on Debian/Ubuntu
-
 1021149 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1021149
   Rebase libguestfs to 1.24 in RHEL 7.1
 
@@ -287,7 +284,7 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 965495 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=965495
   New APIs required in libguestfs for virt-v2v in RHEL 6.5
 
-(89 bugs)
+(88 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
diff --git a/configure.ac b/configure.ac
index f908ccabb..8ea2620e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@
 # freeform string.
 m4_define([libguestfs_major],   [1])
 m4_define([libguestfs_minor],   [25])
-m4_define([libguestfs_release], [38])
+m4_define([libguestfs_release], [39])
 
 AC_INIT([libguestfs],libguestfs_major.libguestfs_minor.libguestfs_release)
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/po-docs/ja.po b/po-docs/ja.po
index de0bde934..ee0a8cb89 100644
--- a/po-docs/ja.po
+++ b/po-docs/ja.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/fedora/language/"
@@ -694,7 +694,7 @@ msgid "B<-q>"
 msgstr "B<-q>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:553
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:547
 #: ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:225
 msgid "B<--quiet>"
@@ -736,7 +736,7 @@ msgstr ""
 "定されていないとき)、 このオプションのみが適用されます。"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:677
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:667
 #: ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267
 #: ../cat/virt-ls.pod:421 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185
 #: ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:169
@@ -749,7 +749,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:679
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:669
 #: ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269
 #: ../cat/virt-ls.pod:423 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187
 #: ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:171
@@ -774,7 +774,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:686 ../builder/virt-index-validate.pod:68
+#: ../builder/virt-builder.pod:676 ../builder/virt-index-validate.pod:68
 #: ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273
 #: ../cat/virt-ls.pod:427 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208
 #: ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428
@@ -789,7 +789,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:688 ../builder/virt-index-validate.pod:70
+#: ../builder/virt-builder.pod:678 ../builder/virt-index-validate.pod:70
 #: ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275
 #: ../cat/virt-ls.pod:429 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210
 #: ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430
@@ -804,7 +804,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:690
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:680
 #: ../builder/virt-index-validate.pod:72 ../cat/virt-cat.pod:150
 #: ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:431
 #: ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:179
@@ -1217,7 +1217,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1821 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1817 ../builder/virt-index-validate.pod:76
 #: ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390
 #: ../cat/virt-ls.pod:486 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260
 #: ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:357
@@ -1242,19 +1242,19 @@ msgstr "このプログラムは以下を返します:"
 #: ../appliance/libguestfs-make-fixed-appliance.pod:36
 #: ../appliance/libguestfs-make-fixed-appliance.pod:54
 #: ../appliance/libguestfs-make-fixed-appliance.pod:75
-#: ../builder/virt-builder.pod:597 ../builder/virt-builder.pod:601
-#: ../builder/virt-builder.pod:966 ../builder/virt-builder.pod:973
-#: ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981
-#: ../builder/virt-builder.pod:986 ../builder/virt-builder.pod:990
-#: ../builder/virt-builder.pod:994 ../builder/virt-builder.pod:998
-#: ../builder/virt-builder.pod:1002 ../builder/virt-builder.pod:1006
-#: ../builder/virt-builder.pod:1010 ../builder/virt-builder.pod:1014
-#: ../builder/virt-builder.pod:1018 ../builder/virt-builder.pod:1022
-#: ../builder/virt-builder.pod:1026 ../builder/virt-builder.pod:1030
-#: ../builder/virt-builder.pod:1034 ../builder/virt-builder.pod:1043
-#: ../builder/virt-builder.pod:1049 ../builder/virt-builder.pod:1461
-#: ../builder/virt-builder.pod:1465 ../builder/virt-builder.pod:1721
-#: ../builder/virt-builder.pod:1725 ../builder/virt-builder.pod:1729
+#: ../builder/virt-builder.pod:591 ../builder/virt-builder.pod:595
+#: ../builder/virt-builder.pod:956 ../builder/virt-builder.pod:963
+#: ../builder/virt-builder.pod:967 ../builder/virt-builder.pod:971
+#: ../builder/virt-builder.pod:976 ../builder/virt-builder.pod:980
+#: ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:992 ../builder/virt-builder.pod:996
+#: ../builder/virt-builder.pod:1000 ../builder/virt-builder.pod:1004
+#: ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1012
+#: ../builder/virt-builder.pod:1016 ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:1024 ../builder/virt-builder.pod:1033
+#: ../builder/virt-builder.pod:1039 ../builder/virt-builder.pod:1203
+#: ../builder/virt-builder.pod:1208 ../builder/virt-builder.pod:1716
+#: ../builder/virt-builder.pod:1720 ../builder/virt-builder.pod:1724
 #: ../builder/virt-index-validate.pod:34 ../builder/virt-index-validate.pod:39
 #: ../builder/virt-index-validate.pod:53 ../builder/virt-index-validate.pod:58
 #: ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193
@@ -1435,7 +1435,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1826 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1822 ../builder/virt-index-validate.pod:81
 #: ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395
 #: ../cat/virt-ls.pod:491 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265
 #: ../diff/virt-diff.pod:253 ../edit/virt-edit.pod:362
@@ -1470,7 +1470,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1844
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1840
 #: ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:258
 #: ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:501
 #: ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../diff/virt-diff.pod:263
@@ -1484,7 +1484,7 @@ msgid "AUTHOR"
 msgstr "著者"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1846
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1842
 #: ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:260
 #: ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:503
 #: ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../diff/virt-diff.pod:265
@@ -1500,7 +1500,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:406
 #: ../appliance/libguestfs-make-fixed-appliance.pod:178
-#: ../builder/virt-builder.pod:1848 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1844 ../builder/virt-index-validate.pod:90
 #: ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410
 #: ../cat/virt-ls.pod:505 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277
 #: ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:377
@@ -1845,7 +1845,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1785 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1780 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1387 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4610 ../test-tool/libguestfs-test-tool.pod:177
@@ -1985,7 +1985,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1547
+#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1542
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1993,7 +1993,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1555
+#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1550
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -2001,7 +2001,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1546
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2195,7 +2195,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:558
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -2610,66 +2610,54 @@ msgid ""
 "source URL."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:295
-msgid ""
-"The default fingerprint (if none are supplied) is S<F777 4FB1 AD07 4A7E 8C87 "
-"67EA 9173 8F73 E1B7 68A0> (which is S<Richard W.M. Jones's> key)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:299
-msgid "You can also set the C<VIRT_BUILDER_FINGERPRINT> environment variable."
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:301
+#: ../builder/virt-builder.pod:295
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:303
+#: ../builder/virt-builder.pod:297
 msgid "B<--firstboot-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:305
+#: ../builder/virt-builder.pod:299
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
 "the script runs (as root, late in the boot process)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:308
+#: ../builder/virt-builder.pod:302
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:310
+#: ../builder/virt-builder.pod:304
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
 "conveniently wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:313
+#: ../builder/virt-builder.pod:307
 msgid ""
 "You can have multiple I<--firstboot> and I<--firstboot-command> options.  "
 "They run in the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:317
+#: ../builder/virt-builder.pod:311
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:319
+#: ../builder/virt-builder.pod:313
 msgid "B<--firstboot-install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:321
+#: ../builder/virt-builder.pod:315
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "when the guest first boots using the guest's package manager (eg. apt, yum, "
@@ -2677,19 +2665,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:325 ../builder/virt-builder.pod:372
+#: ../builder/virt-builder.pod:319 ../builder/virt-builder.pod:366
 msgid ""
 "For an overview on the different ways to install packages, see L</INSTALLING "
 "PACKAGES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:328 ../sparsify/virt-sparsify.pod:182
+#: ../builder/virt-builder.pod:322 ../sparsify/virt-sparsify.pod:182
 msgid "B<--format> qcow2"
 msgstr "B<--format> qcow2"
 
 #. type: =item
-#: ../builder/virt-builder.pod:330 ../resize/virt-resize.pod:400
+#: ../builder/virt-builder.pod:324 ../resize/virt-resize.pod:400
 #: ../sparsify/virt-sparsify.pod:180 ../tools/virt-list-filesystems:92
 #: ../tools/virt-list-partitions:93 ../tools/virt-tar:140
 #: ../tools/virt-win-reg:141
@@ -2697,23 +2685,23 @@ msgid "B<--format> raw"
 msgstr "B<--format> raw"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:332
+#: ../builder/virt-builder.pod:326
 msgid ""
 "For ordinary builds, this selects the output format.  The default is I<raw>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:334
+#: ../builder/virt-builder.pod:328
 msgid "With I<--get-kernel> this specifies the input format."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:336
+#: ../builder/virt-builder.pod:330
 msgid "B<--get-kernel> IMAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:338
+#: ../builder/virt-builder.pod:332
 msgid ""
 "This option extracts the kernel and initramfs from a previously built disk "
 "image called C<IMAGE> (in fact it works for any VM disk image, not just ones "
@@ -2721,21 +2709,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:342
+#: ../builder/virt-builder.pod:336
 msgid ""
 "The kernel and initramfs are written to the current directory, unless you "
 "also specify the I<--output> C<outputdir> B<directory> name."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:345
+#: ../builder/virt-builder.pod:339
 msgid ""
 "The format of the disk image is automatically detected unless you specify it "
 "by using the I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:348
+#: ../builder/virt-builder.pod:342
 msgid ""
 "In the case where the guest contains multiple kernels, the one with the "
 "highest version number is chosen.  To extract arbitrary kernels from the "
@@ -2744,12 +2732,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:353
+#: ../builder/virt-builder.pod:347
 msgid "B<--gpg> GPG"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:355
+#: ../builder/virt-builder.pod:349
 msgid ""
 "Specify an alternate L<gpg(1)> (GNU Privacy Guard) binary.  You can also use "
 "this to add gpg parameters, for example to specify an alternate home "
@@ -2757,7 +2745,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:359
+#: ../builder/virt-builder.pod:353
 #, no-wrap
 msgid ""
 " virt-builder --gpg \"gpg --homedir /tmp\" [...]\n"
@@ -2765,24 +2753,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:361
+#: ../builder/virt-builder.pod:355
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:363
+#: ../builder/virt-builder.pod:357
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
 "domainname (FQDN) if you want."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:366
+#: ../builder/virt-builder.pod:360
 msgid "B<--install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:368
+#: ../builder/virt-builder.pod:362
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "during the image build using the guest's package manager (eg. apt, yum, "
@@ -2790,105 +2778,105 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:375
+#: ../builder/virt-builder.pod:369
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--update>."
 msgstr "I<--long> 参照。"
 
 #. type: =item
-#: ../builder/virt-builder.pod:377
+#: ../builder/virt-builder.pod:371
 msgid "B<--link TARGET:LINK>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:373
 msgid "B<--link TARGET:LINK[:LINK...]>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:375
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
 "C<TARGET>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:384 ../cat/virt-filesystems.pod:211
+#: ../builder/virt-builder.pod:378 ../cat/virt-filesystems.pod:211
 #: ../cat/virt-ls.pod:362 ../tools/virt-list-filesystems:109
 #: ../tools/virt-list-partitions:120
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:380
 msgid "B<--list>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:382
 #, fuzzy
 #| msgid "B<--format> raw"
 msgid "B<--list --format> format"
 msgstr "B<--format> raw"
 
 #. type: =item
-#: ../builder/virt-builder.pod:390
+#: ../builder/virt-builder.pod:384
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:386
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:388
 msgid ""
 "It is possible to choose with I<--format> the output format for the list "
 "templates:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:399
+#: ../builder/virt-builder.pod:393
 msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:401
+#: ../builder/virt-builder.pod:395
 msgid ""
 "The default format, prints only the template identifier and, next to it, its "
 "short description."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:398
 #, fuzzy
 #| msgid "B<--long>"
 msgid "B<long>"
 msgstr "B<--long>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:400
 msgid ""
 "Prints a textual list with the details of the available sources, followed by "
 "the details of the available templates."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:409
+#: ../builder/virt-builder.pod:403
 msgid "B<json>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:411
+#: ../builder/virt-builder.pod:405
 msgid ""
 "Prints a JSON object with the details of the available sources and the "
 "details of the available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:414
+#: ../builder/virt-builder.pod:408
 msgid ""
 "The C<version> key in the main object represents the \"compatibility version"
 "\", and it is bumped every time the resulting JSON output is incompatible "
@@ -2897,22 +2885,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:415
 msgid "I<--long> is a shorthand for the C<long> format."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:423
-msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
+#: ../builder/virt-builder.pod:417
+msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:425
+#: ../builder/virt-builder.pod:419
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:427
+#: ../builder/virt-builder.pod:421
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
 "building is complete.  If you don't want to reveal precisely how the image "
@@ -2920,26 +2908,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:425
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:433
+#: ../builder/virt-builder.pod:427
 #, fuzzy
 #| msgid "B<-m MB>"
 msgid "B<-m> MB"
 msgstr "B<-m MB>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:435
+#: ../builder/virt-builder.pod:429
 #, fuzzy
 #| msgid "B<--memsize MB>"
 msgid "B<--memsize> MB"
 msgstr "B<--memsize MB>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:437
+#: ../builder/virt-builder.pod:431
 msgid ""
 "Change the amount of memory allocated to I<--run> scripts.  Increase this if "
 "you find that I<--run> scripts or the I<--install> option are running out of "
@@ -2947,12 +2935,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:441
+#: ../builder/virt-builder.pod:435
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:437
 #, fuzzy, no-wrap
 #| msgid "guestfs_get_memsize"
 msgid ""
@@ -2961,62 +2949,62 @@ msgid ""
 msgstr "guestfs_get_memsize"
 
 #. type: =item
-#: ../builder/virt-builder.pod:445
+#: ../builder/virt-builder.pod:439
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:447
+#: ../builder/virt-builder.pod:441
 #, fuzzy
 #| msgid "Create a directory named C<path>."
 msgid "Create a directory in the guest."
 msgstr "C<path> という名前のディレクトリーを作成します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:449
+#: ../builder/virt-builder.pod:443
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
 "also works if the directory already exists."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:452 ../fish/guestfish.pod:343
+#: ../builder/virt-builder.pod:446 ../fish/guestfish.pod:343
 #: ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:454
+#: ../builder/virt-builder.pod:448
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:456
+#: ../builder/virt-builder.pod:450
 msgid ""
 "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:458
+#: ../builder/virt-builder.pod:452
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:460
+#: ../builder/virt-builder.pod:454
 msgid ""
 "The network only allows outgoing connections and has other minor "
 "limitations.  See L<virt-rescue(1)/NETWORK>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:457
 msgid ""
 "If you use I<--no-network> then certain other options such as I<--install> "
 "will not work."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:466
+#: ../builder/virt-builder.pod:460
 msgid ""
 "This does not affect whether the guest can access the network once it has "
 "been booted, because that is controlled by your hypervisor or cloud "
@@ -3024,14 +3012,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:470
+#: ../builder/virt-builder.pod:464
 msgid ""
 "Generally speaking you should I<not> use I<--no-network>.  But here are some "
 "reasons why you might want to:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:475 ../builder/virt-builder.pod:1069
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1059
 #: ../examples/guestfs-faq.pod:472 ../examples/guestfs-faq.pod:759
 #: ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:203 ../examples/guestfs-recipes.pod:408
@@ -3043,14 +3031,14 @@ msgid "1."
 msgstr "1."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:477
+#: ../builder/virt-builder.pod:471
 msgid ""
 "Because the libguestfs backend that you are using doesn't support the "
 "network.  (See: L<guestfs(3)/BACKEND>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:480 ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:474 ../builder/virt-builder.pod:1064
 #: ../examples/guestfs-faq.pod:482 ../examples/guestfs-faq.pod:769
 #: ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:210 ../examples/guestfs-recipes.pod:414
@@ -3062,14 +3050,14 @@ msgid "2."
 msgstr "2."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:482
+#: ../builder/virt-builder.pod:476
 msgid ""
 "Any software you need to install comes from an attached ISO, so you don't "
 "need the network."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:485 ../examples/guestfs-faq.pod:488
+#: ../builder/virt-builder.pod:479 ../examples/guestfs-faq.pod:488
 #: ../examples/guestfs-faq.pod:774 ../examples/guestfs-performance.pod:216
 #: ../examples/guestfs-recipes.pod:420 ../rescue/virt-rescue.pod:345
 #: ../resize/virt-resize.pod:52 ../resize/virt-resize.pod:634
@@ -3079,7 +3067,7 @@ msgid "3."
 msgstr "3."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:487
+#: ../builder/virt-builder.pod:481
 msgid ""
 "You don't want untrusted guest code trying to access your host network when "
 "running virt-builder.  This is particularly an issue when you don't trust "
@@ -3087,36 +3075,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:492 ../examples/guestfs-faq.pod:494
+#: ../builder/virt-builder.pod:486 ../examples/guestfs-faq.pod:494
 #: ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr "4."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:494
+#: ../builder/virt-builder.pod:488
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:498 ../fish/guestfish.pod:360
+#: ../builder/virt-builder.pod:492 ../fish/guestfish.pod:360
 #: ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:500
+#: ../builder/virt-builder.pod:494
 #, fuzzy
 #| msgid "Choose the output filesystem type."
 msgid "Do not sync the output file on exit."
 msgstr "出力ファイルシステム形式を選択します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:502
+#: ../builder/virt-builder.pod:496
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:504
+#: ../builder/virt-builder.pod:498
 msgid ""
 "The reason is that qemu/KVM's default caching mode is C<none> or "
 "C<directsync>, both of which bypass the host page cache.  Therefore these "
@@ -3127,36 +3115,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:511
+#: ../builder/virt-builder.pod:505
 msgid ""
 "If you are not using these broken caching modes, you can use I<--no-sync> to "
 "avoid this unnecessary sync and gain considerable extra performance."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:515
+#: ../builder/virt-builder.pod:509
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:517
+#: ../builder/virt-builder.pod:511
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:514
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:516
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:524
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Write the output to C<filename>.  If you don't specify this option, then the "
 "output filename is generated by taking the C<os-version> string and adding "
@@ -3164,43 +3152,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:529
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Note that the output filename could be a device, partition or logical volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:526
 msgid ""
 "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:535
+#: ../builder/virt-builder.pod:529
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:531 ../sysprep/sysprep-extra-options.pod:92
 msgid "Set the password encryption to C<md5>, C<sha256> or C<sha512>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:539
+#: ../builder/virt-builder.pod:533
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
 "guest)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:542 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:536 ../sysprep/sysprep-extra-options.pod:97
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
 "secure against modern attacks."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:545 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:539 ../sysprep/sysprep-extra-options.pod:100
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
 "have support for SHA-512, in which case it will use C<md5>.  You can "
@@ -3208,49 +3196,49 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:549
+#: ../builder/virt-builder.pod:543
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:551
+#: ../builder/virt-builder.pod:545
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:555
+#: ../builder/virt-builder.pod:549
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:557
+#: ../builder/virt-builder.pod:551
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:559
+#: ../builder/virt-builder.pod:553
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:561
+#: ../builder/virt-builder.pod:555
 msgid ""
 "See L</USERS AND PASSWORDS> below for the format of the C<SELECTOR> field, "
 "and also how to set up user accounts."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:561
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:569
+#: ../builder/virt-builder.pod:563
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:571
+#: ../builder/virt-builder.pod:565
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
 "The script runs virtualized inside a small appliance, chrooted into the "
@@ -3258,12 +3246,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:575
+#: ../builder/virt-builder.pod:569
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:577
+#: ../builder/virt-builder.pod:571
 msgid ""
 "If libguestfs supports it then a limited network connection is available but "
 "it only allows outgoing network connections.  You can also attach data disks "
@@ -3273,79 +3261,79 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:577
 msgid ""
 "The alternative version I<--run-command> is the same, but it conveniently "
 "wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:580
 msgid ""
 "You can have multiple I<--run> and I<--run-command> options.  They run in "
 "the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:589
+#: ../builder/virt-builder.pod:583
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:591
+#: ../builder/virt-builder.pod:585
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:593
+#: ../builder/virt-builder.pod:587
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:599
+#: ../builder/virt-builder.pod:593
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:603
+#: ../builder/virt-builder.pod:597
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:607
+#: ../builder/virt-builder.pod:601
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:609
+#: ../builder/virt-builder.pod:603
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:605
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:613
+#: ../builder/virt-builder.pod:607
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:609
 msgid ""
 "Select the size of the output disk, where the size can be specified using "
 "common names such as C<32G> (32 gigabytes) etc."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:618
+#: ../builder/virt-builder.pod:612
 msgid ""
 "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:615
 msgid ""
 "If the size is not specified, then one of two things happens.  If the output "
 "is a file, then the size is the same as the template.  If the output is a "
@@ -3353,53 +3341,50 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:620
 msgid ""
 "To specify size in bytes, the number must be followed by the lowercase "
 "letter I<b>, eg: S<C<--size 10737418240b>>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:629 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:623 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr "B<--smp> N"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:625
 #, fuzzy
 #| msgid "Enable N E<ge> 2 virtual CPUs in the rescue appliance."
 msgid "Enable N E<ge> 2 virtual CPUs for I<--run> scripts to use."
 msgstr "レスキューアプライアンスにおいて N E<ge> 2 仮想 CPU を有効にします。"
 
 #. type: =item
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:627
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:629
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:637
-msgid ""
-"You can give this option multiple times to specify multiple sources.  If not "
-"specified it defaults to L<http://libguestfs.org/download/builder/index.asc>"
-msgstr ""
+#: ../builder/virt-builder.pod:631
+#, fuzzy
+#| msgid "You can give this option multiple times."
+msgid "You can give this option multiple times to specify multiple sources."
+msgstr "このオプションは複数回指定できます。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:641
-msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
-msgstr ""
+#: ../builder/virt-builder.pod:633
+#, fuzzy
+#| msgid "See also L</OPENING DISKS FOR READ AND WRITE> below."
+msgid "See also L</SOURCES OF TEMPLATES> below."
+msgstr "以下の L</OPENING DISKS FOR READ AND WRITE> 参照。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
-msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:645
+#: ../builder/virt-builder.pod:635
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the I<--no-"
@@ -3407,28 +3392,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:639
 #, fuzzy
 #| msgid "B<--timeout N>"
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timeout N>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:651
+#: ../builder/virt-builder.pod:641
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
 "like C<Europe/London>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:654
+#: ../builder/virt-builder.pod:644
 #, fuzzy
 #| msgid "B<--parts>"
 msgid "B<--update>"
 msgstr "B<--parts>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:656
+#: ../builder/virt-builder.pod:646
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
 "is required to update the packages already installed in the template to "
@@ -3436,19 +3421,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:660
+#: ../builder/virt-builder.pod:650
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--install>."
 msgstr "I<--long> 参照。"
 
 #. type: =item
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:652
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:664
+#: ../builder/virt-builder.pod:654
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -3456,14 +3441,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:658
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:661
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -3471,56 +3456,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:665
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:671
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:673
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:682
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:684
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:698
+#: ../builder/virt-builder.pod:688
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:700
+#: ../builder/virt-builder.pod:690
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:692
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:705
+#: ../builder/virt-builder.pod:695
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:707
+#: ../builder/virt-builder.pod:697
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use I<--"
@@ -3528,7 +3513,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:711
+#: ../builder/virt-builder.pod:701
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3536,23 +3521,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:703
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:716
+#: ../builder/virt-builder.pod:706
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:718
+#: ../builder/virt-builder.pod:708
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:720
+#: ../builder/virt-builder.pod:710
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -3560,7 +3545,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:712
 msgid ""
 "Most of the templates that ship with virt-builder come with a very minimal "
 "selection of packages (known as a \"JEOS\" or \"Just Enough Operating System"
@@ -3570,17 +3555,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:728
+#: ../builder/virt-builder.pod:718
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:720
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:722
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3588,13 +3573,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:724
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:737
+#: ../builder/virt-builder.pod:727
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails (eg. "
@@ -3602,12 +3587,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:732
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:744
+#: ../builder/virt-builder.pod:734
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -3615,14 +3600,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:739
 msgid ""
 "You can create the disk image using either L<genisoimage(1)> or L<virt-make-"
 "fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:752
+#: ../builder/virt-builder.pod:742
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -3630,14 +3615,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:744
 msgid ""
 "Create a script that mounts the ISO and sets up the repository.  For yum, "
 "create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:757 ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:747 ../builder/virt-builder.pod:761
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -3646,7 +3631,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:760
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3659,7 +3644,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:767
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3667,12 +3652,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:759
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:774
+#: ../builder/virt-builder.pod:764
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3681,14 +3666,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:777
+#: ../builder/virt-builder.pod:767
 msgid ""
 "Use the I<--attach> option to attach the CD / disk image and the I<--run> "
 "option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:780
+#: ../builder/virt-builder.pod:770
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3698,12 +3683,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:784
+#: ../builder/virt-builder.pod:774
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:786
+#: ../builder/virt-builder.pod:776
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -3711,12 +3696,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:792
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:794
+#: ../builder/virt-builder.pod:784
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -3724,103 +3709,103 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:789
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:801
+#: ../builder/virt-builder.pod:791
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:793 ../sysprep/sysprep-extra-options.pod:44
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:796
 msgid "B<--root-password> random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:798 ../sysprep/sysprep-extra-options.pod:51
 msgid ""
 "Choose a random password, which is printed on stdout.  The password has "
 "approximately 120 bits of randomness."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811 ../fish/guestfish-actions.pod:380
+#: ../builder/virt-builder.pod:801 ../fish/guestfish-actions.pod:380
 #: ../format/virt-format.pod:140 ../src/guestfs-actions.pod:473
 msgid "This is the default."
 msgstr "これがデフォルトです。"
 
 #. type: =item
-#: ../builder/virt-builder.pod:813 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:56
 msgid "B<--root-password> disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:815
+#: ../builder/virt-builder.pod:805
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:67
 msgid "B<--root-password> locked:file:FILENAME"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:810 ../sysprep/sysprep-extra-options.pod:69
 msgid "B<--root-password> locked:password:PASSWORD"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:822 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:812 ../sysprep/sysprep-extra-options.pod:71
 msgid "B<--root-password> locked:random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:824
+#: ../builder/virt-builder.pod:814
 msgid ""
 "The root account is locked, but a password is placed on the account.  If "
 "first unlocked (using C<passwd -u>) then logins will use the given password."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:81
 msgid "B<--root-password> locked"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:830 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:83
 msgid "B<--root-password> locked:disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:822
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:836
+#: ../builder/virt-builder.pod:826
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:828
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:831
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3829,7 +3814,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:844
+#: ../builder/virt-builder.pod:834
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -3837,12 +3822,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:848
+#: ../builder/virt-builder.pod:838
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:850
+#: ../builder/virt-builder.pod:840
 msgid ""
 "Because there are so many different ways to set the keyboard layout in Linux "
 "distributions, virt-builder does not yet attempt to have a simple command "
@@ -3851,17 +3836,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:855
+#: ../builder/virt-builder.pod:845
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:847
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:859
+#: ../builder/virt-builder.pod:849
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3870,19 +3855,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:862
+#: ../builder/virt-builder.pod:852
 msgid ""
 "See L<localectl(1)> and L<https://www.happyassassin.net/2013/11/23/keyboard-"
 "layouts-in-fedora-20-and-previously/> for more details."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:856
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:858
 msgid ""
 "For RHEL E<le> 6, Fedora E<le> 18 and similar, upload or modify the keyboard "
 "configuration file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3890,7 +3875,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:872
+#: ../builder/virt-builder.pod:862
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -3899,17 +3884,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:865
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:877
+#: ../builder/virt-builder.pod:867
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:879
+#: ../builder/virt-builder.pod:869
 msgid ""
 "For Debian-derived distros using C</etc/default/keyboard>, upload or modify "
 "the keyboard file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3917,7 +3902,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:883
+#: ../builder/virt-builder.pod:873
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3926,24 +3911,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:886
+#: ../builder/virt-builder.pod:876
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:878
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:880
 msgid ""
 "Most Linux distributions support multiple locale settings so that you can "
 "have guest messages printed in another language such as Russian."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:893
+#: ../builder/virt-builder.pod:883
 msgid ""
 "However there is no single setting which controls this, since extra packages "
 "may need to be installed to support console and X fonts, and keyboard input "
@@ -3952,17 +3937,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:899
+#: ../builder/virt-builder.pod:889
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:891
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:903
+#: ../builder/virt-builder.pod:893
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3979,12 +3964,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:904
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:906
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3992,7 +3977,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:920
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -4005,7 +3990,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:927
+#: ../builder/virt-builder.pod:917
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -4019,12 +4004,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:935
+#: ../builder/virt-builder.pod:925
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:937
+#: ../builder/virt-builder.pod:927
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, I<--run-"
 "command>, I<--install>, I<--update>, but I<not> firstboot) is logged in one "
@@ -4032,151 +4017,151 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:933
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:945
+#: ../builder/virt-builder.pod:935
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:937
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:949
+#: ../builder/virt-builder.pod:939
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:941
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:953
+#: ../builder/virt-builder.pod:943
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:947
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:950
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:952
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:968
+#: ../builder/virt-builder.pod:958
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:960
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:965
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:969
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "ファイルはディスクにおいて圧縮されます。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:973
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:978
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:982
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:996
+#: ../builder/virt-builder.pod:986
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:990
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1004
+#: ../builder/virt-builder.pod:994
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:998
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1012
+#: ../builder/virt-builder.pod:1002
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016
+#: ../builder/virt-builder.pod:1006
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:1010
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1014
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1018
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1022
 msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1036
+#: ../builder/virt-builder.pod:1026
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -4184,39 +4169,39 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1035
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1047
+#: ../builder/virt-builder.pod:1037
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1041
 msgid "SELinux relabelling is done (I<--selinux-relabel>)."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1045
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1047
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1059
+#: ../builder/virt-builder.pod:1049
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1052
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -4225,7 +4210,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1065 ../examples/guestfs-recipes.pod:261
+#: ../builder/virt-builder.pod:1055 ../examples/guestfs-recipes.pod:261
 #: ../fish/guestfish-actions.pod:2144 ../fish/guestfish-actions.pod:2694
 #: ../fish/guestfish-actions.pod:3290 ../src/guestfs-actions.pod:3418
 #: ../src/guestfs-actions.pod:4293 ../src/guestfs-actions.pod:5178
@@ -4234,14 +4219,14 @@ msgid "Notes:"
 msgstr "注:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1071
+#: ../builder/virt-builder.pod:1061
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1066
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -4251,17 +4236,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1074
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1076
 msgid "Import the image into Glance (the OpenStack image store) by doing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1078
 #, no-wrap
 msgid ""
 " glance image-create --name fedora-20-image --file fedora-20.img \\\n"
@@ -4271,7 +4256,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1092
+#: ../builder/virt-builder.pod:1082
 msgid ""
 "The I<--file> parameter is the virt-builder-generated disk image.  It should "
 "match virt-builder's I<--output> option.  The I<--disk-format> parameter "
@@ -4281,19 +4266,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1098
+#: ../builder/virt-builder.pod:1088
 msgid ""
 "You can use the S<C<glance image-show I<fedora-20-image>>> command to "
 "display the properties of the image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1091
 msgid "To boot up an instance of your image on a Nova compute node, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1093
 #, no-wrap
 msgid ""
 " nova boot fedora-20-server --image fedora-20-image \\\n"
@@ -4302,19 +4287,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1106
+#: ../builder/virt-builder.pod:1096
 msgid ""
 "Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
 "list>> to list running instances."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1099
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1111
+#: ../builder/virt-builder.pod:1101
 msgid ""
 "The qemu command line is not very stable or easy to use, hence libvirt "
 "should be used if possible.  However a command line similar to the following "
@@ -4322,7 +4307,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1115
+#: ../builder/virt-builder.pod:1105
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -4334,38 +4319,38 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1121
+#: ../builder/virt-builder.pod:1111
 msgid ""
 "As with libvirt, it is very important that the correct format is chosen.  It "
 "will be C<raw> unless the I<--format> option was used."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1114
 #, fuzzy
 #| msgid "CONFIGURATION FILES"
 msgid "CONFIGURATION MANAGEMENT"
 msgstr "設定ファイル"
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1126
+#: ../builder/virt-builder.pod:1116
 msgid "Puppet"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1128
+#: ../builder/virt-builder.pod:1118
 msgid ""
 "To enable the Puppet agent in a guest, install the package, point the "
 "configuration at your Puppetmaster, and ensure the agent runs at boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1132
+#: ../builder/virt-builder.pod:1122
 msgid "A typical virt-builder command would be:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1124
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -4380,26 +4365,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1143
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "The precise instructions vary according to the Linux distro.  For further "
 "information see: L<http://docs.puppetlabs.com/guides/installation.htm>"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1137
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1149
+#: ../builder/virt-builder.pod:1139
 msgid ""
 "If virt-builder itself fails, then enable debugging (I<-v>) and report a bug "
 "(see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1142
 msgid ""
 "If virt-builder fails because some script or package it is installing fails, "
 "try using I<--no-delete-on-failure> to preserve the output file, and "
@@ -4407,24 +4392,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1156
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:1151
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1153
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -4432,7 +4417,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1167
+#: ../builder/virt-builder.pod:1157
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -4441,17 +4426,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1173
+#: ../builder/virt-builder.pod:1163
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1175
+#: ../builder/virt-builder.pod:1165
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1177
+#: ../builder/virt-builder.pod:1167
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -4459,25 +4444,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1169
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1182
+#: ../builder/virt-builder.pod:1172
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1174
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1176
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -4487,12 +4472,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1180
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1192
+#: ../builder/virt-builder.pod:1182
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -4500,12 +4485,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1194
+#: ../builder/virt-builder.pod:1184
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1196
+#: ../builder/virt-builder.pod:1186
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -4515,7 +4500,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1192
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -4523,26 +4508,105 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1206
-msgid "CREATING YOUR OWN TEMPLATES"
+#: ../builder/virt-builder.pod:1196
+msgid "SOURCES OF TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1208
+#: ../builder/virt-builder.pod:1198
+msgid ""
+"virt-builder reads the available sources from configuration files, with the "
+"I<.conf> extension and located in the following paths:"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1205
+msgid ""
+"$XDG_CONFIG_HOME/virt-builder/repos.d/ (C<$XDG_CONFIG_HOME> is C<$HOME/."
+"config> if not set)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1210
+msgid ""
+"$XDG_CONFIG_DIRS/virt-builder/repos.d/ (where C<$XDG_CONFIG_DIRS> means any "
+"of the directories in that environment variable, or just C</etc/xdg> if not "
+"set)"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1216
+msgid ""
+"Each I<.conf> file in those paths has a simple text format like the "
+"following:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1219
+#, no-wrap
+msgid ""
+" [libguestfs.org]\n"
+" uri=http://libguestfs.org/download/builder/index.asc\n"
+" gpgkey=file:///etc/xdg/virt-builder/repos.d/libguestfs.gpg\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1223
+msgid ""
+"The part in square brackets is the repository identifier, which is used as "
+"unique identifier."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1226 ../builder/virt-builder.pod:1340
+msgid "The following fields can appear:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1230
+msgid "C<uri=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1232
+msgid "The URI of the index file which this repository refers to."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1234 ../builder/virt-builder.pod:1423
+msgid "This field is required."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1236
+msgid "C<gpgkey=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1238
+msgid ""
+"This optional field represents the URI (although only I<file://> URIs are "
+"accepted) of the key used to sign the index file.  If not present, the index "
+"file referred by I<uri=..> is not signed."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1244
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1211
+#: ../builder/virt-builder.pod:1247
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1213
+#: ../builder/virt-builder.pod:1249
 msgid ""
 "Out of the box, virt-builder downloads the file L<http://libguestfs.org/"
 "download/builder/index.asc> which is an index of available templates plus "
@@ -4551,7 +4615,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1219
+#: ../builder/virt-builder.pod:1255
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -4559,19 +4623,27 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1223
+#: ../builder/virt-builder.pod:1259
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1225
+#: ../builder/virt-builder.pod:1261
 msgid ""
 "You can set up your own site containing an index file and some templates, "
-"and then point virt-builder at the site by using the I<--source> option:"
+"and then point virt-builder at the site by creating a I<.conf> file pointing "
+"to it."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1265
+msgid ""
+"Note that if your index is signed, you will need to properly fill I<gpgkey=.."
+"> in your I<.conf> file, making sure to deploy also the GPG key file."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1269
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -4581,25 +4653,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
-msgid ""
-"(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
-"C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1273
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1239
+#: ../builder/virt-builder.pod:1276
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1241
+#: ../builder/virt-builder.pod:1278
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -4608,56 +4673,32 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1283
 msgid ""
 "To create a key, see the GPG manual L<http://www.gnupg.org/gph/en/manual."
 "html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1249
-msgid ""
-"Export your GPG public key and add it to the keyring of all virt-builder "
-"users:"
+#: ../builder/virt-builder.pod:1286
+msgid "Export your GPG public key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1252
+#: ../builder/virt-builder.pod:1288
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
 " \n"
 msgstr ""
 
-#. type: verbatim
-#: ../builder/virt-builder.pod:1254
-#, no-wrap
-msgid ""
-" # For each virt-builder user:\n"
-" gpg --import pubkey\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1257
-msgid "Also find the fingerprint of your key:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1259
-#, no-wrap
-msgid ""
-" gpg --list-keys --fingerprint\n"
-"\n"
-msgstr ""
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1290
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1263
+#: ../builder/virt-builder.pod:1292
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -4666,14 +4707,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1268
+#: ../builder/virt-builder.pod:1297
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1300
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -4681,19 +4722,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1302
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1304
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1307
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -4709,7 +4750,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1317
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -4726,21 +4767,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1328
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1331
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1334
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -4748,54 +4789,49 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1336
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
-"the server (and is the I<--source> URL).  As noted above, signing the index "
+"the server (and is the I<uri=..> URL).  As noted above, signing the index "
 "file is optional, but recommended."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:1311
-msgid "The following fields can appear:"
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:1315
+#: ../builder/virt-builder.pod:1344
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1317
+#: ../builder/virt-builder.pod:1346
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1320
+#: ../builder/virt-builder.pod:1349
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1351
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1325
+#: ../builder/virt-builder.pod:1354
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1327
+#: ../builder/virt-builder.pod:1356
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1329 ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1358 ../builder/virt-builder.pod:1369
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -4803,12 +4839,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1333
+#: ../builder/virt-builder.pod:1362
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1335
+#: ../builder/virt-builder.pod:1364
 #, fuzzy
 #| msgid ""
 #| "I<This function is deprecated.> In new code, use the L</e2fsck> call "
@@ -4819,19 +4855,19 @@ msgstr ""
 "てください。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1337
+#: ../builder/virt-builder.pod:1366
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1344
+#: ../builder/virt-builder.pod:1373
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1375
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4839,19 +4875,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1348
+#: ../builder/virt-builder.pod:1377
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1350
+#: ../builder/virt-builder.pod:1379
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1353
+#: ../builder/virt-builder.pod:1382
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4859,24 +4895,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1384
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1358
+#: ../builder/virt-builder.pod:1387
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1360
+#: ../builder/virt-builder.pod:1389
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1362
+#: ../builder/virt-builder.pod:1391
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -4885,12 +4921,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1367
+#: ../builder/virt-builder.pod:1396
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1369
+#: ../builder/virt-builder.pod:1398
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -4898,22 +4934,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1373
+#: ../builder/virt-builder.pod:1402
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1375
+#: ../builder/virt-builder.pod:1404
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1377
+#: ../builder/virt-builder.pod:1406
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1379
+#: ../builder/virt-builder.pod:1408
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -4921,7 +4957,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1383
+#: ../builder/virt-builder.pod:1412
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -4929,12 +4965,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1388
+#: ../builder/virt-builder.pod:1417
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1390
+#: ../builder/virt-builder.pod:1419
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -4942,36 +4978,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1394
-msgid "This field is required."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1396
+#: ../builder/virt-builder.pod:1425
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> option."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1400
+#: ../builder/virt-builder.pod:1429
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1431
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1405
+#: ../builder/virt-builder.pod:1434
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1436
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -4979,13 +5010,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1440
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1413
+#: ../builder/virt-builder.pod:1442
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -4993,12 +5024,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1417
+#: ../builder/virt-builder.pod:1446
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1419
+#: ../builder/virt-builder.pod:1448
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -5006,7 +5037,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -5014,32 +5045,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1427
+#: ../builder/virt-builder.pod:1456
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1429
+#: ../builder/virt-builder.pod:1458
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1433
+#: ../builder/virt-builder.pod:1462
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1435
+#: ../builder/virt-builder.pod:1464
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1438
+#: ../builder/virt-builder.pod:1467
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -5051,88 +5082,33 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1444
+#: ../builder/virt-builder.pod:1473
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1446
+#: ../builder/virt-builder.pod:1475
 msgid ""
 "Using the hidden flag prevents the template from being listed by the I<--"
 "list> option (but it is still installable).  This is used for test images."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1452
-msgid "Running virt-builder against the alternate repository"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1454
-msgid ""
-"Ensure each virt-builder user has imported your public key into their gpg "
-"keyring (see above)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1457
-msgid "Each virt-builder user should export these environment variables:"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1463
-msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1467
-msgid ""
-"C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
-"the user who signed the index file and the templates."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1472
-msgid "Now run virt-builder commands as normal, eg:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1474
-#, no-wrap
-msgid ""
-" virt-builder --list --long\n"
-"\n"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1476
-#, no-wrap
-msgid ""
-" virt-builder os-version\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1478
-msgid "To debug problems, add the C<-v> option to these commands."
-msgstr ""
-
-#. type: =head3
-#: ../builder/virt-builder.pod:1480
+#: ../builder/virt-builder.pod:1481
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1482
+#: ../builder/virt-builder.pod:1483
 msgid ""
-"It is possible to use multiple sources with virt-builder.  Use either "
-"multiple I<--source> and/or I<--fingerprint> options, or a comma-separated "
-"list in the C<VIRT_BUILDER_SOURCE> / C<VIRT_BUILDER_FINGERPRINT> environment "
-"variables:"
+"It is possible to use multiple sources with virt-builder.  The recommended "
+"way is to deploy I<.conf> files pointing to the index files. Another way is "
+"to specify the sources using multiple I<--source> and/or I<--fingerprint> "
+"options:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1487
+#: ../builder/virt-builder.pod:1488
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -5142,29 +5118,15 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1491
-msgid "or equivalently:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1493
-#, no-wrap
+#: ../builder/virt-builder.pod:1492
 msgid ""
-" export VIRT_BUILDER_SOURCE=http://example.com/s1/index.asc,http://example.com/s2/index.asc\n"
-" virt-builder [...]\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1496
-msgid ""
-"You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
+"You can provide N or 1 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
 "between each source and each fingerprint:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1496
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -5174,26 +5136,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1504
+#: ../builder/virt-builder.pod:1500
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1507
-msgid ""
-"In the case where you provide no fingerprints, the default fingerprint built "
-"into virt-builder is used for all sources."
+#: ../builder/virt-builder.pod:1503
+msgid "You C<must> provide at least 1 fingerprint."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1510
+#: ../builder/virt-builder.pod:1505
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1507
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -5201,12 +5161,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1517
+#: ../builder/virt-builder.pod:1512
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1519
+#: ../builder/virt-builder.pod:1514
 msgid ""
 "The index file format has a formal specification defined by the flex scanner "
 "and bison parser used to parse the file.  This can be found in the following "
@@ -5214,7 +5174,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1518
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -5223,86 +5183,86 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1526
+#: ../builder/virt-builder.pod:1521
 msgid ""
 "A tool called L<virt-index-validate(1)> is available to validate the index "
 "file to ensure it is correct."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1529
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "Note that the parser and tool can work on either the signed or unsigned "
 "index file (ie. C<index> or C<index.asc>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1532
+#: ../builder/virt-builder.pod:1527
 #, fuzzy
 #| msgid "The returned strings are transcoded to UTF-8."
 msgid "The index is always encoded in UTF-8."
 msgstr "返される文字列は UTF-8 に変換されます。"
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1534
+#: ../builder/virt-builder.pod:1529
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1536
+#: ../builder/virt-builder.pod:1531
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1538
+#: ../builder/virt-builder.pod:1533
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1541
+#: ../builder/virt-builder.pod:1536
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or C<$HOME/."
 "cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1544
+#: ../builder/virt-builder.pod:1539
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1549
+#: ../builder/virt-builder.pod:1544
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1553
+#: ../builder/virt-builder.pod:1548
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1557
+#: ../builder/virt-builder.pod:1552
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1554
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1562
+#: ../builder/virt-builder.pod:1557
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1559
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>, I<--"
@@ -5310,7 +5270,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1568
+#: ../builder/virt-builder.pod:1563
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -5318,12 +5278,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1572
+#: ../builder/virt-builder.pod:1567
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1574
+#: ../builder/virt-builder.pod:1569
 msgid ""
 "To increase both speed and reliability of installing packages, you can set "
 "up a local mirror of the target distribution, and point the guest package "
@@ -5331,7 +5291,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1573
 msgid ""
 "Because of the order in which each phase of installation happens, you cannot "
 "use I<--write> (to point the package manager at a repo)  followed by I<--"
@@ -5341,17 +5301,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1580
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1582
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1584
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5369,12 +5329,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1601
+#: ../builder/virt-builder.pod:1596
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1603
+#: ../builder/virt-builder.pod:1598
 msgid ""
 "Assuming that you are using C<apt-proxy> to mirror the repository, you "
 "should create a new C<sources.list> file to point to your proxy (see "
@@ -5382,7 +5342,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1607
+#: ../builder/virt-builder.pod:1602
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5393,33 +5353,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1612
+#: ../builder/virt-builder.pod:1607
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1614
+#: ../builder/virt-builder.pod:1609
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1617
+#: ../builder/virt-builder.pod:1612
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1619
+#: ../builder/virt-builder.pod:1614
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
-"the signer's fingerprint matches the specified fingerprint (ie. I<--"
-"fingerprint>, C<VIRT_BUILDER_FINGERPRINT>, or a built-in fingerprint, in "
-"that order)."
+"the signer's fingerprint matches the specified fingerprint (ie. the one "
+"specified in I<gpgkey=..> in the I<.conf>, or with I<--fingerprint>, in that "
+"order)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1619
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -5427,13 +5387,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1623
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1631
+#: ../builder/virt-builder.pod:1626
 msgid ""
 "Although the signatures are optional, if you don't have them then virt-"
 "builder users will have to use I<--no-check-signature> on the command line.  "
@@ -5444,19 +5404,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1638 ../src/guestfs.pod:3367
+#: ../builder/virt-builder.pod:1633 ../src/guestfs.pod:3367
 msgid "ARCHITECTURE"
 msgstr "アーキテクチャー"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1635
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1638
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -5465,27 +5425,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1648
+#: ../builder/virt-builder.pod:1643
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1651 ../src/guestfs.pod:1913
+#: ../builder/virt-builder.pod:1646 ../src/guestfs.pod:1913
 #: ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1653
+#: ../builder/virt-builder.pod:1648
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1656
+#: ../builder/virt-builder.pod:1651
 msgid ""
 "I<--install>, I<--update>, I<--run> and I<--run-command> are implemented "
 "using an appliance (a small virtual machine) so these commands do not run on "
@@ -5495,7 +5455,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1662
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -5504,14 +5464,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1667
+#: ../builder/virt-builder.pod:1662
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1665
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -5519,19 +5479,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1669
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1676
+#: ../builder/virt-builder.pod:1671
 #, fuzzy
 #| msgid "VIRT-CLONE"
 msgid "CLONES"
 msgstr "virt-clone"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1678
+#: ../builder/virt-builder.pod:1673
 msgid ""
 "If you wish to create many new guests of the same type, it is tempting to "
 "run virt-builder once and then copy the output file.  You should B<not> do "
@@ -5539,7 +5499,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1678
 msgid ""
 "The reason is that each clone needs to have (at least) a separate random "
 "seed, and possibly other unique features (such as filesystem UUIDs) in "
@@ -5547,7 +5507,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1687
+#: ../builder/virt-builder.pod:1682
 msgid ""
 "Another thing you should I<not> do is to boot the guest, then clone the "
 "booted disk image.  The reason is that some guests create unique machine "
@@ -5556,19 +5516,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1692
+#: ../builder/virt-builder.pod:1687
 #, fuzzy
 #| msgid "See also L<virt-win-reg(1)>."
 msgid "See also: L<virt-sysprep(1)>."
 msgstr "L<virt-win-reg(1)> 参照。"
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694
+#: ../builder/virt-builder.pod:1689
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The most important aspect of getting good performance is caching.  Templates "
 "gets downloaded into the cache the first time they are used, or if you use "
@@ -5577,7 +5537,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1701
+#: ../builder/virt-builder.pod:1696
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5588,53 +5548,53 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1709
+#: ../builder/virt-builder.pod:1704
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1711
+#: ../builder/virt-builder.pod:1706
 msgid ""
 "Use I<--no-sync>.  However read the caveats in the L</OPTIONS> section "
 "above, since this can cause disk corruption if not used correctly."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1714
+#: ../builder/virt-builder.pod:1709
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1716
+#: ../builder/virt-builder.pod:1711
 msgid ""
 "Virt-builder can skip the virt-resize step under certain conditions.  This "
 "makes virt-builder much faster.  The conditions are:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1723
+#: ../builder/virt-builder.pod:1718
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1727
+#: ../builder/virt-builder.pod:1722
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1731
+#: ../builder/virt-builder.pod:1726
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1735
+#: ../builder/virt-builder.pod:1730
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1737
+#: ../builder/virt-builder.pod:1732
 msgid ""
 "Virt-builder uses an internal implementation of pxzcat (parallel xzcat) if "
 "liblzma was found at build time.  If liblzma was not found at build time, "
@@ -5642,14 +5602,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1741
+#: ../builder/virt-builder.pod:1736
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1743
+#: ../builder/virt-builder.pod:1738
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -5657,80 +5617,80 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1747
+#: ../builder/virt-builder.pod:1742
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1750
+#: ../builder/virt-builder.pod:1745
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1753
+#: ../builder/virt-builder.pod:1748
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1756 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1751 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1758
+#: ../builder/virt-builder.pod:1753
 msgid ""
 "Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
 "require that each file has a correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1761
+#: ../builder/virt-builder.pod:1756
 msgid ""
 "Virt-builder does not know how to give new files a label, so there are two "
 "possible strategies it can use to ensure correct labelling:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1766
+#: ../builder/virt-builder.pod:1761
 #, fuzzy
 #| msgid "B<--selinux-relabel>"
 msgid "Using I<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1768
+#: ../builder/virt-builder.pod:1763
 msgid ""
 "This runs L<fixfiles(8)> just before finalizing the guest, which sets "
 "SELinux labels correctly in the disk image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1771
+#: ../builder/virt-builder.pod:1766
 msgid ""
 "Sometimes fixfiles is not possible during installation, in which case this "
 "option falls back on:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1774
+#: ../builder/virt-builder.pod:1769
 msgid "Touching C</.autorelabel>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1776
+#: ../builder/virt-builder.pod:1771
 msgid ""
 "Guest templates may already contain a file called C</.autorelabel>, or it is "
 "touched if I<--selinux-relabel> cannot run fixfiles."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1779
+#: ../builder/virt-builder.pod:1774
 msgid ""
 "For guests that use SELinux, this causes fixfiles to run at first boot.  "
 "Guests will reboot themselves once the first time you use them, which is "
@@ -5738,75 +5698,82 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1787
+#: ../builder/virt-builder.pod:1782
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1792
+#: ../builder/virt-builder.pod:1787
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1794
+#: ../builder/virt-builder.pod:1789
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1796
+#: ../builder/virt-builder.pod:1791
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1798
+#: ../builder/virt-builder.pod:1793
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1801
+#: ../builder/virt-builder.pod:1796
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1803 ../builder/virt-builder.pod:1817
+#: ../builder/virt-builder.pod:1798
+msgid ""
+"Used to determine the location of the template cache, and the location of "
+"the user' sources.  See L</CACHING> and L</SOURCES OF TEMPLATES>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1801
+msgid "C<XDG_CACHE_HOME>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1803
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1805
-msgid "C<VIRT_BUILDER_FINGERPRINT>"
+msgid "C<XDG_CONFIG_HOME>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1807
 msgid ""
-"Set the default value for the GPG signature fingerprint or comma-separated "
-"list of fingerprints (see I<--fingerprint> option)."
+"Used to determine the location of the user' sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1810
-msgid "C<VIRT_BUILDER_SOURCE>"
+msgid "C<XDG_CONFIG_DIRS>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1812
 msgid ""
-"Set the default value for the source URL (or comma-separated list of URLs) "
-"for the template repository (see I<--source> option)."
-msgstr ""
-
-#. type: =item
-#: ../builder/virt-builder.pod:1815
-msgid "C<XDG_CACHE_HOME>"
+"Used to determine the location of the system sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1823 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1819 ../cat/virt-cat.pod:246
 #: ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:488
 #: ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../diff/virt-diff.pod:250
 #: ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:407
@@ -5817,7 +5784,7 @@ msgid ""
 msgstr "このプログラムは、成功すると 0 を、エラーがあると 0 以外を返します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1828
+#: ../builder/virt-builder.pod:1824
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5835,7 +5802,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1850 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1846 ../builder/virt-index-validate.pod:92
 #: ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "Copyright (C) 2013 Red Hat Inc."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index aa6d0679f..a4af20d02 100644
--- a/po-docs/libguestfs-docs.pot
+++ b/po-docs/libguestfs-docs.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.25.38\n"
+"Project-Id-Version: libguestfs 1.25.39\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -426,7 +426,7 @@ msgid "B<-q>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:553 ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:225
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:547 ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:225
 msgid "B<--quiet>"
 msgstr ""
 
@@ -458,12 +458,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:677 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:421 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:354 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579 ../sparsify/virt-sparsify.pod:226 ../sysprep/virt-sysprep.pod:231
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:667 ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267 ../cat/virt-ls.pod:421 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185 ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:169 ../fish/guestfish.pod:421 ../format/virt-format.pod:155 ../fuse/guestmount.pod:354 ../inspector/virt-inspector.pod:118 ../make-fs/virt-make-fs.pod:199 ../rescue/virt-rescue.pod:240 ../resize/virt-resize.pod:579 ../sparsify/virt-sparsify.pod:226 ../sysprep/virt-sysprep.pod:231
 msgid "B<-v>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:679 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:423 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423 ../format/virt-format.pod:157 ../fuse/guestmount.pod:356 ../inspector/virt-inspector.pod:120 ../make-fs/virt-make-fs.pod:201 ../rescue/virt-rescue.pod:242 ../resize/virt-resize.pod:581 ../sparsify/virt-sparsify.pod:228 ../sysprep/virt-sysprep.pod:233
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:669 ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269 ../cat/virt-ls.pod:423 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187 ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:171 ../fish/guestfish.pod:423 ../format/virt-format.pod:157 ../fuse/guestmount.pod:356 ../inspector/virt-inspector.pod:120 ../make-fs/virt-make-fs.pod:201 ../rescue/virt-rescue.pod:242 ../resize/virt-resize.pod:581 ../sparsify/virt-sparsify.pod:228 ../sysprep/virt-sysprep.pod:233
 msgid "B<--verbose>"
 msgstr ""
 
@@ -473,17 +473,17 @@ msgid "Enable verbose messages for debugging."
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:686 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:427 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:360 ../fuse/guestunmount.pod:107 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:205 ../rescue/virt-rescue.pod:246 ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:232 ../sysprep/virt-sysprep.pod:237 ../test-tool/libguestfs-test-tool.pod:61
+#: ../align/virt-alignment-scan.pod:201 ../appliance/libguestfs-make-fixed-appliance.pod:107 ../builder/virt-builder.pod:676 ../builder/virt-index-validate.pod:68 ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273 ../cat/virt-ls.pod:427 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208 ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428 ../format/virt-format.pod:161 ../fuse/guestmount.pod:360 ../fuse/guestunmount.pod:107 ../inspector/virt-inspector.pod:124 ../make-fs/virt-make-fs.pod:205 ../rescue/virt-rescue.pod:246 ../resize/virt-resize.pod:585 ../sparsify/virt-sparsify.pod:232 ../sysprep/virt-sysprep.pod:237 ../test-tool/libguestfs-test-tool.pod:61
 msgid "B<-V>"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:203 ../appliance/libguestfs-make-fixed-appliance.pod:109 ../builder/virt-builder.pod:688 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:429 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430 ../format/virt-format.pod:163 ../fuse/guestmount.pod:362 ../fuse/guestunmount.pod:109 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:234 ../sysprep/virt-sysprep.pod:239 ../test-tool/libguestfs-test-tool.pod:63 ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71 ../tools/virt-tar:118 ../tools/virt-win-reg:111
+#: ../align/virt-alignment-scan.pod:203 ../appliance/libguestfs-make-fixed-appliance.pod:109 ../builder/virt-builder.pod:678 ../builder/virt-index-validate.pod:70 ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275 ../cat/virt-ls.pod:429 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210 ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430 ../format/virt-format.pod:163 ../fuse/guestmount.pod:362 ../fuse/guestunmount.pod:109 ../inspector/virt-inspector.pod:126 ../make-fs/virt-make-fs.pod:207 ../rescue/virt-rescue.pod:248 ../resize/virt-resize.pod:587 ../sparsify/virt-sparsify.pod:234 ../sysprep/virt-sysprep.pod:239 ../test-tool/libguestfs-test-tool.pod:63 ../tools/virt-list-filesystems:70 ../tools/virt-list-partitions:71 ../tools/virt-tar:118 ../tools/virt-win-reg:111
 msgid "B<--version>"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:690 ../builder/virt-index-validate.pod:72 ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:431 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:179 ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:250 ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:236 ../sysprep/virt-sysprep.pod:241 ../tools/virt-list-filesystems:72 ../tools/virt-list-partitions:73 ../tools/virt-tar:120 ../tools/virt-win-reg:113
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:680 ../builder/virt-index-validate.pod:72 ../cat/virt-cat.pod:150 ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:431 ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:179 ../format/virt-format.pod:165 ../inspector/virt-inspector.pod:128 ../make-fs/virt-make-fs.pod:209 ../rescue/virt-rescue.pod:250 ../resize/virt-resize.pod:589 ../sparsify/virt-sparsify.pod:236 ../sysprep/virt-sysprep.pod:241 ../tools/virt-list-filesystems:72 ../tools/virt-list-partitions:73 ../tools/virt-tar:120 ../tools/virt-win-reg:113
 msgid "Display version number and exit."
 msgstr ""
 
@@ -778,7 +778,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1821 ../builder/virt-index-validate.pod:76 ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:486 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:357 ../fish/guestfish.pod:1382 ../format/virt-format.pod:183 ../fuse/guestmount.pod:405 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307 ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:172
+#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1817 ../builder/virt-index-validate.pod:76 ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390 ../cat/virt-ls.pod:486 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260 ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:357 ../fish/guestfish.pod:1382 ../format/virt-format.pod:183 ../fuse/guestmount.pod:405 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307 ../sysprep/virt-sysprep.pod:548 ../test-tool/libguestfs-test-tool.pod:172
 msgid "EXIT STATUS"
 msgstr ""
 
@@ -788,7 +788,7 @@ msgid "This program returns:"
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:365 ../align/virt-alignment-scan.pod:371 ../align/virt-alignment-scan.pod:377 ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:24 ../appliance/libguestfs-make-fixed-appliance.pod:30 ../appliance/libguestfs-make-fixed-appliance.pod:36 ../appliance/libguestfs-make-fixed-appliance.pod:54 ../appliance/libguestfs-make-fixed-appliance.pod:75 ../builder/virt-builder.pod:597 ../builder/virt-builder.pod:601 ../builder/virt-builder.pod:966 ../builder/virt-builder.pod:973 ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981 ../builder/virt-builder.pod:986 ../builder/virt-builder.pod:990 ../builder/virt-builder.pod:994 ../builder/virt-builder.pod:998 ../builder/virt-builder.pod:1002 ../builder/virt-builder.pod:1006 ../builder/virt-builder.pod:1010 ../builder/virt-builder.pod:1014 ../builder/virt-builder.pod:1018 ../builder/virt-builder.pod:1022 ../builder/virt-builder.pod:1026 ../builder/virt-builder.pod:1030 ../builder/virt-builder.pod:1034 ../builder/virt-builder.pod:1043 ../builder/virt-builder.pod:1049 ../builder/virt-builder.pod:1461 ../builder/virt-builder.pod:1465 ../builder/virt-builder.pod:1721 ../builder/virt-builder.pod:1725 ../builder/virt-builder.pod:1729 ../builder/virt-index-validate.pod:34 ../builder/virt-index-validate.pod:39 ../builder/virt-index-validate.pod:53 ../builder/virt-index-validate.pod:58 ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193 ../cat/virt-cat.pod:204 ../cat/virt-cat.pod:208 ../edit/virt-edit.pod:274 ../edit/virt-edit.pod:279 ../edit/virt-edit.pod:284 ../edit/virt-edit.pod:295 ../edit/virt-edit.pod:299 ../examples/guestfs-faq.pod:188 ../examples/guestfs-faq.pod:194 ../examples/guestfs-faq.pod:198 ../examples/guestfs-faq.pod:203 ../examples/guestfs-faq.pod:806 ../examples/guestfs-faq.pod:812 ../examples/guestfs-faq.pod:851 ../examples/guestfs-faq.pod:857 ../examples/guestfs-faq.pod:922 ../examples/guestfs-faq.pod:926 ../examples/guestfs-faq.pod:930 ../examples/guestfs-faq.pod:934 ../examples/guestfs-faq.pod:942 ../examples/guestfs-faq.pod:947 ../examples/guestfs-performance.pod:107 ../examples/guestfs-performance.pod:113 ../examples/guestfs-performance.pod:118 ../examples/guestfs-performance.pod:245 ../examples/guestfs-performance.pod:250 ../examples/guestfs-performance.pod:255 ../examples/guestfs-performance.pod:374 ../examples/guestfs-performance.pod:378 ../examples/guestfs-performance.pod:384 ../examples/guestfs-performance.pod:390 ../examples/guestfs-recipes.pod:231 ../examples/guestfs-recipes.pod:235 ../examples/guestfs-recipes.pod:239 ../examples/guestfs-recipes.pod:265 ../examples/guestfs-recipes.pod:270 ../examples/guestfs-recipes.pod:377 ../examples/guestfs-recipes.pod:381 ../examples/guestfs-recipes.pod:385 ../examples/guestfs-recipes.pod:389 ../examples/guestfs-recipes.pod:393 ../examples/guestfs-testing.pod:69 ../examples/guestfs-testing.pod:76 ../examples/guestfs-testing.pod:87 ../examples/guestfs-testing.pod:96 ../examples/guestfs-testing.pod:205 ../examples/guestfs-testing.pod:209 ../examples/guestfs-testing.pod:213 ../fish/guestfish-actions.pod:684 ../fish/guestfish-actions.pod:690 ../fish/guestfish-actions.pod:698 ../fish/guestfish-actions.pod:705 ../fish/guestfish-actions.pod:712 ../fish/guestfish-actions.pod:1937 ../fish/guestfish-actions.pod:1941 ../fish/guestfish-actions.pod:1945 ../fish/guestfish-actions.pod:1949 ../fish/guestfish-actions.pod:1957 ../fish/guestfish-actions.pod:1961 ../fish/guestfish-actions.pod:1965 ../fish/guestfish-actions.pod:1975 ../fish/guestfish-actions.pod:1979 ../fish/guestfish-actions.pod:1983 ../fish/guestfish-actions.pod:2097 ../fish/guestfish-actions.pod:2101 ../fish/guestfish-actions.pod:2106 ../fish/guestfish-actions.pod:2148 ../fish/guestfish-actions.pod:2152 ../fish/guestfish-actions.pod:2157 ../fish/guestfish-actions.pod:2698 ../fish/guestfish-actions.pod:2705 ../fish/guestfish-actions.pod:2712 ../fish/guestfish-actions.pod:3294 ../fish/guestfish-actions.pod:3300 ../fish/guestfish-actions.pod:3308 ../fish/guestfish-actions.pod:3315 ../fish/guestfish-actions.pod:3322 ../fish/guestfish.pod:476 ../fish/guestfish.pod:480 ../fish/guestfish.pod:484 ../fish/guestfish.pod:488 ../fish/guestfish.pod:1332 ../fish/guestfish.pod:1338 ../fish/libguestfs-tools.conf.pod:24 ../fish/libguestfs-tools.conf.pod:28 ../fish/libguestfs-tools.conf.pod:32 ../fish/libguestfs-tools.conf.pod:62 ../fish/libguestfs-tools.conf.pod:67 ../fish/libguestfs-tools.conf.pod:71 ../fish/libguestfs-tools.conf.pod:77 ../golang/examples/guestfs-golang.pod:60 ../golang/examples/guestfs-golang.pod:64 ../guestfs-release-notes.pod:342 ../guestfs-release-notes.pod:346 ../guestfs-release-notes.pod:350 ../guestfs-release-notes.pod:354 ../guestfs-release-notes.pod:358 ../guestfs-release-notes.pod:362 ../guestfs-release-notes.pod:366 ../guestfs-release-notes.pod:371 ../guestfs-release-notes.pod:375 ../guestfs-release-notes.pod:700 ../guestfs-release-notes.pod:704 ../guestfs-release-notes.pod:708 ../guestfs-release-notes.pod:770 ../guestfs-release-notes.pod:774 ../guestfs-release-notes.pod:778 ../guestfs-release-notes.pod:782 ../guestfs-release-notes.pod:786 ../guestfs-release-notes.pod:790 ../guestfs-release-notes.pod:795 ../guestfs-release-notes.pod:799 ../guestfs-release-notes.pod:803 ../guestfs-release-notes.pod:807 ../guestfs-release-notes.pod:1003 ../guestfs-release-notes.pod:1008 ../guestfs-release-notes.pod:1013 ../inspector/virt-inspector.pod:514 ../inspector/virt-inspector.pod:518 ../resize/virt-resize.pod:373 ../resize/virt-resize.pod:377 ../resize/virt-resize.pod:386 ../resize/virt-resize.pod:392 ../sparsify/virt-sparsify.pod:46 ../sparsify/virt-sparsify.pod:53 ../sparsify/virt-sparsify.pod:57 ../sparsify/virt-sparsify.pod:63 ../sparsify/virt-sparsify.pod:68 ../sparsify/virt-sparsify.pod:73 ../sparsify/virt-sparsify.pod:131 ../sparsify/virt-sparsify.pod:135 ../sparsify/virt-sparsify.pod:139 ../sparsify/virt-sparsify.pod:144 ../src/guestfs-actions.pod:965 ../src/guestfs-actions.pod:971 ../src/guestfs-actions.pod:979 ../src/guestfs-actions.pod:986 ../src/guestfs-actions.pod:993 ../src/guestfs-actions.pod:3131 ../src/guestfs-actions.pod:3135 ../src/guestfs-actions.pod:3139 ../src/guestfs-actions.pod:3143 ../src/guestfs-actions.pod:3151 ../src/guestfs-actions.pod:3155 ../src/guestfs-actions.pod:3159 ../src/guestfs-actions.pod:3169 ../src/guestfs-actions.pod:3173 ../src/guestfs-actions.pod:3177 ../src/guestfs-actions.pod:3352 ../src/guestfs-actions.pod:3356 ../src/guestfs-actions.pod:3361 ../src/guestfs-actions.pod:3422 ../src/guestfs-actions.pod:3426 ../src/guestfs-actions.pod:3431 ../src/guestfs-actions.pod:4297 ../src/guestfs-actions.pod:4304 ../src/guestfs-actions.pod:4311 ../src/guestfs-actions.pod:5182 ../src/guestfs-actions.pod:5188 ../src/guestfs-actions.pod:5196 ../src/guestfs-actions.pod:5203 ../src/guestfs-actions.pod:5210 ../src/guestfs.pod:398 ../src/guestfs.pod:403 ../src/guestfs.pod:408 ../src/guestfs.pod:412 ../src/guestfs.pod:417 ../src/guestfs.pod:421 ../src/guestfs.pod:426 ../src/guestfs.pod:431 ../src/guestfs.pod:782 ../src/guestfs.pod:789 ../src/guestfs.pod:795 ../src/guestfs.pod:801 ../src/guestfs.pod:807 ../src/guestfs.pod:812 ../src/guestfs.pod:818 ../src/guestfs.pod:1046 ../src/guestfs.pod:1050 ../src/guestfs.pod:1056 ../src/guestfs.pod:1139 ../src/guestfs.pod:1144 ../src/guestfs.pod:1148 ../src/guestfs.pod:1154 ../src/guestfs.pod:1158 ../src/guestfs.pod:1162 ../src/guestfs.pod:1167 ../src/guestfs.pod:1712 ../src/guestfs.pod:1716 ../src/guestfs.pod:1720 ../src/guestfs.pod:1725 ../src/guestfs.pod:1733 ../src/guestfs.pod:1752 ../src/guestfs.pod:1760 ../src/guestfs.pod:1777 ../src/guestfs.pod:1782 ../src/guestfs.pod:1786 ../src/guestfs.pod:1975 ../src/guestfs.pod:1979 ../src/guestfs.pod:1983 ../src/guestfs.pod:1987 ../src/guestfs.pod:1991 ../src/guestfs.pod:1995 ../src/guestfs.pod:2651 ../src/guestfs.pod:2656 ../src/guestfs.pod:2660 ../src/guestfs.pod:2764 ../src/guestfs.pod:2769 ../src/guestfs.pod:2773 ../src/guestfs.pod:2783 ../src/guestfs.pod:3214 ../src/guestfs.pod:3219 ../src/guestfs.pod:3225 ../src/guestfs.pod:3233 ../src/guestfs.pod:3750 ../src/guestfs.pod:3756 ../src/guestfs.pod:3761 ../src/guestfs.pod:3767 ../src/guestfs.pod:4162 ../src/guestfs.pod:4166 ../src/guestfs.pod:4170 ../src/guestfs.pod:4174 ../src/guestfs.pod:4178 ../src/guestfs.pod:4182 ../src/guestfs.pod:4186 ../src/guestfs.pod:4433 ../src/guestfs.pod:4438 ../src/guestfs.pod:4442 ../src/guestfs.pod:4446 ../src/guestfs.pod:4450 ../src/guestfs.pod:4464 ../src/guestfs.pod:4468 ../src/guestfs.pod:4473 ../src/guestfs.pod:4477 ../sysprep/virt-sysprep.pod:297 ../sysprep/virt-sysprep.pod:301 ../sysprep/virt-sysprep.pod:305 ../sysprep/virt-sysprep.pod:309 ../sysprep/virt-sysprep.pod:324 ../sysprep/virt-sysprep.pod:328 ../sysprep/virt-sysprep.pod:332 ../sysprep/virt-sysprep.pod:336 ../sysprep/virt-sysprep.pod:340 ../sysprep/virt-sysprep.pod:393 ../sysprep/virt-sysprep.pod:405 ../sysprep/virt-sysprep.pod:409 ../sysprep/virt-sysprep.pod:417 ../sysprep/virt-sysprep.pod:423 ../tools/virt-win-reg:196 ../tools/virt-win-reg:201 ../tools/virt-win-reg:207 ../tools/virt-win-reg:756 ../tools/virt-win-reg:762 ../tools/virt-win-reg:768
+#: ../align/virt-alignment-scan.pod:365 ../align/virt-alignment-scan.pod:371 ../align/virt-alignment-scan.pod:377 ../align/virt-alignment-scan.pod:384 ../appliance/libguestfs-make-fixed-appliance.pod:24 ../appliance/libguestfs-make-fixed-appliance.pod:30 ../appliance/libguestfs-make-fixed-appliance.pod:36 ../appliance/libguestfs-make-fixed-appliance.pod:54 ../appliance/libguestfs-make-fixed-appliance.pod:75 ../builder/virt-builder.pod:591 ../builder/virt-builder.pod:595 ../builder/virt-builder.pod:956 ../builder/virt-builder.pod:963 ../builder/virt-builder.pod:967 ../builder/virt-builder.pod:971 ../builder/virt-builder.pod:976 ../builder/virt-builder.pod:980 ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:988 ../builder/virt-builder.pod:992 ../builder/virt-builder.pod:996 ../builder/virt-builder.pod:1000 ../builder/virt-builder.pod:1004 ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1012 ../builder/virt-builder.pod:1016 ../builder/virt-builder.pod:1020 ../builder/virt-builder.pod:1024 ../builder/virt-builder.pod:1033 ../builder/virt-builder.pod:1039 ../builder/virt-builder.pod:1203 ../builder/virt-builder.pod:1208 ../builder/virt-builder.pod:1716 ../builder/virt-builder.pod:1720 ../builder/virt-builder.pod:1724 ../builder/virt-index-validate.pod:34 ../builder/virt-index-validate.pod:39 ../builder/virt-index-validate.pod:53 ../builder/virt-index-validate.pod:58 ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193 ../cat/virt-cat.pod:204 ../cat/virt-cat.pod:208 ../edit/virt-edit.pod:274 ../edit/virt-edit.pod:279 ../edit/virt-edit.pod:284 ../edit/virt-edit.pod:295 ../edit/virt-edit.pod:299 ../examples/guestfs-faq.pod:188 ../examples/guestfs-faq.pod:194 ../examples/guestfs-faq.pod:198 ../examples/guestfs-faq.pod:203 ../examples/guestfs-faq.pod:806 ../examples/guestfs-faq.pod:812 ../examples/guestfs-faq.pod:851 ../examples/guestfs-faq.pod:857 ../examples/guestfs-faq.pod:922 ../examples/guestfs-faq.pod:926 ../examples/guestfs-faq.pod:930 ../examples/guestfs-faq.pod:934 ../examples/guestfs-faq.pod:942 ../examples/guestfs-faq.pod:947 ../examples/guestfs-performance.pod:107 ../examples/guestfs-performance.pod:113 ../examples/guestfs-performance.pod:118 ../examples/guestfs-performance.pod:245 ../examples/guestfs-performance.pod:250 ../examples/guestfs-performance.pod:255 ../examples/guestfs-performance.pod:374 ../examples/guestfs-performance.pod:378 ../examples/guestfs-performance.pod:384 ../examples/guestfs-performance.pod:390 ../examples/guestfs-recipes.pod:231 ../examples/guestfs-recipes.pod:235 ../examples/guestfs-recipes.pod:239 ../examples/guestfs-recipes.pod:265 ../examples/guestfs-recipes.pod:270 ../examples/guestfs-recipes.pod:377 ../examples/guestfs-recipes.pod:381 ../examples/guestfs-recipes.pod:385 ../examples/guestfs-recipes.pod:389 ../examples/guestfs-recipes.pod:393 ../examples/guestfs-testing.pod:69 ../examples/guestfs-testing.pod:76 ../examples/guestfs-testing.pod:87 ../examples/guestfs-testing.pod:96 ../examples/guestfs-testing.pod:205 ../examples/guestfs-testing.pod:209 ../examples/guestfs-testing.pod:213 ../fish/guestfish-actions.pod:684 ../fish/guestfish-actions.pod:690 ../fish/guestfish-actions.pod:698 ../fish/guestfish-actions.pod:705 ../fish/guestfish-actions.pod:712 ../fish/guestfish-actions.pod:1937 ../fish/guestfish-actions.pod:1941 ../fish/guestfish-actions.pod:1945 ../fish/guestfish-actions.pod:1949 ../fish/guestfish-actions.pod:1957 ../fish/guestfish-actions.pod:1961 ../fish/guestfish-actions.pod:1965 ../fish/guestfish-actions.pod:1975 ../fish/guestfish-actions.pod:1979 ../fish/guestfish-actions.pod:1983 ../fish/guestfish-actions.pod:2097 ../fish/guestfish-actions.pod:2101 ../fish/guestfish-actions.pod:2106 ../fish/guestfish-actions.pod:2148 ../fish/guestfish-actions.pod:2152 ../fish/guestfish-actions.pod:2157 ../fish/guestfish-actions.pod:2698 ../fish/guestfish-actions.pod:2705 ../fish/guestfish-actions.pod:2712 ../fish/guestfish-actions.pod:3294 ../fish/guestfish-actions.pod:3300 ../fish/guestfish-actions.pod:3308 ../fish/guestfish-actions.pod:3315 ../fish/guestfish-actions.pod:3322 ../fish/guestfish.pod:476 ../fish/guestfish.pod:480 ../fish/guestfish.pod:484 ../fish/guestfish.pod:488 ../fish/guestfish.pod:1332 ../fish/guestfish.pod:1338 ../fish/libguestfs-tools.conf.pod:24 ../fish/libguestfs-tools.conf.pod:28 ../fish/libguestfs-tools.conf.pod:32 ../fish/libguestfs-tools.conf.pod:62 ../fish/libguestfs-tools.conf.pod:67 ../fish/libguestfs-tools.conf.pod:71 ../fish/libguestfs-tools.conf.pod:77 ../golang/examples/guestfs-golang.pod:60 ../golang/examples/guestfs-golang.pod:64 ../guestfs-release-notes.pod:342 ../guestfs-release-notes.pod:346 ../guestfs-release-notes.pod:350 ../guestfs-release-notes.pod:354 ../guestfs-release-notes.pod:358 ../guestfs-release-notes.pod:362 ../guestfs-release-notes.pod:366 ../guestfs-release-notes.pod:371 ../guestfs-release-notes.pod:375 ../guestfs-release-notes.pod:700 ../guestfs-release-notes.pod:704 ../guestfs-release-notes.pod:708 ../guestfs-release-notes.pod:770 ../guestfs-release-notes.pod:774 ../guestfs-release-notes.pod:778 ../guestfs-release-notes.pod:782 ../guestfs-release-notes.pod:786 ../guestfs-release-notes.pod:790 ../guestfs-release-notes.pod:795 ../guestfs-release-notes.pod:799 ../guestfs-release-notes.pod:803 ../guestfs-release-notes.pod:807 ../guestfs-release-notes.pod:1003 ../guestfs-release-notes.pod:1008 ../guestfs-release-notes.pod:1013 ../inspector/virt-inspector.pod:514 ../inspector/virt-inspector.pod:518 ../resize/virt-resize.pod:373 ../resize/virt-resize.pod:377 ../resize/virt-resize.pod:386 ../resize/virt-resize.pod:392 ../sparsify/virt-sparsify.pod:46 ../sparsify/virt-sparsify.pod:53 ../sparsify/virt-sparsify.pod:57 ../sparsify/virt-sparsify.pod:63 ../sparsify/virt-sparsify.pod:68 ../sparsify/virt-sparsify.pod:73 ../sparsify/virt-sparsify.pod:131 ../sparsify/virt-sparsify.pod:135 ../sparsify/virt-sparsify.pod:139 ../sparsify/virt-sparsify.pod:144 ../src/guestfs-actions.pod:965 ../src/guestfs-actions.pod:971 ../src/guestfs-actions.pod:979 ../src/guestfs-actions.pod:986 ../src/guestfs-actions.pod:993 ../src/guestfs-actions.pod:3131 ../src/guestfs-actions.pod:3135 ../src/guestfs-actions.pod:3139 ../src/guestfs-actions.pod:3143 ../src/guestfs-actions.pod:3151 ../src/guestfs-actions.pod:3155 ../src/guestfs-actions.pod:3159 ../src/guestfs-actions.pod:3169 ../src/guestfs-actions.pod:3173 ../src/guestfs-actions.pod:3177 ../src/guestfs-actions.pod:3352 ../src/guestfs-actions.pod:3356 ../src/guestfs-actions.pod:3361 ../src/guestfs-actions.pod:3422 ../src/guestfs-actions.pod:3426 ../src/guestfs-actions.pod:3431 ../src/guestfs-actions.pod:4297 ../src/guestfs-actions.pod:4304 ../src/guestfs-actions.pod:4311 ../src/guestfs-actions.pod:5182 ../src/guestfs-actions.pod:5188 ../src/guestfs-actions.pod:5196 ../src/guestfs-actions.pod:5203 ../src/guestfs-actions.pod:5210 ../src/guestfs.pod:398 ../src/guestfs.pod:403 ../src/guestfs.pod:408 ../src/guestfs.pod:412 ../src/guestfs.pod:417 ../src/guestfs.pod:421 ../src/guestfs.pod:426 ../src/guestfs.pod:431 ../src/guestfs.pod:782 ../src/guestfs.pod:789 ../src/guestfs.pod:795 ../src/guestfs.pod:801 ../src/guestfs.pod:807 ../src/guestfs.pod:812 ../src/guestfs.pod:818 ../src/guestfs.pod:1046 ../src/guestfs.pod:1050 ../src/guestfs.pod:1056 ../src/guestfs.pod:1139 ../src/guestfs.pod:1144 ../src/guestfs.pod:1148 ../src/guestfs.pod:1154 ../src/guestfs.pod:1158 ../src/guestfs.pod:1162 ../src/guestfs.pod:1167 ../src/guestfs.pod:1712 ../src/guestfs.pod:1716 ../src/guestfs.pod:1720 ../src/guestfs.pod:1725 ../src/guestfs.pod:1733 ../src/guestfs.pod:1752 ../src/guestfs.pod:1760 ../src/guestfs.pod:1777 ../src/guestfs.pod:1782 ../src/guestfs.pod:1786 ../src/guestfs.pod:1975 ../src/guestfs.pod:1979 ../src/guestfs.pod:1983 ../src/guestfs.pod:1987 ../src/guestfs.pod:1991 ../src/guestfs.pod:1995 ../src/guestfs.pod:2651 ../src/guestfs.pod:2656 ../src/guestfs.pod:2660 ../src/guestfs.pod:2764 ../src/guestfs.pod:2769 ../src/guestfs.pod:2773 ../src/guestfs.pod:2783 ../src/guestfs.pod:3214 ../src/guestfs.pod:3219 ../src/guestfs.pod:3225 ../src/guestfs.pod:3233 ../src/guestfs.pod:3750 ../src/guestfs.pod:3756 ../src/guestfs.pod:3761 ../src/guestfs.pod:3767 ../src/guestfs.pod:4162 ../src/guestfs.pod:4166 ../src/guestfs.pod:4170 ../src/guestfs.pod:4174 ../src/guestfs.pod:4178 ../src/guestfs.pod:4182 ../src/guestfs.pod:4186 ../src/guestfs.pod:4433 ../src/guestfs.pod:4438 ../src/guestfs.pod:4442 ../src/guestfs.pod:4446 ../src/guestfs.pod:4450 ../src/guestfs.pod:4464 ../src/guestfs.pod:4468 ../src/guestfs.pod:4473 ../src/guestfs.pod:4477 ../sysprep/virt-sysprep.pod:297 ../sysprep/virt-sysprep.pod:301 ../sysprep/virt-sysprep.pod:305 ../sysprep/virt-sysprep.pod:309 ../sysprep/virt-sysprep.pod:324 ../sysprep/virt-sysprep.pod:328 ../sysprep/virt-sysprep.pod:332 ../sysprep/virt-sysprep.pod:336 ../sysprep/virt-sysprep.pod:340 ../sysprep/virt-sysprep.pod:393 ../sysprep/virt-sysprep.pod:405 ../sysprep/virt-sysprep.pod:409 ../sysprep/virt-sysprep.pod:417 ../sysprep/virt-sysprep.pod:423 ../tools/virt-win-reg:196 ../tools/virt-win-reg:201 ../tools/virt-win-reg:207 ../tools/virt-win-reg:756 ../tools/virt-win-reg:762 ../tools/virt-win-reg:768
 msgid "*"
 msgstr ""
 
@@ -837,7 +837,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:393 ../appliance/libguestfs-make-fixed-appliance.pod:166 ../builder/virt-builder.pod:1826 ../builder/virt-index-validate.pod:81 ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:491 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../diff/virt-diff.pod:253 ../edit/virt-edit.pod:362 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:57 ../examples/guestfs-faq.pod:1294 ../examples/guestfs-performance.pod:559 ../examples/guestfs-recipes.pod:651 ../examples/guestfs-testing.pod:386 ../fish/guestfish.pod:1603 ../fish/libguestfs-tools.conf.pod:90 ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39 ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41 ../format/virt-format.pod:187 ../fuse/guestmount.pod:410 ../fuse/guestunmount.pod:149 ../golang/examples/guestfs-golang.pod:78 ../guestfs-release-notes.pod:2634 ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:81 ../lua/examples/guestfs-lua.pod:138 ../make-fs/virt-make-fs.pod:217 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:40 ../python/examples/guestfs-python.pod:53 ../rescue/virt-rescue.pod:421 ../resize/virt-resize.pod:756 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:339 ../src/guestfs.pod:4718 ../sysprep/virt-sysprep.pod:552 ../test-tool/libguestfs-test-tool.pod:182 ../tools/virt-list-filesystems:190 ../tools/virt-list-partitions:272 ../tools/virt-tar:301 ../tools/virt-win-reg:792
+#: ../align/virt-alignment-scan.pod:393 ../appliance/libguestfs-make-fixed-appliance.pod:166 ../builder/virt-builder.pod:1822 ../builder/virt-index-validate.pod:81 ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395 ../cat/virt-ls.pod:491 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265 ../diff/virt-diff.pod:253 ../edit/virt-edit.pod:362 ../erlang/examples/guestfs-erlang.pod:97 ../examples/guestfs-examples.pod:57 ../examples/guestfs-faq.pod:1294 ../examples/guestfs-performance.pod:559 ../examples/guestfs-recipes.pod:651 ../examples/guestfs-testing.pod:386 ../fish/guestfish.pod:1603 ../fish/libguestfs-tools.conf.pod:90 ../fish/virt-copy-in.pod:50 ../fish/virt-copy-out.pod:39 ../fish/virt-tar-in.pod:47 ../fish/virt-tar-out.pod:41 ../format/virt-format.pod:187 ../fuse/guestmount.pod:410 ../fuse/guestunmount.pod:149 ../golang/examples/guestfs-golang.pod:78 ../guestfs-release-notes.pod:2634 ../inspector/virt-inspector.pod:501 ../java/examples/guestfs-java.pod:81 ../lua/examples/guestfs-lua.pod:138 ../make-fs/virt-make-fs.pod:217 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:40 ../python/examples/guestfs-python.pod:53 ../rescue/virt-rescue.pod:421 ../resize/virt-resize.pod:756 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:339 ../src/guestfs.pod:4718 ../sysprep/virt-sysprep.pod:552 ../test-tool/libguestfs-test-tool.pod:182 ../tools/virt-list-filesystems:190 ../tools/virt-list-partitions:272 ../tools/virt-tar:301 ../tools/virt-win-reg:792
 msgid "SEE ALSO"
 msgstr ""
 
@@ -849,17 +849,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1844 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:501 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:373 ../format/virt-format.pod:197 ../guestfs-release-notes.pod:2645 ../make-fs/virt-make-fs.pod:231 ../rescue/virt-rescue.pod:431 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-tar:315 ../tools/virt-win-reg:806
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1840 ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:258 ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:501 ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../diff/virt-diff.pod:263 ../edit/virt-edit.pod:373 ../format/virt-format.pod:197 ../guestfs-release-notes.pod:2645 ../make-fs/virt-make-fs.pod:231 ../rescue/virt-rescue.pod:431 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-tar:315 ../tools/virt-win-reg:806
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1846 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:503 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:375 ../format/virt-format.pod:199 ../inspector/virt-inspector.pod:516 ../make-fs/virt-make-fs.pod:233 ../rescue/virt-rescue.pod:433 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../tools/virt-tar:317 ../tools/virt-win-reg:808
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1842 ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:260 ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:503 ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../diff/virt-diff.pod:265 ../edit/virt-edit.pod:375 ../format/virt-format.pod:199 ../inspector/virt-inspector.pod:516 ../make-fs/virt-make-fs.pod:233 ../rescue/virt-rescue.pod:433 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:570 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../tools/virt-tar:317 ../tools/virt-win-reg:808
 msgid "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 msgstr ""
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:178 ../builder/virt-builder.pod:1848 ../builder/virt-index-validate.pod:90 ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:505 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:377 ../erlang/examples/guestfs-erlang.pod:116 ../examples/guestfs-examples.pod:75 ../examples/guestfs-faq.pod:1304 ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:670 ../examples/guestfs-testing.pod:397 ../fish/guestfish.pod:1638 ../fish/libguestfs-tools.conf.pod:102 ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53 ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55 ../format/virt-format.pod:201 ../fuse/guestmount.pod:428 ../fuse/guestunmount.pod:162 ../golang/examples/guestfs-golang.pod:97 ../guestfs-release-notes.pod:2649 ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:100 ../lua/examples/guestfs-lua.pod:157 ../make-fs/virt-make-fs.pod:235 ../ocaml/examples/guestfs-ocaml.pod:97 ../perl/examples/guestfs-perl.pod:59 ../python/examples/guestfs-python.pod:71 ../rescue/virt-rescue.pod:435 ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:54 ../sparsify/virt-sparsify.pod:356 ../src/guestfs.pod:4778 ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-filesystems:206 ../tools/virt-list-partitions:287 ../tools/virt-tar:319 ../tools/virt-win-reg:810
+#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:178 ../builder/virt-builder.pod:1844 ../builder/virt-index-validate.pod:90 ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410 ../cat/virt-ls.pod:505 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277 ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:377 ../erlang/examples/guestfs-erlang.pod:116 ../examples/guestfs-examples.pod:75 ../examples/guestfs-faq.pod:1304 ../examples/guestfs-performance.pod:575 ../examples/guestfs-recipes.pod:670 ../examples/guestfs-testing.pod:397 ../fish/guestfish.pod:1638 ../fish/libguestfs-tools.conf.pod:102 ../fish/virt-copy-in.pod:64 ../fish/virt-copy-out.pod:53 ../fish/virt-tar-in.pod:62 ../fish/virt-tar-out.pod:55 ../format/virt-format.pod:201 ../fuse/guestmount.pod:428 ../fuse/guestunmount.pod:162 ../golang/examples/guestfs-golang.pod:97 ../guestfs-release-notes.pod:2649 ../inspector/virt-inspector.pod:524 ../java/examples/guestfs-java.pod:100 ../lua/examples/guestfs-lua.pod:157 ../make-fs/virt-make-fs.pod:235 ../ocaml/examples/guestfs-ocaml.pod:97 ../perl/examples/guestfs-perl.pod:59 ../python/examples/guestfs-python.pod:71 ../rescue/virt-rescue.pod:435 ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:54 ../sparsify/virt-sparsify.pod:356 ../src/guestfs.pod:4778 ../sysprep/virt-sysprep.pod:574 ../test-tool/libguestfs-test-tool.pod:192 ../tools/virt-list-filesystems:206 ../tools/virt-list-partitions:287 ../tools/virt-tar:319 ../tools/virt-win-reg:810
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1785 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1387 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4610 ../test-tool/libguestfs-test-tool.pod:177
+#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1780 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1387 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4610 ../test-tool/libguestfs-test-tool.pod:177
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
@@ -1237,7 +1237,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1547
+#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1542
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1245,7 +1245,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1555
+#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1550
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1253,7 +1253,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1546
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -1441,7 +1441,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:558
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -1849,66 +1849,54 @@ msgid ""
 "source URL."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:295
-msgid ""
-"The default fingerprint (if none are supplied) is S<F777 4FB1 AD07 4A7E 8C87 "
-"67EA 9173 8F73 E1B7 68A0> (which is S<Richard W.M. Jones's> key)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:299
-msgid "You can also set the C<VIRT_BUILDER_FINGERPRINT> environment variable."
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:301
+#: ../builder/virt-builder.pod:295
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:303
+#: ../builder/virt-builder.pod:297
 msgid "B<--firstboot-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:305
+#: ../builder/virt-builder.pod:299
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
 "the script runs (as root, late in the boot process)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:308
+#: ../builder/virt-builder.pod:302
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:310
+#: ../builder/virt-builder.pod:304
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
 "conveniently wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:313
+#: ../builder/virt-builder.pod:307
 msgid ""
 "You can have multiple I<--firstboot> and I<--firstboot-command> options.  "
 "They run in the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:317
+#: ../builder/virt-builder.pod:311
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:319
+#: ../builder/virt-builder.pod:313
 msgid "B<--firstboot-install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:321
+#: ../builder/virt-builder.pod:315
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "when the guest first boots using the guest's package manager (eg. apt, yum, "
@@ -1916,39 +1904,39 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:325 ../builder/virt-builder.pod:372
+#: ../builder/virt-builder.pod:319 ../builder/virt-builder.pod:366
 msgid ""
 "For an overview on the different ways to install packages, see L</INSTALLING "
 "PACKAGES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:328 ../sparsify/virt-sparsify.pod:182
+#: ../builder/virt-builder.pod:322 ../sparsify/virt-sparsify.pod:182
 msgid "B<--format> qcow2"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:330 ../resize/virt-resize.pod:400 ../sparsify/virt-sparsify.pod:180 ../tools/virt-list-filesystems:92 ../tools/virt-list-partitions:93 ../tools/virt-tar:140 ../tools/virt-win-reg:141
+#: ../builder/virt-builder.pod:324 ../resize/virt-resize.pod:400 ../sparsify/virt-sparsify.pod:180 ../tools/virt-list-filesystems:92 ../tools/virt-list-partitions:93 ../tools/virt-tar:140 ../tools/virt-win-reg:141
 msgid "B<--format> raw"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:332
+#: ../builder/virt-builder.pod:326
 msgid "For ordinary builds, this selects the output format.  The default is I<raw>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:334
+#: ../builder/virt-builder.pod:328
 msgid "With I<--get-kernel> this specifies the input format."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:336
+#: ../builder/virt-builder.pod:330
 msgid "B<--get-kernel> IMAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:338
+#: ../builder/virt-builder.pod:332
 msgid ""
 "This option extracts the kernel and initramfs from a previously built disk "
 "image called C<IMAGE> (in fact it works for any VM disk image, not just ones "
@@ -1956,21 +1944,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:342
+#: ../builder/virt-builder.pod:336
 msgid ""
 "The kernel and initramfs are written to the current directory, unless you "
 "also specify the I<--output> C<outputdir> B<directory> name."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:345
+#: ../builder/virt-builder.pod:339
 msgid ""
 "The format of the disk image is automatically detected unless you specify it "
 "by using the I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:348
+#: ../builder/virt-builder.pod:342
 msgid ""
 "In the case where the guest contains multiple kernels, the one with the "
 "highest version number is chosen.  To extract arbitrary kernels from the "
@@ -1979,12 +1967,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:353
+#: ../builder/virt-builder.pod:347
 msgid "B<--gpg> GPG"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:355
+#: ../builder/virt-builder.pod:349
 msgid ""
 "Specify an alternate L<gpg(1)> (GNU Privacy Guard) binary.  You can also use "
 "this to add gpg parameters, for example to specify an alternate home "
@@ -1992,7 +1980,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:359
+#: ../builder/virt-builder.pod:353
 #, no-wrap
 msgid ""
 " virt-builder --gpg \"gpg --homedir /tmp\" [...]\n"
@@ -2000,24 +1988,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:361
+#: ../builder/virt-builder.pod:355
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:363
+#: ../builder/virt-builder.pod:357
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted "
 "hostname.domainname (FQDN) if you want."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:366
+#: ../builder/virt-builder.pod:360
 msgid "B<--install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:368
+#: ../builder/virt-builder.pod:362
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "during the image build using the guest's package manager (eg. apt, yum, "
@@ -2025,97 +2013,97 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:375
+#: ../builder/virt-builder.pod:369
 msgid "See also I<--update>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:377
+#: ../builder/virt-builder.pod:371
 msgid "B<--link TARGET:LINK>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:373
 msgid "B<--link TARGET:LINK[:LINK...]>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:375
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
 "C<TARGET>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:384 ../cat/virt-filesystems.pod:211 ../cat/virt-ls.pod:362 ../tools/virt-list-filesystems:109 ../tools/virt-list-partitions:120
+#: ../builder/virt-builder.pod:378 ../cat/virt-filesystems.pod:211 ../cat/virt-ls.pod:362 ../tools/virt-list-filesystems:109 ../tools/virt-list-partitions:120
 msgid "B<-l>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:380
 msgid "B<--list>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:382
 msgid "B<--list --format> format"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:390
+#: ../builder/virt-builder.pod:384
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:386
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:388
 msgid ""
 "It is possible to choose with I<--format> the output format for the list "
 "templates:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:399
+#: ../builder/virt-builder.pod:393
 msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:401
+#: ../builder/virt-builder.pod:395
 msgid ""
 "The default format, prints only the template identifier and, next to it, its "
 "short description."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:398
 msgid "B<long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:400
 msgid ""
 "Prints a textual list with the details of the available sources, followed by "
 "the details of the available templates."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:409
+#: ../builder/virt-builder.pod:403
 msgid "B<json>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:411
+#: ../builder/virt-builder.pod:405
 msgid ""
 "Prints a JSON object with the details of the available sources and the "
 "details of the available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:414
+#: ../builder/virt-builder.pod:408
 msgid ""
 "The C<version> key in the main object represents the \"compatibility "
 "version\", and it is bumped every time the resulting JSON output is "
@@ -2124,22 +2112,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:415
 msgid "I<--long> is a shorthand for the C<long> format."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:423
-msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
+#: ../builder/virt-builder.pod:417
+msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:425
+#: ../builder/virt-builder.pod:419
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:427
+#: ../builder/virt-builder.pod:421
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
 "building is complete.  If you don't want to reveal precisely how the image "
@@ -2147,22 +2135,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:425
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:433
+#: ../builder/virt-builder.pod:427
 msgid "B<-m> MB"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:435
+#: ../builder/virt-builder.pod:429
 msgid "B<--memsize> MB"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:437
+#: ../builder/virt-builder.pod:431
 msgid ""
 "Change the amount of memory allocated to I<--run> scripts.  Increase this if "
 "you find that I<--run> scripts or the I<--install> option are running out of "
@@ -2170,12 +2158,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:441
+#: ../builder/virt-builder.pod:435
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:437
 #, no-wrap
 msgid ""
 " guestfish get-memsize\n"
@@ -2183,58 +2171,58 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:445
+#: ../builder/virt-builder.pod:439
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:447
+#: ../builder/virt-builder.pod:441
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:449
+#: ../builder/virt-builder.pod:443
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
 "also works if the directory already exists."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:452 ../fish/guestfish.pod:343 ../rescue/virt-rescue.pod:194
+#: ../builder/virt-builder.pod:446 ../fish/guestfish.pod:343 ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:454
+#: ../builder/virt-builder.pod:448
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:456
+#: ../builder/virt-builder.pod:450
 msgid "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:458
+#: ../builder/virt-builder.pod:452
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:460
+#: ../builder/virt-builder.pod:454
 msgid ""
 "The network only allows outgoing connections and has other minor "
 "limitations.  See L<virt-rescue(1)/NETWORK>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:457
 msgid ""
 "If you use I<--no-network> then certain other options such as I<--install> "
 "will not work."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:466
+#: ../builder/virt-builder.pod:460
 msgid ""
 "This does not affect whether the guest can access the network once it has "
 "been booted, because that is controlled by your hypervisor or cloud "
@@ -2242,43 +2230,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:470
+#: ../builder/virt-builder.pod:464
 msgid ""
 "Generally speaking you should I<not> use I<--no-network>.  But here are some "
 "reasons why you might want to:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:475 ../builder/virt-builder.pod:1069 ../examples/guestfs-faq.pod:472 ../examples/guestfs-faq.pod:759 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:203 ../examples/guestfs-recipes.pod:408 ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31 ../resize/virt-resize.pod:621 ../sparsify/virt-sparsify.pod:278 ../src/guestfs.pod:487 ../src/guestfs.pod:1797 ../src/guestfs.pod:2069 ../src/guestfs.pod:2367 ../src/guestfs.pod:3861
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1059 ../examples/guestfs-faq.pod:472 ../examples/guestfs-faq.pod:759 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:203 ../examples/guestfs-recipes.pod:408 ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31 ../resize/virt-resize.pod:621 ../sparsify/virt-sparsify.pod:278 ../src/guestfs.pod:487 ../src/guestfs.pod:1797 ../src/guestfs.pod:2069 ../src/guestfs.pod:2367 ../src/guestfs.pod:3861
 msgid "1."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:477
+#: ../builder/virt-builder.pod:471
 msgid ""
 "Because the libguestfs backend that you are using doesn't support the "
 "network.  (See: L<guestfs(3)/BACKEND>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:480 ../builder/virt-builder.pod:1074 ../examples/guestfs-faq.pod:482 ../examples/guestfs-faq.pod:769 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:210 ../examples/guestfs-recipes.pod:414 ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44 ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:285 ../src/guestfs.pod:493 ../src/guestfs.pod:1801 ../src/guestfs.pod:2073 ../src/guestfs.pod:2371 ../src/guestfs.pod:3886
+#: ../builder/virt-builder.pod:474 ../builder/virt-builder.pod:1064 ../examples/guestfs-faq.pod:482 ../examples/guestfs-faq.pod:769 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:210 ../examples/guestfs-recipes.pod:414 ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44 ../resize/virt-resize.pod:628 ../sparsify/virt-sparsify.pod:285 ../src/guestfs.pod:493 ../src/guestfs.pod:1801 ../src/guestfs.pod:2073 ../src/guestfs.pod:2371 ../src/guestfs.pod:3886
 msgid "2."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:482
+#: ../builder/virt-builder.pod:476
 msgid ""
 "Any software you need to install comes from an attached ISO, so you don't "
 "need the network."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:485 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:774 ../examples/guestfs-performance.pod:216 ../examples/guestfs-recipes.pod:420 ../rescue/virt-rescue.pod:345 ../resize/virt-resize.pod:52 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:291 ../src/guestfs.pod:504 ../src/guestfs.pod:1805 ../src/guestfs.pod:2377
+#: ../builder/virt-builder.pod:479 ../examples/guestfs-faq.pod:488 ../examples/guestfs-faq.pod:774 ../examples/guestfs-performance.pod:216 ../examples/guestfs-recipes.pod:420 ../rescue/virt-rescue.pod:345 ../resize/virt-resize.pod:52 ../resize/virt-resize.pod:634 ../sparsify/virt-sparsify.pod:291 ../src/guestfs.pod:504 ../src/guestfs.pod:1805 ../src/guestfs.pod:2377
 msgid "3."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:487
+#: ../builder/virt-builder.pod:481
 msgid ""
 "You don't want untrusted guest code trying to access your host network when "
 "running virt-builder.  This is particularly an issue when you don't trust "
@@ -2286,32 +2274,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:492 ../examples/guestfs-faq.pod:494 ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
+#: ../builder/virt-builder.pod:486 ../examples/guestfs-faq.pod:494 ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:494
+#: ../builder/virt-builder.pod:488
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:498 ../fish/guestfish.pod:360 ../fuse/guestmount.pod:288
+#: ../builder/virt-builder.pod:492 ../fish/guestfish.pod:360 ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:500
+#: ../builder/virt-builder.pod:494
 msgid "Do not sync the output file on exit."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:502
+#: ../builder/virt-builder.pod:496
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:504
+#: ../builder/virt-builder.pod:498
 msgid ""
 "The reason is that qemu/KVM's default caching mode is C<none> or "
 "C<directsync>, both of which bypass the host page cache.  Therefore these "
@@ -2322,36 +2310,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:511
+#: ../builder/virt-builder.pod:505
 msgid ""
 "If you are not using these broken caching modes, you can use I<--no-sync> to "
 "avoid this unnecessary sync and gain considerable extra performance."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:515
+#: ../builder/virt-builder.pod:509
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:517
+#: ../builder/virt-builder.pod:511
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:514
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:516
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:524
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Write the output to C<filename>.  If you don't specify this option, then the "
 "output filename is generated by taking the C<os-version> string and adding "
@@ -2359,43 +2347,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:529
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Note that the output filename could be a device, partition or logical "
 "volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:526
 msgid "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:535
+#: ../builder/virt-builder.pod:529
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:531 ../sysprep/sysprep-extra-options.pod:92
 msgid "Set the password encryption to C<md5>, C<sha256> or C<sha512>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:539
+#: ../builder/virt-builder.pod:533
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
 "guest)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:542 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:536 ../sysprep/sysprep-extra-options.pod:97
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
 "secure against modern attacks."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:545 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:539 ../sysprep/sysprep-extra-options.pod:100
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
 "have support for SHA-512, in which case it will use C<md5>.  You can "
@@ -2403,49 +2391,49 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:549
+#: ../builder/virt-builder.pod:543
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:551
+#: ../builder/virt-builder.pod:545
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:555
+#: ../builder/virt-builder.pod:549
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:557
+#: ../builder/virt-builder.pod:551
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:559
+#: ../builder/virt-builder.pod:553
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:561
+#: ../builder/virt-builder.pod:555
 msgid ""
 "See L</USERS AND PASSWORDS> below for the format of the C<SELECTOR> field, "
 "and also how to set up user accounts."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:561
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:569
+#: ../builder/virt-builder.pod:563
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:571
+#: ../builder/virt-builder.pod:565
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
 "The script runs virtualized inside a small appliance, chrooted into the "
@@ -2453,12 +2441,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:575
+#: ../builder/virt-builder.pod:569
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:577
+#: ../builder/virt-builder.pod:571
 msgid ""
 "If libguestfs supports it then a limited network connection is available but "
 "it only allows outgoing network connections.  You can also attach data disks "
@@ -2468,78 +2456,78 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:577
 msgid ""
 "The alternative version I<--run-command> is the same, but it conveniently "
 "wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:580
 msgid ""
 "You can have multiple I<--run> and I<--run-command> options.  They run in "
 "the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:589
+#: ../builder/virt-builder.pod:583
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:591
+#: ../builder/virt-builder.pod:585
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:593
+#: ../builder/virt-builder.pod:587
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:599
+#: ../builder/virt-builder.pod:593
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:603
+#: ../builder/virt-builder.pod:597
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:607
+#: ../builder/virt-builder.pod:601
 msgid "B<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:609
+#: ../builder/virt-builder.pod:603
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:605
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:613
+#: ../builder/virt-builder.pod:607
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:609
 msgid ""
 "Select the size of the output disk, where the size can be specified using "
 "common names such as C<32G> (32 gigabytes) etc."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:618
+#: ../builder/virt-builder.pod:612
 msgid "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:615
 msgid ""
 "If the size is not specified, then one of two things happens.  If the output "
 "is a file, then the size is the same as the template.  If the output is a "
@@ -2547,51 +2535,44 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:620
 msgid ""
 "To specify size in bytes, the number must be followed by the lowercase "
 "letter I<b>, eg: S<C<--size 10737418240b>>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:629 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:623 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:625
 msgid "Enable N E<ge> 2 virtual CPUs for I<--run> scripts to use."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:627
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:629
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:637
-msgid ""
-"You can give this option multiple times to specify multiple sources.  If not "
-"specified it defaults to L<http://libguestfs.org/download/builder/index.asc>"
+#: ../builder/virt-builder.pod:631
+msgid "You can give this option multiple times to specify multiple sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:641
-msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
+#: ../builder/virt-builder.pod:633
+msgid "See also L</SOURCES OF TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
-msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:645
+#: ../builder/virt-builder.pod:635
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the "
@@ -2599,24 +2580,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:639
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:651
+#: ../builder/virt-builder.pod:641
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
 "like C<Europe/London>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:654
+#: ../builder/virt-builder.pod:644
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:656
+#: ../builder/virt-builder.pod:646
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
 "is required to update the packages already installed in the template to "
@@ -2624,17 +2605,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:660
+#: ../builder/virt-builder.pod:650
 msgid "See also I<--install>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:652
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:664
+#: ../builder/virt-builder.pod:654
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -2642,14 +2623,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:658
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:661
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -2657,56 +2638,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:665
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:671
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:673
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:682
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:684
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:698
+#: ../builder/virt-builder.pod:688
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:700
+#: ../builder/virt-builder.pod:690
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:692
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:705
+#: ../builder/virt-builder.pod:695
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:707
+#: ../builder/virt-builder.pod:697
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use "
@@ -2714,7 +2695,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:711
+#: ../builder/virt-builder.pod:701
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -2722,22 +2703,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:703
 msgid "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:716
+#: ../builder/virt-builder.pod:706
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:718
+#: ../builder/virt-builder.pod:708
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:720
+#: ../builder/virt-builder.pod:710
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -2745,7 +2726,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:712
 msgid ""
 "Most of the templates that ship with virt-builder come with a very minimal "
 "selection of packages (known as a \"JEOS\" or \"Just Enough Operating "
@@ -2755,17 +2736,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:728
+#: ../builder/virt-builder.pod:718
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:720
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:722
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -2773,12 +2754,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:724
 msgid "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:737
+#: ../builder/virt-builder.pod:727
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails "
@@ -2787,12 +2768,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:732
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:744
+#: ../builder/virt-builder.pod:734
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -2800,14 +2781,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:739
 msgid ""
 "You can create the disk image using either L<genisoimage(1)> or "
 "L<virt-make-fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:752
+#: ../builder/virt-builder.pod:742
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -2815,14 +2796,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:744
 msgid ""
 "Create a script that mounts the ISO and sets up the repository.  For yum, "
 "create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:757 ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:747 ../builder/virt-builder.pod:761
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -2831,7 +2812,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:760
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -2844,7 +2825,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:767
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -2852,12 +2833,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:759
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:774
+#: ../builder/virt-builder.pod:764
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -2866,14 +2847,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:777
+#: ../builder/virt-builder.pod:767
 msgid ""
 "Use the I<--attach> option to attach the CD / disk image and the I<--run> "
 "option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:780
+#: ../builder/virt-builder.pod:770
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -2883,12 +2864,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:784
+#: ../builder/virt-builder.pod:774
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:786
+#: ../builder/virt-builder.pod:776
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -2896,12 +2877,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:792
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:794
+#: ../builder/virt-builder.pod:784
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -2909,102 +2890,102 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:789
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:801
+#: ../builder/virt-builder.pod:791
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:793 ../sysprep/sysprep-extra-options.pod:44
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:796
 msgid "B<--root-password> random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:798 ../sysprep/sysprep-extra-options.pod:51
 msgid ""
 "Choose a random password, which is printed on stdout.  The password has "
 "approximately 120 bits of randomness."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811 ../fish/guestfish-actions.pod:380 ../format/virt-format.pod:140 ../src/guestfs-actions.pod:473
+#: ../builder/virt-builder.pod:801 ../fish/guestfish-actions.pod:380 ../format/virt-format.pod:140 ../src/guestfs-actions.pod:473
 msgid "This is the default."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:813 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:56
 msgid "B<--root-password> disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:815
+#: ../builder/virt-builder.pod:805
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:67
 msgid "B<--root-password> locked:file:FILENAME"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:810 ../sysprep/sysprep-extra-options.pod:69
 msgid "B<--root-password> locked:password:PASSWORD"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:822 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:812 ../sysprep/sysprep-extra-options.pod:71
 msgid "B<--root-password> locked:random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:824
+#: ../builder/virt-builder.pod:814
 msgid ""
 "The root account is locked, but a password is placed on the account.  If "
 "first unlocked (using C<passwd -u>) then logins will use the given password."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:81
 msgid "B<--root-password> locked"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:830 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:83
 msgid "B<--root-password> locked:disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:822
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:836
+#: ../builder/virt-builder.pod:826
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:828
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with "
 "L<--firstboot-command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:831
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3013,7 +2994,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:844
+#: ../builder/virt-builder.pod:834
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -3021,12 +3002,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:848
+#: ../builder/virt-builder.pod:838
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:850
+#: ../builder/virt-builder.pod:840
 msgid ""
 "Because there are so many different ways to set the keyboard layout in Linux "
 "distributions, virt-builder does not yet attempt to have a simple command "
@@ -3035,17 +3016,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:855
+#: ../builder/virt-builder.pod:845
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:847
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:859
+#: ../builder/virt-builder.pod:849
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3054,7 +3035,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:862
+#: ../builder/virt-builder.pod:852
 msgid ""
 "See L<localectl(1)> and "
 "L<https://www.happyassassin.net/2013/11/23/keyboard-layouts-in-fedora-20-and-previously/> "
@@ -3062,12 +3043,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:856
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:858
 msgid ""
 "For RHEL E<le> 6, Fedora E<le> 18 and similar, upload or modify the keyboard "
 "configuration file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3075,7 +3056,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:872
+#: ../builder/virt-builder.pod:862
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -3084,17 +3065,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:865
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:877
+#: ../builder/virt-builder.pod:867
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:879
+#: ../builder/virt-builder.pod:869
 msgid ""
 "For Debian-derived distros using C</etc/default/keyboard>, upload or modify "
 "the keyboard file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3102,7 +3083,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:883
+#: ../builder/virt-builder.pod:873
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3111,24 +3092,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:886
+#: ../builder/virt-builder.pod:876
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:878
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:880
 msgid ""
 "Most Linux distributions support multiple locale settings so that you can "
 "have guest messages printed in another language such as Russian."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:893
+#: ../builder/virt-builder.pod:883
 msgid ""
 "However there is no single setting which controls this, since extra packages "
 "may need to be installed to support console and X fonts, and keyboard input "
@@ -3137,17 +3118,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:899
+#: ../builder/virt-builder.pod:889
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:891
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:903
+#: ../builder/virt-builder.pod:893
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3166,12 +3147,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:904
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:906
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3179,7 +3160,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:920
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -3192,7 +3173,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:927
+#: ../builder/virt-builder.pod:917
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3206,12 +3187,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:935
+#: ../builder/virt-builder.pod:925
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:937
+#: ../builder/virt-builder.pod:927
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, "
 "I<--run-command>, I<--install>, I<--update>, but I<not> firstboot) is logged "
@@ -3219,148 +3200,148 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:933
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:945
+#: ../builder/virt-builder.pod:935
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:937
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:949
+#: ../builder/virt-builder.pod:939
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:941
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:953
+#: ../builder/virt-builder.pod:943
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:947
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:950
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:952
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:968
+#: ../builder/virt-builder.pod:958
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:960
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:965
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:969
 msgid "The template is uncompressed to a tmp file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:973
 msgid "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:978
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:982
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:996
+#: ../builder/virt-builder.pod:986
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:990
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1004
+#: ../builder/virt-builder.pod:994
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:998
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1012
+#: ../builder/virt-builder.pod:1002
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016
+#: ../builder/virt-builder.pod:1006
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:1010
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1014
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1018
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1022
 msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1036
+#: ../builder/virt-builder.pod:1026
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, "
 "I<--firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -3368,39 +3349,39 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1035
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1047
+#: ../builder/virt-builder.pod:1037
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1041
 msgid "SELinux relabelling is done (I<--selinux-relabel>)."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1045
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1047
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1059
+#: ../builder/virt-builder.pod:1049
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1052
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -3409,19 +3390,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1065 ../examples/guestfs-recipes.pod:261 ../fish/guestfish-actions.pod:2144 ../fish/guestfish-actions.pod:2694 ../fish/guestfish-actions.pod:3290 ../src/guestfs-actions.pod:3418 ../src/guestfs-actions.pod:4293 ../src/guestfs-actions.pod:5178 ../src/guestfs.pod:778 ../src/guestfs.pod:2647 ../tools/virt-win-reg:752
+#: ../builder/virt-builder.pod:1055 ../examples/guestfs-recipes.pod:261 ../fish/guestfish-actions.pod:2144 ../fish/guestfish-actions.pod:2694 ../fish/guestfish-actions.pod:3290 ../src/guestfs-actions.pod:3418 ../src/guestfs-actions.pod:4293 ../src/guestfs-actions.pod:5178 ../src/guestfs.pod:778 ../src/guestfs.pod:2647 ../tools/virt-win-reg:752
 msgid "Notes:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1071
+#: ../builder/virt-builder.pod:1061
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1066
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -3431,17 +3412,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1074
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1076
 msgid "Import the image into Glance (the OpenStack image store) by doing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1078
 #, no-wrap
 msgid ""
 " glance image-create --name fedora-20-image --file fedora-20.img \\\n"
@@ -3451,7 +3432,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1092
+#: ../builder/virt-builder.pod:1082
 msgid ""
 "The I<--file> parameter is the virt-builder-generated disk image.  It should "
 "match virt-builder's I<--output> option.  The I<--disk-format> parameter "
@@ -3461,19 +3442,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1098
+#: ../builder/virt-builder.pod:1088
 msgid ""
 "You can use the S<C<glance image-show I<fedora-20-image>>> command to "
 "display the properties of the image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1091
 msgid "To boot up an instance of your image on a Nova compute node, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1093
 #, no-wrap
 msgid ""
 " nova boot fedora-20-server --image fedora-20-image \\\n"
@@ -3482,19 +3463,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1106
+#: ../builder/virt-builder.pod:1096
 msgid ""
 "Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
 "list>> to list running instances."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1099
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1111
+#: ../builder/virt-builder.pod:1101
 msgid ""
 "The qemu command line is not very stable or easy to use, hence libvirt "
 "should be used if possible.  However a command line similar to the following "
@@ -3502,7 +3483,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1115
+#: ../builder/virt-builder.pod:1105
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -3514,36 +3495,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1121
+#: ../builder/virt-builder.pod:1111
 msgid ""
 "As with libvirt, it is very important that the correct format is chosen.  It "
 "will be C<raw> unless the I<--format> option was used."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1114
 msgid "CONFIGURATION MANAGEMENT"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1126
+#: ../builder/virt-builder.pod:1116
 msgid "Puppet"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1128
+#: ../builder/virt-builder.pod:1118
 msgid ""
 "To enable the Puppet agent in a guest, install the package, point the "
 "configuration at your Puppetmaster, and ensure the agent runs at boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1132
+#: ../builder/virt-builder.pod:1122
 msgid "A typical virt-builder command would be:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1124
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3558,26 +3539,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1143
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "The precise instructions vary according to the Linux distro.  For further "
 "information see: L<http://docs.puppetlabs.com/guides/installation.htm>"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1137
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1149
+#: ../builder/virt-builder.pod:1139
 msgid ""
 "If virt-builder itself fails, then enable debugging (I<-v>) and report a bug "
 "(see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1142
 msgid ""
 "If virt-builder fails because some script or package it is installing fails, "
 "try using I<--no-delete-on-failure> to preserve the output file, and "
@@ -3585,24 +3566,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1156
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:1151
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1153
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -3610,7 +3591,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1167
+#: ../builder/virt-builder.pod:1157
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -3619,17 +3600,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1173
+#: ../builder/virt-builder.pod:1163
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1175
+#: ../builder/virt-builder.pod:1165
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1177
+#: ../builder/virt-builder.pod:1167
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -3637,24 +3618,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1169
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1182
+#: ../builder/virt-builder.pod:1172
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1174
 msgid "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1176
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -3664,12 +3645,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1180
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1192
+#: ../builder/virt-builder.pod:1182
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -3677,12 +3658,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1194
+#: ../builder/virt-builder.pod:1184
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1196
+#: ../builder/virt-builder.pod:1186
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -3692,7 +3673,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1192
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -3700,24 +3681,103 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1206
-msgid "CREATING YOUR OWN TEMPLATES"
+#: ../builder/virt-builder.pod:1196
+msgid "SOURCES OF TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1208
+#: ../builder/virt-builder.pod:1198
+msgid ""
+"virt-builder reads the available sources from configuration files, with the "
+"I<.conf> extension and located in the following paths:"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1205
+msgid ""
+"$XDG_CONFIG_HOME/virt-builder/repos.d/ (C<$XDG_CONFIG_HOME> is "
+"C<$HOME/.config> if not set)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1210
+msgid ""
+"$XDG_CONFIG_DIRS/virt-builder/repos.d/ (where C<$XDG_CONFIG_DIRS> means any "
+"of the directories in that environment variable, or just C</etc/xdg> if not "
+"set)"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1216
+msgid ""
+"Each I<.conf> file in those paths has a simple text format like the "
+"following:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1219
+#, no-wrap
+msgid ""
+" [libguestfs.org]\n"
+" uri=http://libguestfs.org/download/builder/index.asc\n"
+" gpgkey=file:///etc/xdg/virt-builder/repos.d/libguestfs.gpg\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1223
+msgid ""
+"The part in square brackets is the repository identifier, which is used as "
+"unique identifier."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1226 ../builder/virt-builder.pod:1340
+msgid "The following fields can appear:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1230
+msgid "C<uri=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1232
+msgid "The URI of the index file which this repository refers to."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1234 ../builder/virt-builder.pod:1423
+msgid "This field is required."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1236
+msgid "C<gpgkey=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1238
+msgid ""
+"This optional field represents the URI (although only I<file://> URIs are "
+"accepted) of the key used to sign the index file.  If not present, the index "
+"file referred by I<uri=..> is not signed."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1244
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1211
+#: ../builder/virt-builder.pod:1247
 msgid "Libguestfs.org repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1213
+#: ../builder/virt-builder.pod:1249
 msgid ""
 "Out of the box, virt-builder downloads the file "
 "L<http://libguestfs.org/download/builder/index.asc> which is an index of "
@@ -3727,7 +3787,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1219
+#: ../builder/virt-builder.pod:1255
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -3735,19 +3795,28 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1223
+#: ../builder/virt-builder.pod:1259
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1225
+#: ../builder/virt-builder.pod:1261
 msgid ""
 "You can set up your own site containing an index file and some templates, "
-"and then point virt-builder at the site by using the I<--source> option:"
+"and then point virt-builder at the site by creating a I<.conf> file pointing "
+"to it."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1265
+msgid ""
+"Note that if your index is signed, you will need to properly fill "
+"I<gpgkey=..> in your I<.conf> file, making sure to deploy also the GPG key "
+"file."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1269
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -3757,26 +3826,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
-msgid ""
-"(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
-"C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1273
 msgid ""
 "You can host this on any web or FTP server, or a local or network "
 "filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1239
+#: ../builder/virt-builder.pod:1276
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1241
+#: ../builder/virt-builder.pod:1278
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -3785,56 +3847,32 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1283
 msgid ""
 "To create a key, see the GPG manual "
 "L<http://www.gnupg.org/gph/en/manual.html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1249
-msgid ""
-"Export your GPG public key and add it to the keyring of all virt-builder "
-"users:"
+#: ../builder/virt-builder.pod:1286
+msgid "Export your GPG public key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1252
+#: ../builder/virt-builder.pod:1288
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
 " \n"
 msgstr ""
 
-#. type: verbatim
-#: ../builder/virt-builder.pod:1254
-#, no-wrap
-msgid ""
-" # For each virt-builder user:\n"
-" gpg --import pubkey\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1257
-msgid "Also find the fingerprint of your key:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1259
-#, no-wrap
-msgid ""
-" gpg --list-keys --fingerprint\n"
-"\n"
-msgstr ""
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1290
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1263
+#: ../builder/virt-builder.pod:1292
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -3843,14 +3881,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1268
+#: ../builder/virt-builder.pod:1297
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1300
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -3858,19 +3896,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1302
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1304
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1307
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -3886,7 +3924,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1317
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -3903,21 +3941,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1328
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1331
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1334
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -3925,54 +3963,49 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1336
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
-"the server (and is the I<--source> URL).  As noted above, signing the index "
+"the server (and is the I<uri=..> URL).  As noted above, signing the index "
 "file is optional, but recommended."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:1311
-msgid "The following fields can appear:"
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:1315
+#: ../builder/virt-builder.pod:1344
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1317
+#: ../builder/virt-builder.pod:1346
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1320
+#: ../builder/virt-builder.pod:1349
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1351
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1325
+#: ../builder/virt-builder.pod:1354
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1327
+#: ../builder/virt-builder.pod:1356
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1329 ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1358 ../builder/virt-builder.pod:1369
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -3980,29 +4013,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1333
+#: ../builder/virt-builder.pod:1362
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1335
+#: ../builder/virt-builder.pod:1364
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1337
+#: ../builder/virt-builder.pod:1366
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1344
+#: ../builder/virt-builder.pod:1373
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1375
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4010,19 +4043,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1348
+#: ../builder/virt-builder.pod:1377
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1350
+#: ../builder/virt-builder.pod:1379
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1353
+#: ../builder/virt-builder.pod:1382
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4030,24 +4063,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1384
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1358
+#: ../builder/virt-builder.pod:1387
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1360
+#: ../builder/virt-builder.pod:1389
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1362
+#: ../builder/virt-builder.pod:1391
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -4056,12 +4089,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1367
+#: ../builder/virt-builder.pod:1396
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1369
+#: ../builder/virt-builder.pod:1398
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -4069,22 +4102,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1373
+#: ../builder/virt-builder.pod:1402
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1375
+#: ../builder/virt-builder.pod:1404
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1377
+#: ../builder/virt-builder.pod:1406
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1379
+#: ../builder/virt-builder.pod:1408
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -4092,7 +4125,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1383
+#: ../builder/virt-builder.pod:1412
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -4100,12 +4133,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1388
+#: ../builder/virt-builder.pod:1417
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1390
+#: ../builder/virt-builder.pod:1419
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -4113,12 +4146,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1394
-msgid "This field is required."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1396
+#: ../builder/virt-builder.pod:1425
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> "
@@ -4126,24 +4154,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1400
+#: ../builder/virt-builder.pod:1429
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1431
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1405
+#: ../builder/virt-builder.pod:1434
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1436
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -4151,12 +4179,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1440
 msgid "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1413
+#: ../builder/virt-builder.pod:1442
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -4164,12 +4192,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1417
+#: ../builder/virt-builder.pod:1446
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1419
+#: ../builder/virt-builder.pod:1448
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -4177,7 +4205,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -4185,31 +4213,31 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1427
+#: ../builder/virt-builder.pod:1456
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1429
+#: ../builder/virt-builder.pod:1458
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1433
+#: ../builder/virt-builder.pod:1462
 msgid "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1435
+#: ../builder/virt-builder.pod:1464
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1438
+#: ../builder/virt-builder.pod:1467
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -4221,12 +4249,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1444
+#: ../builder/virt-builder.pod:1473
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1446
+#: ../builder/virt-builder.pod:1475
 msgid ""
 "Using the hidden flag prevents the template from being listed by the "
 "I<--list> option (but it is still installable).  This is used for test "
@@ -4234,76 +4262,21 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1452
-msgid "Running virt-builder against the alternate repository"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1454
-msgid ""
-"Ensure each virt-builder user has imported your public key into their gpg "
-"keyring (see above)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1457
-msgid "Each virt-builder user should export these environment variables:"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1463
-msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1467
-msgid ""
-"C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
-"the user who signed the index file and the templates."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1472
-msgid "Now run virt-builder commands as normal, eg:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1474
-#, no-wrap
-msgid ""
-" virt-builder --list --long\n"
-"\n"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1476
-#, no-wrap
-msgid ""
-" virt-builder os-version\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1478
-msgid "To debug problems, add the C<-v> option to these commands."
-msgstr ""
-
-#. type: =head3
-#: ../builder/virt-builder.pod:1480
+#: ../builder/virt-builder.pod:1481
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1482
+#: ../builder/virt-builder.pod:1483
 msgid ""
-"It is possible to use multiple sources with virt-builder.  Use either "
-"multiple I<--source> and/or I<--fingerprint> options, or a comma-separated "
-"list in the C<VIRT_BUILDER_SOURCE> / C<VIRT_BUILDER_FINGERPRINT> environment "
-"variables:"
+"It is possible to use multiple sources with virt-builder.  The recommended "
+"way is to deploy I<.conf> files pointing to the index files. Another way is "
+"to specify the sources using multiple I<--source> and/or I<--fingerprint> "
+"options:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1487
+#: ../builder/virt-builder.pod:1488
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4313,30 +4286,15 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1491
-msgid "or equivalently:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1493
-#, no-wrap
+#: ../builder/virt-builder.pod:1492
 msgid ""
-" export "
-"VIRT_BUILDER_SOURCE=http://example.com/s1/index.asc,http://example.com/s2/index.asc\n"
-" virt-builder [...]\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1496
-msgid ""
-"You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
+"You can provide N or 1 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
 "between each source and each fingerprint:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1496
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4346,26 +4304,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1504
+#: ../builder/virt-builder.pod:1500
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1507
-msgid ""
-"In the case where you provide no fingerprints, the default fingerprint built "
-"into virt-builder is used for all sources."
+#: ../builder/virt-builder.pod:1503
+msgid "You C<must> provide at least 1 fingerprint."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1510
+#: ../builder/virt-builder.pod:1505
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1507
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -4373,12 +4329,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1517
+#: ../builder/virt-builder.pod:1512
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1519
+#: ../builder/virt-builder.pod:1514
 msgid ""
 "The index file format has a formal specification defined by the flex scanner "
 "and bison parser used to parse the file.  This can be found in the following "
@@ -4386,7 +4342,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1518
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -4395,84 +4351,84 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1526
+#: ../builder/virt-builder.pod:1521
 msgid ""
 "A tool called L<virt-index-validate(1)> is available to validate the index "
 "file to ensure it is correct."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1529
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "Note that the parser and tool can work on either the signed or unsigned "
 "index file (ie. C<index> or C<index.asc>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1532
+#: ../builder/virt-builder.pod:1527
 msgid "The index is always encoded in UTF-8."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1534
+#: ../builder/virt-builder.pod:1529
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1536
+#: ../builder/virt-builder.pod:1531
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1538
+#: ../builder/virt-builder.pod:1533
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1541
+#: ../builder/virt-builder.pod:1536
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or "
 "C<$HOME/.cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1544
+#: ../builder/virt-builder.pod:1539
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1549
+#: ../builder/virt-builder.pod:1544
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1553
+#: ../builder/virt-builder.pod:1548
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1557
+#: ../builder/virt-builder.pod:1552
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1554
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1562
+#: ../builder/virt-builder.pod:1557
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1559
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>, "
@@ -4480,7 +4436,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1568
+#: ../builder/virt-builder.pod:1563
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -4488,12 +4444,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1572
+#: ../builder/virt-builder.pod:1567
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1574
+#: ../builder/virt-builder.pod:1569
 msgid ""
 "To increase both speed and reliability of installing packages, you can set "
 "up a local mirror of the target distribution, and point the guest package "
@@ -4501,7 +4457,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1573
 msgid ""
 "Because of the order in which each phase of installation happens, you cannot "
 "use I<--write> (to point the package manager at a repo)  followed by "
@@ -4511,17 +4467,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1580
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1582
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1584
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -4539,12 +4495,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1601
+#: ../builder/virt-builder.pod:1596
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1603
+#: ../builder/virt-builder.pod:1598
 msgid ""
 "Assuming that you are using C<apt-proxy> to mirror the repository, you "
 "should create a new C<sources.list> file to point to your proxy (see "
@@ -4552,7 +4508,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1607
+#: ../builder/virt-builder.pod:1602
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -4563,33 +4519,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1612
+#: ../builder/virt-builder.pod:1607
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1614
+#: ../builder/virt-builder.pod:1609
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1617
+#: ../builder/virt-builder.pod:1612
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1619
+#: ../builder/virt-builder.pod:1614
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
-"the signer's fingerprint matches the specified fingerprint "
-"(ie. I<--fingerprint>, C<VIRT_BUILDER_FINGERPRINT>, or a built-in "
-"fingerprint, in that order)."
+"the signer's fingerprint matches the specified fingerprint (ie. the one "
+"specified in I<gpgkey=..> in the I<.conf>, or with I<--fingerprint>, in that "
+"order)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1619
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -4597,12 +4553,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1623
 msgid "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1631
+#: ../builder/virt-builder.pod:1626
 msgid ""
 "Although the signatures are optional, if you don't have them then "
 "virt-builder users will have to use I<--no-check-signature> on the command "
@@ -4613,19 +4569,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1638 ../src/guestfs.pod:3367
+#: ../builder/virt-builder.pod:1633 ../src/guestfs.pod:3367
 msgid "ARCHITECTURE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1635
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1638
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: "
@@ -4634,26 +4590,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1648
+#: ../builder/virt-builder.pod:1643
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1651 ../src/guestfs.pod:1913 ../sysprep/virt-sysprep.pod:490
+#: ../builder/virt-builder.pod:1646 ../src/guestfs.pod:1913 ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1653
+#: ../builder/virt-builder.pod:1648
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1656
+#: ../builder/virt-builder.pod:1651
 msgid ""
 "I<--install>, I<--update>, I<--run> and I<--run-command> are implemented "
 "using an appliance (a small virtual machine) so these commands do not run on "
@@ -4663,7 +4619,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1662
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -4672,14 +4628,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1667
+#: ../builder/virt-builder.pod:1662
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1665
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -4687,17 +4643,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1669
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1676
+#: ../builder/virt-builder.pod:1671
 msgid "CLONES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1678
+#: ../builder/virt-builder.pod:1673
 msgid ""
 "If you wish to create many new guests of the same type, it is tempting to "
 "run virt-builder once and then copy the output file.  You should B<not> do "
@@ -4705,7 +4661,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1678
 msgid ""
 "The reason is that each clone needs to have (at least) a separate random "
 "seed, and possibly other unique features (such as filesystem UUIDs) in "
@@ -4713,7 +4669,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1687
+#: ../builder/virt-builder.pod:1682
 msgid ""
 "Another thing you should I<not> do is to boot the guest, then clone the "
 "booted disk image.  The reason is that some guests create unique machine "
@@ -4722,17 +4678,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1692
+#: ../builder/virt-builder.pod:1687
 msgid "See also: L<virt-sysprep(1)>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694
+#: ../builder/virt-builder.pod:1689
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The most important aspect of getting good performance is caching.  Templates "
 "gets downloaded into the cache the first time they are used, or if you use "
@@ -4741,7 +4697,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1701
+#: ../builder/virt-builder.pod:1696
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -4752,51 +4708,51 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1709
+#: ../builder/virt-builder.pod:1704
 msgid "Using I<--no-sync>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1711
+#: ../builder/virt-builder.pod:1706
 msgid ""
 "Use I<--no-sync>.  However read the caveats in the L</OPTIONS> section "
 "above, since this can cause disk corruption if not used correctly."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1714
+#: ../builder/virt-builder.pod:1709
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1716
+#: ../builder/virt-builder.pod:1711
 msgid ""
 "Virt-builder can skip the virt-resize step under certain conditions.  This "
 "makes virt-builder much faster.  The conditions are:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1723
+#: ../builder/virt-builder.pod:1718
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1727
+#: ../builder/virt-builder.pod:1722
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1731
+#: ../builder/virt-builder.pod:1726
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1735
+#: ../builder/virt-builder.pod:1730
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1737
+#: ../builder/virt-builder.pod:1732
 msgid ""
 "Virt-builder uses an internal implementation of pxzcat (parallel xzcat) if "
 "liblzma was found at build time.  If liblzma was not found at build time, "
@@ -4804,12 +4760,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1741
+#: ../builder/virt-builder.pod:1736
 msgid "User-Mode Linux"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1743
+#: ../builder/virt-builder.pod:1738
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -4817,78 +4773,78 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1747
+#: ../builder/virt-builder.pod:1742
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1750
+#: ../builder/virt-builder.pod:1745
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1753
+#: ../builder/virt-builder.pod:1748
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create "
 "raw-format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1756 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1751 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1758
+#: ../builder/virt-builder.pod:1753
 msgid ""
 "Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
 "require that each file has a correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1761
+#: ../builder/virt-builder.pod:1756
 msgid ""
 "Virt-builder does not know how to give new files a label, so there are two "
 "possible strategies it can use to ensure correct labelling:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1766
+#: ../builder/virt-builder.pod:1761
 msgid "Using I<--selinux-relabel>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1768
+#: ../builder/virt-builder.pod:1763
 msgid ""
 "This runs L<fixfiles(8)> just before finalizing the guest, which sets "
 "SELinux labels correctly in the disk image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1771
+#: ../builder/virt-builder.pod:1766
 msgid ""
 "Sometimes fixfiles is not possible during installation, in which case this "
 "option falls back on:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1774
+#: ../builder/virt-builder.pod:1769
 msgid "Touching C</.autorelabel>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1776
+#: ../builder/virt-builder.pod:1771
 msgid ""
 "Guest templates may already contain a file called C</.autorelabel>, or it is "
 "touched if I<--selinux-relabel> cannot run fixfiles."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1779
+#: ../builder/virt-builder.pod:1774
 msgid ""
 "For guests that use SELinux, this causes fixfiles to run at first boot.  "
 "Guests will reboot themselves once the first time you use them, which is "
@@ -4896,80 +4852,87 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1787
+#: ../builder/virt-builder.pod:1782
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1792
+#: ../builder/virt-builder.pod:1787
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1794
+#: ../builder/virt-builder.pod:1789
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1796
+#: ../builder/virt-builder.pod:1791
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1798
+#: ../builder/virt-builder.pod:1793
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1801
+#: ../builder/virt-builder.pod:1796
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1803 ../builder/virt-builder.pod:1817
+#: ../builder/virt-builder.pod:1798
+msgid ""
+"Used to determine the location of the template cache, and the location of "
+"the user' sources.  See L</CACHING> and L</SOURCES OF TEMPLATES>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1801
+msgid "C<XDG_CACHE_HOME>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1803
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1805
-msgid "C<VIRT_BUILDER_FINGERPRINT>"
+msgid "C<XDG_CONFIG_HOME>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1807
 msgid ""
-"Set the default value for the GPG signature fingerprint or comma-separated "
-"list of fingerprints (see I<--fingerprint> option)."
+"Used to determine the location of the user' sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1810
-msgid "C<VIRT_BUILDER_SOURCE>"
+msgid "C<XDG_CONFIG_DIRS>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1812
 msgid ""
-"Set the default value for the source URL (or comma-separated list of URLs) "
-"for the template repository (see I<--source> option)."
-msgstr ""
-
-#. type: =item
-#: ../builder/virt-builder.pod:1815
-msgid "C<XDG_CACHE_HOME>"
+"Used to determine the location of the system sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1823 ../cat/virt-cat.pod:246 ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:488 ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../diff/virt-diff.pod:250 ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:407 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:753 ../sparsify/virt-sparsify.pod:309
+#: ../builder/virt-builder.pod:1819 ../cat/virt-cat.pod:246 ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:488 ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../diff/virt-diff.pod:250 ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:407 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:753 ../sparsify/virt-sparsify.pod:309
 msgid "This program returns 0 if successful, or non-zero if there was an error."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1828
+#: ../builder/virt-builder.pod:1824
 msgid ""
 "L<guestfs(3)>, L<guestfish(1)>, L<guestmount(1)>, L<virt-copy-out(1)>, "
 "L<virt-install(1)>, L<virt-rescue(1)>, L<virt-resize(1)>, "
@@ -4979,7 +4942,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1850 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
+#: ../builder/virt-builder.pod:1846 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/uk.po b/po-docs/uk.po
index dee0fb473..918a86dc3 100644
--- a/po-docs/uk.po
+++ b/po-docs/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/fedora/"
@@ -707,7 +707,7 @@ msgid "B<-q>"
 msgstr "B<-q>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:553
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:547
 #: ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:225
 msgid "B<--quiet>"
@@ -749,7 +749,7 @@ msgstr ""
 "(якщо не вказано параметрів I<-a> і I<-d>)."
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:677
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:667
 #: ../cat/virt-cat.pod:140 ../cat/virt-filesystems.pod:267
 #: ../cat/virt-ls.pod:421 ../daemon/guestfsd.pod:62 ../df/virt-df.pod:185
 #: ../diff/virt-diff.pod:202 ../edit/virt-edit.pod:169
@@ -762,7 +762,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:679
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:669
 #: ../cat/virt-cat.pod:142 ../cat/virt-filesystems.pod:269
 #: ../cat/virt-ls.pod:423 ../daemon/guestfsd.pod:64 ../df/virt-df.pod:187
 #: ../diff/virt-diff.pod:204 ../edit/virt-edit.pod:171
@@ -787,7 +787,7 @@ msgstr "Увімкнути докладний показ повідомлень
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:686 ../builder/virt-index-validate.pod:68
+#: ../builder/virt-builder.pod:676 ../builder/virt-index-validate.pod:68
 #: ../cat/virt-cat.pod:146 ../cat/virt-filesystems.pod:273
 #: ../cat/virt-ls.pod:427 ../df/virt-df.pod:191 ../diff/virt-diff.pod:208
 #: ../edit/virt-edit.pod:175 ../fish/guestfish.pod:428
@@ -802,7 +802,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:688 ../builder/virt-index-validate.pod:70
+#: ../builder/virt-builder.pod:678 ../builder/virt-index-validate.pod:70
 #: ../cat/virt-cat.pod:148 ../cat/virt-filesystems.pod:275
 #: ../cat/virt-ls.pod:429 ../df/virt-df.pod:193 ../diff/virt-diff.pod:210
 #: ../edit/virt-edit.pod:177 ../fish/guestfish.pod:430
@@ -817,7 +817,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:690
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:680
 #: ../builder/virt-index-validate.pod:72 ../cat/virt-cat.pod:150
 #: ../cat/virt-filesystems.pod:277 ../cat/virt-ls.pod:431
 #: ../df/virt-df.pod:195 ../diff/virt-diff.pod:212 ../edit/virt-edit.pod:179
@@ -1191,7 +1191,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1821 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1817 ../builder/virt-index-validate.pod:76
 #: ../cat/virt-cat.pod:244 ../cat/virt-filesystems.pod:390
 #: ../cat/virt-ls.pod:486 ../daemon/guestfsd.pod:73 ../df/virt-df.pod:260
 #: ../diff/virt-diff.pod:248 ../edit/virt-edit.pod:357
@@ -1216,19 +1216,19 @@ msgstr "Ця програма повертає:"
 #: ../appliance/libguestfs-make-fixed-appliance.pod:36
 #: ../appliance/libguestfs-make-fixed-appliance.pod:54
 #: ../appliance/libguestfs-make-fixed-appliance.pod:75
-#: ../builder/virt-builder.pod:597 ../builder/virt-builder.pod:601
-#: ../builder/virt-builder.pod:966 ../builder/virt-builder.pod:973
-#: ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981
-#: ../builder/virt-builder.pod:986 ../builder/virt-builder.pod:990
-#: ../builder/virt-builder.pod:994 ../builder/virt-builder.pod:998
-#: ../builder/virt-builder.pod:1002 ../builder/virt-builder.pod:1006
-#: ../builder/virt-builder.pod:1010 ../builder/virt-builder.pod:1014
-#: ../builder/virt-builder.pod:1018 ../builder/virt-builder.pod:1022
-#: ../builder/virt-builder.pod:1026 ../builder/virt-builder.pod:1030
-#: ../builder/virt-builder.pod:1034 ../builder/virt-builder.pod:1043
-#: ../builder/virt-builder.pod:1049 ../builder/virt-builder.pod:1461
-#: ../builder/virt-builder.pod:1465 ../builder/virt-builder.pod:1721
-#: ../builder/virt-builder.pod:1725 ../builder/virt-builder.pod:1729
+#: ../builder/virt-builder.pod:591 ../builder/virt-builder.pod:595
+#: ../builder/virt-builder.pod:956 ../builder/virt-builder.pod:963
+#: ../builder/virt-builder.pod:967 ../builder/virt-builder.pod:971
+#: ../builder/virt-builder.pod:976 ../builder/virt-builder.pod:980
+#: ../builder/virt-builder.pod:984 ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:992 ../builder/virt-builder.pod:996
+#: ../builder/virt-builder.pod:1000 ../builder/virt-builder.pod:1004
+#: ../builder/virt-builder.pod:1008 ../builder/virt-builder.pod:1012
+#: ../builder/virt-builder.pod:1016 ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:1024 ../builder/virt-builder.pod:1033
+#: ../builder/virt-builder.pod:1039 ../builder/virt-builder.pod:1203
+#: ../builder/virt-builder.pod:1208 ../builder/virt-builder.pod:1716
+#: ../builder/virt-builder.pod:1720 ../builder/virt-builder.pod:1724
 #: ../builder/virt-index-validate.pod:34 ../builder/virt-index-validate.pod:39
 #: ../builder/virt-index-validate.pod:53 ../builder/virt-index-validate.pod:58
 #: ../cat/virt-cat.pod:183 ../cat/virt-cat.pod:188 ../cat/virt-cat.pod:193
@@ -1405,7 +1405,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1826 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1822 ../builder/virt-index-validate.pod:81
 #: ../cat/virt-cat.pod:249 ../cat/virt-filesystems.pod:395
 #: ../cat/virt-ls.pod:491 ../daemon/guestfsd.pod:117 ../df/virt-df.pod:265
 #: ../diff/virt-diff.pod:253 ../edit/virt-edit.pod:362
@@ -1440,7 +1440,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1844
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1840
 #: ../builder/virt-index-validate.pod:86 ../cat/virt-cat.pod:258
 #: ../cat/virt-filesystems.pod:406 ../cat/virt-ls.pod:501
 #: ../daemon/guestfsd.pod:122 ../df/virt-df.pod:273 ../diff/virt-diff.pod:263
@@ -1454,7 +1454,7 @@ msgid "AUTHOR"
 msgstr "АВТОР"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1846
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1842
 #: ../builder/virt-index-validate.pod:88 ../cat/virt-cat.pod:260
 #: ../cat/virt-filesystems.pod:408 ../cat/virt-ls.pod:503
 #: ../daemon/guestfsd.pod:124 ../df/virt-df.pod:275 ../diff/virt-diff.pod:265
@@ -1470,7 +1470,7 @@ msgstr "Richard W.M. Jones L<http://people.redhat.com/~rjones/>"
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:406
 #: ../appliance/libguestfs-make-fixed-appliance.pod:178
-#: ../builder/virt-builder.pod:1848 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1844 ../builder/virt-index-validate.pod:90
 #: ../cat/virt-cat.pod:262 ../cat/virt-filesystems.pod:410
 #: ../cat/virt-ls.pod:505 ../daemon/guestfsd.pod:126 ../df/virt-df.pod:277
 #: ../diff/virt-diff.pod:267 ../edit/virt-edit.pod:377
@@ -1802,7 +1802,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1785 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1780 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1387 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4610 ../test-tool/libguestfs-test-tool.pod:177
@@ -1944,7 +1944,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1547
+#: ../builder/virt-builder.pod:39 ../builder/virt-builder.pod:1542
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1952,7 +1952,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1555
+#: ../builder/virt-builder.pod:41 ../builder/virt-builder.pod:1550
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1960,7 +1960,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:43 ../builder/virt-builder.pod:1546
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2154,7 +2154,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:119 ../builder/virt-builder.pod:558
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -2565,66 +2565,54 @@ msgid ""
 "source URL."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:295
-msgid ""
-"The default fingerprint (if none are supplied) is S<F777 4FB1 AD07 4A7E 8C87 "
-"67EA 9173 8F73 E1B7 68A0> (which is S<Richard W.M. Jones's> key)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:299
-msgid "You can also set the C<VIRT_BUILDER_FINGERPRINT> environment variable."
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:301
+#: ../builder/virt-builder.pod:295
 msgid "B<--firstboot> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:303
+#: ../builder/virt-builder.pod:297
 msgid "B<--firstboot-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:305
+#: ../builder/virt-builder.pod:299
 msgid ""
 "Install C<SCRIPT> inside the guest, so that when the guest first boots up, "
 "the script runs (as root, late in the boot process)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:308
+#: ../builder/virt-builder.pod:302
 msgid "The script is automatically chmod +x after installation in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:310
+#: ../builder/virt-builder.pod:304
 msgid ""
 "The alternative version I<--firstboot-command> is the same, but it "
 "conveniently wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:313
+#: ../builder/virt-builder.pod:307
 msgid ""
 "You can have multiple I<--firstboot> and I<--firstboot-command> options.  "
 "They run in the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:317
+#: ../builder/virt-builder.pod:311
 msgid "See also I<--run>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:319
+#: ../builder/virt-builder.pod:313
 msgid "B<--firstboot-install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:321
+#: ../builder/virt-builder.pod:315
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "when the guest first boots using the guest's package manager (eg. apt, yum, "
@@ -2632,19 +2620,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:325 ../builder/virt-builder.pod:372
+#: ../builder/virt-builder.pod:319 ../builder/virt-builder.pod:366
 msgid ""
 "For an overview on the different ways to install packages, see L</INSTALLING "
 "PACKAGES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:328 ../sparsify/virt-sparsify.pod:182
+#: ../builder/virt-builder.pod:322 ../sparsify/virt-sparsify.pod:182
 msgid "B<--format> qcow2"
 msgstr "B<--format> qcow2"
 
 #. type: =item
-#: ../builder/virt-builder.pod:330 ../resize/virt-resize.pod:400
+#: ../builder/virt-builder.pod:324 ../resize/virt-resize.pod:400
 #: ../sparsify/virt-sparsify.pod:180 ../tools/virt-list-filesystems:92
 #: ../tools/virt-list-partitions:93 ../tools/virt-tar:140
 #: ../tools/virt-win-reg:141
@@ -2652,23 +2640,23 @@ msgid "B<--format> raw"
 msgstr "B<--format> raw"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:332
+#: ../builder/virt-builder.pod:326
 msgid ""
 "For ordinary builds, this selects the output format.  The default is I<raw>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:334
+#: ../builder/virt-builder.pod:328
 msgid "With I<--get-kernel> this specifies the input format."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:336
+#: ../builder/virt-builder.pod:330
 msgid "B<--get-kernel> IMAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:338
+#: ../builder/virt-builder.pod:332
 msgid ""
 "This option extracts the kernel and initramfs from a previously built disk "
 "image called C<IMAGE> (in fact it works for any VM disk image, not just ones "
@@ -2676,21 +2664,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:342
+#: ../builder/virt-builder.pod:336
 msgid ""
 "The kernel and initramfs are written to the current directory, unless you "
 "also specify the I<--output> C<outputdir> B<directory> name."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:345
+#: ../builder/virt-builder.pod:339
 msgid ""
 "The format of the disk image is automatically detected unless you specify it "
 "by using the I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:348
+#: ../builder/virt-builder.pod:342
 msgid ""
 "In the case where the guest contains multiple kernels, the one with the "
 "highest version number is chosen.  To extract arbitrary kernels from the "
@@ -2699,12 +2687,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:353
+#: ../builder/virt-builder.pod:347
 msgid "B<--gpg> GPG"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:355
+#: ../builder/virt-builder.pod:349
 msgid ""
 "Specify an alternate L<gpg(1)> (GNU Privacy Guard) binary.  You can also use "
 "this to add gpg parameters, for example to specify an alternate home "
@@ -2712,7 +2700,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:359
+#: ../builder/virt-builder.pod:353
 #, no-wrap
 msgid ""
 " virt-builder --gpg \"gpg --homedir /tmp\" [...]\n"
@@ -2720,24 +2708,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:361
+#: ../builder/virt-builder.pod:355
 msgid "B<--hostname> HOSTNAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:363
+#: ../builder/virt-builder.pod:357
 msgid ""
 "Set the hostname of the guest to C<HOSTNAME>.  You can use a dotted hostname."
 "domainname (FQDN) if you want."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:366
+#: ../builder/virt-builder.pod:360
 msgid "B<--install> PKG[,PKG,...]"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:368
+#: ../builder/virt-builder.pod:362
 msgid ""
 "Install the named packages (a comma-separated list).  These are installed "
 "during the image build using the guest's package manager (eg. apt, yum, "
@@ -2745,105 +2733,105 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:375
+#: ../builder/virt-builder.pod:369
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--update>."
 msgstr "Див. також I<--long>."
 
 #. type: =item
-#: ../builder/virt-builder.pod:377
+#: ../builder/virt-builder.pod:371
 msgid "B<--link TARGET:LINK>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:373
 msgid "B<--link TARGET:LINK[:LINK...]>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:375
 msgid ""
 "Create symbolic link(s) in the guest, starting at C<LINK> and pointing at "
 "C<TARGET>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:384 ../cat/virt-filesystems.pod:211
+#: ../builder/virt-builder.pod:378 ../cat/virt-filesystems.pod:211
 #: ../cat/virt-ls.pod:362 ../tools/virt-list-filesystems:109
 #: ../tools/virt-list-partitions:120
 msgid "B<-l>"
 msgstr "B<-l>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:380
 msgid "B<--list>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:382
 #, fuzzy
 #| msgid "B<--format> raw"
 msgid "B<--list --format> format"
 msgstr "B<--format> raw"
 
 #. type: =item
-#: ../builder/virt-builder.pod:390
+#: ../builder/virt-builder.pod:384
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:386
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:388
 msgid ""
 "It is possible to choose with I<--format> the output format for the list "
 "templates:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:399
+#: ../builder/virt-builder.pod:393
 msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:401
+#: ../builder/virt-builder.pod:395
 msgid ""
 "The default format, prints only the template identifier and, next to it, its "
 "short description."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:398
 #, fuzzy
 #| msgid "B<--long>"
 msgid "B<long>"
 msgstr "B<--long>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:400
 msgid ""
 "Prints a textual list with the details of the available sources, followed by "
 "the details of the available templates."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:409
+#: ../builder/virt-builder.pod:403
 msgid "B<json>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:411
+#: ../builder/virt-builder.pod:405
 msgid ""
 "Prints a JSON object with the details of the available sources and the "
 "details of the available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:414
+#: ../builder/virt-builder.pod:408
 msgid ""
 "The C<version> key in the main object represents the \"compatibility version"
 "\", and it is bumped every time the resulting JSON output is incompatible "
@@ -2852,22 +2840,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:415
 msgid "I<--long> is a shorthand for the C<long> format."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:423
-msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
+#: ../builder/virt-builder.pod:417
+msgid "See also: I<--source>, I<--notes>, L</SOURCES OF TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:425
+#: ../builder/virt-builder.pod:419
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:427
+#: ../builder/virt-builder.pod:421
 msgid ""
 "Scrub C<builder.log> (log file from build commands) from the image after "
 "building is complete.  If you don't want to reveal precisely how the image "
@@ -2875,26 +2863,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:425
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:433
+#: ../builder/virt-builder.pod:427
 #, fuzzy
 #| msgid "B<-m MB>"
 msgid "B<-m> MB"
 msgstr "B<-m МБ>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:435
+#: ../builder/virt-builder.pod:429
 #, fuzzy
 #| msgid "B<--memsize MB>"
 msgid "B<--memsize> MB"
 msgstr "B<--memsize МБ>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:437
+#: ../builder/virt-builder.pod:431
 msgid ""
 "Change the amount of memory allocated to I<--run> scripts.  Increase this if "
 "you find that I<--run> scripts or the I<--install> option are running out of "
@@ -2902,12 +2890,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:441
+#: ../builder/virt-builder.pod:435
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:437
 #, fuzzy, no-wrap
 #| msgid "guestfs_get_memsize"
 msgid ""
@@ -2916,62 +2904,62 @@ msgid ""
 msgstr "guestfs_get_memsize"
 
 #. type: =item
-#: ../builder/virt-builder.pod:445
+#: ../builder/virt-builder.pod:439
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:447
+#: ../builder/virt-builder.pod:441
 #, fuzzy
 #| msgid "Remove \".ssh\" directories in the guest."
 msgid "Create a directory in the guest."
 msgstr "Вилучити каталоги «.ssh» у гостьовій системі."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:449
+#: ../builder/virt-builder.pod:443
 msgid ""
 "This uses S<C<mkdir -p>> so any intermediate directories are created, and it "
 "also works if the directory already exists."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:452 ../fish/guestfish.pod:343
+#: ../builder/virt-builder.pod:446 ../fish/guestfish.pod:343
 #: ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:454
+#: ../builder/virt-builder.pod:448
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:456
+#: ../builder/virt-builder.pod:450
 msgid ""
 "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:458
+#: ../builder/virt-builder.pod:452
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:460
+#: ../builder/virt-builder.pod:454
 msgid ""
 "The network only allows outgoing connections and has other minor "
 "limitations.  See L<virt-rescue(1)/NETWORK>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:457
 msgid ""
 "If you use I<--no-network> then certain other options such as I<--install> "
 "will not work."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:466
+#: ../builder/virt-builder.pod:460
 msgid ""
 "This does not affect whether the guest can access the network once it has "
 "been booted, because that is controlled by your hypervisor or cloud "
@@ -2979,14 +2967,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:470
+#: ../builder/virt-builder.pod:464
 msgid ""
 "Generally speaking you should I<not> use I<--no-network>.  But here are some "
 "reasons why you might want to:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:475 ../builder/virt-builder.pod:1069
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1059
 #: ../examples/guestfs-faq.pod:472 ../examples/guestfs-faq.pod:759
 #: ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:203 ../examples/guestfs-recipes.pod:408
@@ -2998,14 +2986,14 @@ msgid "1."
 msgstr "1."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:477
+#: ../builder/virt-builder.pod:471
 msgid ""
 "Because the libguestfs backend that you are using doesn't support the "
 "network.  (See: L<guestfs(3)/BACKEND>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:480 ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:474 ../builder/virt-builder.pod:1064
 #: ../examples/guestfs-faq.pod:482 ../examples/guestfs-faq.pod:769
 #: ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:210 ../examples/guestfs-recipes.pod:414
@@ -3017,14 +3005,14 @@ msgid "2."
 msgstr "2."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:482
+#: ../builder/virt-builder.pod:476
 msgid ""
 "Any software you need to install comes from an attached ISO, so you don't "
 "need the network."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:485 ../examples/guestfs-faq.pod:488
+#: ../builder/virt-builder.pod:479 ../examples/guestfs-faq.pod:488
 #: ../examples/guestfs-faq.pod:774 ../examples/guestfs-performance.pod:216
 #: ../examples/guestfs-recipes.pod:420 ../rescue/virt-rescue.pod:345
 #: ../resize/virt-resize.pod:52 ../resize/virt-resize.pod:634
@@ -3034,7 +3022,7 @@ msgid "3."
 msgstr "3."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:487
+#: ../builder/virt-builder.pod:481
 msgid ""
 "You don't want untrusted guest code trying to access your host network when "
 "running virt-builder.  This is particularly an issue when you don't trust "
@@ -3042,34 +3030,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:492 ../examples/guestfs-faq.pod:494
+#: ../builder/virt-builder.pod:486 ../examples/guestfs-faq.pod:494
 #: ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr "4."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:494
+#: ../builder/virt-builder.pod:488
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:498 ../fish/guestfish.pod:360
+#: ../builder/virt-builder.pod:492 ../fish/guestfish.pod:360
 #: ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:500
+#: ../builder/virt-builder.pod:494
 msgid "Do not sync the output file on exit."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:502
+#: ../builder/virt-builder.pod:496
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:504
+#: ../builder/virt-builder.pod:498
 msgid ""
 "The reason is that qemu/KVM's default caching mode is C<none> or "
 "C<directsync>, both of which bypass the host page cache.  Therefore these "
@@ -3080,36 +3068,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:511
+#: ../builder/virt-builder.pod:505
 msgid ""
 "If you are not using these broken caching modes, you can use I<--no-sync> to "
 "avoid this unnecessary sync and gain considerable extra performance."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:515
+#: ../builder/virt-builder.pod:509
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:517
+#: ../builder/virt-builder.pod:511
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:514
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:516
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:524
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Write the output to C<filename>.  If you don't specify this option, then the "
 "output filename is generated by taking the C<os-version> string and adding "
@@ -3117,36 +3105,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:529
+#: ../builder/virt-builder.pod:523
 msgid ""
 "Note that the output filename could be a device, partition or logical volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:526
 msgid ""
 "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:535
+#: ../builder/virt-builder.pod:529
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:537 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:531 ../sysprep/sysprep-extra-options.pod:92
 msgid "Set the password encryption to C<md5>, C<sha256> or C<sha512>."
 msgstr "Встановити спосіб шифрування паролів: C<md5>, C<sha256> або C<sha512>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:539
+#: ../builder/virt-builder.pod:533
 msgid ""
 "C<sha256> and C<sha512> require glibc E<ge> 2.7 (check crypt(3) inside the "
 "guest)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:542 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:536 ../sysprep/sysprep-extra-options.pod:97
 msgid ""
 "C<md5> will work with relatively old Linux guests (eg. RHEL 3), but is not "
 "secure against modern attacks."
@@ -3155,7 +3143,7 @@ msgstr ""
 "(наприкладRHEL 3), але є незахищеним щодо новітніх способів атак."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:545 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:539 ../sysprep/sysprep-extra-options.pod:100
 msgid ""
 "The default is C<sha512> unless libguestfs detects an old guest that didn't "
 "have support for SHA-512, in which case it will use C<md5>.  You can "
@@ -3168,51 +3156,51 @@ msgstr ""
 "спосіб шифрування."
 
 #. type: =item
-#: ../builder/virt-builder.pod:549
+#: ../builder/virt-builder.pod:543
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:551
+#: ../builder/virt-builder.pod:545
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:555
+#: ../builder/virt-builder.pod:549
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:557
+#: ../builder/virt-builder.pod:551
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> SELECTOR"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:559
+#: ../builder/virt-builder.pod:553
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:561
+#: ../builder/virt-builder.pod:555
 msgid ""
 "See L</USERS AND PASSWORDS> below for the format of the C<SELECTOR> field, "
 "and also how to set up user accounts."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:567
+#: ../builder/virt-builder.pod:561
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:569
+#: ../builder/virt-builder.pod:563
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:571
+#: ../builder/virt-builder.pod:565
 msgid ""
 "Run the shell script (or any program) called C<SCRIPT> on the disk image.  "
 "The script runs virtualized inside a small appliance, chrooted into the "
@@ -3220,12 +3208,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:575
+#: ../builder/virt-builder.pod:569
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:577
+#: ../builder/virt-builder.pod:571
 msgid ""
 "If libguestfs supports it then a limited network connection is available but "
 "it only allows outgoing network connections.  You can also attach data disks "
@@ -3235,79 +3223,79 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:583
+#: ../builder/virt-builder.pod:577
 msgid ""
 "The alternative version I<--run-command> is the same, but it conveniently "
 "wraps the command up in a single line script for you."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:580
 msgid ""
 "You can have multiple I<--run> and I<--run-command> options.  They run in "
 "the same order that they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:589
+#: ../builder/virt-builder.pod:583
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:591
+#: ../builder/virt-builder.pod:585
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:593
+#: ../builder/virt-builder.pod:587
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:599
+#: ../builder/virt-builder.pod:593
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:603
+#: ../builder/virt-builder.pod:597
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:607
+#: ../builder/virt-builder.pod:601
 msgid "B<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:609
+#: ../builder/virt-builder.pod:603
 msgid "Relabel files in the guest so that they have the correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:605
 msgid "You should only use this option for guests which support SELinux."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:613
+#: ../builder/virt-builder.pod:607
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:609
 msgid ""
 "Select the size of the output disk, where the size can be specified using "
 "common names such as C<32G> (32 gigabytes) etc."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:618
+#: ../builder/virt-builder.pod:612
 msgid ""
 "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:621
+#: ../builder/virt-builder.pod:615
 msgid ""
 "If the size is not specified, then one of two things happens.  If the output "
 "is a file, then the size is the same as the template.  If the output is a "
@@ -3315,51 +3303,48 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:626
+#: ../builder/virt-builder.pod:620
 msgid ""
 "To specify size in bytes, the number must be followed by the lowercase "
 "letter I<b>, eg: S<C<--size 10737418240b>>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:629 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:623 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr "B<--smp> N"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:631
+#: ../builder/virt-builder.pod:625
 msgid "Enable N E<ge> 2 virtual CPUs for I<--run> scripts to use."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:633
+#: ../builder/virt-builder.pod:627
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:635
+#: ../builder/virt-builder.pod:629
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:637
-msgid ""
-"You can give this option multiple times to specify multiple sources.  If not "
-"specified it defaults to L<http://libguestfs.org/download/builder/index.asc>"
-msgstr ""
+#: ../builder/virt-builder.pod:631
+#, fuzzy
+#| msgid "You can give this option multiple times."
+msgid "You can give this option multiple times to specify multiple sources."
+msgstr "Цей параметр можна вказувати декілька разів."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:641
-msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
-msgstr ""
+#: ../builder/virt-builder.pod:633
+#, fuzzy
+#| msgid "See L</RANDOM SEED> below."
+msgid "See also L</SOURCES OF TEMPLATES> below."
+msgstr "Див. L</RANDOM SEED> нижче."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:643
-msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:645
+#: ../builder/virt-builder.pod:635
 msgid ""
 "Note that you should not point I<--source> to sources that you don't trust "
 "(unless the source is signed by someone you do trust).  See also the I<--no-"
@@ -3367,28 +3352,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:639
 #, fuzzy
 #| msgid "B<--timeout N>"
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timeout N>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:651
+#: ../builder/virt-builder.pod:641
 msgid ""
 "Set the default timezone of the guest to C<TIMEZONE>.  Use a location string "
 "like C<Europe/London>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:654
+#: ../builder/virt-builder.pod:644
 #, fuzzy
 #| msgid "B<--parts>"
 msgid "B<--update>"
 msgstr "B<--parts>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:656
+#: ../builder/virt-builder.pod:646
 msgid ""
 "Do the equivalent of C<yum update>, C<apt-get upgrade>, or whatever command "
 "is required to update the packages already installed in the template to "
@@ -3396,19 +3381,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:660
+#: ../builder/virt-builder.pod:650
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--install>."
 msgstr "Див. також I<--long>."
 
 #. type: =item
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:652
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:664
+#: ../builder/virt-builder.pod:654
 msgid ""
 "Upload local file C<FILE> to destination C<DEST> in the disk image.  File "
 "owner and permissions from the original are preserved, so you should set "
@@ -3416,14 +3401,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:658
 msgid ""
 "C<DEST> could be the final filename.  This can be used to rename the file on "
 "upload."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:661
 msgid ""
 "If C<DEST> is a directory name (which must already exist in the guest)  then "
 "the file is uploaded into that directory, and it keeps the same name as on "
@@ -3431,56 +3416,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:665
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:681
+#: ../builder/virt-builder.pod:671
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:673
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:682
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:694
+#: ../builder/virt-builder.pod:684
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:698
+#: ../builder/virt-builder.pod:688
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:700
+#: ../builder/virt-builder.pod:690
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:702
+#: ../builder/virt-builder.pod:692
 msgid ""
 "There are several approaches to installing packages or applications in the "
 "guest which have different trade-offs."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:705
+#: ../builder/virt-builder.pod:695
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:707
+#: ../builder/virt-builder.pod:697
 msgid ""
 "If the guest OS you are installing is similar to the host OS (eg.  both are "
 "Linux), and if libguestfs supports network connections, then you can use I<--"
@@ -3488,7 +3473,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:711
+#: ../builder/virt-builder.pod:701
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3496,23 +3481,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:713
+#: ../builder/virt-builder.pod:703
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:716
+#: ../builder/virt-builder.pod:706
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:718
+#: ../builder/virt-builder.pod:708
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:720
+#: ../builder/virt-builder.pod:710
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -3520,7 +3505,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:712
 msgid ""
 "Most of the templates that ship with virt-builder come with a very minimal "
 "selection of packages (known as a \"JEOS\" or \"Just Enough Operating System"
@@ -3530,17 +3515,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:728
+#: ../builder/virt-builder.pod:718
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:730
+#: ../builder/virt-builder.pod:720
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:722
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3548,13 +3533,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:734
+#: ../builder/virt-builder.pod:724
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:737
+#: ../builder/virt-builder.pod:727
 msgid ""
 "The downsides are that it will take the guest a lot longer to boot first "
 "time, and there's nothing much you can do if package installation fails (eg. "
@@ -3562,12 +3547,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:742
+#: ../builder/virt-builder.pod:732
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:744
+#: ../builder/virt-builder.pod:734
 msgid ""
 "If the software you want to install is not available in the main package "
 "repository of the guest, then you can add a side repository.  Usually this "
@@ -3575,14 +3560,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:739
 msgid ""
 "You can create the disk image using either L<genisoimage(1)> or L<virt-make-"
 "fs(1)>.  For genisoimage, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:752
+#: ../builder/virt-builder.pod:742
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -3590,14 +3575,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:744
 msgid ""
 "Create a script that mounts the ISO and sets up the repository.  For yum, "
 "create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:757 ../builder/virt-builder.pod:771
+#: ../builder/virt-builder.pod:747 ../builder/virt-builder.pod:761
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -3606,7 +3591,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:760
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3619,7 +3604,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:767
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3627,12 +3612,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:769
+#: ../builder/virt-builder.pod:759
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:774
+#: ../builder/virt-builder.pod:764
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3641,14 +3626,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:777
+#: ../builder/virt-builder.pod:767
 msgid ""
 "Use the I<--attach> option to attach the CD / disk image and the I<--run> "
 "option to run the script:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:780
+#: ../builder/virt-builder.pod:770
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3658,12 +3643,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:784
+#: ../builder/virt-builder.pod:774
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:786
+#: ../builder/virt-builder.pod:776
 msgid ""
 "The I<--root-password> option is used to change the root password (otherwise "
 "a random password is used).  This option takes a password C<SELECTOR> in one "
@@ -3671,12 +3656,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:792
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:794
+#: ../builder/virt-builder.pod:784
 msgid ""
 "Read the root password from C<FILENAME>.  The whole first line of this file "
 "is the replacement password.  Any other lines are ignored.  You should "
@@ -3684,117 +3669,117 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:789
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:801
+#: ../builder/virt-builder.pod:791
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:793 ../sysprep/sysprep-extra-options.pod:44
 msgid ""
 "B<Note: this is not secure> since any user on the same machine can see the "
 "cleartext password using L<ps(1)>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:806
+#: ../builder/virt-builder.pod:796
 #, fuzzy
 #| msgid "B<--root-password password:PASSWORD>"
 msgid "B<--root-password> random"
 msgstr "B<--root-password password:ПАРОЛЬ>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:798 ../sysprep/sysprep-extra-options.pod:51
 msgid ""
 "Choose a random password, which is printed on stdout.  The password has "
 "approximately 120 bits of randomness."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:811 ../fish/guestfish-actions.pod:380
+#: ../builder/virt-builder.pod:801 ../fish/guestfish-actions.pod:380
 #: ../format/virt-format.pod:140 ../src/guestfs-actions.pod:473
 msgid "This is the default."
 msgstr "Типове значення."
 
 #. type: =item
-#: ../builder/virt-builder.pod:813 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:56
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> disabled"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:815
+#: ../builder/virt-builder.pod:805
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:808 ../sysprep/sysprep-extra-options.pod:67
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> locked:file:FILENAME"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:810 ../sysprep/sysprep-extra-options.pod:69
 #, fuzzy
 #| msgid "B<--root-password password:PASSWORD>"
 msgid "B<--root-password> locked:password:PASSWORD"
 msgstr "B<--root-password password:ПАРОЛЬ>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:822 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:812 ../sysprep/sysprep-extra-options.pod:71
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> locked:random"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:824
+#: ../builder/virt-builder.pod:814
 msgid ""
 "The root account is locked, but a password is placed on the account.  If "
 "first unlocked (using C<passwd -u>) then logins will use the given password."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:828 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:818 ../sysprep/sysprep-extra-options.pod:81
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> locked"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:830 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:820 ../sysprep/sysprep-extra-options.pod:83
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> locked:disabled"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:822
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:836
+#: ../builder/virt-builder.pod:826
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:828
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:831
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3803,7 +3788,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:844
+#: ../builder/virt-builder.pod:834
 msgid ""
 "The above command will create an C<rjones> account with no password, and "
 "force the user to set a password when they first log in.  There are other "
@@ -3811,12 +3796,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:848
+#: ../builder/virt-builder.pod:838
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:850
+#: ../builder/virt-builder.pod:840
 msgid ""
 "Because there are so many different ways to set the keyboard layout in Linux "
 "distributions, virt-builder does not yet attempt to have a simple command "
@@ -3825,17 +3810,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:855
+#: ../builder/virt-builder.pod:845
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:857
+#: ../builder/virt-builder.pod:847
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:859
+#: ../builder/virt-builder.pod:849
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3844,19 +3829,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:862
+#: ../builder/virt-builder.pod:852
 msgid ""
 "See L<localectl(1)> and L<https://www.happyassassin.net/2013/11/23/keyboard-"
 "layouts-in-fedora-20-and-previously/> for more details."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:866
+#: ../builder/virt-builder.pod:856
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:868
+#: ../builder/virt-builder.pod:858
 msgid ""
 "For RHEL E<le> 6, Fedora E<le> 18 and similar, upload or modify the keyboard "
 "configuration file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3864,7 +3849,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:872
+#: ../builder/virt-builder.pod:862
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -3873,17 +3858,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:865
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:877
+#: ../builder/virt-builder.pod:867
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:879
+#: ../builder/virt-builder.pod:869
 msgid ""
 "For Debian-derived distros using C</etc/default/keyboard>, upload or modify "
 "the keyboard file using the I<--upload>, I<--write> or I<--edit> options.  "
@@ -3891,7 +3876,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:883
+#: ../builder/virt-builder.pod:873
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3900,24 +3885,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:886
+#: ../builder/virt-builder.pod:876
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:888
+#: ../builder/virt-builder.pod:878
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:880
 msgid ""
 "Most Linux distributions support multiple locale settings so that you can "
 "have guest messages printed in another language such as Russian."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:893
+#: ../builder/virt-builder.pod:883
 msgid ""
 "However there is no single setting which controls this, since extra packages "
 "may need to be installed to support console and X fonts, and keyboard input "
@@ -3926,17 +3911,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:899
+#: ../builder/virt-builder.pod:889
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:901
+#: ../builder/virt-builder.pod:891
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:903
+#: ../builder/virt-builder.pod:893
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3953,12 +3938,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:914
+#: ../builder/virt-builder.pod:904
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:916
+#: ../builder/virt-builder.pod:906
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3966,7 +3951,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:920
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -3979,7 +3964,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:927
+#: ../builder/virt-builder.pod:917
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3993,12 +3978,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:935
+#: ../builder/virt-builder.pod:925
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:937
+#: ../builder/virt-builder.pod:927
 msgid ""
 "Scripts and package installation that runs at build time (I<--run>, I<--run-"
 "command>, I<--install>, I<--update>, but I<not> firstboot) is logged in one "
@@ -4006,151 +3991,151 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:933
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:945
+#: ../builder/virt-builder.pod:935
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:937
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:949
+#: ../builder/virt-builder.pod:939
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:941
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:953
+#: ../builder/virt-builder.pod:943
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:957
+#: ../builder/virt-builder.pod:947
 msgid ""
 "If you don't want the log file to appear in the final image, then use the "
 "I<--no-logfile> command line option."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:960
+#: ../builder/virt-builder.pod:950
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:962
+#: ../builder/virt-builder.pod:952
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:968
+#: ../builder/virt-builder.pod:958
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:970
+#: ../builder/virt-builder.pod:960
 msgid ""
 "If the template image is present in the cache, the cached version is used "
 "instead.  (See L</CACHING>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:965
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:969
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "Файл стиснено на диску."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:973
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:988
+#: ../builder/virt-builder.pod:978
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:992
+#: ../builder/virt-builder.pod:982
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:996
+#: ../builder/virt-builder.pod:986
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:990
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1004
+#: ../builder/virt-builder.pod:994
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:998
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1012
+#: ../builder/virt-builder.pod:1002
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016
+#: ../builder/virt-builder.pod:1006
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:1010
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1024
+#: ../builder/virt-builder.pod:1014
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1028
+#: ../builder/virt-builder.pod:1018
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1032
+#: ../builder/virt-builder.pod:1022
 msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1036
+#: ../builder/virt-builder.pod:1026
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
+#: ../builder/virt-builder.pod:1029
 msgid ""
 "Note that although firstboot scripts are installed at this step, they do not "
 "run until the guest is booted first time.  Firstboot scripts will run in the "
@@ -4158,39 +4143,39 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1035
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1047
+#: ../builder/virt-builder.pod:1037
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1051
+#: ../builder/virt-builder.pod:1041
 msgid "SELinux relabelling is done (I<--selinux-relabel>)."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1045
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1057
+#: ../builder/virt-builder.pod:1047
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1059
+#: ../builder/virt-builder.pod:1049
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1062
+#: ../builder/virt-builder.pod:1052
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -4199,7 +4184,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1065 ../examples/guestfs-recipes.pod:261
+#: ../builder/virt-builder.pod:1055 ../examples/guestfs-recipes.pod:261
 #: ../fish/guestfish-actions.pod:2144 ../fish/guestfish-actions.pod:2694
 #: ../fish/guestfish-actions.pod:3290 ../src/guestfs-actions.pod:3418
 #: ../src/guestfs-actions.pod:4293 ../src/guestfs-actions.pod:5178
@@ -4208,14 +4193,14 @@ msgid "Notes:"
 msgstr "Нотатки:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1071
+#: ../builder/virt-builder.pod:1061
 msgid ""
 "You I<must> specify the correct format.  The format is C<raw> unless you "
 "used virt-builder's I<--format> option."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1066
 msgid ""
 "You can run virt-install as root or non-root.  Each works slightly "
 "differently because libvirt manages a different set of virtual machines for "
@@ -4225,17 +4210,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1074
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1076
 msgid "Import the image into Glance (the OpenStack image store) by doing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1078
 #, no-wrap
 msgid ""
 " glance image-create --name fedora-20-image --file fedora-20.img \\\n"
@@ -4245,7 +4230,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1092
+#: ../builder/virt-builder.pod:1082
 msgid ""
 "The I<--file> parameter is the virt-builder-generated disk image.  It should "
 "match virt-builder's I<--output> option.  The I<--disk-format> parameter "
@@ -4255,19 +4240,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1098
+#: ../builder/virt-builder.pod:1088
 msgid ""
 "You can use the S<C<glance image-show I<fedora-20-image>>> command to "
 "display the properties of the image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1091
 msgid "To boot up an instance of your image on a Nova compute node, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1093
 #, no-wrap
 msgid ""
 " nova boot fedora-20-server --image fedora-20-image \\\n"
@@ -4276,19 +4261,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1106
+#: ../builder/virt-builder.pod:1096
 msgid ""
 "Use S<C<nova flavor-list>> to list possible machine flavors.  Use S<C<nova "
 "list>> to list running instances."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1109
+#: ../builder/virt-builder.pod:1099
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1111
+#: ../builder/virt-builder.pod:1101
 msgid ""
 "The qemu command line is not very stable or easy to use, hence libvirt "
 "should be used if possible.  However a command line similar to the following "
@@ -4296,7 +4281,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1115
+#: ../builder/virt-builder.pod:1105
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -4308,38 +4293,38 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1121
+#: ../builder/virt-builder.pod:1111
 msgid ""
 "As with libvirt, it is very important that the correct format is chosen.  It "
 "will be C<raw> unless the I<--format> option was used."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1114
 #, fuzzy
 #| msgid "CONNECTION MANAGEMENT"
 msgid "CONFIGURATION MANAGEMENT"
 msgstr "КЕРУВАННЯ З’ЄДНАННЯМ"
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1126
+#: ../builder/virt-builder.pod:1116
 msgid "Puppet"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1128
+#: ../builder/virt-builder.pod:1118
 msgid ""
 "To enable the Puppet agent in a guest, install the package, point the "
 "configuration at your Puppetmaster, and ensure the agent runs at boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1132
+#: ../builder/virt-builder.pod:1122
 msgid "A typical virt-builder command would be:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1124
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -4354,26 +4339,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1143
+#: ../builder/virt-builder.pod:1133
 msgid ""
 "The precise instructions vary according to the Linux distro.  For further "
 "information see: L<http://docs.puppetlabs.com/guides/installation.htm>"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1147
+#: ../builder/virt-builder.pod:1137
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1149
+#: ../builder/virt-builder.pod:1139
 msgid ""
 "If virt-builder itself fails, then enable debugging (I<-v>) and report a bug "
 "(see L</BUGS> below)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1142
 msgid ""
 "If virt-builder fails because some script or package it is installing fails, "
 "try using I<--no-delete-on-failure> to preserve the output file, and "
@@ -4381,24 +4366,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1156
+#: ../builder/virt-builder.pod:1146
 msgid ""
 "If virt-builder is successful but the image doesn't work, here are some "
 "things to try:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1161
+#: ../builder/virt-builder.pod:1151
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1153
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1155
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -4406,7 +4391,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1167
+#: ../builder/virt-builder.pod:1157
 msgid ""
 "This gives you a rescue shell.  You can mount the filesystems from the disk "
 "image on C</sysroot> and examine them using ordinary Linux commands.  You "
@@ -4415,17 +4400,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1173
+#: ../builder/virt-builder.pod:1163
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1175
+#: ../builder/virt-builder.pod:1165
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1177
+#: ../builder/virt-builder.pod:1167
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -4433,25 +4418,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1169
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1182
+#: ../builder/virt-builder.pod:1172
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1174
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1176
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -4461,12 +4446,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1190
+#: ../builder/virt-builder.pod:1180
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1192
+#: ../builder/virt-builder.pod:1182
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -4474,12 +4459,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1194
+#: ../builder/virt-builder.pod:1184
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1196
+#: ../builder/virt-builder.pod:1186
 msgid ""
 "If the guest hangs during boot, it can be helpful to add a serial console to "
 "the guest, and direct kernel messages to the serial console.  Adding the "
@@ -4489,7 +4474,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1202
+#: ../builder/virt-builder.pod:1192
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -4497,26 +4482,105 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1206
-msgid "CREATING YOUR OWN TEMPLATES"
+#: ../builder/virt-builder.pod:1196
+msgid "SOURCES OF TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1208
+#: ../builder/virt-builder.pod:1198
+msgid ""
+"virt-builder reads the available sources from configuration files, with the "
+"I<.conf> extension and located in the following paths:"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1205
+msgid ""
+"$XDG_CONFIG_HOME/virt-builder/repos.d/ (C<$XDG_CONFIG_HOME> is C<$HOME/."
+"config> if not set)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1210
+msgid ""
+"$XDG_CONFIG_DIRS/virt-builder/repos.d/ (where C<$XDG_CONFIG_DIRS> means any "
+"of the directories in that environment variable, or just C</etc/xdg> if not "
+"set)"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1216
+msgid ""
+"Each I<.conf> file in those paths has a simple text format like the "
+"following:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1219
+#, no-wrap
+msgid ""
+" [libguestfs.org]\n"
+" uri=http://libguestfs.org/download/builder/index.asc\n"
+" gpgkey=file:///etc/xdg/virt-builder/repos.d/libguestfs.gpg\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1223
+msgid ""
+"The part in square brackets is the repository identifier, which is used as "
+"unique identifier."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1226 ../builder/virt-builder.pod:1340
+msgid "The following fields can appear:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1230
+msgid "C<uri=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1232
+msgid "The URI of the index file which this repository refers to."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1234 ../builder/virt-builder.pod:1423
+msgid "This field is required."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1236
+msgid "C<gpgkey=URI>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1238
+msgid ""
+"This optional field represents the URI (although only I<file://> URIs are "
+"accepted) of the key used to sign the index file.  If not present, the index "
+"file referred by I<uri=..> is not signed."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1244
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1211
+#: ../builder/virt-builder.pod:1247
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1213
+#: ../builder/virt-builder.pod:1249
 msgid ""
 "Out of the box, virt-builder downloads the file L<http://libguestfs.org/"
 "download/builder/index.asc> which is an index of available templates plus "
@@ -4525,7 +4589,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1219
+#: ../builder/virt-builder.pod:1255
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -4533,19 +4597,27 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1223
+#: ../builder/virt-builder.pod:1259
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1225
+#: ../builder/virt-builder.pod:1261
 msgid ""
 "You can set up your own site containing an index file and some templates, "
-"and then point virt-builder at the site by using the I<--source> option:"
+"and then point virt-builder at the site by creating a I<.conf> file pointing "
+"to it."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1265
+msgid ""
+"Note that if your index is signed, you will need to properly fill I<gpgkey=.."
+"> in your I<.conf> file, making sure to deploy also the GPG key file."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1229
+#: ../builder/virt-builder.pod:1269
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -4555,25 +4627,18 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
-msgid ""
-"(Note setting the environment variables C<VIRT_BUILDER_SOURCE> and "
-"C<VIRT_BUILDER_FINGERPRINT> may be easier to type!)"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1236
+#: ../builder/virt-builder.pod:1273
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1239
+#: ../builder/virt-builder.pod:1276
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1241
+#: ../builder/virt-builder.pod:1278
 msgid ""
 "If you don't have a GnuPG key, you will need to set one up.  (Strictly "
 "speaking this is optional, but if your index and template files are not "
@@ -4582,56 +4647,32 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1283
 msgid ""
 "To create a key, see the GPG manual L<http://www.gnupg.org/gph/en/manual."
 "html>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1249
-msgid ""
-"Export your GPG public key and add it to the keyring of all virt-builder "
-"users:"
+#: ../builder/virt-builder.pod:1286
+msgid "Export your GPG public key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1252
+#: ../builder/virt-builder.pod:1288
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
 " \n"
 msgstr ""
 
-#. type: verbatim
-#: ../builder/virt-builder.pod:1254
-#, no-wrap
-msgid ""
-" # For each virt-builder user:\n"
-" gpg --import pubkey\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1257
-msgid "Also find the fingerprint of your key:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1259
-#, no-wrap
-msgid ""
-" gpg --list-keys --fingerprint\n"
-"\n"
-msgstr ""
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1290
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1263
+#: ../builder/virt-builder.pod:1292
 msgid ""
 "There are many ways to create the templates.  For example you could clone "
 "existing guests (see L<virt-sysprep(1)>), or you could install a guest by "
@@ -4640,14 +4681,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1268
+#: ../builder/virt-builder.pod:1297
 msgid ""
 "For best results when compressing the templates, use the following xz "
 "options (see L<nbdkit-xz-plugin(1)> for further explanation):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1300
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -4655,19 +4696,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1302
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1275
+#: ../builder/virt-builder.pod:1304
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1307
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -4683,7 +4724,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1317
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -4700,21 +4741,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1328
 msgid ""
 "The part in square brackets is the C<os-version>, which is the same string "
 "that is used on the virt-builder command line to build that OS."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1302
+#: ../builder/virt-builder.pod:1331
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1334
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -4722,54 +4763,49 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1336
 msgid ""
 "This will create the final file called C<index.asc> which can be uploaded to "
-"the server (and is the I<--source> URL).  As noted above, signing the index "
+"the server (and is the I<uri=..> URL).  As noted above, signing the index "
 "file is optional, but recommended."
 msgstr ""
 
-#. type: textblock
-#: ../builder/virt-builder.pod:1311
-msgid "The following fields can appear:"
-msgstr ""
-
 #. type: =item
-#: ../builder/virt-builder.pod:1315
+#: ../builder/virt-builder.pod:1344
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1317
+#: ../builder/virt-builder.pod:1346
 msgid ""
 "The user-friendly name of this template.  This is displayed in the I<--list> "
 "output but is otherwise not significant."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1320
+#: ../builder/virt-builder.pod:1349
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1351
 msgid ""
 "This optional field maps the operating system to the associated libosinfo "
 "ID.  Virt-builder does not use it (yet)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1325
+#: ../builder/virt-builder.pod:1354
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1327
+#: ../builder/virt-builder.pod:1356
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1329 ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1358 ../builder/virt-builder.pod:1369
 msgid ""
 "Note that absolute paths or URIs are B<not> permitted here.  This is because "
 "virt-builder has a \"same origin\" policy for templates so they cannot come "
@@ -4777,29 +4813,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1333
+#: ../builder/virt-builder.pod:1362
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1335
+#: ../builder/virt-builder.pod:1364
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1337
+#: ../builder/virt-builder.pod:1366
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1344
+#: ../builder/virt-builder.pod:1373
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1375
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4807,19 +4843,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1348
+#: ../builder/virt-builder.pod:1377
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1350
+#: ../builder/virt-builder.pod:1379
 msgid ""
 "The SHA-512 checksum of the B<compressed> file is checked after it is "
 "downloaded.  To work out the signature, do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1353
+#: ../builder/virt-builder.pod:1382
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4827,24 +4863,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1384
 msgid ""
 "Note if you use this, you don't need to sign the file, ie. don't use "
 "C<sig>.  This option overrides C<sig>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1358
+#: ../builder/virt-builder.pod:1387
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1360
+#: ../builder/virt-builder.pod:1389
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1362
+#: ../builder/virt-builder.pod:1391
 msgid ""
 "If you need to interoperate with virt-builder = 1.24.0 then you have to use "
 "C<checksum> because that version would give a parse error with square "
@@ -4853,12 +4889,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1367
+#: ../builder/virt-builder.pod:1396
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1369
+#: ../builder/virt-builder.pod:1398
 msgid ""
 "The revision is an integer which is used to control the template cache.  "
 "Increasing the revision number causes clients to download the template again "
@@ -4866,22 +4902,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1373
+#: ../builder/virt-builder.pod:1402
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1375
+#: ../builder/virt-builder.pod:1404
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1377
+#: ../builder/virt-builder.pod:1406
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1379
+#: ../builder/virt-builder.pod:1408
 msgid ""
 "Specify the format of the disk image (before it was compressed).  If not "
 "given, the format is autodetected, but generally it is better to be explicit "
@@ -4889,7 +4925,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1383
+#: ../builder/virt-builder.pod:1412
 msgid ""
 "Note this is the source format, which is different from the I<--format> "
 "option (requested output format).  Virt-builder does on-the-fly conversion "
@@ -4897,12 +4933,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1388
+#: ../builder/virt-builder.pod:1417
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1390
+#: ../builder/virt-builder.pod:1419
 msgid ""
 "The virtual size of the image in bytes.  This is the size of the image when "
 "uncompressed.  If using a non-raw format such as qcow2 then it means the "
@@ -4910,36 +4946,31 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1394
-msgid "This field is required."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1396
+#: ../builder/virt-builder.pod:1425
 msgid ""
 "Virt-builder also uses this as the minimum size that users can request via "
 "the I<--size> option, or as the default size if there is no I<--size> option."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1400
+#: ../builder/virt-builder.pod:1429
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1431
 msgid ""
 "The compressed size of the disk image in bytes.  This is just used for "
 "information (when using I<--list --long>)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1405
+#: ../builder/virt-builder.pod:1434
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1436
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named partition in the guest image to fill up all available "
@@ -4947,13 +4978,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1440
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1413
+#: ../builder/virt-builder.pod:1442
 msgid ""
 "It's a good idea to use this, but not required.  If the field is omitted "
 "then virt-resize will create an extra partition at the end of the disk to "
@@ -4961,12 +4992,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1417
+#: ../builder/virt-builder.pod:1446
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1419
+#: ../builder/virt-builder.pod:1448
 msgid ""
 "When expanding the image to its final size, instruct L<virt-resize(1)> to "
 "expand the named logical volume in the guest image to fill up all available "
@@ -4974,7 +5005,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "If the guest uses LVM2 you should usually put the LV of the guest's root "
 "filesystem here.  If the guest does not use LVM2 or its root filesystem is "
@@ -4982,32 +5013,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1427
+#: ../builder/virt-builder.pod:1456
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1429
+#: ../builder/virt-builder.pod:1458
 msgid ""
 "Any notes that go with this image, especially notes describing what packages "
 "are in the image, how the image was prepared, and licensing information."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1433
+#: ../builder/virt-builder.pod:1462
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1435
+#: ../builder/virt-builder.pod:1464
 msgid ""
 "You can use multi-line notes here by indenting each new line with at least "
 "one character of whitespace (even on blank lines):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1438
+#: ../builder/virt-builder.pod:1467
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -5019,88 +5050,33 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1444
+#: ../builder/virt-builder.pod:1473
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1446
+#: ../builder/virt-builder.pod:1475
 msgid ""
 "Using the hidden flag prevents the template from being listed by the I<--"
 "list> option (but it is still installable).  This is used for test images."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1452
-msgid "Running virt-builder against the alternate repository"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1454
-msgid ""
-"Ensure each virt-builder user has imported your public key into their gpg "
-"keyring (see above)."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1457
-msgid "Each virt-builder user should export these environment variables:"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1463
-msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1467
-msgid ""
-"C<VIRT_BUILDER_FINGERPRINT> to contain the fingerprint (long hex string) of "
-"the user who signed the index file and the templates."
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1472
-msgid "Now run virt-builder commands as normal, eg:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1474
-#, no-wrap
-msgid ""
-" virt-builder --list --long\n"
-"\n"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1476
-#, no-wrap
-msgid ""
-" virt-builder os-version\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1478
-msgid "To debug problems, add the C<-v> option to these commands."
-msgstr ""
-
-#. type: =head3
-#: ../builder/virt-builder.pod:1480
+#: ../builder/virt-builder.pod:1481
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1482
+#: ../builder/virt-builder.pod:1483
 msgid ""
-"It is possible to use multiple sources with virt-builder.  Use either "
-"multiple I<--source> and/or I<--fingerprint> options, or a comma-separated "
-"list in the C<VIRT_BUILDER_SOURCE> / C<VIRT_BUILDER_FINGERPRINT> environment "
-"variables:"
+"It is possible to use multiple sources with virt-builder.  The recommended "
+"way is to deploy I<.conf> files pointing to the index files. Another way is "
+"to specify the sources using multiple I<--source> and/or I<--fingerprint> "
+"options:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1487
+#: ../builder/virt-builder.pod:1488
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -5110,29 +5086,15 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1491
-msgid "or equivalently:"
-msgstr ""
-
-#. type: verbatim
-#: ../builder/virt-builder.pod:1493
-#, no-wrap
+#: ../builder/virt-builder.pod:1492
 msgid ""
-" export VIRT_BUILDER_SOURCE=http://example.com/s1/index.asc,http://example.com/s2/index.asc\n"
-" virt-builder [...]\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../builder/virt-builder.pod:1496
-msgid ""
-"You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
+"You can provide N or 1 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
 "between each source and each fingerprint:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1496
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -5142,26 +5104,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1504
+#: ../builder/virt-builder.pod:1500
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1507
-msgid ""
-"In the case where you provide no fingerprints, the default fingerprint built "
-"into virt-builder is used for all sources."
+#: ../builder/virt-builder.pod:1503
+msgid "You C<must> provide at least 1 fingerprint."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1510
+#: ../builder/virt-builder.pod:1505
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1507
 msgid ""
 "You should be aware of the licensing of images that you distribute.  For "
 "open source guests, provide a link to the source code in the C<notes> field "
@@ -5169,12 +5129,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1517
+#: ../builder/virt-builder.pod:1512
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1519
+#: ../builder/virt-builder.pod:1514
 msgid ""
 "The index file format has a formal specification defined by the flex scanner "
 "and bison parser used to parse the file.  This can be found in the following "
@@ -5182,7 +5142,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1518
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -5191,84 +5151,84 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1526
+#: ../builder/virt-builder.pod:1521
 msgid ""
 "A tool called L<virt-index-validate(1)> is available to validate the index "
 "file to ensure it is correct."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1529
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "Note that the parser and tool can work on either the signed or unsigned "
 "index file (ie. C<index> or C<index.asc>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1532
+#: ../builder/virt-builder.pod:1527
 msgid "The index is always encoded in UTF-8."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1534
+#: ../builder/virt-builder.pod:1529
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1536
+#: ../builder/virt-builder.pod:1531
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1538
+#: ../builder/virt-builder.pod:1533
 msgid ""
 "Since the templates are usually very large, downloaded templates are cached "
 "in the user's home directory."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1541
+#: ../builder/virt-builder.pod:1536
 msgid ""
 "The location of the cache is C<$XDG_CACHE_HOME/virt-builder/> or C<$HOME/."
 "cache/virt-builder>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1544
+#: ../builder/virt-builder.pod:1539
 msgid ""
 "You can print out information about the cache directory, including which "
 "guests are currently cached, by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1549
+#: ../builder/virt-builder.pod:1544
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1553
+#: ../builder/virt-builder.pod:1548
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1557
+#: ../builder/virt-builder.pod:1552
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1554
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1562
+#: ../builder/virt-builder.pod:1557
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1559
 msgid ""
 "Virt-builder uses L<curl(1)> to download files and it also uses the current "
 "C<http_proxy> (etc) settings when installing packages (I<--install>, I<--"
@@ -5276,7 +5236,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1568
+#: ../builder/virt-builder.pod:1563
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -5284,12 +5244,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1572
+#: ../builder/virt-builder.pod:1567
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1574
+#: ../builder/virt-builder.pod:1569
 msgid ""
 "To increase both speed and reliability of installing packages, you can set "
 "up a local mirror of the target distribution, and point the guest package "
@@ -5297,7 +5257,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1573
 msgid ""
 "Because of the order in which each phase of installation happens, you cannot "
 "use I<--write> (to point the package manager at a repo)  followed by I<--"
@@ -5307,17 +5267,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1580
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1582
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1584
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5335,12 +5295,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1601
+#: ../builder/virt-builder.pod:1596
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1603
+#: ../builder/virt-builder.pod:1598
 msgid ""
 "Assuming that you are using C<apt-proxy> to mirror the repository, you "
 "should create a new C<sources.list> file to point to your proxy (see "
@@ -5348,7 +5308,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1607
+#: ../builder/virt-builder.pod:1602
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5359,33 +5319,33 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1612
+#: ../builder/virt-builder.pod:1607
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1614
+#: ../builder/virt-builder.pod:1609
 msgid ""
 "Virt-builder uses GNU Privacy Guard (GnuPG or gpg) to verify that the index "
 "and templates have not been tampered with."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1617
+#: ../builder/virt-builder.pod:1612
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1619
+#: ../builder/virt-builder.pod:1614
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
-"the signer's fingerprint matches the specified fingerprint (ie. I<--"
-"fingerprint>, C<VIRT_BUILDER_FINGERPRINT>, or a built-in fingerprint, in "
-"that order)."
+"the signer's fingerprint matches the specified fingerprint (ie. the one "
+"specified in I<gpgkey=..> in the I<.conf>, or with I<--fingerprint>, in that "
+"order)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1619
 msgid ""
 "For checking against the built-in public key/fingerprint, this requires "
 "importing the public key into the user's local gpg keyring (that's just the "
@@ -5393,13 +5353,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1623
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1631
+#: ../builder/virt-builder.pod:1626
 msgid ""
 "Although the signatures are optional, if you don't have them then virt-"
 "builder users will have to use I<--no-check-signature> on the command line.  "
@@ -5410,19 +5370,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1638 ../src/guestfs.pod:3367
+#: ../builder/virt-builder.pod:1633 ../src/guestfs.pod:3367
 msgid "ARCHITECTURE"
 msgstr "АРХІТЕКТУРА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1635
 msgid ""
 "Virt-builder can build a guest for any architecture no matter what the host "
 "architecture is.  For example an x86-64 guest on an ARM host."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1638
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -5431,27 +5391,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1648
+#: ../builder/virt-builder.pod:1643
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1651 ../src/guestfs.pod:1913
+#: ../builder/virt-builder.pod:1646 ../src/guestfs.pod:1913
 #: ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr "БЕЗПЕКА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1653
+#: ../builder/virt-builder.pod:1648
 msgid ""
 "Virt-builder does not need to run as root (in fact, should not be run as "
 "root), and doesn't use setuid, C<sudo> or any similar mechanism."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1656
+#: ../builder/virt-builder.pod:1651
 msgid ""
 "I<--install>, I<--update>, I<--run> and I<--run-command> are implemented "
 "using an appliance (a small virtual machine) so these commands do not run on "
@@ -5461,7 +5421,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1662
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "However these options will have access to the host's network and since the "
 "template may contain untrusted code, the code might try to access host "
@@ -5470,14 +5430,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1667
+#: ../builder/virt-builder.pod:1662
 msgid ""
 "Firstboot commands run in the context of the guest when it is booted, and so "
 "the security of your hypervisor / cloud should be considered."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1665
 msgid ""
 "Virt-builder injects a random seed into every guest which it builds.  This "
 "helps to ensure that TCP sequence numbers, UUIDs, ssh host keys etc are "
@@ -5485,19 +5445,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1669
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1676
+#: ../builder/virt-builder.pod:1671
 #, fuzzy
 #| msgid "VIRT-CLONE"
 msgid "CLONES"
 msgstr "VIRT-CLONE"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1678
+#: ../builder/virt-builder.pod:1673
 msgid ""
 "If you wish to create many new guests of the same type, it is tempting to "
 "run virt-builder once and then copy the output file.  You should B<not> do "
@@ -5505,7 +5465,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1678
 msgid ""
 "The reason is that each clone needs to have (at least) a separate random "
 "seed, and possibly other unique features (such as filesystem UUIDs) in "
@@ -5513,7 +5473,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1687
+#: ../builder/virt-builder.pod:1682
 msgid ""
 "Another thing you should I<not> do is to boot the guest, then clone the "
 "booted disk image.  The reason is that some guests create unique machine "
@@ -5522,19 +5482,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1692
+#: ../builder/virt-builder.pod:1687
 #, fuzzy
 #| msgid "See also L<virt-win-reg(1)>."
 msgid "See also: L<virt-sysprep(1)>."
 msgstr "Див. також L<virt-win-reg(1)>."
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694
+#: ../builder/virt-builder.pod:1689
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The most important aspect of getting good performance is caching.  Templates "
 "gets downloaded into the cache the first time they are used, or if you use "
@@ -5543,7 +5503,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1701
+#: ../builder/virt-builder.pod:1696
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5554,55 +5514,55 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1709
+#: ../builder/virt-builder.pod:1704
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1711
+#: ../builder/virt-builder.pod:1706
 msgid ""
 "Use I<--no-sync>.  However read the caveats in the L</OPTIONS> section "
 "above, since this can cause disk corruption if not used correctly."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1714
+#: ../builder/virt-builder.pod:1709
 #, fuzzy
 #| msgid "virt-resize"
 msgid "Skipping virt-resize"
 msgstr "virt-resize"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1716
+#: ../builder/virt-builder.pod:1711
 msgid ""
 "Virt-builder can skip the virt-resize step under certain conditions.  This "
 "makes virt-builder much faster.  The conditions are:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1723
+#: ../builder/virt-builder.pod:1718
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1727
+#: ../builder/virt-builder.pod:1722
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1731
+#: ../builder/virt-builder.pod:1726
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1735
+#: ../builder/virt-builder.pod:1730
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1737
+#: ../builder/virt-builder.pod:1732
 msgid ""
 "Virt-builder uses an internal implementation of pxzcat (parallel xzcat) if "
 "liblzma was found at build time.  If liblzma was not found at build time, "
@@ -5610,14 +5570,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1741
+#: ../builder/virt-builder.pod:1736
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1743
+#: ../builder/virt-builder.pod:1738
 msgid ""
 "You can use virt-builder with the User-Mode Linux (UML) backend.  This may "
 "be faster when running virt-builder inside a virtual machine (eg. in the "
@@ -5625,80 +5585,80 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1747
+#: ../builder/virt-builder.pod:1742
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1750
+#: ../builder/virt-builder.pod:1745
 msgid ""
 "Currently you have to use the I<--no-network> option.  This should be fixed "
 "in a future version."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1753
+#: ../builder/virt-builder.pod:1748
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1756 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1751 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELINUX"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1758
+#: ../builder/virt-builder.pod:1753
 msgid ""
 "Guests which use SELinux (such as Fedora and Red Hat Enterprise Linux)  "
 "require that each file has a correct SELinux label."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1761
+#: ../builder/virt-builder.pod:1756
 msgid ""
 "Virt-builder does not know how to give new files a label, so there are two "
 "possible strategies it can use to ensure correct labelling:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1766
+#: ../builder/virt-builder.pod:1761
 #, fuzzy
 #| msgid "B<--selinux-relabel>"
 msgid "Using I<--selinux-relabel>"
 msgstr "B<--selinux-relabel>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1768
+#: ../builder/virt-builder.pod:1763
 msgid ""
 "This runs L<fixfiles(8)> just before finalizing the guest, which sets "
 "SELinux labels correctly in the disk image."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1771
+#: ../builder/virt-builder.pod:1766
 msgid ""
 "Sometimes fixfiles is not possible during installation, in which case this "
 "option falls back on:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1774
+#: ../builder/virt-builder.pod:1769
 msgid "Touching C</.autorelabel>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1776
+#: ../builder/virt-builder.pod:1771
 msgid ""
 "Guest templates may already contain a file called C</.autorelabel>, or it is "
 "touched if I<--selinux-relabel> cannot run fixfiles."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1779
+#: ../builder/virt-builder.pod:1774
 msgid ""
 "For guests that use SELinux, this causes fixfiles to run at first boot.  "
 "Guests will reboot themselves once the first time you use them, which is "
@@ -5706,75 +5666,82 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1787
+#: ../builder/virt-builder.pod:1782
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1792
+#: ../builder/virt-builder.pod:1787
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1794
+#: ../builder/virt-builder.pod:1789
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1796
+#: ../builder/virt-builder.pod:1791
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1798
+#: ../builder/virt-builder.pod:1793
 msgid ""
 "Set the proxy for downloads.  These environment variables (and more)  are "
 "actually interpreted by L<curl(1)>, not virt-builder."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1801
+#: ../builder/virt-builder.pod:1796
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1803 ../builder/virt-builder.pod:1817
+#: ../builder/virt-builder.pod:1798
+msgid ""
+"Used to determine the location of the template cache, and the location of "
+"the user' sources.  See L</CACHING> and L</SOURCES OF TEMPLATES>."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:1801
+msgid "C<XDG_CACHE_HOME>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1803
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1805
-msgid "C<VIRT_BUILDER_FINGERPRINT>"
+msgid "C<XDG_CONFIG_HOME>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1807
 msgid ""
-"Set the default value for the GPG signature fingerprint or comma-separated "
-"list of fingerprints (see I<--fingerprint> option)."
+"Used to determine the location of the user' sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:1810
-msgid "C<VIRT_BUILDER_SOURCE>"
+msgid "C<XDG_CONFIG_DIRS>"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1812
 msgid ""
-"Set the default value for the source URL (or comma-separated list of URLs) "
-"for the template repository (see I<--source> option)."
-msgstr ""
-
-#. type: =item
-#: ../builder/virt-builder.pod:1815
-msgid "C<XDG_CACHE_HOME>"
+"Used to determine the location of the system sources.  See L</SOURCES OF "
+"TEMPLATES>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1823 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1819 ../cat/virt-cat.pod:246
 #: ../cat/virt-filesystems.pod:392 ../cat/virt-ls.pod:488
 #: ../daemon/guestfsd.pod:75 ../df/virt-df.pod:262 ../diff/virt-diff.pod:250
 #: ../edit/virt-edit.pod:359 ../fuse/guestmount.pod:407
@@ -5787,7 +5754,7 @@ msgstr ""
 "значення, якщо сталася помилка."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1828
+#: ../builder/virt-builder.pod:1824
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5805,7 +5772,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1850 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1846 ../builder/virt-index-validate.pod:92
 #: ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "© Red Hat Inc., 2013"
diff --git a/po/en_GB.po b/po/en_GB.po
index 5cb3d6f9a..ba33cc269 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6884,34 +6913,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6921,21 +6950,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6950,49 +6979,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index ab72cdbfe..c9b33ffa5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Spanish <trans-es@lists.fedoraproject.org>\n"
@@ -70,22 +70,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -98,7 +106,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -110,14 +118,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -181,7 +193,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -197,13 +209,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -233,15 +245,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -249,11 +261,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -261,10 +273,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -275,41 +291,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -317,11 +334,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -340,7 +357,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -350,14 +371,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -416,17 +437,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -452,6 +473,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -464,39 +489,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -512,25 +537,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -575,11 +600,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -595,11 +620,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -628,7 +653,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -646,7 +671,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -656,7 +681,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -666,7 +691,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -676,7 +701,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -733,7 +758,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -745,37 +770,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -787,7 +812,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -807,15 +832,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -827,21 +852,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -928,15 +953,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -981,11 +1006,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -993,7 +1018,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1011,31 +1036,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1048,11 +1077,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1072,7 +1101,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1086,7 +1115,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1113,23 +1142,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1137,11 +1166,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1153,7 +1182,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1344,11 +1373,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1356,19 +1385,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1388,11 +1417,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1407,23 +1436,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1499,11 +1528,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1519,7 +1548,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1527,15 +1556,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1543,7 +1572,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1570,27 +1599,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1615,7 +1644,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1625,19 +1654,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1647,7 +1676,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1755,7 +1784,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1810,7 +1839,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1818,23 +1847,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1861,7 +1890,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1873,7 +1902,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1913,11 +1942,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1997,7 +2026,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2147,13 +2176,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2163,7 +2192,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2179,24 +2208,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2204,7 +2233,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -7010,35 +7039,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7048,21 +7077,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "no es posible crear un nuevo contexto XPath"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7077,49 +7106,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 68423344e..3bf2a4497 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Gujarati <trans-gu@lists.fedoraproject.org>\n"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6843,34 +6872,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6880,21 +6909,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6909,49 +6938,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index 4826c7f4d..6c5c07954 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6841,34 +6870,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6878,21 +6907,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6907,49 +6936,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index 52c92e87c..328feb798 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6846,34 +6875,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6883,21 +6912,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6912,49 +6941,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 86f361cd9..a0a811048 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.25.38\n"
+"Project-Id-Version: libguestfs 1.25.39\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,22 +68,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -96,7 +104,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -108,14 +116,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -179,7 +191,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -195,13 +207,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -231,15 +243,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -247,11 +259,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -259,10 +271,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -273,41 +289,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -315,11 +332,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -338,7 +355,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -348,14 +369,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -414,17 +435,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -450,6 +471,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -462,39 +487,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -510,25 +535,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -573,11 +598,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,11 +618,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -626,7 +651,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -644,7 +669,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -654,7 +679,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -664,7 +689,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -674,7 +699,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -731,7 +756,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -743,37 +768,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -785,7 +810,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -805,15 +830,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -825,21 +850,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,15 +951,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -979,11 +1004,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +1016,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1009,31 +1034,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1046,11 +1075,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1099,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1113,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1111,23 +1140,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1135,11 +1164,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1151,7 +1180,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1342,11 +1371,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1354,19 +1383,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1415,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1405,23 +1434,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1497,11 +1526,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1517,7 +1546,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1525,15 +1554,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1541,7 +1570,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1568,27 +1597,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1613,7 +1642,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1623,19 +1652,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1645,7 +1674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1753,7 +1782,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1808,7 +1837,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1816,23 +1845,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1859,7 +1888,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1871,7 +1900,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1911,11 +1940,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1995,7 +2024,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2145,13 +2174,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2161,7 +2190,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2177,24 +2206,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2202,7 +2231,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6832,34 +6861,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6869,21 +6898,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6898,49 +6927,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 8c11b18e6..1a0c4973a 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Malayalam <discuss@lists.smc.org.in>\n"
@@ -68,22 +68,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -96,7 +104,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -108,14 +116,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -179,7 +191,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -195,13 +207,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -231,15 +243,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -247,11 +259,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -259,10 +271,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -273,41 +289,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -315,11 +332,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -338,7 +355,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -348,14 +369,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -414,17 +435,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -450,6 +471,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -462,39 +487,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -510,25 +535,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -573,11 +598,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,11 +618,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -626,7 +651,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -644,7 +669,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -654,7 +679,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -664,7 +689,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -674,7 +699,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -731,7 +756,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -743,37 +768,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -785,7 +810,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -805,15 +830,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -825,21 +850,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,15 +951,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -979,11 +1004,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +1016,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1009,31 +1034,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1046,11 +1075,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1099,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1113,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1111,23 +1140,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1135,11 +1164,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1151,7 +1180,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1342,11 +1371,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1354,19 +1383,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1415,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1405,23 +1434,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1497,11 +1526,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1517,7 +1546,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1525,15 +1554,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1541,7 +1570,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1568,27 +1597,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1613,7 +1642,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1623,19 +1652,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1645,7 +1674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1753,7 +1782,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1808,7 +1837,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1816,23 +1845,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1859,7 +1888,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1871,7 +1900,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1911,11 +1940,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1995,7 +2024,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2145,13 +2174,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2161,7 +2190,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2177,24 +2206,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2202,7 +2231,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6843,34 +6872,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6880,21 +6909,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6909,49 +6938,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 68838dccc..d98d9d1e9 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -70,22 +70,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -98,7 +106,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -110,14 +118,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -181,7 +193,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -197,13 +209,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -233,15 +245,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -249,11 +261,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -261,10 +273,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -275,41 +291,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -317,11 +334,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -340,7 +357,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -350,14 +371,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -416,17 +437,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -452,6 +473,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -464,39 +489,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -512,25 +537,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -575,11 +600,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -595,11 +620,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -628,7 +653,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -646,7 +671,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -656,7 +681,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -666,7 +691,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -676,7 +701,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -733,7 +758,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -745,37 +770,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -787,7 +812,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -807,15 +832,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -827,21 +852,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -928,15 +953,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -981,11 +1006,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -993,7 +1018,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1011,31 +1036,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1048,11 +1077,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1072,7 +1101,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1086,7 +1115,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1113,23 +1142,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1137,11 +1166,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1153,7 +1182,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1344,11 +1373,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1356,19 +1385,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1388,11 +1417,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1407,23 +1436,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1499,11 +1528,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1519,7 +1548,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1527,15 +1556,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1543,7 +1572,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1570,27 +1599,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1615,7 +1644,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1625,19 +1654,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1647,7 +1676,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1755,7 +1784,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1810,7 +1839,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1818,23 +1847,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1861,7 +1890,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1873,7 +1902,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1913,11 +1942,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1997,7 +2026,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2147,13 +2176,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2163,7 +2192,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2179,24 +2208,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2204,7 +2233,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6930,34 +6959,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6967,21 +6996,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "नवीन XPath संदर्भ निर्माण करणे अशक्य"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6996,49 +7025,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index eda70acc8..cb22dab4a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -75,22 +75,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr "%s (ignored)\n"
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr "%s: --domain optie kan slechts een keer opgegeven worden\n"
@@ -103,7 +111,7 @@ msgstr "%s: --enable optie kan slechts een keer opgegeven worden\n"
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr "%s: --enable: '%s' is geen bekende bewerking\n"
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -115,14 +123,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -197,7 +209,7 @@ msgstr "%s: Deze partitie wordt met rust gelaten."
 msgid "%s: This partition will be resized from %s to %s."
 msgstr "%s: De grootte van deze partitie wordt veranderd van %s naar %s."
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -213,13 +225,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -249,15 +261,15 @@ msgstr "%s: lege --expand optie"
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -265,11 +277,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -277,10 +289,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr "%s: bestand is te klein om een schijf image te zijn (%Ld bytes)"
@@ -291,41 +307,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -333,11 +350,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -359,7 +376,11 @@ msgstr "%s: ontbrekend grootte veld in '%s' optie"
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: nieuwe partitie grootte is nul of negatief"
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -369,14 +390,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr "%s: In de gast image werden geen besturingssystemen gevonden\n"
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -455,17 +476,17 @@ msgstr ""
 "gedetailleerde hulp\n"
 "lees je de man pagina virt-resize(1).\n"
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -498,6 +519,10 @@ msgstr "%s: deze partitie is als gemarkeerd om in grootte veranderd te worden"
 msgid "%s: this partition overlaps the previous one"
 msgstr "%s: deze partitie overlapt de vorige"
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -512,39 +537,39 @@ msgstr ""
 "%s: onbekend partitie tabel type\n"
 "virt-resize ondersteunt alleen MBR (DOS) en GPT partitie tabellen."
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -560,25 +585,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -625,11 +650,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Voeg schijf image bestand toe"
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -645,11 +670,11 @@ msgstr "Voeg scripts toe om te draaien bij de volgende opstart"
 msgid "Align first partition (default: auto)"
 msgstr "Richt eerste partitie uit (standaard: auto)"
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -680,7 +705,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -700,7 +725,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Gecomprimeerde output formaat"
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -712,7 +737,7 @@ msgstr ""
 "Kopieer naar doel en maakt het sparse ...\n"
 "%!"
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -724,7 +749,7 @@ msgstr ""
 "Bezig met kopiëren %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -734,7 +759,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -791,7 +816,7 @@ msgstr "Debug GC en geheugen toewijzingen (intern)"
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -803,37 +828,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Verwijder partitie"
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr "Toon versie en sluit af"
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -845,7 +870,7 @@ msgstr "Kopieer bootlader niet"
 msgid "Don't create extra partition"
 msgstr "Maak geen extra partitie aan"
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -865,15 +890,15 @@ msgstr "Print geen log boodschappen"
 msgid "Don't print the summary"
 msgstr "Print de samenvatting niet"
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -885,21 +910,21 @@ msgstr "Dump POD (intern)"
 msgid "Dump POD for options (internal)"
 msgstr "Dump POD voor opties (intern)"
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Zet debug boodschappen aan"
@@ -1005,15 +1030,15 @@ msgstr ""
 "Vul vrije ruimte in volgroep %s met nul in ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -1062,11 +1087,11 @@ msgstr "Formaat van output schijf"
 msgid "Format of output disk (default: same as input)"
 msgstr "Formaat van output schijf (standaard: hetzelfde als input)"
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -1074,7 +1099,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr "Genereer random seed voor gast"
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1092,31 +1117,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1129,11 +1158,11 @@ msgstr "Toon ondersteunde bewerkingen"
 msgid "Make output machine readable"
 msgstr "Maak output leesbaar voor machines"
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1153,7 +1182,7 @@ msgstr "Nieuwe hostnaam"
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1169,7 +1198,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1203,23 +1232,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1227,11 +1256,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Voer een test run uit"
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1243,7 +1272,7 @@ msgstr "Stille output"
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr "Lees virt-sysprep(1) man pagina voor verdere informatie.\n"
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1456,11 +1485,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Verander grootte van partitie"
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1468,19 +1497,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr "Voer willekeurige scrips voor de gast uit"
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1502,11 +1531,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1521,23 +1550,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1613,11 +1642,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1633,7 +1662,7 @@ msgstr "Stel libvirt URI in"
 msgid "Set libvirt guest name"
 msgstr "Stel libvirt gastnaam in"
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1641,15 +1670,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1657,7 +1686,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr "Stel partitie uitlijning in (standaard: 128 sectors)"
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1684,27 +1713,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1729,7 +1758,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1739,19 +1768,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1763,7 +1792,7 @@ msgstr ""
 "Bezig met instellen van initiële partitie tabel op %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1917,7 +1946,7 @@ msgstr ""
 "De systeembrede procesaccounting zal opgeslagen worden in de pacct\n"
 "logbestandenfiles als procesaccounting aangezet is."
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1987,7 +2016,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1995,23 +2024,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -2038,7 +2067,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -2054,7 +2083,7 @@ msgstr ""
 "\n"
 "Zie L</RANDOM SEED> hieronder."
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -2103,11 +2132,11 @@ msgstr "uitlijning kan niet < 1 zijn"
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -2187,7 +2216,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr "nooit|altijd|auto"
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2340,13 +2369,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2356,7 +2385,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2372,24 +2401,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2397,7 +2426,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -7287,35 +7316,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr "realpath: kon '%s' niet converteren naar een absoluut pad"
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "kon niet verbinden met libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr "kon libvirt mogelijkheden niet verkrijgen"
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7325,21 +7354,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "kan nieuwe XPath context niet aanmaken"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7354,49 +7383,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr "kon libvirt domein niet vernietigen"
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: interne fout bij formuleren van foutboodschap"
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr "kon schijf niet koppelen aan libvirt domein"
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr "kon schijf niet loskoppelen van libvirt domein"
 
diff --git a/po/or.po b/po/or.po
index 9392d1970..fb113c7fa 100644
--- a/po/or.po
+++ b/po/or.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6842,34 +6871,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6879,21 +6908,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6908,49 +6937,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 885af33b0..2b57eb074 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users@lists.sf.net>\n"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6926,34 +6955,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6963,21 +6992,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "ਨਵਾਂ XPath ਪ੍ਰਸੰਗ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6992,49 +7021,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index a41a99b81..b10ad5bbd 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Polish <trans-pl@lists.fedoraproject.org>\n"
@@ -72,22 +72,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr "%s: opcja --domain może zostać podana tylko raz\n"
@@ -100,7 +108,7 @@ msgstr "%s: opcja --enable może zostać podana tylko raz\n"
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -112,14 +120,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -184,7 +196,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr "%s: Rrozmiar partycji zostanie zmieniony z %s na %s."
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -200,13 +212,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -236,15 +248,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -252,11 +264,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -264,10 +276,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -278,41 +294,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -320,11 +337,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -343,7 +360,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: nowy rozmiar partycji wynosi zero lub jest ujemny"
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -353,14 +374,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -419,17 +440,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,6 +476,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -467,39 +492,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -515,25 +540,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -578,11 +603,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Dodaje obraz dysku"
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -598,11 +623,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr "Wyrównaj pierwszą partycję (domyślnie: automatycznie)"
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -631,7 +656,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -649,7 +674,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -659,7 +684,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -671,7 +696,7 @@ msgstr ""
 "Kopiowanie %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -681,7 +706,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -738,7 +763,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -750,37 +775,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Usuwa partycję"
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -792,7 +817,7 @@ msgstr "Bez kopiowania programu startowego"
 msgid "Don't create extra partition"
 msgstr "Bez tworzenia dodatkowej partycji"
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -812,15 +837,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr "Bez wyświetlania podsumowania"
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -832,21 +857,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Włącza komunikaty debugowania"
@@ -939,15 +964,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -992,11 +1017,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -1004,7 +1029,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1022,31 +1047,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1059,11 +1088,11 @@ msgstr "Wyświetla listę obsługiwanych działań"
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1083,7 +1112,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1097,7 +1126,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1124,23 +1153,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1148,11 +1177,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1166,7 +1195,7 @@ msgstr ""
 "Proszę przeczytać stronę podręcznika virt-sysprep(1), aby uzyskać więcej "
 "informacji.\n"
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1357,11 +1386,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Zmienia rozmiar partycji"
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1369,19 +1398,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1401,11 +1430,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1420,23 +1449,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1512,11 +1541,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1532,7 +1561,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1540,15 +1569,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1556,7 +1585,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1583,27 +1612,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1628,7 +1657,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1638,19 +1667,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1660,7 +1689,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1768,7 +1797,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1823,7 +1852,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1831,23 +1860,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1874,7 +1903,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1886,7 +1915,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1928,11 +1957,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -2012,7 +2041,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr "nigdy|zawsze|automatycznie"
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2162,13 +2191,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2178,7 +2207,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2194,24 +2223,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2219,7 +2248,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -7127,35 +7156,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "należy wywołać guestfs_add_drive przed guestfs_launch"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7165,21 +7194,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "nie można utworzyć nowego kontekstu XPath"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7194,49 +7223,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
 
diff --git a/po/ta.po b/po/ta.po
index 894621bed..bcb70df54 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Tamil <tamil-users@lists.fedoraproject.org>\n"
@@ -68,22 +68,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -96,7 +104,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -108,14 +116,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -179,7 +191,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -195,13 +207,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -231,15 +243,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -247,11 +259,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -259,10 +271,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -273,41 +289,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -315,11 +332,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -338,7 +355,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -348,14 +369,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -414,17 +435,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -450,6 +471,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -462,39 +487,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -510,25 +535,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -573,11 +598,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,11 +618,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -626,7 +651,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -644,7 +669,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -654,7 +679,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -664,7 +689,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -674,7 +699,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -731,7 +756,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -743,37 +768,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -785,7 +810,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -805,15 +830,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -825,21 +850,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,15 +951,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -979,11 +1004,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +1016,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1009,31 +1034,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1046,11 +1075,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1099,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1113,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1111,23 +1140,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1135,11 +1164,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1151,7 +1180,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1342,11 +1371,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1354,19 +1383,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1415,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1405,23 +1434,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1497,11 +1526,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1517,7 +1546,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1525,15 +1554,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1541,7 +1570,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1568,27 +1597,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1613,7 +1642,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1623,19 +1652,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1645,7 +1674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1753,7 +1782,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1808,7 +1837,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1816,23 +1845,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1859,7 +1888,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1871,7 +1900,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1911,11 +1940,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1995,7 +2024,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2145,13 +2174,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2161,7 +2190,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2177,24 +2206,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2202,7 +2231,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6842,34 +6871,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6879,21 +6908,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6908,49 +6937,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index e6419afd3..96bbb85d8 100644
--- a/po/te.po
+++ b/po/te.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -69,22 +69,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr ""
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr ""
@@ -97,7 +105,7 @@ msgstr ""
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr ""
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -109,14 +117,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -180,7 +192,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -196,13 +208,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -232,15 +244,15 @@ msgstr ""
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -248,11 +260,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -260,10 +272,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr ""
@@ -274,41 +290,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -316,11 +333,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -339,7 +356,11 @@ msgstr ""
 msgid "%s: new partition size is zero or negative"
 msgstr ""
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -349,14 +370,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr ""
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -415,17 +436,17 @@ msgid ""
 "read the man page virt-resize(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -451,6 +472,10 @@ msgstr ""
 msgid "%s: this partition overlaps the previous one"
 msgstr ""
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -463,39 +488,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -511,25 +536,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -574,11 +599,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,11 +619,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -627,7 +652,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -645,7 +670,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr ""
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -655,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -665,7 +690,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -675,7 +700,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -732,7 +757,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -744,37 +769,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -786,7 +811,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -806,15 +831,15 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -826,21 +851,21 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,15 +952,15 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -980,11 +1005,11 @@ msgstr ""
 msgid "Format of output disk (default: same as input)"
 msgstr ""
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +1017,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1010,31 +1035,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr ""
@@ -1047,11 +1076,11 @@ msgstr ""
 msgid "Make output machine readable"
 msgstr ""
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1100,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1114,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1112,23 +1141,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1136,11 +1165,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr ""
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1152,7 +1181,7 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1343,11 +1372,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr ""
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1355,19 +1384,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1416,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1406,23 +1435,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1498,11 +1527,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1518,7 +1547,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1526,15 +1555,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1542,7 +1571,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1569,27 +1598,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1614,7 +1643,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1624,19 +1653,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1646,7 +1675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1754,7 +1783,7 @@ msgid ""
 "log files if the process accounting is on."
 msgstr ""
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1809,7 +1838,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1817,23 +1846,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -1860,7 +1889,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -1872,7 +1901,7 @@ msgid ""
 "See L</RANDOM SEED> below."
 msgstr ""
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -1912,11 +1941,11 @@ msgstr ""
 msgid "btrfs-filesystem-resize"
 msgstr ""
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -1996,7 +2025,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr ""
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2146,13 +2175,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2162,7 +2191,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2178,24 +2207,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2203,7 +2232,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -6840,34 +6869,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ఆరంభించబడింది మరియు డెమోన్‌ను సంప్రదించింది, అయితే state != READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6877,21 +6906,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6906,49 +6935,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
 "'--format' option, or via the optional 'format' argument to 'add-drive'."
 msgstr ""
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index c64093ad7..69ea01b5e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: libguestfs\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-02-26 19:40+0000\n"
+"POT-Creation-Date: 2014-03-01 16:25+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones@redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -74,22 +74,30 @@ msgstr ""
 msgid "%s (ignored)\n"
 msgstr "%s (проігноровано)\n"
 
-#: ../builder/builder.ml:970 ../builder/builder.ml:604
+#: ../builder/builder.ml:983 ../builder/builder.ml:617
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
+#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:88
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:165 ../builder/cmdline.ml:92
+#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:90
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
-#: ../builder/builder.ml:703
+#: ../builder/builder.ml:716
 msgid "%s: %s: command exited with an error\n"
 msgstr ""
 
+#: ../builder/sources.ml:52
+msgid "%s: '%s' has invalid gpgkey URI\n"
+msgstr ""
+
+#: ../builder/sources.ml:62
+msgid "%s: '%s' has non-local gpgkey URI\n"
+msgstr ""
+
 #: ../sysprep/main.ml:63
 msgid "%s: --domain option can only be given once\n"
 msgstr "%s: параметр --domain можна вказувати лише один раз\n"
@@ -102,7 +110,7 @@ msgstr "%s: параметр --enable можна вказувати лише о
 msgid "%s: --enable: '%s' is not a known operation\n"
 msgstr "%s: --enable: «%s» не є відомою програмі дією\n"
 
-#: ../builder/builder.ml:731
+#: ../builder/builder.ml:744
 msgid "%s: --install is not supported for this guest operating system\n"
 msgstr ""
 
@@ -114,14 +122,18 @@ msgstr ""
 msgid "%s: --operations: empty operation name\n"
 msgstr ""
 
-#: ../builder/builder.ml:760
+#: ../builder/builder.ml:773
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:204
+#: ../builder/cmdline.ml:202
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
+#: ../builder/sources.ml:75
+msgid "%s: ... read %d sources\n"
+msgstr ""
+
 #: ../mllib/common_utils.ml:196
 msgid ""
 "%s: If reporting bugs, run %s with debugging enabled (-v) and include the "
@@ -198,7 +210,7 @@ msgstr "%s: цей розділ не буде змінено."
 msgid "%s: This partition will be resized from %s to %s."
 msgstr "%s: розмір цього розділу буде змінено з %s на %s."
 
-#: ../builder/cmdline.ml:304
+#: ../builder/cmdline.ml:302
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -214,13 +226,13 @@ msgid ""
 "read the man page virt-builder(1).\n"
 msgstr ""
 
-#: ../builder/builder.ml:198
+#: ../builder/builder.ml:211
 msgid ""
 "%s: cannot find os-version '%s'.\n"
 "Use --list to list available guest types.\n"
 msgstr ""
 
-#: ../builder/builder.ml:279
+#: ../builder/builder.ml:292
 msgid "%s: cannot output to a character device or /dev/null\n"
 msgstr ""
 
@@ -250,15 +262,15 @@ msgstr "%s: порожній аргумент параметра --expand"
 msgid "%s: error: %s"
 msgstr ""
 
-#: ../builder/builder.ml:827
+#: ../builder/builder.ml:840
 msgid "%s: error: %s is not a regular file in the guest\n"
 msgstr ""
 
-#: ../resize/resize.ml:1302 ../builder/builder.ml:1004
+#: ../resize/resize.ml:1302 ../builder/builder.ml:1017
 msgid "%s: error: %s: %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1305 ../builder/builder.ml:1007
+#: ../resize/resize.ml:1305 ../builder/builder.ml:1020
 msgid "%s: error: %s: %s: %s\n"
 msgstr ""
 
@@ -266,11 +278,11 @@ msgstr ""
 msgid "%s: error: could not find cache directory. Is $HOME set?\n"
 msgstr ""
 
-#: ../builder/builder.ml:177
+#: ../builder/builder.ml:190
 msgid "%s: error: no cache directory\n"
 msgstr ""
 
-#: ../resize/resize.ml:1324 ../builder/builder.ml:1025
+#: ../resize/resize.ml:1324 ../builder/builder.ml:1038
 msgid "%s: exception: %s\n"
 msgstr ""
 
@@ -278,10 +290,14 @@ msgstr ""
 msgid "%s: failed to download %s: HTTP status code %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1312 ../builder/builder.ml:1013
+#: ../resize/resize.ml:1312 ../builder/builder.ml:1026
 msgid "%s: failure: %s\n"
 msgstr ""
 
+#: ../builder/sources.ml:113
+msgid "%s: file error: %s: %s\n"
+msgstr ""
+
 #: ../resize/resize.ml:387 ../resize/resize.ml:384
 msgid "%s: file is too small to be a disk image (%Ld bytes)"
 msgstr "%s: файл є надто малим, щоб бути образом диска (%Ld байтів)"
@@ -292,41 +308,42 @@ msgid ""
 "You should install gpg, or use --gpg option, or use --no-check-signature.\n"
 msgstr ""
 
-#: ../builder/builder.ml:306
+#: ../builder/builder.ml:319
 msgid ""
 "%s: images cannot be shrunk, the output size is too small for this image.  "
 "Requested size = %s, minimum size = %s\n"
 msgstr ""
 
-#: ../resize/resize.ml:1321 ../builder/builder.ml:1022
+#: ../resize/resize.ml:1321 ../builder/builder.ml:1035
 msgid "%s: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../resize/resize.ml:1318 ../builder/builder.ml:1019
+#: ../resize/resize.ml:1318 ../builder/builder.ml:1032
 msgid "%s: internal error: assertion failed at %s, line %d, char %d\n"
 msgstr ""
 
-#: ../resize/resize.ml:1315 ../builder/builder.ml:1016
+#: ../resize/resize.ml:1315 ../builder/sources.ml:118
+#: ../builder/builder.ml:1029
 msgid "%s: internal error: invalid argument: %s\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:75
+#: ../builder/cmdline.ml:73
 msgid "%s: invalid --edit format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:120
+#: ../builder/cmdline.ml:118
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:134
+#: ../builder/cmdline.ml:132
 msgid "%s: invalid --list-format type '%s', see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:199
+#: ../builder/cmdline.ml:197
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:216
+#: ../builder/cmdline.ml:214
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -334,11 +351,11 @@ msgstr ""
 msgid "%s: invalid password selector '%s'; see the man page.\n"
 msgstr ""
 
-#: ../resize/resize.ml:1309 ../builder/builder.ml:1010
+#: ../resize/resize.ml:1309 ../builder/builder.ml:1023
 msgid "%s: libguestfs error: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:673
+#: ../builder/builder.ml:686
 msgid "%s: log file %s: %s (ignored)\n"
 msgstr ""
 
@@ -361,7 +378,11 @@ msgstr "%s: не вказано аргумент розміру у параме
 msgid "%s: new partition size is zero or negative"
 msgstr "%s: розмір нового розділу є нульовим або від’ємним"
 
-#: ../builder/builder.ml:608
+#: ../builder/sources.ml:44
+msgid "%s: no 'uri' entry for '%s' in %s, skipping it\n"
+msgstr ""
+
+#: ../builder/builder.ml:621
 msgid ""
 "%s: no guest operating systems or multiboot OS found in this disk image\n"
 "This is a failure of the source repository.  Use -v for more information.\n"
@@ -371,14 +392,14 @@ msgstr ""
 msgid "%s: no operating systems were found in the guest image\n"
 msgstr "%s: у образі гостьової системи не знайдено операційних систем\n"
 
-#: ../builder/builder.ml:431
+#: ../builder/builder.ml:444
 msgid ""
 "%s: no plan could be found for making a disk image with\n"
 "the required size, format etc. This is a bug in libguestfs!\n"
 "Please file a bug, giving the command line arguments you used.\n"
 msgstr ""
 
-#: ../builder/builder.ml:311
+#: ../builder/builder.ml:324
 msgid ""
 "%s: output size is too large for this block device.  Requested size = %s, "
 "output block device = %s, output block device size = %s\n"
@@ -457,17 +478,17 @@ msgstr ""
 "Коротке резюме параметрів наведено нижче. Щоб отримати докладну довідку,\n"
 "будь ласка, ознайомтеся зі сторінкою підручника (man) virt-resize(1)\n"
 
-#: ../builder/builder.ml:735
+#: ../builder/builder.ml:748
 msgid ""
 "%s: sorry, don't know how to use --install with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/builder.ml:764
+#: ../builder/builder.ml:777
 msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:442
+#: ../builder/cmdline.ml:426
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -499,6 +520,10 @@ msgstr "%s: цей розділ вже було позначено для змі
 msgid "%s: this partition overlaps the previous one"
 msgstr "%s: цей розділ перекривається з попереднім"
 
+#: ../builder/sources.ml:33
+msgid "%s: trying to read %s\n"
+msgstr ""
+
 #: ../builder/downloader.ml:107
 msgid ""
 "%s: unexpected output from curl command, enable debug and look at previous "
@@ -513,39 +538,39 @@ msgstr ""
 "%s: невідомий тип таблиці розділів\n"
 "У virt-resize передбачено підтримку лише таблиць MBR (DOS) та GPT."
 
-#: ../builder/cmdline.ml:396
+#: ../builder/cmdline.ml:394
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:403
+#: ../builder/cmdline.ml:401
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:406
+#: ../builder/cmdline.ml:404
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:377
+#: ../builder/cmdline.ml:375
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:384
+#: ../builder/cmdline.ml:382
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:367
+#: ../builder/cmdline.ml:365
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:387 ../builder/cmdline.ml:370
+#: ../builder/cmdline.ml:385 ../builder/cmdline.ml:368
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -561,25 +586,25 @@ msgstr ""
 msgid "%s: warning: gpg program is not available\n"
 msgstr ""
 
-#: ../builder/builder.ml:622
+#: ../builder/builder.ml:635
 msgid ""
 "%s: warning: hostname could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:614
+#: ../builder/builder.ml:627
 msgid ""
 "%s: warning: random seed could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:652
+#: ../builder/builder.ml:665
 msgid ""
 "%s: warning: root password could not be set for this type of guest\n"
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:631
+#: ../builder/builder.ml:644
 msgid ""
 "%s: warning: timezone could not be set for this type of guest\n"
 "%!"
@@ -626,11 +651,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Додати файл образу диска"
 
-#: ../builder/cmdline.ml:257
+#: ../builder/cmdline.ml:255
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:249
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -647,11 +672,11 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr "Вирівняти перший розділ (типове значення: auto)"
 
-#: ../builder/list_entries.ml:87
+#: ../builder/list_entries.ml:93
 msgid "Architecture:"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:224
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -682,7 +707,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:232
 msgid "Check digital signatures"
 msgstr ""
 
@@ -702,7 +727,7 @@ msgstr ""
 msgid "Compressed output format"
 msgstr "Стиснений формат виведення даних"
 
-#: ../builder/builder.ml:556
+#: ../builder/builder.ml:569
 msgid "Converting %s to %s"
 msgstr ""
 
@@ -714,7 +739,7 @@ msgstr ""
 "Скопіювати призначення і виконати розрідження…\n"
 "%!"
 
-#: ../builder/builder.ml:490
+#: ../builder/builder.ml:503
 msgid "Copying"
 msgstr ""
 
@@ -726,7 +751,7 @@ msgstr ""
 "Копіювання %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:268
+#: ../builder/cmdline.ml:266
 msgid "Create directory"
 msgstr ""
 
@@ -736,7 +761,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:258
+#: ../builder/cmdline.ml:256
 msgid "Create symbolic links"
 msgstr ""
 
@@ -793,7 +818,7 @@ msgstr "Діагностика GC та розподілу пам’яті (вн
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:240
+#: ../builder/cmdline.ml:238
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -805,37 +830,37 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Вилучити розділ"
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:240
 msgid "Delete the template cache"
 msgstr ""
 
-#: ../builder/builder.ml:838
+#: ../builder/builder.ml:851
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:268
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:235
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:230
+#: ../builder/cmdline.ml:228
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:271
+#: ../builder/cmdline.ml:269
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:211
-#. ../builder/cmdline.ml:295
+#. ../builder/cmdline.ml:293
 #: ../sysprep/main.ml:164 ../sysprep/main.ml:163 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr "Показати номер версії і вийти"
 
-#: ../builder/cmdline.ml:289
+#: ../builder/cmdline.ml:287
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -847,7 +872,7 @@ msgstr "Не копіювати завантажувач"
 msgid "Don't create extra partition"
 msgstr "Не створювати додаткового розділу"
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:242
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -867,15 +892,15 @@ msgstr "Не виводити повідомлень до журналу"
 msgid "Don't print the summary"
 msgstr "Не виводити даних резюме"
 
-#: ../builder/cmdline.ml:232
+#: ../builder/cmdline.ml:230
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:92
+#: ../builder/list_entries.ml:98
 msgid "Download size:"
 msgstr ""
 
-#: ../builder/builder.ml:225 ../builder/builder.ml:184
+#: ../builder/builder.ml:238 ../builder/builder.ml:197
 msgid "Downloading: %s"
 msgstr ""
 
@@ -887,21 +912,21 @@ msgstr "Створити дамп POD (вбудоване)"
 msgid "Dump POD for options (internal)"
 msgstr "Створити дамп POD для параметрів (вбудоване)"
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:243
 msgid "Edit file with Perl expr"
 msgstr ""
 
-#: ../builder/builder.ml:824
+#: ../builder/builder.ml:837
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:269
+#: ../builder/cmdline.ml:267
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:209
 #. ../resize/resize.ml:183
-#. ../builder/cmdline.ml:293
+#. ../builder/cmdline.ml:291
 #: ../sysprep/main.ml:162 ../sysprep/main.ml:161 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Увімкнути показ діагностичних повідомлень"
@@ -1007,15 +1032,15 @@ msgstr ""
 "Заповнити вільне місце у групі томів %s нулями…\n"
 "%!"
 
-#: ../builder/cmdline.ml:247
+#: ../builder/cmdline.ml:245
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:70
+#: ../builder/list_entries.ml:73
 msgid "Fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:959
+#: ../builder/builder.ml:972
 msgid "Finishing off"
 msgstr ""
 
@@ -1066,11 +1091,11 @@ msgstr ""
 "Формат диска результатів (типове значення: той самий, що і у початкового "
 "диска)"
 
-#: ../builder/builder.ml:949
+#: ../builder/builder.ml:962
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:85
+#: ../builder/list_entries.ml:91
 msgid "Full name:"
 msgstr ""
 
@@ -1078,7 +1103,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr "Створити породжувач випадкових чисел для гостьової системи"
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:252
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1096,31 +1121,35 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:871
+#: ../builder/builder.ml:884
 msgid "Installing firstboot command: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:874
+#: ../builder/builder.ml:887
 msgid "Installing firstboot packages: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:867
+#: ../builder/builder.ml:880
 msgid "Installing firstboot script: [%d] %s"
 msgstr ""
 
-#: ../builder/builder.ml:779
+#: ../builder/builder.ml:792
 msgid "Installing packages: %s"
 msgstr ""
 
-#: ../builder/builder.ml:847
+#: ../builder/list_entries.ml:75
+msgid "Key: %s\n"
+msgstr ""
+
+#: ../builder/builder.ml:860
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:257
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:265
+#. ../builder/cmdline.ml:263
 #: ../sysprep/main.ml:153 ../sparsify/sparsify.ml:79 ../resize/resize.ml:192
 msgid "List long options"
 msgstr "Показати список повних версій параметрів"
@@ -1133,11 +1162,11 @@ msgstr "Показати список підтримуваних команд"
 msgid "Make output machine readable"
 msgstr "Зробити машину виведення даних придатною для читання даних"
 
-#: ../builder/builder.ml:788
+#: ../builder/builder.ml:801
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:88
+#: ../builder/list_entries.ml:94
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1157,7 +1186,7 @@ msgstr "Нова назва вузла"
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:276
 msgid "No progress messages"
 msgstr ""
 
@@ -1173,7 +1202,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:110
+#: ../builder/list_entries.ml:116
 msgid ""
 "Notes:\n"
 "\n"
@@ -1206,23 +1235,23 @@ msgid ""
 "new random UUIDs are generated and assigned to filesystems."
 msgstr ""
 
-#: ../builder/builder.ml:569
+#: ../builder/builder.ml:582
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:250
 msgid "Output format (default: raw)"
 msgstr ""
 
-#: ../builder/builder.ml:946
+#: ../builder/builder.ml:959
 msgid "Output format: %s"
 msgstr ""
 
-#: ../builder/builder.ml:945
+#: ../builder/builder.ml:958
 msgid "Output size: %s"
 msgstr ""
 
-#: ../builder/builder.ml:944
+#: ../builder/builder.ml:957
 msgid "Output: %s"
 msgstr ""
 
@@ -1230,11 +1259,11 @@ msgstr ""
 msgid "Perform a dry run"
 msgstr "Виконати тестовий запуск"
 
-#: ../builder/builder.ml:426
+#: ../builder/builder.ml:439
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:275
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1248,7 +1277,7 @@ msgstr ""
 "Ознайомтеся зі сторінкою підручника (man) virt-sysprep(1), щоб дізнатися "
 "більше.\n"
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:283
 msgid "Relabel files with correct SELinux labels"
 msgstr ""
 
@@ -1460,11 +1489,11 @@ msgstr ""
 msgid "Resize partition"
 msgstr "Змінити розміри розділу"
 
-#: ../builder/builder.ml:517
+#: ../builder/builder.ml:530
 msgid "Resizing (using virt-resize) to expand the disk to %s"
 msgstr ""
 
-#: ../builder/builder.ml:543
+#: ../builder/builder.ml:556
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
@@ -1472,19 +1501,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr "Запустити довільні скрипти дій над гостьовою системою"
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:247
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:280
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:246
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:279
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1506,11 +1535,11 @@ msgid ""
 "the full absolute path to the script."
 msgstr ""
 
-#: ../builder/builder.ml:888 ../builder/builder.ml:884
+#: ../builder/builder.ml:901 ../builder/builder.ml:897
 msgid "Running: %s"
 msgstr ""
 
-#: ../builder/builder.ml:893
+#: ../builder/builder.ml:906
 msgid "SELinux relabelling"
 msgstr ""
 
@@ -1525,23 +1554,23 @@ msgid ""
 "be specified using this argument."
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:281
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:262
 msgid "Scrub build log file"
 msgstr ""
 
-#: ../builder/builder.ml:912
+#: ../builder/builder.ml:925
 msgid "Scrubbing the log file"
 msgstr ""
 
-#: ../builder/builder.ml:855
+#: ../builder/builder.ml:868
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:253
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1617,11 +1646,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:228
+#: ../builder/cmdline.ml:226
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:237
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1637,7 +1666,7 @@ msgstr "Встановити адресу libvirt"
 msgid "Set libvirt guest name"
 msgstr "Встановити назву гостьової системи libvirt"
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:264
 msgid "Set memory size"
 msgstr ""
 
@@ -1645,15 +1674,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:287
+#: ../builder/cmdline.ml:285
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:286
+#: ../builder/cmdline.ml:284
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:270
 msgid "Set output filename"
 msgstr ""
 
@@ -1661,7 +1690,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr "Встановити вирівнювання розділів (типове значення: 128 секторів)"
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:273
 msgid "Set password crypto"
 msgstr ""
 
@@ -1688,27 +1717,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:278
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:288
+#: ../builder/cmdline.ml:286
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:227
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:288
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:261
 msgid "Set the format for --list (default: short)"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:254
 msgid "Set the hostname"
 msgstr ""
 
@@ -1733,7 +1762,7 @@ msgid ""
 "of C<SELECTOR>."
 msgstr ""
 
-#: ../builder/builder.ml:612
+#: ../builder/builder.ml:625
 msgid "Setting a random seed"
 msgstr ""
 
@@ -1743,19 +1772,19 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/builder.ml:647
+#: ../builder/builder.ml:660
 msgid "Setting random root password [did you mean to use --root-password?]"
 msgstr ""
 
-#: ../builder/builder.ml:644
+#: ../builder/builder.ml:657
 msgid "Setting root password"
 msgstr ""
 
-#: ../builder/builder.ml:620
+#: ../builder/builder.ml:633
 msgid "Setting the hostname: %s"
 msgstr ""
 
-#: ../builder/builder.ml:629
+#: ../builder/builder.ml:642
 msgid "Setting the timezone: %s"
 msgstr ""
 
@@ -1767,7 +1796,7 @@ msgstr ""
 "Встановлення початкової таблиці розділів на %s…\n"
 "%!"
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:259
 msgid "Shortcut for --list-format short"
 msgstr ""
 
@@ -1920,7 +1949,7 @@ msgstr ""
 "Дані обліку процесів системи будуть зберігатися у файлах журналу\n"
 "pacct, якщо увімкнено облік процесів."
 
-#: ../builder/builder.ml:210
+#: ../builder/builder.ml:223
 msgid "There are no notes for %s\n"
 msgstr ""
 
@@ -1986,7 +2015,7 @@ msgstr ""
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
-#: ../builder/builder.ml:947
+#: ../builder/builder.ml:960
 msgid "Total usable space: %s"
 msgstr ""
 
@@ -1994,23 +2023,23 @@ msgstr ""
 msgid "Turn off sparse copying"
 msgstr ""
 
-#: ../builder/builder.ml:505
+#: ../builder/builder.ml:518
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:291
+#: ../builder/cmdline.ml:289
 msgid "Update core packages"
 msgstr ""
 
-#: ../builder/builder.ml:771
+#: ../builder/builder.ml:784
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:292
+#: ../builder/cmdline.ml:290
 msgid "Upload file to dest"
 msgstr ""
 
-#: ../builder/builder.ml:802
+#: ../builder/builder.ml:815
 msgid "Uploading: %s to %s"
 msgstr ""
 
@@ -2037,7 +2066,7 @@ msgid ""
 "You can use both options as many times as you want."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:295
 msgid "Write file"
 msgstr ""
 
@@ -2054,7 +2083,7 @@ msgstr ""
 "\n"
 "Див. L</RANDOM SEED> нижче."
 
-#: ../builder/builder.ml:795
+#: ../builder/builder.ml:808
 msgid "Writing: %s"
 msgstr ""
 
@@ -2102,11 +2131,11 @@ msgstr "значенням вирівнювання не може бути чи
 msgid "btrfs-filesystem-resize"
 msgstr "btrfs-filesystem-resize"
 
-#: ../builder/builder.ml:160
+#: ../builder/builder.ml:173
 msgid "cache directory: %s\n"
 msgstr ""
 
-#: ../builder/builder.ml:167
+#: ../builder/builder.ml:180
 msgid "cached"
 msgstr ""
 
@@ -2188,7 +2217,7 @@ msgstr ""
 msgid "never|always|auto"
 msgstr "never|always|auto"
 
-#: ../builder/builder.ml:170
+#: ../builder/builder.ml:183
 msgid "no cache directory\n"
 msgstr ""
 
@@ -2347,13 +2376,13 @@ msgstr ""
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:140
+#: ../builder/sigchecker.ml:74
 msgid ""
 "virt-builder: error: GPG failure: could not run GPG the first time\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:240
+#: ../builder/sigchecker.ml:169
 msgid ""
 "virt-builder: error: GPG failure: could not verify digital signature of "
 "file\n"
@@ -2363,7 +2392,7 @@ msgid ""
 " - Check no one has tampered with the website or your network!\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:287
+#: ../builder/sigchecker.ml:216
 msgid ""
 "virt-builder: error: checksum of template did not match the expected "
 "checksum!\n"
@@ -2379,24 +2408,24 @@ msgstr ""
 msgid "virt-builder: error: could not evaluate Perl expression '%s'\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:173
+#: ../builder/sigchecker.ml:102
 msgid ""
 "virt-builder: error: could not export public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:121
+#: ../builder/sigchecker.ml:50
 msgid ""
 "virt-builder: error: could not import public key\n"
 "Use the '-v' option and look for earlier error messages.\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:273
+#: ../builder/sigchecker.ml:202
 msgid ""
 "virt-builder: error: could not run sha512sum command to verify checksum\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:258
+#: ../builder/sigchecker.ml:187
 msgid ""
 "virt-builder: error: fingerprint of signature does not match the expected "
 "fingerprint!\n"
@@ -2404,7 +2433,7 @@ msgid ""
 "  expected fingerprint: %s\n"
 msgstr ""
 
-#: ../builder/sigchecker.ml:222
+#: ../builder/sigchecker.ml:151
 msgid ""
 "virt-builder: error: there is no detached signature file\n"
 "This probably means the index file is missing a sig=... line.\n"
@@ -7563,38 +7592,38 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
 
-#: src/launch-direct.c:853 src/launch-libvirt.c:524
+#: src/launch-direct.c:853 src/launch-libvirt.c:526
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
 "дорівнює READY"
 
-#: src/launch-direct.c:1242 src/launch-libvirt.c:1256
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1258
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
 
-#: src/launch-libvirt.c:229
+#: src/launch-libvirt.c:231
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "у модулі libvirt ще не передбачено підтримки прапорця безпосереднього режиму"
 
-#: src/launch-libvirt.c:238
+#: src/launch-libvirt.c:240
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 "щоб скористатися модулем «libvirt», вам слід встановити libvirt >= %d.%d.%d"
 
-#: src/launch-libvirt.c:273
+#: src/launch-libvirt.c:275
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "не вдалося встановити з’єднання з libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:289
+#: src/launch-libvirt.c:291
 msgid "could not get libvirt capabilities"
 msgstr "не вдалося визначити можливості libvirt"
 
-#: src/launch-libvirt.c:452
+#: src/launch-libvirt.c:454
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7604,22 +7633,22 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:589
+#: src/launch-libvirt.c:591
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 "не вдалося обробити запис можливостей у форматі XML, повернутий libvirt"
 
-#: src/launch-libvirt.c:595 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:597 src/libvirt-domain.c:355 src/libvirt-domain.c:438
 #: src/libvirt-domain.c:651
 msgid "unable to create new XPath context"
 msgstr "не вдалося створити контекст XPath"
 
-#: src/launch-libvirt.c:605
+#: src/launch-libvirt.c:607
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "не вдалося обробити вираз XPath: %s"
 
-#: src/launch-libvirt.c:638
+#: src/launch-libvirt.c:640
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7647,16 +7676,16 @@ msgstr ""
 "guestfs(3) та списком поширених питань щодо libguestfs та відповідей\n"
 "на ці питання."
 
-#: src/launch-libvirt.c:869
+#: src/launch-libvirt.c:871
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1212
+#: src/launch-libvirt.c:1214
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
 
-#: src/launch-libvirt.c:1333
+#: src/launch-libvirt.c:1335
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -7664,7 +7693,7 @@ msgstr ""
 "у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
 "тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
 
-#: src/launch-libvirt.c:1358
+#: src/launch-libvirt.c:1360
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -7676,7 +7705,7 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1365
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format when using a non-file protocol.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -7689,20 +7718,20 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1608
+#: src/launch-libvirt.c:1610
 msgid "could not destroy libvirt domain"
 msgstr "не вдалося знищити домен libvirt"
 
-#: src/launch-libvirt.c:1645
+#: src/launch-libvirt.c:1647
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
 
-#: src/launch-libvirt.c:1704
+#: src/launch-libvirt.c:1706
 msgid "could not attach disk to libvirt domain"
 msgstr "не вдалося долучити диск до домену libvirt"
 
-#: src/launch-libvirt.c:1735
+#: src/launch-libvirt.c:1737
 msgid "could not detach disk from libvirt domain"
 msgstr "не вдалося від’єднати диск від домену libvirt"