diff --git a/BUGS b/BUGS
index 438817151..96fae5c20 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-01-13
+Last updated: 2014-01-17
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -251,6 +251,12 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 1051694 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1051694
   libguestfs FTBFS on Ubuntu saucy
 
+1053847 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1053847
+  Recommended default clock/timer settings
+
+1054761 NEW https://bugzilla.redhat.com/show_bug.cgi?id=1054761
+  guestfs_pvs prints "unknown device" if a physical volume is missing
+
 503134 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=503134
   guestfish's list splitting does not recognize internal quoting
 
@@ -266,16 +272,13 @@ Bugs in NEW or ASSIGNED state are open and waiting for someone to fix.
 624335 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=624335
   blockdev-setbsz succeeds, but does not affect blockdev-getbsz
 
-660687 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=660687
-  guestmount: "touch" command fails: touch: setting times of `timestamp': Invalid argument
-
 691389 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=691389
   SELinux labels don't work over guestmount (FUSE)
 
 965495 ASSIGNED https://bugzilla.redhat.com/show_bug.cgi?id=965495
   New APIs required in libguestfs for virt-v2v in RHEL 6.5
 
-(85 bugs)
+(86 bugs)
 
 --------------------------------------------------
 Bugs in MODIFIED, POST or ON_QA state are fixed.
@@ -284,13 +287,16 @@ You can help by testing the fixes.
 1028650 POST https://bugzilla.redhat.com/show_bug.cgi?id=1028650
   virt-* argument parser doesn't accept --arg=value (you have to use --arg value)
 
+1045033 POST https://bugzilla.redhat.com/show_bug.cgi?id=1045033
+  LIBVIRT_DEFAULT_URI=qemu:///system breaks libguestfs
+
 998109 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=998109
   Let's enable kvmclock in RHEL 7
 
 1020950 ON_QA https://bugzilla.redhat.com/show_bug.cgi?id=1020950
   CVE-2013-4419 libguestfs: insecure temporary directory handling for guestfish's network socket [epel-5]
 
-(3 bugs)
+(4 bugs)
 
 --------------------------------------------------
 These bugs are in the VERIFIED state.
diff --git a/configure.ac b/configure.ac
index 1e5b096e0..1f61d81a4 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], [21])
+m4_define([libguestfs_release], [22])
 
 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 a2e730520..418b1f8d3 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -693,7 +693,7 @@ msgid "B<-q>"
 msgstr "B<-q>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:514
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:542
 #: ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:215
 msgid "B<--quiet>"
@@ -735,7 +735,7 @@ msgstr ""
 "定されていないとき)、 このオプションのみが適用されます。"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:632
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:660
 #: ../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
@@ -747,7 +747,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:634
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:662
 #: ../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
@@ -771,7 +771,7 @@ msgstr "デバッグ用の冗長なメッセージを有効にします。"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:641 ../builder/virt-index-validate.pod:68
+#: ../builder/virt-builder.pod:669 ../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
@@ -786,7 +786,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:643 ../builder/virt-index-validate.pod:70
+#: ../builder/virt-builder.pod:671 ../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
@@ -801,7 +801,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:645
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:673
 #: ../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
@@ -1212,7 +1212,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1697 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1742 ../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
@@ -1237,19 +1237,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:558 ../builder/virt-builder.pod:562
-#: ../builder/virt-builder.pod:921 ../builder/virt-builder.pod:928
-#: ../builder/virt-builder.pod:932 ../builder/virt-builder.pod:936
-#: ../builder/virt-builder.pod:941 ../builder/virt-builder.pod:945
-#: ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:953
-#: ../builder/virt-builder.pod:957 ../builder/virt-builder.pod:961
-#: ../builder/virt-builder.pod:965 ../builder/virt-builder.pod:969
-#: ../builder/virt-builder.pod:973 ../builder/virt-builder.pod:977
-#: ../builder/virt-builder.pod:981 ../builder/virt-builder.pod:985
-#: ../builder/virt-builder.pod:989 ../builder/virt-builder.pod:998
-#: ../builder/virt-builder.pod:1372 ../builder/virt-builder.pod:1376
-#: ../builder/virt-builder.pod:1614 ../builder/virt-builder.pod:1618
-#: ../builder/virt-builder.pod:1622 ../builder/virt-index-validate.pod:34
+#: ../builder/virt-builder.pod:586 ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:956
+#: ../builder/virt-builder.pod:960 ../builder/virt-builder.pod:964
+#: ../builder/virt-builder.pod:969 ../builder/virt-builder.pod:973
+#: ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981
+#: ../builder/virt-builder.pod:985 ../builder/virt-builder.pod:989
+#: ../builder/virt-builder.pod:993 ../builder/virt-builder.pod:997
+#: ../builder/virt-builder.pod:1001 ../builder/virt-builder.pod:1005
+#: ../builder/virt-builder.pod:1009 ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1017 ../builder/virt-builder.pod:1026
+#: ../builder/virt-builder.pod:1417 ../builder/virt-builder.pod:1421
+#: ../builder/virt-builder.pod:1659 ../builder/virt-builder.pod:1663
+#: ../builder/virt-builder.pod:1667 ../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
@@ -1424,7 +1424,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1702 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1747 ../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
@@ -1459,7 +1459,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1719
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1764
 #: ../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
@@ -1472,7 +1472,7 @@ msgid "AUTHOR"
 msgstr "著者"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1721
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1766
 #: ../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
@@ -1488,7 +1488,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:179
-#: ../builder/virt-builder.pod:1723 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1768 ../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
@@ -1833,7 +1833,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1661 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1706 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4592 ../test-tool/libguestfs-test-tool.pod:178
@@ -1959,7 +1959,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:34
 #, no-wrap
 msgid ""
-" virt-builder -l|--list [--long]\n"
+" virt-builder -l|--list [--long] [--list-format short|long|json]\n"
 "\n"
 msgstr ""
 
@@ -1972,7 +1972,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1458
+#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1503
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1980,7 +1980,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1466
+#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1511
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1988,7 +1988,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1462
+#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1507
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2182,7 +2182,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:553
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -2785,33 +2785,92 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:377
+#, fuzzy
+#| msgid "B<--format> raw"
+msgid "B<--list --format> format"
+msgstr "B<--format> raw"
+
+#. type: =item
+#: ../builder/virt-builder.pod:379
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:381
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:383
 msgid ""
-"The alternative I<--list --long> form shows lots more details about each "
-"operating system option."
+"It is possible to choose with I<--format> the output format for the list "
+"templates:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:388
+msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:384
+#: ../builder/virt-builder.pod:390
+msgid ""
+"The default format, prints only the template identifier and, next to it, its "
+"short description."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:393
+#, fuzzy
+#| msgid "B<--long>"
+msgid "B<long>"
+msgstr "B<--long>"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:395
+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:398
+msgid "B<json>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:400
+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:403
+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 "
+"with the previous versions (for example the structure has changed, or non-"
+"optional keys are no more present)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:410
+msgid "I<--long> is a shorthand for the C<long> format."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:412
 msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:414
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:416
 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 "
@@ -2819,26 +2878,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:420
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:422
 #, fuzzy
 #| msgid "B<-m MB>"
 msgid "B<-m> MB"
 msgstr "B<-m MB>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:396
+#: ../builder/virt-builder.pod:424
 #, fuzzy
 #| msgid "B<--memsize MB>"
 msgid "B<--memsize> MB"
 msgstr "B<--memsize MB>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:398
+#: ../builder/virt-builder.pod:426
 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 "
@@ -2846,12 +2905,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:402
+#: ../builder/virt-builder.pod:430
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:432
 #, fuzzy, no-wrap
 #| msgid "guestfs_get_memsize"
 msgid ""
@@ -2860,62 +2919,62 @@ msgid ""
 msgstr "guestfs_get_memsize"
 
 #. type: =item
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:434
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:408
+#: ../builder/virt-builder.pod:436
 #, fuzzy
 #| msgid "Create a directory named C<path>."
 msgid "Create a directory in the guest."
 msgstr "C<path> という名前のディレクトリーを作成します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:410
+#: ../builder/virt-builder.pod:438
 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:413 ../fish/guestfish.pod:343
+#: ../builder/virt-builder.pod:441 ../fish/guestfish.pod:343
 #: ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:415
+#: ../builder/virt-builder.pod:443
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:417
+#: ../builder/virt-builder.pod:445
 msgid ""
 "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:419
+#: ../builder/virt-builder.pod:447
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:449
 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:424
+#: ../builder/virt-builder.pod:452
 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:427
+#: ../builder/virt-builder.pod:455
 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 "
@@ -2923,14 +2982,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:459
 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:436 ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:464 ../builder/virt-builder.pod:1048
 #: ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:408
 #: ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31
@@ -2941,14 +3000,14 @@ msgid "1."
 msgstr "1."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:438
+#: ../builder/virt-builder.pod:466
 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:441 ../builder/virt-builder.pod:1025
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1053
 #: ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:414
 #: ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44
@@ -2959,14 +3018,14 @@ msgid "2."
 msgstr "2."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:471
 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:446 ../examples/guestfs-faq.pod:528
+#: ../builder/virt-builder.pod:474 ../examples/guestfs-faq.pod:528
 #: ../examples/guestfs-performance.pod:175
 #: ../examples/guestfs-performance.pod:224 ../examples/guestfs-recipes.pod:420
 #: ../rescue/virt-rescue.pod:345 ../resize/virt-resize.pod:52
@@ -2976,7 +3035,7 @@ msgid "3."
 msgstr "3."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:448
+#: ../builder/virt-builder.pod:476
 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 "
@@ -2984,36 +3043,36 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:453 ../examples/guestfs-faq.pod:534
+#: ../builder/virt-builder.pod:481 ../examples/guestfs-faq.pod:534
 #: ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr "4."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:455
+#: ../builder/virt-builder.pod:483
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:459 ../fish/guestfish.pod:360
+#: ../builder/virt-builder.pod:487 ../fish/guestfish.pod:360
 #: ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:461
+#: ../builder/virt-builder.pod:489
 #, fuzzy
 #| msgid "Choose the output filesystem type."
 msgid "Do not sync the output file on exit."
 msgstr "出力ファイルシステム形式を選択します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:491
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:465
+#: ../builder/virt-builder.pod:493
 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 "
@@ -3024,36 +3083,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:472
+#: ../builder/virt-builder.pod:500
 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:476
+#: ../builder/virt-builder.pod:504
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:478
+#: ../builder/virt-builder.pod:506
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:481
+#: ../builder/virt-builder.pod:509
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:483
+#: ../builder/virt-builder.pod:511
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:485
+#: ../builder/virt-builder.pod:513
 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 "
@@ -3061,43 +3120,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:490
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Note that the output filename could be a device, partition or logical volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:493
+#: ../builder/virt-builder.pod:521
 msgid ""
 "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:496
+#: ../builder/virt-builder.pod:524
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:498 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:526 ../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:500
+#: ../builder/virt-builder.pod:528
 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:503 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:531 ../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:506 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:534 ../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 "
@@ -3105,49 +3164,49 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:510
+#: ../builder/virt-builder.pod:538
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:512
+#: ../builder/virt-builder.pod:540
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:516
+#: ../builder/virt-builder.pod:544
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:518
+#: ../builder/virt-builder.pod:546
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:548
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:550
 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:528
+#: ../builder/virt-builder.pod:556
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:530
+#: ../builder/virt-builder.pod:558
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:560
 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 "
@@ -3155,12 +3214,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:536
+#: ../builder/virt-builder.pod:564
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:538
+#: ../builder/virt-builder.pod:566
 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 "
@@ -3170,64 +3229,64 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:572
 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:547
+#: ../builder/virt-builder.pod:575
 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:550
+#: ../builder/virt-builder.pod:578
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:580
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:554
+#: ../builder/virt-builder.pod:582
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:560
+#: ../builder/virt-builder.pod:588
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:592
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:568
+#: ../builder/virt-builder.pod:596
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:598
 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:573
+#: ../builder/virt-builder.pod:601
 msgid ""
 "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:604
 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 "
@@ -3235,53 +3294,53 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:609
 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:584 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:612 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr "B<--smp> N"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:614
 #, 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:588
+#: ../builder/virt-builder.pod:616
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:618
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:592
+#: ../builder/virt-builder.pod:620
 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 ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:596
+#: ../builder/virt-builder.pod:624
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:598
+#: ../builder/virt-builder.pod:626
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:600
+#: ../builder/virt-builder.pod:628
 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-"
@@ -3289,28 +3348,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:604
+#: ../builder/virt-builder.pod:632
 #, fuzzy
 #| msgid "B<--timeout N>"
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timeout N>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:606
+#: ../builder/virt-builder.pod:634
 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:609
+#: ../builder/virt-builder.pod:637
 #, fuzzy
 #| msgid "B<--parts>"
 msgid "B<--update>"
 msgstr "B<--parts>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:639
 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 "
@@ -3318,19 +3377,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:643
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--install>."
 msgstr "I<--long> 参照。"
 
 #. type: =item
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:645
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:647
 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 "
@@ -3338,14 +3397,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:651
 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:626
+#: ../builder/virt-builder.pod:654
 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 "
@@ -3353,56 +3412,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:630
+#: ../builder/virt-builder.pod:658
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:636
+#: ../builder/virt-builder.pod:664
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:638
+#: ../builder/virt-builder.pod:666
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:647
+#: ../builder/virt-builder.pod:675
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:677
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:653
+#: ../builder/virt-builder.pod:681
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:655
+#: ../builder/virt-builder.pod:683
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:685
 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:660
+#: ../builder/virt-builder.pod:688
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:690
 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<--"
@@ -3410,7 +3469,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:666
+#: ../builder/virt-builder.pod:694
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3418,23 +3477,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:696
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:699
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:673
+#: ../builder/virt-builder.pod:701
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:703
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -3442,7 +3501,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:705
 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"
@@ -3452,17 +3511,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:711
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:713
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:715
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3470,13 +3529,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:689
+#: ../builder/virt-builder.pod:717
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:720
 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. "
@@ -3484,12 +3543,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:697
+#: ../builder/virt-builder.pod:725
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:699
+#: ../builder/virt-builder.pod:727
 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 "
@@ -3497,14 +3556,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:732
 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:707
+#: ../builder/virt-builder.pod:735
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -3512,14 +3571,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:737
 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:712 ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:740 ../builder/virt-builder.pod:754
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -3528,7 +3587,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:715
+#: ../builder/virt-builder.pod:743
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3541,7 +3600,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3549,12 +3608,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:724
+#: ../builder/virt-builder.pod:752
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:729
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3563,14 +3622,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:760
 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:735
+#: ../builder/virt-builder.pod:763
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3580,12 +3639,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:739
+#: ../builder/virt-builder.pod:767
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:741
+#: ../builder/virt-builder.pod:769
 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 "
@@ -3593,12 +3652,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:747
+#: ../builder/virt-builder.pod:775
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:777
 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 "
@@ -3606,103 +3665,103 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:756
+#: ../builder/virt-builder.pod:784
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:758 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:786 ../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:761
+#: ../builder/virt-builder.pod:789
 msgid "B<--root-password> random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:791 ../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:766 ../fish/guestfish-actions.pod:380
+#: ../builder/virt-builder.pod:794 ../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:768 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:796 ../sysprep/sysprep-extra-options.pod:56
 msgid "B<--root-password> disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:770
+#: ../builder/virt-builder.pod:798
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:773 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:801 ../sysprep/sysprep-extra-options.pod:67
 msgid "B<--root-password> locked:file:FILENAME"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:775 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:69
 msgid "B<--root-password> locked:password:PASSWORD"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:777 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:805 ../sysprep/sysprep-extra-options.pod:71
 msgid "B<--root-password> locked:random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:779
+#: ../builder/virt-builder.pod:807
 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:783 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:811 ../sysprep/sysprep-extra-options.pod:81
 msgid "B<--root-password> locked"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:785 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:813 ../sysprep/sysprep-extra-options.pod:83
 msgid "B<--root-password> locked:disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:787
+#: ../builder/virt-builder.pod:815
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:791
+#: ../builder/virt-builder.pod:819
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:793
+#: ../builder/virt-builder.pod:821
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:796
+#: ../builder/virt-builder.pod:824
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3711,7 +3770,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:827
 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 "
@@ -3719,12 +3778,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:803
+#: ../builder/virt-builder.pod:831
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:805
+#: ../builder/virt-builder.pod:833
 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 "
@@ -3733,17 +3792,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:810
+#: ../builder/virt-builder.pod:838
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:812
+#: ../builder/virt-builder.pod:840
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:814
+#: ../builder/virt-builder.pod:842
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3752,19 +3811,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:817
+#: ../builder/virt-builder.pod:845
 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:821
+#: ../builder/virt-builder.pod:849
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:823
+#: ../builder/virt-builder.pod:851
 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.  "
@@ -3772,7 +3831,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:827
+#: ../builder/virt-builder.pod:855
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -3781,17 +3840,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:858
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:860
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:862
 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.  "
@@ -3799,7 +3858,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:866
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3808,24 +3867,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:869
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:843
+#: ../builder/virt-builder.pod:871
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:873
 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:848
+#: ../builder/virt-builder.pod:876
 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 "
@@ -3834,17 +3893,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:854
+#: ../builder/virt-builder.pod:882
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:856
+#: ../builder/virt-builder.pod:884
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:858
+#: ../builder/virt-builder.pod:886
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3861,12 +3920,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:869
+#: ../builder/virt-builder.pod:897
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:871
+#: ../builder/virt-builder.pod:899
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3874,7 +3933,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:903
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -3887,7 +3946,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:882
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3901,12 +3960,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:918
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:892
+#: ../builder/virt-builder.pod:920
 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 "
@@ -3914,151 +3973,151 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:898
+#: ../builder/virt-builder.pod:926
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:900
+#: ../builder/virt-builder.pod:928
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:902
+#: ../builder/virt-builder.pod:930
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:932
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:906
+#: ../builder/virt-builder.pod:934
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:908
+#: ../builder/virt-builder.pod:936
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:940
 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:915
+#: ../builder/virt-builder.pod:943
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:917
+#: ../builder/virt-builder.pod:945
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:951
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:925
+#: ../builder/virt-builder.pod:953
 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:930
+#: ../builder/virt-builder.pod:958
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:934
+#: ../builder/virt-builder.pod:962
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "ファイルはディスクにおいて圧縮されます。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:938
+#: ../builder/virt-builder.pod:966
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:971
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:975
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:979
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:955
+#: ../builder/virt-builder.pod:983
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:959
+#: ../builder/virt-builder.pod:987
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:963
+#: ../builder/virt-builder.pod:991
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:967
+#: ../builder/virt-builder.pod:995
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:971
+#: ../builder/virt-builder.pod:999
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:1003
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:1007
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:1011
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:987
-msgid "Symbolic links are created (I<--link)."
+#: ../builder/virt-builder.pod:1015
+msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:991
+#: ../builder/virt-builder.pod:1019
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:994
+#: ../builder/virt-builder.pod:1022
 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 "
@@ -4066,34 +4125,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:1028
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1002
+#: ../builder/virt-builder.pod:1030
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1006
+#: ../builder/virt-builder.pod:1034
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1036
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1038
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1041
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -4102,7 +4161,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016 ../examples/guestfs-recipes.pod:261
+#: ../builder/virt-builder.pod:1044 ../examples/guestfs-recipes.pod:261
 #: ../fish/guestfish-actions.pod:2096 ../fish/guestfish-actions.pod:2638
 #: ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:3328
 #: ../src/guestfs-actions.pod:4190 ../src/guestfs-actions.pod:5075
@@ -4111,14 +4170,14 @@ msgid "Notes:"
 msgstr "注:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1050
 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:1027
+#: ../builder/virt-builder.pod:1055
 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 "
@@ -4127,33 +4186,71 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:1035 ../builder/virt-builder.pod:1041
-#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
-#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
-#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
-#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
-#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr "コメント"
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1037
+#: ../builder/virt-builder.pod:1063
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
-msgid "XXX"
+#: ../builder/virt-builder.pod:1065
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1067
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1071
+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 "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since virt-"
+"builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1077
+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:1080
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1082
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1085
+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:1043
+#: ../builder/virt-builder.pod:1088
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1090
 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 "
@@ -4161,7 +4258,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1094
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -4173,26 +4270,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1100
 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:1058
+#: ../builder/virt-builder.pod:1103
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1105
 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:1063
+#: ../builder/virt-builder.pod:1108
 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 "
@@ -4200,24 +4297,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1067
+#: ../builder/virt-builder.pod:1112
 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:1072
+#: ../builder/virt-builder.pod:1117
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1119
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1121
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -4225,7 +4322,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1123
 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 "
@@ -4234,17 +4331,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1129
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1131
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1133
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -4252,25 +4349,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1135
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1138
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1095
+#: ../builder/virt-builder.pod:1140
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1097
+#: ../builder/virt-builder.pod:1142
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -4280,12 +4377,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1146
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1148
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -4293,12 +4390,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1105
+#: ../builder/virt-builder.pod:1150
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1152
 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 "
@@ -4308,7 +4405,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1113
+#: ../builder/virt-builder.pod:1158
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -4316,26 +4413,26 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1117
+#: ../builder/virt-builder.pod:1162
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1119
+#: ../builder/virt-builder.pod:1164
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1167
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1169
 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 "
@@ -4344,7 +4441,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1130
+#: ../builder/virt-builder.pod:1175
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -4352,19 +4449,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1179
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1136
+#: ../builder/virt-builder.pod:1181
 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:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1140
+#: ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -4374,25 +4471,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1189
 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:1147
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1195
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1197
 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 "
@@ -4401,21 +4498,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:1202
 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:1160
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1208
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
@@ -4423,7 +4520,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1210
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -4432,12 +4529,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1213
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1170
+#: ../builder/virt-builder.pod:1215
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -4445,12 +4542,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1172
+#: ../builder/virt-builder.pod:1217
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1219
 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 "
@@ -4459,14 +4556,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1224
 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:1182
+#: ../builder/virt-builder.pod:1227
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -4474,19 +4571,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1229
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1231
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1189
+#: ../builder/virt-builder.pod:1234
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -4502,7 +4599,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1199
+#: ../builder/virt-builder.pod:1244
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -4519,21 +4616,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1255
 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:1213
+#: ../builder/virt-builder.pod:1258
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1216
+#: ../builder/virt-builder.pod:1261
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -4541,7 +4638,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1263
 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 "
@@ -4549,46 +4646,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1222
+#: ../builder/virt-builder.pod:1267
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1226
+#: ../builder/virt-builder.pod:1271
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1228
+#: ../builder/virt-builder.pod:1273
 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:1231
+#: ../builder/virt-builder.pod:1276
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
+#: ../builder/virt-builder.pod:1278
 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:1236
+#: ../builder/virt-builder.pod:1281
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1283
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240 ../builder/virt-builder.pod:1251
+#: ../builder/virt-builder.pod:1285 ../builder/virt-builder.pod:1296
 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 "
@@ -4596,12 +4693,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1289
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1291
 #, fuzzy
 #| msgid ""
 #| "I<This function is deprecated.> In new code, use the L</e2fsck> call "
@@ -4612,19 +4709,19 @@ msgstr ""
 "てください。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1248
+#: ../builder/virt-builder.pod:1293
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1300
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1257
+#: ../builder/virt-builder.pod:1302
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4632,19 +4729,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1259
+#: ../builder/virt-builder.pod:1304
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1306
 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:1264
+#: ../builder/virt-builder.pod:1309
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4652,24 +4749,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1311
 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:1269
+#: ../builder/virt-builder.pod:1314
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1316
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1318
 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 "
@@ -4678,12 +4775,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1323
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1280
+#: ../builder/virt-builder.pod:1325
 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 "
@@ -4691,22 +4788,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1329
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1331
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1333
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1290
+#: ../builder/virt-builder.pod:1335
 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 "
@@ -4714,7 +4811,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1294
+#: ../builder/virt-builder.pod:1339
 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 "
@@ -4722,12 +4819,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1344
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1301
+#: ../builder/virt-builder.pod:1346
 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 "
@@ -4735,36 +4832,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1350
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1352
 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:1311
+#: ../builder/virt-builder.pod:1356
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1313
+#: ../builder/virt-builder.pod:1358
 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:1316
+#: ../builder/virt-builder.pod:1361
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1318
+#: ../builder/virt-builder.pod:1363
 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 "
@@ -4772,13 +4869,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1367
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1324
+#: ../builder/virt-builder.pod:1369
 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 "
@@ -4786,12 +4883,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1328
+#: ../builder/virt-builder.pod:1373
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1330
+#: ../builder/virt-builder.pod:1375
 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 "
@@ -4799,7 +4896,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1334
+#: ../builder/virt-builder.pod:1379
 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 "
@@ -4807,32 +4904,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1338
+#: ../builder/virt-builder.pod:1383
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1385
 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:1344
+#: ../builder/virt-builder.pod:1389
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1391
 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:1349
+#: ../builder/virt-builder.pod:1394
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -4844,53 +4941,53 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1400
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1357
+#: ../builder/virt-builder.pod:1402
 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:1363
+#: ../builder/virt-builder.pod:1408
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1365
+#: ../builder/virt-builder.pod:1410
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1368
+#: ../builder/virt-builder.pod:1413
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1374
+#: ../builder/virt-builder.pod:1419
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1378
+#: ../builder/virt-builder.pod:1423
 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:1383
+#: ../builder/virt-builder.pod:1428
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1385
+#: ../builder/virt-builder.pod:1430
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -4898,7 +4995,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1387
+#: ../builder/virt-builder.pod:1432
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -4906,17 +5003,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1389
+#: ../builder/virt-builder.pod:1434
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1391
+#: ../builder/virt-builder.pod:1436
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1393
+#: ../builder/virt-builder.pod:1438
 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 "
@@ -4925,7 +5022,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1398
+#: ../builder/virt-builder.pod:1443
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4935,12 +5032,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1447
 msgid "or equivalently:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1404
+#: ../builder/virt-builder.pod:1449
 #, no-wrap
 msgid ""
 " export VIRT_BUILDER_SOURCE=http://example.com/s1/index.asc,http://example.com/s2/index.asc\n"
@@ -4949,7 +5046,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
@@ -4957,7 +5054,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1456
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4967,26 +5064,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1415
+#: ../builder/virt-builder.pod:1460
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1418
+#: ../builder/virt-builder.pod:1463
 msgid ""
 "In the case where you provide no fingerprints, the default fingerprint built "
 "into virt-builder is used for all sources."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1421
+#: ../builder/virt-builder.pod:1466
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1468
 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 "
@@ -4994,12 +5091,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1428
+#: ../builder/virt-builder.pod:1473
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1430
+#: ../builder/virt-builder.pod:1475
 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 "
@@ -5007,7 +5104,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1434
+#: ../builder/virt-builder.pod:1479
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -5016,86 +5113,86 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1437
+#: ../builder/virt-builder.pod:1482
 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:1440
+#: ../builder/virt-builder.pod:1485
 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:1443
+#: ../builder/virt-builder.pod:1488
 #, 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:1445
+#: ../builder/virt-builder.pod:1490
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1447
+#: ../builder/virt-builder.pod:1492
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1449
+#: ../builder/virt-builder.pod:1494
 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:1452
+#: ../builder/virt-builder.pod:1497
 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:1455
+#: ../builder/virt-builder.pod:1500
 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:1460
+#: ../builder/virt-builder.pod:1505
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1464
+#: ../builder/virt-builder.pod:1509
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1468
+#: ../builder/virt-builder.pod:1513
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1470
+#: ../builder/virt-builder.pod:1515
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1473
+#: ../builder/virt-builder.pod:1518
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1475
+#: ../builder/virt-builder.pod:1520
 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<--"
@@ -5103,7 +5200,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1479
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -5111,12 +5208,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1483
+#: ../builder/virt-builder.pod:1528
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1485
+#: ../builder/virt-builder.pod:1530
 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 "
@@ -5124,7 +5221,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1489
+#: ../builder/virt-builder.pod:1534
 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<--"
@@ -5134,17 +5231,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1496
+#: ../builder/virt-builder.pod:1541
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1498
+#: ../builder/virt-builder.pod:1543
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1545
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5162,12 +5259,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1557
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1514
+#: ../builder/virt-builder.pod:1559
 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 "
@@ -5175,7 +5272,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1518
+#: ../builder/virt-builder.pod:1563
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5186,24 +5283,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1568
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1525
+#: ../builder/virt-builder.pod:1570
 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:1528
+#: ../builder/virt-builder.pod:1573
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1530
+#: ../builder/virt-builder.pod:1575
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint (ie. I<--"
@@ -5212,7 +5309,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1535
+#: ../builder/virt-builder.pod:1580
 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 "
@@ -5220,13 +5317,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1539
+#: ../builder/virt-builder.pod:1584
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1542
+#: ../builder/virt-builder.pod:1587
 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.  "
@@ -5237,19 +5334,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1549 ../src/guestfs.pod:3353
+#: ../builder/virt-builder.pod:1594 ../src/guestfs.pod:3353
 msgid "ARCHITECTURE"
 msgstr "アーキテクチャー"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:1596
 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:1554
+#: ../builder/virt-builder.pod:1599
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -5258,27 +5355,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1604
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1562 ../src/guestfs.pod:1899
+#: ../builder/virt-builder.pod:1607 ../src/guestfs.pod:1899
 #: ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr "セキュリティ"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1609
 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:1567
+#: ../builder/virt-builder.pod:1612
 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 "
@@ -5288,7 +5385,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1573
+#: ../builder/virt-builder.pod:1618
 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 "
@@ -5297,14 +5394,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1623
 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:1581
+#: ../builder/virt-builder.pod:1626
 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 "
@@ -5312,17 +5409,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1630
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1632
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1634
 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 "
@@ -5331,7 +5428,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1594
+#: ../builder/virt-builder.pod:1639
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5342,53 +5439,53 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1602
+#: ../builder/virt-builder.pod:1647
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1604
+#: ../builder/virt-builder.pod:1649
 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:1607
+#: ../builder/virt-builder.pod:1652
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1609
+#: ../builder/virt-builder.pod:1654
 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:1616
+#: ../builder/virt-builder.pod:1661
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1620
+#: ../builder/virt-builder.pod:1665
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1669
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1673
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1630
+#: ../builder/virt-builder.pod:1675
 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, "
@@ -5396,14 +5493,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1634
+#: ../builder/virt-builder.pod:1679
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1636
+#: ../builder/virt-builder.pod:1681
 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 "
@@ -5411,40 +5508,40 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1685
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1688
 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:1646
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1649 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1651
+#: ../builder/virt-builder.pod:1696
 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:1654
+#: ../builder/virt-builder.pod:1699
 msgid ""
 "Since virt-builder does not know how to give new files a correct label, it "
 "touches C</.autorelabel> in the guest and relies on the guest to relabel "
@@ -5452,82 +5549,82 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1658
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
 "time you use them.  This is normal, and harmless."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1663
+#: ../builder/virt-builder.pod:1708
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1668
+#: ../builder/virt-builder.pod:1713
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1715
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1672
+#: ../builder/virt-builder.pod:1717
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1719
 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:1677
+#: ../builder/virt-builder.pod:1722
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1679 ../builder/virt-builder.pod:1693
+#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1726
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1728
 msgid ""
 "Set the default value for the GPG signature fingerprint or comma-separated "
 "list of fingerprints (see I<--fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1686
+#: ../builder/virt-builder.pod:1731
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1733
 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:1691
+#: ../builder/virt-builder.pod:1736
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1699 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1744 ../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:403
@@ -5538,7 +5635,7 @@ msgid ""
 msgstr "このプログラムは、成功すると 0 を、エラーがあると 0 以外を返します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1704
+#: ../builder/virt-builder.pod:1749
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5556,7 +5653,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1725 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1770 ../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."
@@ -13091,6 +13188,15 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr "Copyright (C) 2012 Red Hat Inc."
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
+#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
+#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
+#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
+#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr "コメント"
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index 80441fed3..817e1cfd1 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.21\n"
+"Project-Id-Version: libguestfs 1.25.22\n"
 "Report-Msgid-Bugs-To: libguestfs@redhat.com\n"
-"POT-Creation-Date: 2014-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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:514 ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:215
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:542 ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511 ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:215
 msgid "B<--quiet>"
 msgstr ""
 
@@ -458,12 +458,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:632 ../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 ../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:660 ../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 ../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:634 ../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 ../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:662 ../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 ../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:641 ../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 ../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:669 ../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 ../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:643 ../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 ../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-make-fs:167 ../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:671 ../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 ../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-make-fs:167 ../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:645 ../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 ../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-make-fs:169 ../tools/virt-tar:120 ../tools/virt-win-reg:113
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:673 ../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 ../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-make-fs:169 ../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:1697 ../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:1356 ../format/virt-format.pod:183 ../fuse/guestmount.pod:401 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307 ../sysprep/virt-sysprep.pod:547 ../test-tool/libguestfs-test-tool.pod:173
+#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1742 ../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:1356 ../format/virt-format.pod:183 ../fuse/guestmount.pod:401 ../fuse/guestunmount.pod:126 ../inspector/virt-inspector.pod:496 ../resize/virt-resize.pod:751 ../sparsify/virt-sparsify.pod:307 ../sysprep/virt-sysprep.pod:547 ../test-tool/libguestfs-test-tool.pod:173
 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:558 ../builder/virt-builder.pod:562 ../builder/virt-builder.pod:921 ../builder/virt-builder.pod:928 ../builder/virt-builder.pod:932 ../builder/virt-builder.pod:936 ../builder/virt-builder.pod:941 ../builder/virt-builder.pod:945 ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:953 ../builder/virt-builder.pod:957 ../builder/virt-builder.pod:961 ../builder/virt-builder.pod:965 ../builder/virt-builder.pod:969 ../builder/virt-builder.pod:973 ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981 ../builder/virt-builder.pod:985 ../builder/virt-builder.pod:989 ../builder/virt-builder.pod:998 ../builder/virt-builder.pod:1372 ../builder/virt-builder.pod:1376 ../builder/virt-builder.pod:1614 ../builder/virt-builder.pod:1618 ../builder/virt-builder.pod:1622 ../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:209 ../examples/guestfs-faq.pod:215 ../examples/guestfs-faq.pod:254 ../examples/guestfs-faq.pod:260 ../examples/guestfs-faq.pod:814 ../examples/guestfs-faq.pod:818 ../examples/guestfs-faq.pod:822 ../examples/guestfs-faq.pod:826 ../examples/guestfs-faq.pod:834 ../examples/guestfs-faq.pod:839 ../examples/guestfs-performance.pod:107 ../examples/guestfs-performance.pod:113 ../examples/guestfs-performance.pod:118 ../examples/guestfs-performance.pod:253 ../examples/guestfs-performance.pod:258 ../examples/guestfs-performance.pod:263 ../examples/guestfs-performance.pod:382 ../examples/guestfs-performance.pod:386 ../examples/guestfs-performance.pod:392 ../examples/guestfs-performance.pod:398 ../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:1889 ../fish/guestfish-actions.pod:1893 ../fish/guestfish-actions.pod:1897 ../fish/guestfish-actions.pod:1901 ../fish/guestfish-actions.pod:1909 ../fish/guestfish-actions.pod:1913 ../fish/guestfish-actions.pod:1917 ../fish/guestfish-actions.pod:1927 ../fish/guestfish-actions.pod:1931 ../fish/guestfish-actions.pod:1935 ../fish/guestfish-actions.pod:2049 ../fish/guestfish-actions.pod:2053 ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2100 ../fish/guestfish-actions.pod:2104 ../fish/guestfish-actions.pod:2109 ../fish/guestfish-actions.pod:2642 ../fish/guestfish-actions.pod:2649 ../fish/guestfish-actions.pod:2656 ../fish/guestfish-actions.pod:3238 ../fish/guestfish-actions.pod:3244 ../fish/guestfish-actions.pod:3252 ../fish/guestfish-actions.pod:3259 ../fish/guestfish-actions.pod:3266 ../fish/guestfish.pod:476 ../fish/guestfish.pod:480 ../fish/guestfish.pod:484 ../fish/guestfish.pod:488 ../fish/libguestfs-tools.conf.pod:20 ../fish/libguestfs-tools.conf.pod:24 ../fish/libguestfs-tools.conf.pod:28 ../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:3041 ../src/guestfs-actions.pod:3045 ../src/guestfs-actions.pod:3049 ../src/guestfs-actions.pod:3053 ../src/guestfs-actions.pod:3061 ../src/guestfs-actions.pod:3065 ../src/guestfs-actions.pod:3069 ../src/guestfs-actions.pod:3079 ../src/guestfs-actions.pod:3083 ../src/guestfs-actions.pod:3087 ../src/guestfs-actions.pod:3262 ../src/guestfs-actions.pod:3266 ../src/guestfs-actions.pod:3271 ../src/guestfs-actions.pod:3332 ../src/guestfs-actions.pod:3336 ../src/guestfs-actions.pod:3341 ../src/guestfs-actions.pod:4194 ../src/guestfs-actions.pod:4201 ../src/guestfs-actions.pod:4208 ../src/guestfs-actions.pod:5079 ../src/guestfs-actions.pod:5085 ../src/guestfs-actions.pod:5093 ../src/guestfs-actions.pod:5100 ../src/guestfs-actions.pod:5107 ../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:1698 ../src/guestfs.pod:1702 ../src/guestfs.pod:1706 ../src/guestfs.pod:1711 ../src/guestfs.pod:1719 ../src/guestfs.pod:1738 ../src/guestfs.pod:1746 ../src/guestfs.pod:1763 ../src/guestfs.pod:1768 ../src/guestfs.pod:1772 ../src/guestfs.pod:1961 ../src/guestfs.pod:1965 ../src/guestfs.pod:1969 ../src/guestfs.pod:1973 ../src/guestfs.pod:1977 ../src/guestfs.pod:1981 ../src/guestfs.pod:2637 ../src/guestfs.pod:2642 ../src/guestfs.pod:2646 ../src/guestfs.pod:2750 ../src/guestfs.pod:2755 ../src/guestfs.pod:2759 ../src/guestfs.pod:2769 ../src/guestfs.pod:3200 ../src/guestfs.pod:3205 ../src/guestfs.pod:3211 ../src/guestfs.pod:3219 ../src/guestfs.pod:3736 ../src/guestfs.pod:3742 ../src/guestfs.pod:3747 ../src/guestfs.pod:3753 ../src/guestfs.pod:4148 ../src/guestfs.pod:4152 ../src/guestfs.pod:4156 ../src/guestfs.pod:4160 ../src/guestfs.pod:4164 ../src/guestfs.pod:4168 ../src/guestfs.pod:4172 ../src/guestfs.pod:4415 ../src/guestfs.pod:4420 ../src/guestfs.pod:4424 ../src/guestfs.pod:4428 ../src/guestfs.pod:4432 ../src/guestfs.pod:4446 ../src/guestfs.pod:4450 ../src/guestfs.pod:4455 ../src/guestfs.pod:4459 ../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:586 ../builder/virt-builder.pod:590 ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:956 ../builder/virt-builder.pod:960 ../builder/virt-builder.pod:964 ../builder/virt-builder.pod:969 ../builder/virt-builder.pod:973 ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981 ../builder/virt-builder.pod:985 ../builder/virt-builder.pod:989 ../builder/virt-builder.pod:993 ../builder/virt-builder.pod:997 ../builder/virt-builder.pod:1001 ../builder/virt-builder.pod:1005 ../builder/virt-builder.pod:1009 ../builder/virt-builder.pod:1013 ../builder/virt-builder.pod:1017 ../builder/virt-builder.pod:1026 ../builder/virt-builder.pod:1417 ../builder/virt-builder.pod:1421 ../builder/virt-builder.pod:1659 ../builder/virt-builder.pod:1663 ../builder/virt-builder.pod:1667 ../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:209 ../examples/guestfs-faq.pod:215 ../examples/guestfs-faq.pod:254 ../examples/guestfs-faq.pod:260 ../examples/guestfs-faq.pod:814 ../examples/guestfs-faq.pod:818 ../examples/guestfs-faq.pod:822 ../examples/guestfs-faq.pod:826 ../examples/guestfs-faq.pod:834 ../examples/guestfs-faq.pod:839 ../examples/guestfs-performance.pod:107 ../examples/guestfs-performance.pod:113 ../examples/guestfs-performance.pod:118 ../examples/guestfs-performance.pod:253 ../examples/guestfs-performance.pod:258 ../examples/guestfs-performance.pod:263 ../examples/guestfs-performance.pod:382 ../examples/guestfs-performance.pod:386 ../examples/guestfs-performance.pod:392 ../examples/guestfs-performance.pod:398 ../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:1889 ../fish/guestfish-actions.pod:1893 ../fish/guestfish-actions.pod:1897 ../fish/guestfish-actions.pod:1901 ../fish/guestfish-actions.pod:1909 ../fish/guestfish-actions.pod:1913 ../fish/guestfish-actions.pod:1917 ../fish/guestfish-actions.pod:1927 ../fish/guestfish-actions.pod:1931 ../fish/guestfish-actions.pod:1935 ../fish/guestfish-actions.pod:2049 ../fish/guestfish-actions.pod:2053 ../fish/guestfish-actions.pod:2058 ../fish/guestfish-actions.pod:2100 ../fish/guestfish-actions.pod:2104 ../fish/guestfish-actions.pod:2109 ../fish/guestfish-actions.pod:2642 ../fish/guestfish-actions.pod:2649 ../fish/guestfish-actions.pod:2656 ../fish/guestfish-actions.pod:3238 ../fish/guestfish-actions.pod:3244 ../fish/guestfish-actions.pod:3252 ../fish/guestfish-actions.pod:3259 ../fish/guestfish-actions.pod:3266 ../fish/guestfish.pod:476 ../fish/guestfish.pod:480 ../fish/guestfish.pod:484 ../fish/guestfish.pod:488 ../fish/libguestfs-tools.conf.pod:20 ../fish/libguestfs-tools.conf.pod:24 ../fish/libguestfs-tools.conf.pod:28 ../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:3041 ../src/guestfs-actions.pod:3045 ../src/guestfs-actions.pod:3049 ../src/guestfs-actions.pod:3053 ../src/guestfs-actions.pod:3061 ../src/guestfs-actions.pod:3065 ../src/guestfs-actions.pod:3069 ../src/guestfs-actions.pod:3079 ../src/guestfs-actions.pod:3083 ../src/guestfs-actions.pod:3087 ../src/guestfs-actions.pod:3262 ../src/guestfs-actions.pod:3266 ../src/guestfs-actions.pod:3271 ../src/guestfs-actions.pod:3332 ../src/guestfs-actions.pod:3336 ../src/guestfs-actions.pod:3341 ../src/guestfs-actions.pod:4194 ../src/guestfs-actions.pod:4201 ../src/guestfs-actions.pod:4208 ../src/guestfs-actions.pod:5079 ../src/guestfs-actions.pod:5085 ../src/guestfs-actions.pod:5093 ../src/guestfs-actions.pod:5100 ../src/guestfs-actions.pod:5107 ../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:1698 ../src/guestfs.pod:1702 ../src/guestfs.pod:1706 ../src/guestfs.pod:1711 ../src/guestfs.pod:1719 ../src/guestfs.pod:1738 ../src/guestfs.pod:1746 ../src/guestfs.pod:1763 ../src/guestfs.pod:1768 ../src/guestfs.pod:1772 ../src/guestfs.pod:1961 ../src/guestfs.pod:1965 ../src/guestfs.pod:1969 ../src/guestfs.pod:1973 ../src/guestfs.pod:1977 ../src/guestfs.pod:1981 ../src/guestfs.pod:2637 ../src/guestfs.pod:2642 ../src/guestfs.pod:2646 ../src/guestfs.pod:2750 ../src/guestfs.pod:2755 ../src/guestfs.pod:2759 ../src/guestfs.pod:2769 ../src/guestfs.pod:3200 ../src/guestfs.pod:3205 ../src/guestfs.pod:3211 ../src/guestfs.pod:3219 ../src/guestfs.pod:3736 ../src/guestfs.pod:3742 ../src/guestfs.pod:3747 ../src/guestfs.pod:3753 ../src/guestfs.pod:4148 ../src/guestfs.pod:4152 ../src/guestfs.pod:4156 ../src/guestfs.pod:4160 ../src/guestfs.pod:4164 ../src/guestfs.pod:4168 ../src/guestfs.pod:4172 ../src/guestfs.pod:4415 ../src/guestfs.pod:4420 ../src/guestfs.pod:4424 ../src/guestfs.pod:4428 ../src/guestfs.pod:4432 ../src/guestfs.pod:4446 ../src/guestfs.pod:4450 ../src/guestfs.pod:4455 ../src/guestfs.pod:4459 ../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:1702 ../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:1186 ../examples/guestfs-performance.pod:567 ../examples/guestfs-recipes.pod:651 ../examples/guestfs-testing.pod:386 ../fish/guestfish.pod:1556 ../fish/libguestfs-tools.conf.pod:57 ../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:406 ../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 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:40 ../python/examples/guestfs-python.pod:53 ../rescue/virt-rescue.pod:417 ../resize/virt-resize.pod:756 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:339 ../src/guestfs.pod:4695 ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:183 ../tools/virt-list-filesystems:190 ../tools/virt-list-partitions:272 ../tools/virt-make-fs:643 ../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:1747 ../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:1186 ../examples/guestfs-performance.pod:567 ../examples/guestfs-recipes.pod:651 ../examples/guestfs-testing.pod:386 ../fish/guestfish.pod:1556 ../fish/libguestfs-tools.conf.pod:57 ../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:406 ../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 ../ocaml/examples/guestfs-ocaml.pod:78 ../perl/examples/guestfs-perl.pod:40 ../python/examples/guestfs-python.pod:53 ../rescue/virt-rescue.pod:417 ../resize/virt-resize.pod:756 ../ruby/examples/guestfs-ruby.pod:36 ../sparsify/virt-sparsify.pod:339 ../src/guestfs.pod:4695 ../sysprep/virt-sysprep.pod:551 ../test-tool/libguestfs-test-tool.pod:183 ../tools/virt-list-filesystems:190 ../tools/virt-list-partitions:272 ../tools/virt-make-fs:643 ../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:1719 ../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 ../rescue/virt-rescue.pod:427 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-make-fs:658 ../tools/virt-tar:315 ../tools/virt-win-reg:806
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1764 ../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 ../rescue/virt-rescue.pod:427 ../resize/virt-resize.pod:779 ../sparsify/virt-sparsify.pod:352 ../tools/virt-list-filesystems:202 ../tools/virt-list-partitions:283 ../tools/virt-make-fs:658 ../tools/virt-tar:315 ../tools/virt-win-reg:806
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1721 ../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 ../rescue/virt-rescue.pod:429 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:568 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../tools/virt-make-fs:660 ../tools/virt-tar:317 ../tools/virt-win-reg:808
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1766 ../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 ../rescue/virt-rescue.pod:429 ../resize/virt-resize.pod:781 ../sparsify/virt-sparsify.pod:354 ../sysprep/virt-sysprep.pod:568 ../tools/virt-list-filesystems:204 ../tools/virt-list-partitions:285 ../tools/virt-make-fs:660 ../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:179 ../builder/virt-builder.pod:1723 ../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:1196 ../examples/guestfs-performance.pod:584 ../examples/guestfs-recipes.pod:670 ../examples/guestfs-testing.pod:397 ../fish/guestfish.pod:1591 ../fish/libguestfs-tools.conf.pod:68 ../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:424 ../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 ../ocaml/examples/guestfs-ocaml.pod:97 ../perl/examples/guestfs-perl.pod:59 ../python/examples/guestfs-python.pod:71 ../rescue/virt-rescue.pod:431 ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:54 ../sparsify/virt-sparsify.pod:356 ../src/guestfs.pod:4756 ../sysprep/virt-sysprep.pod:572 ../test-tool/libguestfs-test-tool.pod:193 ../tools/virt-list-filesystems:206 ../tools/virt-list-partitions:287 ../tools/virt-make-fs:662 ../tools/virt-tar:319 ../tools/virt-win-reg:810
+#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:179 ../builder/virt-builder.pod:1768 ../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:1196 ../examples/guestfs-performance.pod:584 ../examples/guestfs-recipes.pod:670 ../examples/guestfs-testing.pod:397 ../fish/guestfish.pod:1591 ../fish/libguestfs-tools.conf.pod:68 ../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:424 ../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 ../ocaml/examples/guestfs-ocaml.pod:97 ../perl/examples/guestfs-perl.pod:59 ../python/examples/guestfs-python.pod:71 ../rescue/virt-rescue.pod:431 ../resize/virt-resize.pod:783 ../ruby/examples/guestfs-ruby.pod:54 ../sparsify/virt-sparsify.pod:356 ../src/guestfs.pod:4756 ../sysprep/virt-sysprep.pod:572 ../test-tool/libguestfs-test-tool.pod:193 ../tools/virt-list-filesystems:206 ../tools/virt-list-partitions:287 ../tools/virt-make-fs:662 ../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:1661 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4592 ../test-tool/libguestfs-test-tool.pod:178
+#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1706 ../edit/virt-edit.pod:337 ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115 ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312 ../src/guestfs.pod:4592 ../test-tool/libguestfs-test-tool.pod:178
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
@@ -1223,7 +1223,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:34
 #, no-wrap
 msgid ""
-" virt-builder -l|--list [--long]\n"
+" virt-builder -l|--list [--long] [--list-format short|long|json]\n"
 "\n"
 msgstr ""
 
@@ -1236,7 +1236,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1458
+#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1503
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1244,7 +1244,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1466
+#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1511
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1252,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1462
+#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1507
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -1440,7 +1440,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:553
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -2028,33 +2028,88 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:377
+msgid "B<--list --format> format"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:379
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:381
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:383
 msgid ""
-"The alternative I<--list --long> form shows lots more details about each "
-"operating system option."
+"It is possible to choose with I<--format> the output format for the list "
+"templates:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:388
+msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:384
+#: ../builder/virt-builder.pod:390
+msgid ""
+"The default format, prints only the template identifier and, next to it, its "
+"short description."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:393
+msgid "B<long>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:395
+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:398
+msgid "B<json>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:400
+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:403
+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 with the previous versions (for example the structure has "
+"changed, or non-optional keys are no more present)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:410
+msgid "I<--long> is a shorthand for the C<long> format."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:412
 msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:414
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:416
 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 "
@@ -2062,22 +2117,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:420
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:422
 msgid "B<-m> MB"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:396
+#: ../builder/virt-builder.pod:424
 msgid "B<--memsize> MB"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:398
+#: ../builder/virt-builder.pod:426
 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 "
@@ -2085,12 +2140,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:402
+#: ../builder/virt-builder.pod:430
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:432
 #, no-wrap
 msgid ""
 " guestfish get-memsize\n"
@@ -2098,58 +2153,58 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:434
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:408
+#: ../builder/virt-builder.pod:436
 msgid "Create a directory in the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:410
+#: ../builder/virt-builder.pod:438
 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:413 ../fish/guestfish.pod:343 ../rescue/virt-rescue.pod:194
+#: ../builder/virt-builder.pod:441 ../fish/guestfish.pod:343 ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:415
+#: ../builder/virt-builder.pod:443
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:417
+#: ../builder/virt-builder.pod:445
 msgid "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:419
+#: ../builder/virt-builder.pod:447
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:449
 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:424
+#: ../builder/virt-builder.pod:452
 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:427
+#: ../builder/virt-builder.pod:455
 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 "
@@ -2157,43 +2212,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:459
 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:436 ../builder/virt-builder.pod:1020 ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:211 ../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:1783 ../src/guestfs.pod:2055 ../src/guestfs.pod:2353 ../src/guestfs.pod:3847
+#: ../builder/virt-builder.pod:464 ../builder/virt-builder.pod:1048 ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161 ../examples/guestfs-performance.pod:211 ../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:1783 ../src/guestfs.pod:2055 ../src/guestfs.pod:2353 ../src/guestfs.pod:3847
 msgid "1."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:438
+#: ../builder/virt-builder.pod:466
 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:441 ../builder/virt-builder.pod:1025 ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:218 ../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:1787 ../src/guestfs.pod:2059 ../src/guestfs.pod:2357 ../src/guestfs.pod:3872
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1053 ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167 ../examples/guestfs-performance.pod:218 ../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:1787 ../src/guestfs.pod:2059 ../src/guestfs.pod:2357 ../src/guestfs.pod:3872
 msgid "2."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:471
 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:446 ../examples/guestfs-faq.pod:528 ../examples/guestfs-performance.pod:175 ../examples/guestfs-performance.pod:224 ../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:1791 ../src/guestfs.pod:2363
+#: ../builder/virt-builder.pod:474 ../examples/guestfs-faq.pod:528 ../examples/guestfs-performance.pod:175 ../examples/guestfs-performance.pod:224 ../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:1791 ../src/guestfs.pod:2363
 msgid "3."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:448
+#: ../builder/virt-builder.pod:476
 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 "
@@ -2201,32 +2256,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:453 ../examples/guestfs-faq.pod:534 ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
+#: ../builder/virt-builder.pod:481 ../examples/guestfs-faq.pod:534 ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:455
+#: ../builder/virt-builder.pod:483
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:459 ../fish/guestfish.pod:360 ../fuse/guestmount.pod:288
+#: ../builder/virt-builder.pod:487 ../fish/guestfish.pod:360 ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:461
+#: ../builder/virt-builder.pod:489
 msgid "Do not sync the output file on exit."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:491
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:465
+#: ../builder/virt-builder.pod:493
 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 "
@@ -2237,36 +2292,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:472
+#: ../builder/virt-builder.pod:500
 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:476
+#: ../builder/virt-builder.pod:504
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:478
+#: ../builder/virt-builder.pod:506
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:481
+#: ../builder/virt-builder.pod:509
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:483
+#: ../builder/virt-builder.pod:511
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:485
+#: ../builder/virt-builder.pod:513
 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 "
@@ -2274,43 +2329,43 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:490
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Note that the output filename could be a device, partition or logical "
 "volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:493
+#: ../builder/virt-builder.pod:521
 msgid "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:496
+#: ../builder/virt-builder.pod:524
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:498 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:526 ../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:500
+#: ../builder/virt-builder.pod:528
 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:503 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:531 ../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:506 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:534 ../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 "
@@ -2318,49 +2373,49 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:510
+#: ../builder/virt-builder.pod:538
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:512
+#: ../builder/virt-builder.pod:540
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:516
+#: ../builder/virt-builder.pod:544
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:518
+#: ../builder/virt-builder.pod:546
 msgid "B<--root-password> SELECTOR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:548
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:550
 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:528
+#: ../builder/virt-builder.pod:556
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:530
+#: ../builder/virt-builder.pod:558
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:560
 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 "
@@ -2368,12 +2423,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:536
+#: ../builder/virt-builder.pod:564
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:538
+#: ../builder/virt-builder.pod:566
 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 "
@@ -2383,63 +2438,63 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:572
 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:547
+#: ../builder/virt-builder.pod:575
 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:550
+#: ../builder/virt-builder.pod:578
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:580
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:554
+#: ../builder/virt-builder.pod:582
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:560
+#: ../builder/virt-builder.pod:588
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:592
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:568
+#: ../builder/virt-builder.pod:596
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:598
 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:573
+#: ../builder/virt-builder.pod:601
 msgid "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:604
 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 "
@@ -2447,51 +2502,51 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:609
 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:584 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:612 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:614
 msgid "Enable N E<ge> 2 virtual CPUs for I<--run> scripts to use."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:588
+#: ../builder/virt-builder.pod:616
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:618
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:592
+#: ../builder/virt-builder.pod:620
 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 ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:596
+#: ../builder/virt-builder.pod:624
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:598
+#: ../builder/virt-builder.pod:626
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:600
+#: ../builder/virt-builder.pod:628
 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 "
@@ -2499,24 +2554,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:604
+#: ../builder/virt-builder.pod:632
 msgid "B<--timezone> TIMEZONE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:606
+#: ../builder/virt-builder.pod:634
 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:609
+#: ../builder/virt-builder.pod:637
 msgid "B<--update>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:639
 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 "
@@ -2524,17 +2579,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:643
 msgid "See also I<--install>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:645
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:647
 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 "
@@ -2542,14 +2597,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:651
 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:626
+#: ../builder/virt-builder.pod:654
 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 "
@@ -2557,56 +2612,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:630
+#: ../builder/virt-builder.pod:658
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:636
+#: ../builder/virt-builder.pod:664
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:638
+#: ../builder/virt-builder.pod:666
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:647
+#: ../builder/virt-builder.pod:675
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:677
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:653
+#: ../builder/virt-builder.pod:681
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:655
+#: ../builder/virt-builder.pod:683
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:685
 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:660
+#: ../builder/virt-builder.pod:688
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:690
 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 "
@@ -2614,7 +2669,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:666
+#: ../builder/virt-builder.pod:694
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -2622,22 +2677,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:696
 msgid "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:699
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:673
+#: ../builder/virt-builder.pod:701
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:703
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -2645,7 +2700,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:705
 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 "
@@ -2655,17 +2710,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:711
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:713
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:715
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -2673,12 +2728,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:689
+#: ../builder/virt-builder.pod:717
 msgid "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:720
 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 "
@@ -2687,12 +2742,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:697
+#: ../builder/virt-builder.pod:725
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:699
+#: ../builder/virt-builder.pod:727
 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 "
@@ -2700,14 +2755,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:732
 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:707
+#: ../builder/virt-builder.pod:735
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -2715,14 +2770,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:737
 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:712 ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:740 ../builder/virt-builder.pod:754
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -2731,7 +2786,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:715
+#: ../builder/virt-builder.pod:743
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -2744,7 +2799,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -2752,12 +2807,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:724
+#: ../builder/virt-builder.pod:752
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:729
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -2766,14 +2821,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:760
 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:735
+#: ../builder/virt-builder.pod:763
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -2783,12 +2838,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:739
+#: ../builder/virt-builder.pod:767
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:741
+#: ../builder/virt-builder.pod:769
 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 "
@@ -2796,12 +2851,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:747
+#: ../builder/virt-builder.pod:775
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:777
 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 "
@@ -2809,102 +2864,102 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:756
+#: ../builder/virt-builder.pod:784
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:758 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:786 ../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:761
+#: ../builder/virt-builder.pod:789
 msgid "B<--root-password> random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:791 ../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:766 ../fish/guestfish-actions.pod:380 ../format/virt-format.pod:140 ../src/guestfs-actions.pod:473
+#: ../builder/virt-builder.pod:794 ../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:768 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:796 ../sysprep/sysprep-extra-options.pod:56
 msgid "B<--root-password> disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:770
+#: ../builder/virt-builder.pod:798
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:773 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:801 ../sysprep/sysprep-extra-options.pod:67
 msgid "B<--root-password> locked:file:FILENAME"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:775 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:803 ../sysprep/sysprep-extra-options.pod:69
 msgid "B<--root-password> locked:password:PASSWORD"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:777 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:805 ../sysprep/sysprep-extra-options.pod:71
 msgid "B<--root-password> locked:random"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:779
+#: ../builder/virt-builder.pod:807
 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:783 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:811 ../sysprep/sysprep-extra-options.pod:81
 msgid "B<--root-password> locked"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:785 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:813 ../sysprep/sysprep-extra-options.pod:83
 msgid "B<--root-password> locked:disabled"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:787
+#: ../builder/virt-builder.pod:815
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:791
+#: ../builder/virt-builder.pod:819
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:793
+#: ../builder/virt-builder.pod:821
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with "
 "L<--firstboot-command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:796
+#: ../builder/virt-builder.pod:824
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -2913,7 +2968,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:827
 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 "
@@ -2921,12 +2976,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:803
+#: ../builder/virt-builder.pod:831
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:805
+#: ../builder/virt-builder.pod:833
 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 "
@@ -2935,17 +2990,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:810
+#: ../builder/virt-builder.pod:838
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:812
+#: ../builder/virt-builder.pod:840
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:814
+#: ../builder/virt-builder.pod:842
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -2954,7 +3009,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:817
+#: ../builder/virt-builder.pod:845
 msgid ""
 "See L<localectl(1)> and "
 "L<https://www.happyassassin.net/2013/11/23/keyboard-layouts-in-fedora-20-and-previously/> "
@@ -2962,12 +3017,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:821
+#: ../builder/virt-builder.pod:849
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:823
+#: ../builder/virt-builder.pod:851
 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.  "
@@ -2975,7 +3030,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:827
+#: ../builder/virt-builder.pod:855
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -2984,17 +3039,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:858
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:860
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:862
 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.  "
@@ -3002,7 +3057,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:866
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3011,24 +3066,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:869
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:843
+#: ../builder/virt-builder.pod:871
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:873
 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:848
+#: ../builder/virt-builder.pod:876
 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 "
@@ -3037,17 +3092,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:854
+#: ../builder/virt-builder.pod:882
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:856
+#: ../builder/virt-builder.pod:884
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:858
+#: ../builder/virt-builder.pod:886
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3066,12 +3121,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:869
+#: ../builder/virt-builder.pod:897
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:871
+#: ../builder/virt-builder.pod:899
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3079,7 +3134,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:903
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -3092,7 +3147,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:882
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3106,12 +3161,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:918
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:892
+#: ../builder/virt-builder.pod:920
 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 "
@@ -3119,148 +3174,148 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:898
+#: ../builder/virt-builder.pod:926
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:900
+#: ../builder/virt-builder.pod:928
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:902
+#: ../builder/virt-builder.pod:930
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:932
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:906
+#: ../builder/virt-builder.pod:934
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:908
+#: ../builder/virt-builder.pod:936
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:940
 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:915
+#: ../builder/virt-builder.pod:943
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:917
+#: ../builder/virt-builder.pod:945
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:951
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:925
+#: ../builder/virt-builder.pod:953
 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:930
+#: ../builder/virt-builder.pod:958
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:934
+#: ../builder/virt-builder.pod:962
 msgid "The template is uncompressed to a tmp file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:938
+#: ../builder/virt-builder.pod:966
 msgid "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:971
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:975
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:979
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:955
+#: ../builder/virt-builder.pod:983
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:959
+#: ../builder/virt-builder.pod:987
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:963
+#: ../builder/virt-builder.pod:991
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:967
+#: ../builder/virt-builder.pod:995
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:971
+#: ../builder/virt-builder.pod:999
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:1003
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:1007
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:1011
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:987
-msgid "Symbolic links are created (I<--link)."
+#: ../builder/virt-builder.pod:1015
+msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:991
+#: ../builder/virt-builder.pod:1019
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, "
 "I<--firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:994
+#: ../builder/virt-builder.pod:1022
 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 "
@@ -3268,34 +3323,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:1028
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1002
+#: ../builder/virt-builder.pod:1030
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1006
+#: ../builder/virt-builder.pod:1034
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1036
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1038
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1041
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -3304,19 +3359,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016 ../examples/guestfs-recipes.pod:261 ../fish/guestfish-actions.pod:2096 ../fish/guestfish-actions.pod:2638 ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:3328 ../src/guestfs-actions.pod:4190 ../src/guestfs-actions.pod:5075 ../src/guestfs.pod:778 ../src/guestfs.pod:2633 ../tools/virt-win-reg:752
+#: ../builder/virt-builder.pod:1044 ../examples/guestfs-recipes.pod:261 ../fish/guestfish-actions.pod:2096 ../fish/guestfish-actions.pod:2638 ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:3328 ../src/guestfs-actions.pod:4190 ../src/guestfs-actions.pod:5075 ../src/guestfs.pod:778 ../src/guestfs.pod:2633 ../tools/virt-win-reg:752
 msgid "Notes:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1050
 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:1027
+#: ../builder/virt-builder.pod:1055
 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 "
@@ -3325,28 +3380,71 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:1035 ../builder/virt-builder.pod:1041 ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8 ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204 ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553 ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr ""
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1037
+#: ../builder/virt-builder.pod:1063
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
-msgid "XXX"
+#: ../builder/virt-builder.pod:1065
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1067
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1071
+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 "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since "
+"virt-builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1077
+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:1080
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1082
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1085
+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:1043
+#: ../builder/virt-builder.pod:1088
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1090
 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 "
@@ -3354,7 +3452,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1094
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -3366,26 +3464,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1100
 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:1058
+#: ../builder/virt-builder.pod:1103
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1105
 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:1063
+#: ../builder/virt-builder.pod:1108
 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 "
@@ -3393,24 +3491,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1067
+#: ../builder/virt-builder.pod:1112
 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:1072
+#: ../builder/virt-builder.pod:1117
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1119
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1121
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -3418,7 +3516,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1123
 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 "
@@ -3427,17 +3525,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1129
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1131
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1133
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -3445,24 +3543,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1135
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1138
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1095
+#: ../builder/virt-builder.pod:1140
 msgid "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1097
+#: ../builder/virt-builder.pod:1142
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -3472,12 +3570,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1146
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1148
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -3485,12 +3583,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1105
+#: ../builder/virt-builder.pod:1150
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1152
 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 "
@@ -3500,7 +3598,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1113
+#: ../builder/virt-builder.pod:1158
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -3508,24 +3606,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1117
+#: ../builder/virt-builder.pod:1162
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1119
+#: ../builder/virt-builder.pod:1164
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1167
 msgid "Libguestfs.org repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1169
 msgid ""
 "Out of the box, virt-builder downloads the file "
 "L<http://libguestfs.org/download/builder/index.asc> which is an index of "
@@ -3535,7 +3633,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1130
+#: ../builder/virt-builder.pod:1175
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -3543,19 +3641,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1179
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1136
+#: ../builder/virt-builder.pod:1181
 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:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1140
+#: ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -3565,26 +3663,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1189
 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:1147
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "You can host this on any web or FTP server, or a local or network "
 "filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1195
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1197
 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 "
@@ -3593,21 +3691,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:1202
 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:1160
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1208
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
@@ -3615,7 +3713,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1210
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -3624,12 +3722,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1213
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1170
+#: ../builder/virt-builder.pod:1215
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -3637,12 +3735,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1172
+#: ../builder/virt-builder.pod:1217
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1219
 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 "
@@ -3651,14 +3749,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1224
 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:1182
+#: ../builder/virt-builder.pod:1227
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -3666,19 +3764,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1229
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1231
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1189
+#: ../builder/virt-builder.pod:1234
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -3694,7 +3792,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1199
+#: ../builder/virt-builder.pod:1244
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -3711,21 +3809,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1255
 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:1213
+#: ../builder/virt-builder.pod:1258
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1216
+#: ../builder/virt-builder.pod:1261
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -3733,7 +3831,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1263
 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 "
@@ -3741,46 +3839,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1222
+#: ../builder/virt-builder.pod:1267
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1226
+#: ../builder/virt-builder.pod:1271
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1228
+#: ../builder/virt-builder.pod:1273
 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:1231
+#: ../builder/virt-builder.pod:1276
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
+#: ../builder/virt-builder.pod:1278
 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:1236
+#: ../builder/virt-builder.pod:1281
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1283
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240 ../builder/virt-builder.pod:1251
+#: ../builder/virt-builder.pod:1285 ../builder/virt-builder.pod:1296
 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 "
@@ -3788,29 +3886,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1289
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1291
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1248
+#: ../builder/virt-builder.pod:1293
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1300
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1257
+#: ../builder/virt-builder.pod:1302
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -3818,19 +3916,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1259
+#: ../builder/virt-builder.pod:1304
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1306
 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:1264
+#: ../builder/virt-builder.pod:1309
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -3838,24 +3936,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1311
 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:1269
+#: ../builder/virt-builder.pod:1314
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1316
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1318
 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 "
@@ -3864,12 +3962,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1323
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1280
+#: ../builder/virt-builder.pod:1325
 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 "
@@ -3877,22 +3975,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1329
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1331
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1333
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1290
+#: ../builder/virt-builder.pod:1335
 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 "
@@ -3900,7 +3998,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1294
+#: ../builder/virt-builder.pod:1339
 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 "
@@ -3908,12 +4006,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1344
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1301
+#: ../builder/virt-builder.pod:1346
 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 "
@@ -3921,12 +4019,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1350
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1352
 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> "
@@ -3934,24 +4032,24 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1311
+#: ../builder/virt-builder.pod:1356
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1313
+#: ../builder/virt-builder.pod:1358
 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:1316
+#: ../builder/virt-builder.pod:1361
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1318
+#: ../builder/virt-builder.pod:1363
 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 "
@@ -3959,12 +4057,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1367
 msgid "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1324
+#: ../builder/virt-builder.pod:1369
 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 "
@@ -3972,12 +4070,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1328
+#: ../builder/virt-builder.pod:1373
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1330
+#: ../builder/virt-builder.pod:1375
 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 "
@@ -3985,7 +4083,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1334
+#: ../builder/virt-builder.pod:1379
 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 "
@@ -3993,31 +4091,31 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1338
+#: ../builder/virt-builder.pod:1383
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1385
 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:1344
+#: ../builder/virt-builder.pod:1389
 msgid "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1391
 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:1349
+#: ../builder/virt-builder.pod:1394
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -4029,12 +4127,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1400
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1357
+#: ../builder/virt-builder.pod:1402
 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 "
@@ -4042,41 +4140,41 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1363
+#: ../builder/virt-builder.pod:1408
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1365
+#: ../builder/virt-builder.pod:1410
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1368
+#: ../builder/virt-builder.pod:1413
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1374
+#: ../builder/virt-builder.pod:1419
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1378
+#: ../builder/virt-builder.pod:1423
 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:1383
+#: ../builder/virt-builder.pod:1428
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1385
+#: ../builder/virt-builder.pod:1430
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -4084,7 +4182,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1387
+#: ../builder/virt-builder.pod:1432
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -4092,17 +4190,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1389
+#: ../builder/virt-builder.pod:1434
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1391
+#: ../builder/virt-builder.pod:1436
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1393
+#: ../builder/virt-builder.pod:1438
 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 "
@@ -4111,7 +4209,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1398
+#: ../builder/virt-builder.pod:1443
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4121,12 +4219,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1447
 msgid "or equivalently:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1404
+#: ../builder/virt-builder.pod:1449
 #, no-wrap
 msgid ""
 " export "
@@ -4136,7 +4234,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
@@ -4144,7 +4242,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1456
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4154,26 +4252,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1415
+#: ../builder/virt-builder.pod:1460
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1418
+#: ../builder/virt-builder.pod:1463
 msgid ""
 "In the case where you provide no fingerprints, the default fingerprint built "
 "into virt-builder is used for all sources."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1421
+#: ../builder/virt-builder.pod:1466
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1468
 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 "
@@ -4181,12 +4279,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1428
+#: ../builder/virt-builder.pod:1473
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1430
+#: ../builder/virt-builder.pod:1475
 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 "
@@ -4194,7 +4292,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1434
+#: ../builder/virt-builder.pod:1479
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -4203,84 +4301,84 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1437
+#: ../builder/virt-builder.pod:1482
 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:1440
+#: ../builder/virt-builder.pod:1485
 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:1443
+#: ../builder/virt-builder.pod:1488
 msgid "The index is always encoded in UTF-8."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1445
+#: ../builder/virt-builder.pod:1490
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1447
+#: ../builder/virt-builder.pod:1492
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1449
+#: ../builder/virt-builder.pod:1494
 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:1452
+#: ../builder/virt-builder.pod:1497
 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:1455
+#: ../builder/virt-builder.pod:1500
 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:1460
+#: ../builder/virt-builder.pod:1505
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1464
+#: ../builder/virt-builder.pod:1509
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1468
+#: ../builder/virt-builder.pod:1513
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1470
+#: ../builder/virt-builder.pod:1515
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1473
+#: ../builder/virt-builder.pod:1518
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1475
+#: ../builder/virt-builder.pod:1520
 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>, "
@@ -4288,7 +4386,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1479
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -4296,12 +4394,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1483
+#: ../builder/virt-builder.pod:1528
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1485
+#: ../builder/virt-builder.pod:1530
 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 "
@@ -4309,7 +4407,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1489
+#: ../builder/virt-builder.pod:1534
 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 "
@@ -4319,17 +4417,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1496
+#: ../builder/virt-builder.pod:1541
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1498
+#: ../builder/virt-builder.pod:1543
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1545
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -4347,12 +4445,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1557
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1514
+#: ../builder/virt-builder.pod:1559
 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 "
@@ -4360,7 +4458,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1518
+#: ../builder/virt-builder.pod:1563
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -4371,24 +4469,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1568
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1525
+#: ../builder/virt-builder.pod:1570
 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:1528
+#: ../builder/virt-builder.pod:1573
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1530
+#: ../builder/virt-builder.pod:1575
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint "
@@ -4397,7 +4495,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1535
+#: ../builder/virt-builder.pod:1580
 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 "
@@ -4405,12 +4503,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1539
+#: ../builder/virt-builder.pod:1584
 msgid "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1542
+#: ../builder/virt-builder.pod:1587
 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 "
@@ -4421,19 +4519,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1549 ../src/guestfs.pod:3353
+#: ../builder/virt-builder.pod:1594 ../src/guestfs.pod:3353
 msgid "ARCHITECTURE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:1596
 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:1554
+#: ../builder/virt-builder.pod:1599
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: "
@@ -4442,26 +4540,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1604
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1562 ../src/guestfs.pod:1899 ../sysprep/virt-sysprep.pod:490
+#: ../builder/virt-builder.pod:1607 ../src/guestfs.pod:1899 ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1609
 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:1567
+#: ../builder/virt-builder.pod:1612
 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 "
@@ -4471,7 +4569,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1573
+#: ../builder/virt-builder.pod:1618
 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 "
@@ -4480,14 +4578,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1623
 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:1581
+#: ../builder/virt-builder.pod:1626
 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 "
@@ -4495,17 +4593,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1630
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1632
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1634
 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 "
@@ -4514,7 +4612,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1594
+#: ../builder/virt-builder.pod:1639
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -4525,51 +4623,51 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1602
+#: ../builder/virt-builder.pod:1647
 msgid "Using I<--no-sync>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1604
+#: ../builder/virt-builder.pod:1649
 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:1607
+#: ../builder/virt-builder.pod:1652
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1609
+#: ../builder/virt-builder.pod:1654
 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:1616
+#: ../builder/virt-builder.pod:1661
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1620
+#: ../builder/virt-builder.pod:1665
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1669
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1673
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1630
+#: ../builder/virt-builder.pod:1675
 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, "
@@ -4577,12 +4675,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1634
+#: ../builder/virt-builder.pod:1679
 msgid "User-Mode Linux"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1636
+#: ../builder/virt-builder.pod:1681
 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 "
@@ -4590,40 +4688,40 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1685
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1688
 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:1646
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create "
 "raw-format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1649 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1651
+#: ../builder/virt-builder.pod:1696
 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:1654
+#: ../builder/virt-builder.pod:1699
 msgid ""
 "Since virt-builder does not know how to give new files a correct label, it "
 "touches C</.autorelabel> in the guest and relies on the guest to relabel "
@@ -4631,87 +4729,87 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1658
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
 "time you use them.  This is normal, and harmless."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1663
+#: ../builder/virt-builder.pod:1708
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1668
+#: ../builder/virt-builder.pod:1713
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1715
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1672
+#: ../builder/virt-builder.pod:1717
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1719
 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:1677
+#: ../builder/virt-builder.pod:1722
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1679 ../builder/virt-builder.pod:1693
+#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1726
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1728
 msgid ""
 "Set the default value for the GPG signature fingerprint or comma-separated "
 "list of fingerprints (see I<--fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1686
+#: ../builder/virt-builder.pod:1731
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1733
 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:1691
+#: ../builder/virt-builder.pod:1736
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1699 ../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:403 ../inspector/virt-inspector.pod:498 ../resize/virt-resize.pod:753 ../sparsify/virt-sparsify.pod:309
+#: ../builder/virt-builder.pod:1744 ../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:403 ../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:1704
+#: ../builder/virt-builder.pod:1749
 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)>, "
@@ -4720,7 +4818,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1725 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
+#: ../builder/virt-builder.pod:1770 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr ""
 
@@ -11452,6 +11550,11 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr ""
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8 ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14 ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204 ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553 ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr ""
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
diff --git a/po-docs/uk.po b/po-docs/uk.po
index c17685641..341768a2a 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -706,7 +706,7 @@ msgid "B<-q>"
 msgstr "B<-q>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:514
+#: ../align/virt-alignment-scan.pod:181 ../builder/virt-builder.pod:542
 #: ../fuse/guestunmount.pod:87 ../resize/virt-resize.pod:511
 #: ../sparsify/virt-sparsify.pod:222 ../sysprep/virt-sysprep.pod:215
 msgid "B<--quiet>"
@@ -748,7 +748,7 @@ msgstr ""
 "(якщо не вказано параметрів I<-a> і I<-d>)."
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:632
+#: ../align/virt-alignment-scan.pod:195 ../builder/virt-builder.pod:660
 #: ../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
@@ -760,7 +760,7 @@ msgid "B<-v>"
 msgstr "B<-v>"
 
 #. type: =item
-#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:634
+#: ../align/virt-alignment-scan.pod:197 ../builder/virt-builder.pod:662
 #: ../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
@@ -784,7 +784,7 @@ msgstr "Увімкнути докладний показ повідомлень
 #. type: =item
 #: ../align/virt-alignment-scan.pod:201
 #: ../appliance/libguestfs-make-fixed-appliance.pod:107
-#: ../builder/virt-builder.pod:641 ../builder/virt-index-validate.pod:68
+#: ../builder/virt-builder.pod:669 ../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
@@ -799,7 +799,7 @@ msgstr "B<-V>"
 #. type: =item
 #: ../align/virt-alignment-scan.pod:203
 #: ../appliance/libguestfs-make-fixed-appliance.pod:109
-#: ../builder/virt-builder.pod:643 ../builder/virt-index-validate.pod:70
+#: ../builder/virt-builder.pod:671 ../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
@@ -814,7 +814,7 @@ msgid "B<--version>"
 msgstr "B<--version>"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:645
+#: ../align/virt-alignment-scan.pod:205 ../builder/virt-builder.pod:673
 #: ../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
@@ -1186,7 +1186,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1697 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1742 ../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
@@ -1211,19 +1211,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:558 ../builder/virt-builder.pod:562
-#: ../builder/virt-builder.pod:921 ../builder/virt-builder.pod:928
-#: ../builder/virt-builder.pod:932 ../builder/virt-builder.pod:936
-#: ../builder/virt-builder.pod:941 ../builder/virt-builder.pod:945
-#: ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:953
-#: ../builder/virt-builder.pod:957 ../builder/virt-builder.pod:961
-#: ../builder/virt-builder.pod:965 ../builder/virt-builder.pod:969
-#: ../builder/virt-builder.pod:973 ../builder/virt-builder.pod:977
-#: ../builder/virt-builder.pod:981 ../builder/virt-builder.pod:985
-#: ../builder/virt-builder.pod:989 ../builder/virt-builder.pod:998
-#: ../builder/virt-builder.pod:1372 ../builder/virt-builder.pod:1376
-#: ../builder/virt-builder.pod:1614 ../builder/virt-builder.pod:1618
-#: ../builder/virt-builder.pod:1622 ../builder/virt-index-validate.pod:34
+#: ../builder/virt-builder.pod:586 ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:949 ../builder/virt-builder.pod:956
+#: ../builder/virt-builder.pod:960 ../builder/virt-builder.pod:964
+#: ../builder/virt-builder.pod:969 ../builder/virt-builder.pod:973
+#: ../builder/virt-builder.pod:977 ../builder/virt-builder.pod:981
+#: ../builder/virt-builder.pod:985 ../builder/virt-builder.pod:989
+#: ../builder/virt-builder.pod:993 ../builder/virt-builder.pod:997
+#: ../builder/virt-builder.pod:1001 ../builder/virt-builder.pod:1005
+#: ../builder/virt-builder.pod:1009 ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1017 ../builder/virt-builder.pod:1026
+#: ../builder/virt-builder.pod:1417 ../builder/virt-builder.pod:1421
+#: ../builder/virt-builder.pod:1659 ../builder/virt-builder.pod:1663
+#: ../builder/virt-builder.pod:1667 ../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
@@ -1394,7 +1394,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:393
 #: ../appliance/libguestfs-make-fixed-appliance.pod:166
-#: ../builder/virt-builder.pod:1702 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1747 ../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
@@ -1429,7 +1429,7 @@ msgstr ""
 "L<virt-resize(1)>, L<http://libguestfs.org/>."
 
 #. type: =head1
-#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1719
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1764
 #: ../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
@@ -1442,7 +1442,7 @@ msgid "AUTHOR"
 msgstr "АВТОР"
 
 #. type: textblock
-#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1721
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1766
 #: ../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
@@ -1458,7 +1458,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:179
-#: ../builder/virt-builder.pod:1723 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1768 ../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
@@ -1790,7 +1790,7 @@ msgstr ""
 
 #. type: =head1
 #: ../appliance/libguestfs-make-fixed-appliance.pod:161
-#: ../builder/virt-builder.pod:1661 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1706 ../edit/virt-edit.pod:337
 #: ../fish/guestfish.pod:1361 ../fuse/guestunmount.pod:115
 #: ../rescue/virt-rescue.pod:390 ../sparsify/virt-sparsify.pod:312
 #: ../src/guestfs.pod:4592 ../test-tool/libguestfs-test-tool.pod:178
@@ -1918,7 +1918,7 @@ msgstr ""
 #: ../builder/virt-builder.pod:34
 #, no-wrap
 msgid ""
-" virt-builder -l|--list [--long]\n"
+" virt-builder -l|--list [--long] [--list-format short|long|json]\n"
 "\n"
 msgstr ""
 
@@ -1931,7 +1931,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1458
+#: ../builder/virt-builder.pod:38 ../builder/virt-builder.pod:1503
 #, no-wrap
 msgid ""
 " virt-builder --print-cache\n"
@@ -1939,7 +1939,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1466
+#: ../builder/virt-builder.pod:40 ../builder/virt-builder.pod:1511
 #, no-wrap
 msgid ""
 " virt-builder --cache-all-templates\n"
@@ -1947,7 +1947,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1462
+#: ../builder/virt-builder.pod:42 ../builder/virt-builder.pod:1507
 #, no-wrap
 msgid ""
 " virt-builder --delete-cache\n"
@@ -2141,7 +2141,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:525
+#: ../builder/virt-builder.pod:118 ../builder/virt-builder.pod:553
 msgid ""
 "Note if you I<don't> set I<--root-password> then the guest is given a "
 "I<random> root password."
@@ -2740,33 +2740,92 @@ msgstr ""
 
 #. type: =item
 #: ../builder/virt-builder.pod:377
+#, fuzzy
+#| msgid "B<--format> raw"
+msgid "B<--list --format> format"
+msgstr "B<--format> raw"
+
+#. type: =item
+#: ../builder/virt-builder.pod:379
 msgid "B<--list --long>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:379
+#: ../builder/virt-builder.pod:381
 msgid "List available templates."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:381
+#: ../builder/virt-builder.pod:383
 msgid ""
-"The alternative I<--list --long> form shows lots more details about each "
-"operating system option."
+"It is possible to choose with I<--format> the output format for the list "
+"templates:"
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:388
+msgid "B<short>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:384
+#: ../builder/virt-builder.pod:390
+msgid ""
+"The default format, prints only the template identifier and, next to it, its "
+"short description."
+msgstr ""
+
+#. type: =item
+#: ../builder/virt-builder.pod:393
+#, fuzzy
+#| msgid "B<--long>"
+msgid "B<long>"
+msgstr "B<--long>"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:395
+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:398
+msgid "B<json>"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:400
+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:403
+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 "
+"with the previous versions (for example the structure has changed, or non-"
+"optional keys are no more present)."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:410
+msgid "I<--long> is a shorthand for the C<long> format."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:412
 msgid "See also: I<--source>, I<--notes>, L</CREATING YOUR OWN TEMPLATES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:386
+#: ../builder/virt-builder.pod:414
 msgid "B<--no-logfile>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:388
+#: ../builder/virt-builder.pod:416
 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 "
@@ -2774,26 +2833,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:392
+#: ../builder/virt-builder.pod:420
 msgid "See also: L</LOG FILE>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:394
+#: ../builder/virt-builder.pod:422
 #, fuzzy
 #| msgid "B<-m MB>"
 msgid "B<-m> MB"
 msgstr "B<-m МБ>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:396
+#: ../builder/virt-builder.pod:424
 #, fuzzy
 #| msgid "B<--memsize MB>"
 msgid "B<--memsize> MB"
 msgstr "B<--memsize МБ>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:398
+#: ../builder/virt-builder.pod:426
 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 "
@@ -2801,12 +2860,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:402
+#: ../builder/virt-builder.pod:430
 msgid "The default can be found with this command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:404
+#: ../builder/virt-builder.pod:432
 #, fuzzy, no-wrap
 #| msgid "guestfs_get_memsize"
 msgid ""
@@ -2815,62 +2874,62 @@ msgid ""
 msgstr "guestfs_get_memsize"
 
 #. type: =item
-#: ../builder/virt-builder.pod:406
+#: ../builder/virt-builder.pod:434
 msgid "B<--mkdir> DIR"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:408
+#: ../builder/virt-builder.pod:436
 #, fuzzy
 #| msgid "Remove \".ssh\" directories in the guest."
 msgid "Create a directory in the guest."
 msgstr "Вилучити каталоги «.ssh» у гостьовій системі."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:410
+#: ../builder/virt-builder.pod:438
 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:413 ../fish/guestfish.pod:343
+#: ../builder/virt-builder.pod:441 ../fish/guestfish.pod:343
 #: ../rescue/virt-rescue.pod:194
 msgid "B<--network>"
 msgstr "B<--network>"
 
 #. type: =item
-#: ../builder/virt-builder.pod:415
+#: ../builder/virt-builder.pod:443
 msgid "B<--no-network>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:417
+#: ../builder/virt-builder.pod:445
 msgid ""
 "Enable or disable network access from the guest during the installation."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:419
+#: ../builder/virt-builder.pod:447
 msgid "Enabled is the default.  Use I<--no-network> to disable access."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:421
+#: ../builder/virt-builder.pod:449
 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:424
+#: ../builder/virt-builder.pod:452
 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:427
+#: ../builder/virt-builder.pod:455
 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 "
@@ -2878,14 +2937,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:431
+#: ../builder/virt-builder.pod:459
 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:436 ../builder/virt-builder.pod:1020
+#: ../builder/virt-builder.pod:464 ../builder/virt-builder.pod:1048
 #: ../examples/guestfs-faq.pod:512 ../examples/guestfs-performance.pod:161
 #: ../examples/guestfs-performance.pod:211 ../examples/guestfs-recipes.pod:408
 #: ../rescue/virt-rescue.pod:328 ../resize/virt-resize.pod:31
@@ -2896,14 +2955,14 @@ msgid "1."
 msgstr "1."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:438
+#: ../builder/virt-builder.pod:466
 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:441 ../builder/virt-builder.pod:1025
+#: ../builder/virt-builder.pod:469 ../builder/virt-builder.pod:1053
 #: ../examples/guestfs-faq.pod:522 ../examples/guestfs-performance.pod:167
 #: ../examples/guestfs-performance.pod:218 ../examples/guestfs-recipes.pod:414
 #: ../rescue/virt-rescue.pod:336 ../resize/virt-resize.pod:44
@@ -2914,14 +2973,14 @@ msgid "2."
 msgstr "2."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:443
+#: ../builder/virt-builder.pod:471
 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:446 ../examples/guestfs-faq.pod:528
+#: ../builder/virt-builder.pod:474 ../examples/guestfs-faq.pod:528
 #: ../examples/guestfs-performance.pod:175
 #: ../examples/guestfs-performance.pod:224 ../examples/guestfs-recipes.pod:420
 #: ../rescue/virt-rescue.pod:345 ../resize/virt-resize.pod:52
@@ -2931,7 +2990,7 @@ msgid "3."
 msgstr "3."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:448
+#: ../builder/virt-builder.pod:476
 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 "
@@ -2939,34 +2998,34 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:453 ../examples/guestfs-faq.pod:534
+#: ../builder/virt-builder.pod:481 ../examples/guestfs-faq.pod:534
 #: ../rescue/virt-rescue.pod:354 ../resize/virt-resize.pod:61
 msgid "4."
 msgstr "4."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:455
+#: ../builder/virt-builder.pod:483
 msgid "You don't have a host network (eg. in secure/restricted environments)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:459 ../fish/guestfish.pod:360
+#: ../builder/virt-builder.pod:487 ../fish/guestfish.pod:360
 #: ../fuse/guestmount.pod:288
 msgid "B<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:461
+#: ../builder/virt-builder.pod:489
 msgid "Do not sync the output file on exit."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:463
+#: ../builder/virt-builder.pod:491
 msgid "Virt-builder fsync's the output file or disk image when it exits."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:465
+#: ../builder/virt-builder.pod:493
 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 "
@@ -2977,36 +3036,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:472
+#: ../builder/virt-builder.pod:500
 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:476
+#: ../builder/virt-builder.pod:504
 msgid "B<--notes> os-version"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:478
+#: ../builder/virt-builder.pod:506
 msgid ""
 "List any notes associated with this guest, then exit (this does not do the "
 "install)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:481
+#: ../builder/virt-builder.pod:509
 msgid "B<-o> filename"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:483
+#: ../builder/virt-builder.pod:511
 msgid "B<--output> filename"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:485
+#: ../builder/virt-builder.pod:513
 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 "
@@ -3014,36 +3073,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:490
+#: ../builder/virt-builder.pod:518
 msgid ""
 "Note that the output filename could be a device, partition or logical volume."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:493
+#: ../builder/virt-builder.pod:521
 msgid ""
 "When used with I<--get-kernel>, this option specifies the output directory."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:496
+#: ../builder/virt-builder.pod:524
 msgid "B<--password-crypto> password-crypto"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:498 ../sysprep/sysprep-extra-options.pod:92
+#: ../builder/virt-builder.pod:526 ../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:500
+#: ../builder/virt-builder.pod:528
 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:503 ../sysprep/sysprep-extra-options.pod:97
+#: ../builder/virt-builder.pod:531 ../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."
@@ -3052,7 +3111,7 @@ msgstr ""
 "(наприкладRHEL 3), але є незахищеним щодо новітніх способів атак."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:506 ../sysprep/sysprep-extra-options.pod:100
+#: ../builder/virt-builder.pod:534 ../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 "
@@ -3065,51 +3124,51 @@ msgstr ""
 "спосіб шифрування."
 
 #. type: =item
-#: ../builder/virt-builder.pod:510
+#: ../builder/virt-builder.pod:538
 msgid "B<--print-cache>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:512
+#: ../builder/virt-builder.pod:540
 msgid "Print information about the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:516
+#: ../builder/virt-builder.pod:544
 msgid "Don't print ordinary progress messages."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:518
+#: ../builder/virt-builder.pod:546
 #, fuzzy
 #| msgid "B<--root-password file:FILENAME>"
 msgid "B<--root-password> SELECTOR"
 msgstr "B<--root-password file:НАЗВА_ФАЙЛА>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:520
+#: ../builder/virt-builder.pod:548
 msgid "Set the root password."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:522
+#: ../builder/virt-builder.pod:550
 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:528
+#: ../builder/virt-builder.pod:556
 msgid "B<--run> SCRIPT"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:530
+#: ../builder/virt-builder.pod:558
 msgid "B<--run-command> 'CMD ARGS ...'"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:532
+#: ../builder/virt-builder.pod:560
 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 "
@@ -3117,12 +3176,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:536
+#: ../builder/virt-builder.pod:564
 msgid "The script is automatically chmod +x."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:538
+#: ../builder/virt-builder.pod:566
 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 "
@@ -3132,64 +3191,64 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:544
+#: ../builder/virt-builder.pod:572
 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:547
+#: ../builder/virt-builder.pod:575
 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:550
+#: ../builder/virt-builder.pod:578
 msgid "See also: I<--firstboot>, I<--attach>, I<--upload>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:552
+#: ../builder/virt-builder.pod:580
 msgid "B<--scrub> FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:554
+#: ../builder/virt-builder.pod:582
 msgid "Scrub a file from the guest.  This is like I<--delete> except that:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:560
+#: ../builder/virt-builder.pod:588
 msgid "It scrubs the data so a guest could not recover it."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:564
+#: ../builder/virt-builder.pod:592
 msgid "It cannot delete directories, only regular files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:568
+#: ../builder/virt-builder.pod:596
 msgid "B<--size> SIZE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:570
+#: ../builder/virt-builder.pod:598
 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:573
+#: ../builder/virt-builder.pod:601
 msgid ""
 "Virt-builder will resize filesystems inside the disk image automatically."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:576
+#: ../builder/virt-builder.pod:604
 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 "
@@ -3197,51 +3256,51 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:581
+#: ../builder/virt-builder.pod:609
 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:584 ../rescue/virt-rescue.pod:227
+#: ../builder/virt-builder.pod:612 ../rescue/virt-rescue.pod:227
 msgid "B<--smp> N"
 msgstr "B<--smp> N"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:586
+#: ../builder/virt-builder.pod:614
 msgid "Enable N E<ge> 2 virtual CPUs for I<--run> scripts to use."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:588
+#: ../builder/virt-builder.pod:616
 msgid "B<--source> URL"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:590
+#: ../builder/virt-builder.pod:618
 msgid "Set the source URL to look for indexes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:592
+#: ../builder/virt-builder.pod:620
 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 ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:596
+#: ../builder/virt-builder.pod:624
 msgid "See also L</CREATING YOUR OWN TEMPLATES> below."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:598
+#: ../builder/virt-builder.pod:626
 msgid "You can also set the C<VIRT_BUILDER_SOURCE> environment variable."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:600
+#: ../builder/virt-builder.pod:628
 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-"
@@ -3249,28 +3308,28 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:604
+#: ../builder/virt-builder.pod:632
 #, fuzzy
 #| msgid "B<--timeout N>"
 msgid "B<--timezone> TIMEZONE"
 msgstr "B<--timeout N>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:606
+#: ../builder/virt-builder.pod:634
 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:609
+#: ../builder/virt-builder.pod:637
 #, fuzzy
 #| msgid "B<--parts>"
 msgid "B<--update>"
 msgstr "B<--parts>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:611
+#: ../builder/virt-builder.pod:639
 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 "
@@ -3278,19 +3337,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:615
+#: ../builder/virt-builder.pod:643
 #, fuzzy
 #| msgid "See also I<--long>."
 msgid "See also I<--install>."
 msgstr "Див. також I<--long>."
 
 #. type: =item
-#: ../builder/virt-builder.pod:617
+#: ../builder/virt-builder.pod:645
 msgid "B<--upload> FILE:DEST"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:619
+#: ../builder/virt-builder.pod:647
 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 "
@@ -3298,14 +3357,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:623
+#: ../builder/virt-builder.pod:651
 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:626
+#: ../builder/virt-builder.pod:654
 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 "
@@ -3313,56 +3372,56 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:630
+#: ../builder/virt-builder.pod:658
 msgid "See also: I<--mkdir>, I<--delete>, I<--scrub>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:636
+#: ../builder/virt-builder.pod:664
 msgid "Enable debug messages and/or produce verbose output."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:638
+#: ../builder/virt-builder.pod:666
 msgid ""
 "When reporting bugs, use this option and attach the complete output to your "
 "bug report."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:647
+#: ../builder/virt-builder.pod:675
 msgid "B<--write> FILE:CONTENT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:649
+#: ../builder/virt-builder.pod:677
 msgid "Write C<CONTENT> to C<FILE>."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:653
+#: ../builder/virt-builder.pod:681
 msgid "REFERENCE"
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:655
+#: ../builder/virt-builder.pod:683
 msgid "INSTALLING PACKAGES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:657
+#: ../builder/virt-builder.pod:685
 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:660
+#: ../builder/virt-builder.pod:688
 msgid "Installing packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:662
+#: ../builder/virt-builder.pod:690
 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<--"
@@ -3370,7 +3429,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:666
+#: ../builder/virt-builder.pod:694
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --install inkscape\n"
@@ -3378,23 +3437,23 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:668
+#: ../builder/virt-builder.pod:696
 msgid ""
 "This uses the guest's package manager and the host's network connection."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:671
+#: ../builder/virt-builder.pod:699
 msgid "Updating packages at build time"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:673
+#: ../builder/virt-builder.pod:701
 msgid "To update the core set of packages in the template at build time:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:675
+#: ../builder/virt-builder.pod:703
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --update\n"
@@ -3402,7 +3461,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:677
+#: ../builder/virt-builder.pod:705
 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"
@@ -3412,17 +3471,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:683
+#: ../builder/virt-builder.pod:711
 msgid "Installing packages at first boot"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:685
+#: ../builder/virt-builder.pod:713
 msgid "Another option is to install the packages when the guest first boots:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:687
+#: ../builder/virt-builder.pod:715
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 --firstboot-install inkscape\n"
@@ -3430,13 +3489,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:689
+#: ../builder/virt-builder.pod:717
 msgid ""
 "This uses the guest's package manager and the guest's network connection."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:692
+#: ../builder/virt-builder.pod:720
 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. "
@@ -3444,12 +3503,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:697
+#: ../builder/virt-builder.pod:725
 msgid "Installing packages at build time from a side repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:699
+#: ../builder/virt-builder.pod:727
 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 "
@@ -3457,14 +3516,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:704
+#: ../builder/virt-builder.pod:732
 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:707
+#: ../builder/virt-builder.pod:735
 #, no-wrap
 msgid ""
 " genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/\n"
@@ -3472,14 +3531,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:709
+#: ../builder/virt-builder.pod:737
 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:712 ../builder/virt-builder.pod:726
+#: ../builder/virt-builder.pod:740 ../builder/virt-builder.pod:754
 #, no-wrap
 msgid ""
 " mkdir /tmp/mount\n"
@@ -3488,7 +3547,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:715
+#: ../builder/virt-builder.pod:743
 #, no-wrap
 msgid ""
 " cat <<'EOF' > /etc/yum.repos.d/extra.repo\n"
@@ -3501,7 +3560,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:722
+#: ../builder/virt-builder.pod:750
 #, no-wrap
 msgid ""
 " yum -y install famousdatabase\n"
@@ -3509,12 +3568,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:724
+#: ../builder/virt-builder.pod:752
 msgid "For apt, create /tmp/install.sh containing:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:729
+#: ../builder/virt-builder.pod:757
 #, no-wrap
 msgid ""
 " apt-cdrom -d=/tmp/mount add\n"
@@ -3523,14 +3582,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:732
+#: ../builder/virt-builder.pod:760
 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:735
+#: ../builder/virt-builder.pod:763
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3540,12 +3599,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:739
+#: ../builder/virt-builder.pod:767
 msgid "USERS AND PASSWORDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:741
+#: ../builder/virt-builder.pod:769
 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 "
@@ -3553,12 +3612,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:747
+#: ../builder/virt-builder.pod:775
 msgid "B<--root-password> file:FILENAME"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:749
+#: ../builder/virt-builder.pod:777
 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 "
@@ -3566,117 +3625,117 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:754
+#: ../builder/virt-builder.pod:782
 msgid "B<--root-password> password:PASSWORD"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:756
+#: ../builder/virt-builder.pod:784
 msgid "Set the root password to the literal string C<PASSWORD>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:758 ../sysprep/sysprep-extra-options.pod:44
+#: ../builder/virt-builder.pod:786 ../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:761
+#: ../builder/virt-builder.pod:789
 #, fuzzy
 #| msgid "B<--root-password password:PASSWORD>"
 msgid "B<--root-password> random"
 msgstr "B<--root-password password:ПАРОЛЬ>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:763 ../sysprep/sysprep-extra-options.pod:51
+#: ../builder/virt-builder.pod:791 ../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:766 ../fish/guestfish-actions.pod:380
+#: ../builder/virt-builder.pod:794 ../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:768 ../sysprep/sysprep-extra-options.pod:56
+#: ../builder/virt-builder.pod:796 ../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:770
+#: ../builder/virt-builder.pod:798
 msgid ""
 "The root account password is disabled.  This is like putting C<*> in the "
 "password field."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:773 ../sysprep/sysprep-extra-options.pod:67
+#: ../builder/virt-builder.pod:801 ../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:775 ../sysprep/sysprep-extra-options.pod:69
+#: ../builder/virt-builder.pod:803 ../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:777 ../sysprep/sysprep-extra-options.pod:71
+#: ../builder/virt-builder.pod:805 ../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:779
+#: ../builder/virt-builder.pod:807
 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:783 ../sysprep/sysprep-extra-options.pod:81
+#: ../builder/virt-builder.pod:811 ../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:785 ../sysprep/sysprep-extra-options.pod:83
+#: ../builder/virt-builder.pod:813 ../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:787
+#: ../builder/virt-builder.pod:815
 msgid "The root account is locked I<and> password is disabled."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:791
+#: ../builder/virt-builder.pod:819
 msgid "Creating user accounts"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:793
+#: ../builder/virt-builder.pod:821
 msgid ""
 "To create user accounts, use the L<useradd(8)> command with L<--firstboot-"
 "command> like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:796
+#: ../builder/virt-builder.pod:824
 #, no-wrap
 msgid ""
 " virt-builder --firstboot-command \\\n"
@@ -3685,7 +3744,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:799
+#: ../builder/virt-builder.pod:827
 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 "
@@ -3693,12 +3752,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:803
+#: ../builder/virt-builder.pod:831
 msgid "KEYBOARD LAYOUT"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:805
+#: ../builder/virt-builder.pod:833
 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 "
@@ -3707,17 +3766,17 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:810
+#: ../builder/virt-builder.pod:838
 msgid "Keyboard layout with systemd"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:812
+#: ../builder/virt-builder.pod:840
 msgid "For distros that use systemd C<localectl>, use a command like this:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:814
+#: ../builder/virt-builder.pod:842
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3726,19 +3785,19 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:817
+#: ../builder/virt-builder.pod:845
 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:821
+#: ../builder/virt-builder.pod:849
 msgid "Keyboard layout using C</etc/sysconfig/keyboard>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:823
+#: ../builder/virt-builder.pod:851
 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.  "
@@ -3746,7 +3805,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:827
+#: ../builder/virt-builder.pod:855
 #, no-wrap
 msgid ""
 " virt-builder centos-6 \\\n"
@@ -3755,17 +3814,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:830
+#: ../builder/virt-builder.pod:858
 msgid "The format of this file can be found documented in many places online."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:832
+#: ../builder/virt-builder.pod:860
 msgid "Keyboard layout with Debian-derived distros"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:834
+#: ../builder/virt-builder.pod:862
 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.  "
@@ -3773,7 +3832,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:838
+#: ../builder/virt-builder.pod:866
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3782,24 +3841,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:841
+#: ../builder/virt-builder.pod:869
 msgid "See L<https://wiki.debian.org/Keyboard>."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:843
+#: ../builder/virt-builder.pod:871
 msgid "LANGUAGE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:845
+#: ../builder/virt-builder.pod:873
 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:848
+#: ../builder/virt-builder.pod:876
 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 "
@@ -3808,17 +3867,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:854
+#: ../builder/virt-builder.pod:882
 msgid "This section contains examples for some common Linux distributions."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:856
+#: ../builder/virt-builder.pod:884
 msgid "Setting Japanese in Fedora 20"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:858
+#: ../builder/virt-builder.pod:886
 #, no-wrap
 msgid ""
 " virt-builder fedora-20 \\\n"
@@ -3835,12 +3894,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:869
+#: ../builder/virt-builder.pod:897
 msgid "Setting Japanese in Debian 7 (Wheezy)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:871
+#: ../builder/virt-builder.pod:899
 msgid ""
 "Note that although this enables Japanese in the text console too, it is "
 "unlikely that you will see properly rendered Japanese there.  However "
@@ -3848,7 +3907,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:875
+#: ../builder/virt-builder.pod:903
 #, no-wrap
 msgid ""
 " pkgs=locales,xfce4,\\\n"
@@ -3861,7 +3920,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:882
+#: ../builder/virt-builder.pod:910
 #, no-wrap
 msgid ""
 " virt-builder debian-7 \\\n"
@@ -3875,12 +3934,12 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:890
+#: ../builder/virt-builder.pod:918
 msgid "LOG FILE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:892
+#: ../builder/virt-builder.pod:920
 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 "
@@ -3888,151 +3947,151 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:898
+#: ../builder/virt-builder.pod:926
 msgid "C</tmp/builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:900
+#: ../builder/virt-builder.pod:928
 msgid "On Linux, BSD and other guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:902
+#: ../builder/virt-builder.pod:930
 msgid "C<C:\\Temp\\builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:904
+#: ../builder/virt-builder.pod:932
 msgid "On Windows, DOS guests."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:906
+#: ../builder/virt-builder.pod:934
 msgid "C</builder.log>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:908
+#: ../builder/virt-builder.pod:936
 msgid "If C</tmp> or C<C:\\Temp> is missing."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:912
+#: ../builder/virt-builder.pod:940
 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:915
+#: ../builder/virt-builder.pod:943
 msgid "INSTALLATION PROCESS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:917
+#: ../builder/virt-builder.pod:945
 msgid "When you invoke virt-builder, installation proceeds as follows:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:923
+#: ../builder/virt-builder.pod:951
 msgid "The template image is downloaded."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:925
+#: ../builder/virt-builder.pod:953
 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:930
+#: ../builder/virt-builder.pod:958
 msgid "The template signature is checked."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:934
+#: ../builder/virt-builder.pod:962
 #, fuzzy
 #| msgid "The file is compressed on-disk."
 msgid "The template is uncompressed to a tmp file."
 msgstr "Файл стиснено на диску."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:938
+#: ../builder/virt-builder.pod:966
 msgid ""
 "The template image is resized into the destination, using L<virt-resize(1)>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:943
+#: ../builder/virt-builder.pod:971
 msgid "Extra disks are attached (I<--attach>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:947
+#: ../builder/virt-builder.pod:975
 msgid "A new random seed is generated for the guest."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:951
+#: ../builder/virt-builder.pod:979
 msgid "The hostname and timezone are set (I<--hostname>, I<--timezone>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:955
+#: ../builder/virt-builder.pod:983
 msgid "The root password is changed (I<--root-password>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:959
+#: ../builder/virt-builder.pod:987
 msgid "Core packages are updated (I<--update>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:963
+#: ../builder/virt-builder.pod:991
 msgid "Packages are installed (I<--install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:967
+#: ../builder/virt-builder.pod:995
 msgid "Directories are created (I<--mkdir>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:971
+#: ../builder/virt-builder.pod:999
 msgid "Files are written (I<--write>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:975
+#: ../builder/virt-builder.pod:1003
 msgid "Files are uploaded (I<--upload>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:979
+#: ../builder/virt-builder.pod:1007
 msgid "Files are edited (I<--edit>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:983
+#: ../builder/virt-builder.pod:1011
 msgid "Files are deleted (I<--delete>, I<--scrub>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:987
-msgid "Symbolic links are created (I<--link)."
+#: ../builder/virt-builder.pod:1015
+msgid "Symbolic links are created (I<--link>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:991
+#: ../builder/virt-builder.pod:1019
 msgid ""
 "Firstboot scripts are installed (I<--firstboot>, I<--firstboot-command>, I<--"
 "firstboot-install>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:994
+#: ../builder/virt-builder.pod:1022
 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 "
@@ -4040,34 +4099,34 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1000
+#: ../builder/virt-builder.pod:1028
 msgid "Scripts are run (I<--run>, I<--run-command>)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1002
+#: ../builder/virt-builder.pod:1030
 msgid "Scripts run in the order they appear on the command line."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1006
+#: ../builder/virt-builder.pod:1034
 msgid "IMPORTING THE DISK IMAGE"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1008
+#: ../builder/virt-builder.pod:1036
 msgid "Importing into libvirt"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1010
+#: ../builder/virt-builder.pod:1038
 msgid ""
 "Import the disk image into libvirt using L<virt-install(1)> I<--import> "
 "option."
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1013
+#: ../builder/virt-builder.pod:1041
 #, no-wrap
 msgid ""
 " virt-install --import \\\n"
@@ -4076,7 +4135,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1016 ../examples/guestfs-recipes.pod:261
+#: ../builder/virt-builder.pod:1044 ../examples/guestfs-recipes.pod:261
 #: ../fish/guestfish-actions.pod:2096 ../fish/guestfish-actions.pod:2638
 #: ../fish/guestfish-actions.pod:3234 ../src/guestfs-actions.pod:3328
 #: ../src/guestfs-actions.pod:4190 ../src/guestfs-actions.pod:5075
@@ -4085,14 +4144,14 @@ msgid "Notes:"
 msgstr "Нотатки:"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1022
+#: ../builder/virt-builder.pod:1050
 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:1027
+#: ../builder/virt-builder.pod:1055
 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 "
@@ -4101,33 +4160,71 @@ msgid ""
 "differently as well."
 msgstr ""
 
-#. type: =end
-#: ../builder/virt-builder.pod:1035 ../builder/virt-builder.pod:1041
-#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
-#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
-#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
-#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
-#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
-msgid "comment"
-msgstr "коментар"
-
 #. type: =head3
-#: ../builder/virt-builder.pod:1037
+#: ../builder/virt-builder.pod:1063
 msgid "Importing into OpenStack"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1039
-msgid "XXX"
+#: ../builder/virt-builder.pod:1065
+msgid "Import the image into Glance (the OpenStack image store) by doing:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1067
+#, no-wrap
+msgid ""
+" glance image-create --name fedora-20-image --file fedora-20.img \\\n"
+"   --disk-format raw --container-format bare \\\n"
+"   --is-public True\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1071
+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 "
+"should match virt-builder's I<--format> option (or C<raw> if you didn't use "
+"that option).  The I<--container-format> should always be C<bare> since virt-"
+"builder doesn't put images into containers."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1077
+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:1080
+msgid "To boot up an instance of your image on a Nova compute node, do:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1082
+#, no-wrap
+msgid ""
+" nova boot fedora-20-server --image fedora-20-image \\\n"
+"   --flavor m1.medium\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1085
+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:1043
+#: ../builder/virt-builder.pod:1088
 msgid "Booting directly using qemu or KVM"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1045
+#: ../builder/virt-builder.pod:1090
 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 "
@@ -4135,7 +4232,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1049
+#: ../builder/virt-builder.pod:1094
 #, no-wrap
 msgid ""
 " qemu-system-x86_64 \\\n"
@@ -4147,26 +4244,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1055
+#: ../builder/virt-builder.pod:1100
 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:1058
+#: ../builder/virt-builder.pod:1103
 msgid "DEBUGGING BUILDS"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1060
+#: ../builder/virt-builder.pod:1105
 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:1063
+#: ../builder/virt-builder.pod:1108
 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 "
@@ -4174,24 +4271,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1067
+#: ../builder/virt-builder.pod:1112
 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:1072
+#: ../builder/virt-builder.pod:1117
 msgid "Use virt-rescue"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1074
+#: ../builder/virt-builder.pod:1119
 msgid "Run L<virt-rescue(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1076
+#: ../builder/virt-builder.pod:1121
 #, no-wrap
 msgid ""
 " virt-rescue -a disk.img\n"
@@ -4199,7 +4296,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1078
+#: ../builder/virt-builder.pod:1123
 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 "
@@ -4208,17 +4305,17 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1084
+#: ../builder/virt-builder.pod:1129
 msgid "Use guestfish"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1086
+#: ../builder/virt-builder.pod:1131
 msgid "Run L<guestfish(1)> on the disk image:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1088
+#: ../builder/virt-builder.pod:1133
 #, no-wrap
 msgid ""
 " guestfish -a disk.img -i\n"
@@ -4226,25 +4323,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1090
+#: ../builder/virt-builder.pod:1135
 msgid ""
 "Use guestfish commands like C<ll /directory> and C<cat /file> to examine "
 "directories and files."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1093
+#: ../builder/virt-builder.pod:1138
 msgid "Use guestmount"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1095
+#: ../builder/virt-builder.pod:1140
 msgid ""
 "Mount the disk image safely on the host using FUSE and L<guestmount(1)>:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1097
+#: ../builder/virt-builder.pod:1142
 #, no-wrap
 msgid ""
 " mkdir /tmp/mp\n"
@@ -4254,12 +4351,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1101
+#: ../builder/virt-builder.pod:1146
 msgid "To unmount the disk image do:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1103
+#: ../builder/virt-builder.pod:1148
 #, no-wrap
 msgid ""
 " fusermount -u /tmp/mp\n"
@@ -4267,12 +4364,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1105
+#: ../builder/virt-builder.pod:1150
 msgid "Add a serial console"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1107
+#: ../builder/virt-builder.pod:1152
 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 "
@@ -4282,7 +4379,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1113
+#: ../builder/virt-builder.pod:1158
 #, no-wrap
 msgid ""
 " console=tty0 console=ttyS0,115200\n"
@@ -4290,26 +4387,26 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1117
+#: ../builder/virt-builder.pod:1162
 msgid "CREATING YOUR OWN TEMPLATES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1119
+#: ../builder/virt-builder.pod:1164
 msgid ""
 "For serious virt-builder use, you may want to create your own repository of "
 "templates."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1122
+#: ../builder/virt-builder.pod:1167
 #, fuzzy
 #| msgid "guestfs_grepi"
 msgid "Libguestfs.org repository"
 msgstr "guestfs_grepi"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1124
+#: ../builder/virt-builder.pod:1169
 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 "
@@ -4318,7 +4415,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1130
+#: ../builder/virt-builder.pod:1175
 msgid ""
 "The templates hosted on libguestfs.org were created using shell scripts, "
 "kickstart files and preseed files which can be found in the libguestfs "
@@ -4326,19 +4423,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1134
+#: ../builder/virt-builder.pod:1179
 msgid "Setting up the repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1136
+#: ../builder/virt-builder.pod:1181
 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:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1140
+#: ../builder/virt-builder.pod:1185
 #, no-wrap
 msgid ""
 " virt-builder --source https://example.com/builder/index.asc \\\n"
@@ -4348,25 +4445,25 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1144
+#: ../builder/virt-builder.pod:1189
 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:1147
+#: ../builder/virt-builder.pod:1192
 msgid ""
 "You can host this on any web or FTP server, or a local or network filesystem."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1150
+#: ../builder/virt-builder.pod:1195
 msgid "Setting up a GPG key"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1152
+#: ../builder/virt-builder.pod:1197
 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 "
@@ -4375,21 +4472,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1157
+#: ../builder/virt-builder.pod:1202
 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:1160
+#: ../builder/virt-builder.pod:1205
 msgid ""
 "Export your GPG public key and add it to the keyring of all virt-builder "
 "users:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1163
+#: ../builder/virt-builder.pod:1208
 #, no-wrap
 msgid ""
 " gpg --export -a \"you@example.com\" > pubkey\n"
@@ -4397,7 +4494,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1165
+#: ../builder/virt-builder.pod:1210
 #, no-wrap
 msgid ""
 " # For each virt-builder user:\n"
@@ -4406,12 +4503,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1168
+#: ../builder/virt-builder.pod:1213
 msgid "Also find the fingerprint of your key:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1170
+#: ../builder/virt-builder.pod:1215
 #, no-wrap
 msgid ""
 " gpg --list-keys --fingerprint\n"
@@ -4419,12 +4516,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1172
+#: ../builder/virt-builder.pod:1217
 msgid "Create the templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1174
+#: ../builder/virt-builder.pod:1219
 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 "
@@ -4433,14 +4530,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1179
+#: ../builder/virt-builder.pod:1224
 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:1182
+#: ../builder/virt-builder.pod:1227
 #, no-wrap
 msgid ""
 " xz --best --block-size=16777216 disk\n"
@@ -4448,19 +4545,19 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1184
+#: ../builder/virt-builder.pod:1229
 msgid "Creating and signing the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1186
+#: ../builder/virt-builder.pod:1231
 msgid ""
 "The index file has a simple text format (shown here without the digital "
 "signature):"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1189
+#: ../builder/virt-builder.pod:1234
 #, no-wrap
 msgid ""
 " [fedora-18]\n"
@@ -4476,7 +4573,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1199
+#: ../builder/virt-builder.pod:1244
 #, no-wrap
 msgid ""
 " [fedora-19]\n"
@@ -4493,21 +4590,21 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1210
+#: ../builder/virt-builder.pod:1255
 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:1213
+#: ../builder/virt-builder.pod:1258
 msgid ""
 "After preparing the C<index> file in the correct format, clearsign it using "
 "the following command:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1216
+#: ../builder/virt-builder.pod:1261
 #, no-wrap
 msgid ""
 " gpg --clearsign --armor index\n"
@@ -4515,7 +4612,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1218
+#: ../builder/virt-builder.pod:1263
 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 "
@@ -4523,46 +4620,46 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1222
+#: ../builder/virt-builder.pod:1267
 msgid "The following fields can appear:"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1226
+#: ../builder/virt-builder.pod:1271
 msgid "C<name=NAME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1228
+#: ../builder/virt-builder.pod:1273
 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:1231
+#: ../builder/virt-builder.pod:1276
 msgid "C<osinfo=ID>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1233
+#: ../builder/virt-builder.pod:1278
 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:1236
+#: ../builder/virt-builder.pod:1281
 msgid "C<file=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1238
+#: ../builder/virt-builder.pod:1283
 msgid "The path (relative to the index) of the xz-compressed template."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1240 ../builder/virt-builder.pod:1251
+#: ../builder/virt-builder.pod:1285 ../builder/virt-builder.pod:1296
 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 "
@@ -4570,29 +4667,29 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1244
+#: ../builder/virt-builder.pod:1289
 msgid "C<sig=PATH>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1246
+#: ../builder/virt-builder.pod:1291
 msgid "B<This option is deprecated>.  Use the checksum field instead."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1248
+#: ../builder/virt-builder.pod:1293
 msgid ""
 "The path (relative to the index) of the GPG detached signature of the xz "
 "file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1255
+#: ../builder/virt-builder.pod:1300
 msgid "The file can be created as follows:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1257
+#: ../builder/virt-builder.pod:1302
 #, no-wrap
 msgid ""
 " gpg --detach-sign --armor -o disk.xz.sig disk.xz\n"
@@ -4600,19 +4697,19 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1259
+#: ../builder/virt-builder.pod:1304
 msgid "C<checksum[sha512]=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1261
+#: ../builder/virt-builder.pod:1306
 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:1264
+#: ../builder/virt-builder.pod:1309
 #, no-wrap
 msgid ""
 " sha512sum disk.xz\n"
@@ -4620,24 +4717,24 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1266
+#: ../builder/virt-builder.pod:1311
 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:1269
+#: ../builder/virt-builder.pod:1314
 msgid "C<checksum=7b882fe9b82eb0fef...>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1271
+#: ../builder/virt-builder.pod:1316
 msgid "C<checksum> is an alias for C<checksum[sha512]>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1273
+#: ../builder/virt-builder.pod:1318
 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 "
@@ -4646,12 +4743,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1278
+#: ../builder/virt-builder.pod:1323
 msgid "C<revision=N>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1280
+#: ../builder/virt-builder.pod:1325
 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 "
@@ -4659,22 +4756,22 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1284
+#: ../builder/virt-builder.pod:1329
 msgid "The revision number is optional.  If omitted it defaults to C<1>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1286
+#: ../builder/virt-builder.pod:1331
 msgid "C<format=raw>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1288
+#: ../builder/virt-builder.pod:1333
 msgid "C<format=qcow2>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1290
+#: ../builder/virt-builder.pod:1335
 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 "
@@ -4682,7 +4779,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1294
+#: ../builder/virt-builder.pod:1339
 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 "
@@ -4690,12 +4787,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1299
+#: ../builder/virt-builder.pod:1344
 msgid "C<size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1301
+#: ../builder/virt-builder.pod:1346
 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 "
@@ -4703,36 +4800,36 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1305
+#: ../builder/virt-builder.pod:1350
 msgid "This field is required."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1307
+#: ../builder/virt-builder.pod:1352
 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:1311
+#: ../builder/virt-builder.pod:1356
 msgid "C<compressed_size=NNN>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1313
+#: ../builder/virt-builder.pod:1358
 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:1316
+#: ../builder/virt-builder.pod:1361
 msgid "C<expand=/dev/sdaX>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1318
+#: ../builder/virt-builder.pod:1363
 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 "
@@ -4740,13 +4837,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1322
+#: ../builder/virt-builder.pod:1367
 msgid ""
 "You should usually put the device name of the guest's root filesystem here."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1324
+#: ../builder/virt-builder.pod:1369
 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 "
@@ -4754,12 +4851,12 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1328
+#: ../builder/virt-builder.pod:1373
 msgid "C<lvexpand=/dev/VolGroup/LogVol>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1330
+#: ../builder/virt-builder.pod:1375
 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 "
@@ -4767,7 +4864,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1334
+#: ../builder/virt-builder.pod:1379
 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 "
@@ -4775,32 +4872,32 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1338
+#: ../builder/virt-builder.pod:1383
 msgid "C<notes=NOTES>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1340
+#: ../builder/virt-builder.pod:1385
 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:1344
+#: ../builder/virt-builder.pod:1389
 msgid ""
 "This information is shown in the I<--notes> and I<--list> I<--long> modes."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1346
+#: ../builder/virt-builder.pod:1391
 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:1349
+#: ../builder/virt-builder.pod:1394
 #, no-wrap
 msgid ""
 " notes=This image was prepared using\n"
@@ -4812,53 +4909,53 @@ msgid ""
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1355
+#: ../builder/virt-builder.pod:1400
 msgid "C<hidden=true>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1357
+#: ../builder/virt-builder.pod:1402
 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:1363
+#: ../builder/virt-builder.pod:1408
 msgid "Running virt-builder against the alternate repository"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1365
+#: ../builder/virt-builder.pod:1410
 msgid ""
 "Ensure each virt-builder user has imported your public key into their gpg "
 "keyring (see above)."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1368
+#: ../builder/virt-builder.pod:1413
 msgid "Each virt-builder user should export these environment variables:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1374
+#: ../builder/virt-builder.pod:1419
 msgid "C<VIRT_BUILDER_SOURCE> to point to the URL of the C<index.asc> file."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1378
+#: ../builder/virt-builder.pod:1423
 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:1383
+#: ../builder/virt-builder.pod:1428
 msgid "Now run virt-builder commands as normal, eg:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1385
+#: ../builder/virt-builder.pod:1430
 #, no-wrap
 msgid ""
 " virt-builder --list --long\n"
@@ -4866,7 +4963,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1387
+#: ../builder/virt-builder.pod:1432
 #, no-wrap
 msgid ""
 " virt-builder os-version\n"
@@ -4874,17 +4971,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1389
+#: ../builder/virt-builder.pod:1434
 msgid "To debug problems, add the C<-v> option to these commands."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1391
+#: ../builder/virt-builder.pod:1436
 msgid "Running virt-builder against multiple sources"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1393
+#: ../builder/virt-builder.pod:1438
 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 "
@@ -4893,7 +4990,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1398
+#: ../builder/virt-builder.pod:1443
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4903,12 +5000,12 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1402
+#: ../builder/virt-builder.pod:1447
 msgid "or equivalently:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1404
+#: ../builder/virt-builder.pod:1449
 #, no-wrap
 msgid ""
 " export VIRT_BUILDER_SOURCE=http://example.com/s1/index.asc,http://example.com/s2/index.asc\n"
@@ -4917,7 +5014,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1407
+#: ../builder/virt-builder.pod:1452
 msgid ""
 "You can provide N, 1 or 0 fingerprints.  In the case where you provide N "
 "fingerprints, N = number of sources and there is a 1-1 correspondence "
@@ -4925,7 +5022,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1411
+#: ../builder/virt-builder.pod:1456
 #, no-wrap
 msgid ""
 " virt-builder \\\n"
@@ -4935,26 +5032,26 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1415
+#: ../builder/virt-builder.pod:1460
 msgid ""
 "In the case where you provide 1 fingerprint, the same fingerprint is used "
 "for all sources."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1418
+#: ../builder/virt-builder.pod:1463
 msgid ""
 "In the case where you provide no fingerprints, the default fingerprint built "
 "into virt-builder is used for all sources."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1421
+#: ../builder/virt-builder.pod:1466
 msgid "Licensing of templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1423
+#: ../builder/virt-builder.pod:1468
 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 "
@@ -4962,12 +5059,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1428
+#: ../builder/virt-builder.pod:1473
 msgid "Formal specification of the index file"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1430
+#: ../builder/virt-builder.pod:1475
 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 "
@@ -4975,7 +5072,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1434
+#: ../builder/virt-builder.pod:1479
 #, no-wrap
 msgid ""
 " builder/index-scan.l\n"
@@ -4984,84 +5081,84 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1437
+#: ../builder/virt-builder.pod:1482
 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:1440
+#: ../builder/virt-builder.pod:1485
 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:1443
+#: ../builder/virt-builder.pod:1488
 msgid "The index is always encoded in UTF-8."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1445
+#: ../builder/virt-builder.pod:1490
 msgid "CACHING"
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1447
+#: ../builder/virt-builder.pod:1492
 msgid "Caching templates"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1449
+#: ../builder/virt-builder.pod:1494
 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:1452
+#: ../builder/virt-builder.pod:1497
 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:1455
+#: ../builder/virt-builder.pod:1500
 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:1460
+#: ../builder/virt-builder.pod:1505
 msgid "The cache can be deleted if you want to save space by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1464
+#: ../builder/virt-builder.pod:1509
 msgid "You can download all (current) templates to the local cache by doing:"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1468
+#: ../builder/virt-builder.pod:1513
 msgid "To disable the template cache, use I<--no-cache>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1470
+#: ../builder/virt-builder.pod:1515
 msgid ""
 "Only templates are cached.  The index and detached digital signatures are "
 "not cached."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1473
+#: ../builder/virt-builder.pod:1518
 msgid "Caching packages"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1475
+#: ../builder/virt-builder.pod:1520
 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<--"
@@ -5069,7 +5166,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1479
+#: ../builder/virt-builder.pod:1524
 msgid ""
 "You may therefore want to set those environment variables in order to "
 "maximize the amount of local caching that happens.  See L</ENVIRONMENT "
@@ -5077,12 +5174,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1483
+#: ../builder/virt-builder.pod:1528
 msgid "Local mirrors"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1485
+#: ../builder/virt-builder.pod:1530
 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 "
@@ -5090,7 +5187,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1489
+#: ../builder/virt-builder.pod:1534
 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<--"
@@ -5100,17 +5197,17 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1496
+#: ../builder/virt-builder.pod:1541
 msgid "Using a local mirror with Fedora"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1498
+#: ../builder/virt-builder.pod:1543
 msgid "To install a Fedora guest using a local mirror:"
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1500
+#: ../builder/virt-builder.pod:1545
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5128,12 +5225,12 @@ msgid ""
 msgstr ""
 
 #. type: =head4
-#: ../builder/virt-builder.pod:1512
+#: ../builder/virt-builder.pod:1557
 msgid "Using a local mirror with Debian"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1514
+#: ../builder/virt-builder.pod:1559
 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 "
@@ -5141,7 +5238,7 @@ msgid ""
 msgstr ""
 
 #. type: verbatim
-#: ../builder/virt-builder.pod:1518
+#: ../builder/virt-builder.pod:1563
 #, no-wrap
 msgid ""
 " virt-builder fedora 20 \\\n"
@@ -5152,24 +5249,24 @@ msgid ""
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1523
+#: ../builder/virt-builder.pod:1568
 msgid "DIGITAL SIGNATURES"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1525
+#: ../builder/virt-builder.pod:1570
 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:1528
+#: ../builder/virt-builder.pod:1573
 msgid "The source points to an index file, which is optionally signed."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1530
+#: ../builder/virt-builder.pod:1575
 msgid ""
 "Virt-builder downloads the index and checks that the signature is valid and "
 "the signer's fingerprint matches the specified fingerprint (ie. I<--"
@@ -5178,7 +5275,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1535
+#: ../builder/virt-builder.pod:1580
 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 "
@@ -5186,13 +5283,13 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1539
+#: ../builder/virt-builder.pod:1584
 msgid ""
 "When a template is downloaded, its signature is checked in the same way."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1542
+#: ../builder/virt-builder.pod:1587
 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.  "
@@ -5203,19 +5300,19 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1549 ../src/guestfs.pod:3353
+#: ../builder/virt-builder.pod:1594 ../src/guestfs.pod:3353
 msgid "ARCHITECTURE"
 msgstr "АРХІТЕКТУРА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1551
+#: ../builder/virt-builder.pod:1596
 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:1554
+#: ../builder/virt-builder.pod:1599
 msgid ""
 "However certain options may not work correctly, specifically options that "
 "require running commands in the guest during the build process: I<--"
@@ -5224,27 +5321,27 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1559
+#: ../builder/virt-builder.pod:1604
 msgid ""
 "An x86-64 host building 32 bit i686 guests should work without any special "
 "steps."
 msgstr ""
 
 #. type: =head1
-#: ../builder/virt-builder.pod:1562 ../src/guestfs.pod:1899
+#: ../builder/virt-builder.pod:1607 ../src/guestfs.pod:1899
 #: ../sysprep/virt-sysprep.pod:490
 msgid "SECURITY"
 msgstr "БЕЗПЕКА"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1564
+#: ../builder/virt-builder.pod:1609
 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:1567
+#: ../builder/virt-builder.pod:1612
 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 "
@@ -5254,7 +5351,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1573
+#: ../builder/virt-builder.pod:1618
 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 "
@@ -5263,14 +5360,14 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1578
+#: ../builder/virt-builder.pod:1623
 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:1581
+#: ../builder/virt-builder.pod:1626
 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 "
@@ -5278,17 +5375,17 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1585
+#: ../builder/virt-builder.pod:1630
 msgid "You should check digital signatures and not ignore any signing errors."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1587
+#: ../builder/virt-builder.pod:1632
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1589
+#: ../builder/virt-builder.pod:1634
 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 "
@@ -5297,7 +5394,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1594
+#: ../builder/virt-builder.pod:1639
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5308,55 +5405,55 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1602
+#: ../builder/virt-builder.pod:1647
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1604
+#: ../builder/virt-builder.pod:1649
 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:1607
+#: ../builder/virt-builder.pod:1652
 #, fuzzy
 #| msgid "virt-resize"
 msgid "Skipping virt-resize"
 msgstr "virt-resize"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1609
+#: ../builder/virt-builder.pod:1654
 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:1616
+#: ../builder/virt-builder.pod:1661
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1620
+#: ../builder/virt-builder.pod:1665
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1624
+#: ../builder/virt-builder.pod:1669
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1628
+#: ../builder/virt-builder.pod:1673
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1630
+#: ../builder/virt-builder.pod:1675
 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, "
@@ -5364,14 +5461,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1634
+#: ../builder/virt-builder.pod:1679
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1636
+#: ../builder/virt-builder.pod:1681
 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 "
@@ -5379,40 +5476,40 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1640
+#: ../builder/virt-builder.pod:1685
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1643
+#: ../builder/virt-builder.pod:1688
 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:1646
+#: ../builder/virt-builder.pod:1691
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1649 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELINUX"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1651
+#: ../builder/virt-builder.pod:1696
 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:1654
+#: ../builder/virt-builder.pod:1699
 msgid ""
 "Since virt-builder does not know how to give new files a correct label, it "
 "touches C</.autorelabel> in the guest and relies on the guest to relabel "
@@ -5420,82 +5517,82 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1658
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
 "time you use them.  This is normal, and harmless."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1663
+#: ../builder/virt-builder.pod:1708
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1668
+#: ../builder/virt-builder.pod:1713
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1670
+#: ../builder/virt-builder.pod:1715
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1672
+#: ../builder/virt-builder.pod:1717
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1674
+#: ../builder/virt-builder.pod:1719
 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:1677
+#: ../builder/virt-builder.pod:1722
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1679 ../builder/virt-builder.pod:1693
+#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1726
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1683
+#: ../builder/virt-builder.pod:1728
 msgid ""
 "Set the default value for the GPG signature fingerprint or comma-separated "
 "list of fingerprints (see I<--fingerprint> option)."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1686
+#: ../builder/virt-builder.pod:1731
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1733
 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:1691
+#: ../builder/virt-builder.pod:1736
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1699 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1744 ../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:403
@@ -5508,7 +5605,7 @@ msgstr ""
 "значення, якщо сталася помилка."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1704
+#: ../builder/virt-builder.pod:1749
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5526,7 +5623,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1725 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1770 ../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"
@@ -12944,6 +13041,15 @@ msgstr ""
 msgid "Copyright (C) 2012 Red Hat Inc."
 msgstr "© Red Hat Inc., 2012"
 
+#. type: =end
+#: ../examples/guestfs-recipes.pod:3 ../examples/guestfs-recipes.pod:8
+#: ../guestfs-release-notes.pod:7 ../guestfs-release-notes.pod:14
+#: ../guestfs-release-notes.pod:200 ../guestfs-release-notes.pod:204
+#: ../guestfs-release-notes.pod:549 ../guestfs-release-notes.pod:553
+#: ../guestfs-release-notes.pod:1105 ../guestfs-release-notes.pod:1109
+msgid "comment"
+msgstr "коментар"
+
 #. type: textblock
 #: ../examples/guestfs-recipes.pod:5
 msgid ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 05919338a..2e520fe62 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: failed to create handle\n"
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2424,12 +2436,12 @@ msgstr ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1).\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2714,7 +2726,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2738,12 +2750,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5150,7 +5162,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr ""
@@ -6163,212 +6175,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6458,43 +6474,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6605,17 +6621,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6624,33 +6640,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6660,21 +6681,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6689,82 +6710,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6872,71 +6888,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/es.po b/po/es.po
index 95c8c963c..85df8f809 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -74,11 +74,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -114,7 +114,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -297,11 +297,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -418,7 +422,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -456,39 +460,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -574,11 +578,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,7 +598,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -623,7 +627,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -661,7 +665,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -671,7 +675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -728,7 +732,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -752,7 +756,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -760,29 +764,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -794,7 +798,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -814,11 +818,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -834,7 +838,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -842,13 +846,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,11 +931,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -984,7 +988,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +996,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1030,11 +1034,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1051,7 +1055,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1075,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1116,7 +1120,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1140,7 +1144,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1347,19 +1351,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1391,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1403,7 +1407,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1479,11 +1483,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1499,7 +1503,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1507,15 +1511,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1523,7 +1527,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1550,23 +1554,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1623,11 +1631,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1794,7 +1806,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1802,7 +1814,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1810,7 +1822,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2283,7 +2295,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2312,7 +2324,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2321,7 +2333,7 @@ msgstr "guestfs_create: falló al crear manipulador\n"
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2425,14 +2437,14 @@ msgstr ""
 "  -x                   Rastrea llamados API de libguestfs\n"
 "Para obtener mayor información, consulte la página man %s(1).\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 "%s para utilizar una letra de unidad de Windows, este debe ser un huésped "
 "Windows\n"
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr "%s: no se ha encontrado una unidad '%c'.\n"
@@ -2723,7 +2735,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2747,12 +2759,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr "%s: la opción -b ha sido indicada en múltiples oportunidades\n"
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr "%s: la opción -e ha sido indicada en múltiples oportunidades\n"
@@ -5203,7 +5215,7 @@ msgstr "copy-out: '%s' no es ni un archivo ni un directorio\n"
 msgid "display filename\n"
 msgstr "muestra el nombre del archivo\n"
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "utilice '%s nombre de archivo' para editar un archivo\n"
@@ -6285,212 +6297,216 @@ msgstr "línea no esperada desde el comando db_dump, sin prefijo de espacio"
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr "dígitos no-hex inesperados en el resultado del comando db_dump"
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "el parámetro %s está vacío o contiene caracteres no permitidos"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6582,43 +6598,43 @@ msgstr ""
 "no está disponible la arquitectura del archivo API debido a que esta versión "
 "de libguestfs ha sido compilada sin la biblioteca libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6731,17 +6747,17 @@ msgstr ""
 "%s: no se ha encontrado un dispositivo raíz: sólo invoque esta función con "
 "un dispositivo raíz previamente obtenido mediante  guestfs_inspect_os"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6750,34 +6766,39 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 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-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6787,21 +6808,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "no es posible crear un nuevo contexto XPath"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6816,82 +6837,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7009,7 +7025,7 @@ msgstr ""
 "--live\n"
 "Consulte la documentación para obtener mayor información."
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
@@ -7018,49 +7034,49 @@ msgstr ""
 "%s: disco está marcado como <readonly/> en libvirt XML, y readonlydisk "
 "establecido a \"error\""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "no es posible evaluar la expression XPath"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "el dominio libvirt no posee discos"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -7069,16 +7085,16 @@ msgstr ""
 "Para obtener mayor información, consulte ATTACHING TO RUNNING DAEMONS en "
 "guestfs(3)."
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "error leyendo información XML de libvirt: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr "no es posible analizar la información XML devuelta por libvirt"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/gu.po b/po/gu.po
index d535f880b..bd9bacdae 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: હેન્ડલ ને બનાવવાનું 
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2407,12 +2419,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2663,7 +2675,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2687,12 +2699,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5099,7 +5111,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ફાઇલને સુધારવા માટે '%s filename' ને વાપરો\n"
@@ -6122,212 +6134,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6417,43 +6433,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6564,17 +6580,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6583,33 +6599,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6619,21 +6640,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6648,82 +6669,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6831,71 +6847,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "libvirt ડોમેઇન પાસે ડિસ્કો નથી"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/hi.po b/po/hi.po
index b3e7461f4..73a1d68c3 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: नियंत्रण बनाने में व
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2407,12 +2419,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2663,7 +2675,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2687,12 +2699,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5099,7 +5111,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "किसी फाइल के संपादन के लिए '%s filename' का प्रयोग करें\n"
@@ -6120,212 +6132,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6415,43 +6431,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6562,17 +6578,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6581,33 +6597,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6617,21 +6638,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6646,82 +6667,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6829,71 +6845,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/kn.po b/po/kn.po
index 3931b1d82..ffef0db31 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: ಹ್ಯಾಂಡಲ್ ಅನ್ನು ನಿರ್ಮ
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2407,12 +2419,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2663,7 +2675,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2687,12 +2699,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5101,7 +5113,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ಒಂದು ಕಡತವನ್ನು ಸಂಪಾದಿಸಲು '%s filename' ಅನ್ನು ಬಳಸಿ\n"
@@ -6125,212 +6137,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6420,43 +6436,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6567,17 +6583,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6586,33 +6602,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6622,21 +6643,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6651,82 +6672,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6834,71 +6850,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 494303d47..a1472eaa1 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.25.21\n"
+"Project-Id-Version: libguestfs 1.25.22\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -295,11 +295,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -416,7 +420,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -454,39 +458,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -572,11 +576,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -592,7 +596,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -621,7 +625,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -659,7 +663,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -669,7 +673,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -726,7 +730,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -750,7 +754,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -758,29 +762,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -792,7 +796,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -812,11 +816,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -832,7 +836,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -840,13 +844,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -925,11 +929,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -982,7 +986,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -990,7 +994,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1028,11 +1032,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1049,7 +1053,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1069,7 +1073,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1083,7 +1087,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1114,7 +1118,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1138,7 +1142,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1345,19 +1349,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1385,11 +1389,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1401,7 +1405,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1477,11 +1481,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1497,7 +1501,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1505,15 +1509,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1521,7 +1525,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1548,23 +1552,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1621,11 +1629,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1792,7 +1804,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1800,7 +1812,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1808,7 +1820,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2281,7 +2293,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2310,7 +2322,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2319,7 +2331,7 @@ msgstr ""
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2406,12 +2418,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2662,7 +2674,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2686,12 +2698,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5098,7 +5110,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr ""
@@ -6111,212 +6123,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6406,43 +6422,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6553,17 +6569,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6572,33 +6588,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6608,21 +6629,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6637,82 +6658,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6820,71 +6836,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/ml.po b/po/ml.po
index fde128211..46145c92b 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -295,11 +295,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -416,7 +420,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -454,39 +458,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -572,11 +576,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -592,7 +596,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -621,7 +625,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -659,7 +663,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -669,7 +673,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -726,7 +730,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -750,7 +754,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -758,29 +762,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -792,7 +796,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -812,11 +816,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -832,7 +836,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -840,13 +844,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -925,11 +929,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -982,7 +986,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -990,7 +994,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1028,11 +1032,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1049,7 +1053,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1069,7 +1073,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1083,7 +1087,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1114,7 +1118,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1138,7 +1142,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1345,19 +1349,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1385,11 +1389,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1401,7 +1405,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1477,11 +1481,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1497,7 +1501,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1505,15 +1509,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1521,7 +1525,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1548,23 +1552,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1621,11 +1629,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1792,7 +1804,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1800,7 +1812,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1808,7 +1820,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2281,7 +2293,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2310,7 +2322,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2319,7 +2331,7 @@ msgstr "guestfs_create: ഹാന്‍ഡില്‍ ഉണ്ടാക്ക
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2406,12 +2418,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2662,7 +2674,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2686,12 +2698,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5101,7 +5113,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ഒരു ഫയല്‍ ചിട്ടപ്പെടുത്തുന്നതിനായി '%s filename' ഉപയോഗിക്കുക\n"
@@ -6122,212 +6134,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6417,43 +6433,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6564,17 +6580,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6583,33 +6599,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6619,21 +6640,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6648,82 +6669,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6831,71 +6847,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/mr.po b/po/mr.po
index 65f2bb148..413e3d469 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -74,11 +74,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -114,7 +114,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -181,7 +181,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -297,11 +297,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -418,7 +422,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -456,39 +460,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -574,11 +578,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -594,7 +598,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -623,7 +627,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -661,7 +665,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -671,7 +675,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -728,7 +732,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -752,7 +756,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -760,29 +764,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -794,7 +798,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -814,11 +818,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -834,7 +838,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -842,13 +846,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -927,11 +931,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -984,7 +988,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -992,7 +996,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1030,11 +1034,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1051,7 +1055,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1071,7 +1075,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1085,7 +1089,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1116,7 +1120,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1140,7 +1144,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1347,19 +1351,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1387,11 +1391,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1403,7 +1407,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1479,11 +1483,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1499,7 +1503,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1507,15 +1511,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1523,7 +1527,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1550,23 +1554,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1623,11 +1631,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1794,7 +1806,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1802,7 +1814,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1810,7 +1822,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2283,7 +2295,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2312,7 +2324,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2321,7 +2333,7 @@ msgstr "guestfs_create: हँडल निर्माण करण्यास
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2425,12 +2437,12 @@ msgstr ""
 "  -x                   libguestfs API कॉल्स् ट्रेस करा\n"
 "अधिक माहितीकरीता, manpage %s(1) पहा.\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2715,7 +2727,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2739,12 +2751,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5156,7 +5168,7 @@ msgstr "copy-out: '%s' फाइल किंवा डिरेक्ट्र
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "फाइल संपादीत करण्यासाठी '%s filename' याचा वापर करा\n"
@@ -6207,212 +6219,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "%s घटक रिकामे आहे किंवा अस्वीकार्य अक्षरे समाविष्टीत आहे"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6502,43 +6518,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6651,17 +6667,17 @@ msgstr ""
 "%s: रूट साधण आढळले नाही: guestfs_inspect_os द्वारे पूर्वी पुरवलेल्या रूट साधणसह "
 "फंक्शनद्वारेच कॉल करा"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6670,33 +6686,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6706,21 +6727,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "नवीन XPath संदर्भ निर्माण करणे अशक्य"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6735,82 +6756,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6923,56 +6939,56 @@ msgstr ""
 "live प्रवेश निर्देशीत करा.  बहुतांश libguestfs साधनांमध्ये हे पर्याय --ro किंवा\n"
 "--live असे असतात.  पुढील माहितीकरीता दस्तऐवजीकरणचा सल्ला घ्या."
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "XPath वाकप्रचार मुल्यमापन करणे अशक्य"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "libvirt डोमेनमध्ये डिस्क्स् आढळले नाही"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -6980,16 +6996,16 @@ msgstr ""
 "या अतिथीकडे guestfsd करीता libvirt <channel> व्याख्या नाही\n"
 "पुढील माहितीसाठी guestfs(3) मध्ये सुरू डिमन्स्ला कसे जोडायचे पहा."
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "libvirt XML माहिती वाचतेवेळी त्रुटी आढळली: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr "libvirt द्वारे पुरवलेली XML माहिती वाचण्यास अशक्य"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/nl.po b/po/nl.po
index cb24d94a3..623e58bb6 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -79,11 +79,11 @@ msgstr "%s (ignored)\n"
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -119,7 +119,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -197,7 +197,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:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -313,11 +313,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -457,7 +461,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -504,39 +508,39 @@ msgstr ""
 "%s: onbekend partitie tabel type\n"
 "virt-resize ondersteunt alleen MBR (DOS) en GPT partitie tabellen."
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -624,11 +628,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Voeg schijf image bestand toe"
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -644,7 +648,7 @@ 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/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -675,7 +679,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -719,7 +723,7 @@ msgstr ""
 "Bezig met kopiëren %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -729,7 +733,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -786,7 +790,7 @@ msgstr "Debug GC en geheugen toewijzingen (intern)"
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -810,7 +814,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -818,29 +822,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr "Toon versie en sluit af"
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -852,7 +856,7 @@ msgstr "Kopieer bootlader niet"
 msgid "Don't create extra partition"
 msgstr "Maak geen extra partitie aan"
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -872,11 +876,11 @@ msgstr "Print geen log boodschappen"
 msgid "Don't print the summary"
 msgstr "Print de samenvatting niet"
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -892,7 +896,7 @@ msgstr "Dump POD (intern)"
 msgid "Dump POD for options (internal)"
 msgstr "Dump POD voor opties (intern)"
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -900,13 +904,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Zet debug boodschappen aan"
@@ -1004,11 +1008,11 @@ msgstr ""
 "Vul vrije ruimte in volgroep %s met nul in ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -1065,7 +1069,7 @@ msgstr "Formaat van output schijf (standaard: hetzelfde als input)"
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -1073,7 +1077,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr "Genereer random seed voor gast"
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1111,11 +1115,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1132,7 +1136,7 @@ msgstr "Maak output leesbaar voor machines"
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1152,7 +1156,7 @@ msgstr "Nieuwe hostnaam"
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1168,7 +1172,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1206,7 +1210,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1230,7 +1234,7 @@ msgstr "Voer een test run uit"
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1459,19 +1463,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr "Voer willekeurige scrips voor de gast uit"
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1501,11 +1505,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr "Script of programma welke op de gast uitgevoerd moet worden"
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1517,7 +1521,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1593,11 +1597,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1613,7 +1617,7 @@ msgstr "Stel libvirt URI in"
 msgid "Set libvirt guest name"
 msgstr "Stel libvirt gastnaam in"
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1621,15 +1625,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1637,7 +1641,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr "Stel partitie uitlijning in (standaard: 128 sectors)"
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1664,23 +1668,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1739,11 +1747,15 @@ msgstr ""
 "Bezig met instellen van initiële partitie tabel op %s ...\n"
 "%!"
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr "Verklein partitie"
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1971,7 +1983,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1979,7 +1991,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1987,7 +1999,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2485,7 +2497,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr "je kunt dezelfde schijf image niet voor input en output gebruiken"
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2514,7 +2526,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2523,7 +2535,7 @@ msgstr "guestfs_create: hendel aanmaken mislukte\n"
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2627,13 +2639,13 @@ msgstr ""
 "  -x                   Trace libguestfs API calls\n"
 "Voor meer informatie, zie de manpagina %s(1).\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 "%s: om Windows schijf letters te gebruiken, moet dit een Windows gast zijn\n"
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr "%s: starion '%c:' niet gevonden.\n"
@@ -2950,7 +2962,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2974,12 +2986,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr "%s: -b optie meerdere keren opgegeven\n"
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr "%s: -e optie meerdere keren opgegeven\n"
@@ -5407,7 +5419,7 @@ msgstr "copy-out: '%s' is geen bestand of map\n"
 msgid "display filename\n"
 msgstr "toon bestandsnaam\n"
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "gebruik '%s bestandsnaam' om een bestand te bewerken\n"
@@ -6565,212 +6577,216 @@ msgstr "onverwachte regel van db_dump commando, geen spatie prefix"
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr "onverwachte niet-hex tekens in output van db_dump commando"
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr "voor apparaat '/dev/null' moet het formaat 'raw' zijn"
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "%s parameter is leeg of bevat niet geoorloofde karakters"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr "label parameter is leeg, te lang of bevat niet toegestane karakters"
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr "'label' is vereist bij het hotpluggen van stations"
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr "schijf met label '%s' werd niet gevonden"
@@ -6862,43 +6878,43 @@ msgstr ""
 "bestand-architectuur API is niet beschikbaar omdat deze versie van "
 "libguestfs gecompileerd werd zonder de libmagic bibliotheek"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "bestandssysteem is al aangekoppeld in een andere thread"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "je moet guestfs_mount_local eerst aanroepen"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "er is geen bestandssysteem aangekoppeld"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "kon map cache hashtabellen niet initialiseren"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -7011,18 +7027,18 @@ msgstr ""
 "%s: root apparaat niet gevonden: roep deze functie alleen aan met een root "
 "apparaat eerder teruggegeven door guestfs_inspect_os"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 "niet afgesloten aanhalingsteken (%c) in commandoregel in de buurt van: %s"
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr "kan string in aanhalingstekens in de buurt van: %s niet ontleden"
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -7031,34 +7047,39 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, 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:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "kon niet verbinden met libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr "kon libvirt mogelijkheden niet verkrijgen"
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7068,21 +7089,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "kan nieuwe XPath context niet aanmaken"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7097,82 +7118,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
-msgstr "fout bij het construeren van libvirt XML op \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
+msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, 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:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr "kon libvirt domein niet vernietigen"
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: interne fout bij formuleren van foutboodschap"
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr "kon schijf niet koppelen aan libvirt domein"
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr "kon schijf niet loskoppelen van libvirt domein"
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7289,7 +7305,7 @@ msgstr ""
 "deze opties respectievelijk\n"
 "--ro of --live.  Raadpleeg de documentatie voor meer informatie."
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
@@ -7298,49 +7314,49 @@ msgstr ""
 "%s: schijf is in libvirt XML  <readonly/> gemarkeerd, en readonlydisk was "
 "ingesteld op \"error\""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "kan XPath expressie niet evalueren"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "libvirt domein heeft geen schijven"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -7348,16 +7364,16 @@ msgstr ""
 "deze gast heeft geen libvirt <channel> definitie voor guestfsd\n"
 "Zie ATTACHING TO RUNNING DAEMONS in guestfs(3) voor meer informate."
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "fout bij het lezen van libvirt XML informatie: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr "kan XML informatie teruggegeven door libvirt niet ontleden"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
@@ -7734,6 +7750,9 @@ msgstr "virt-win-reg: {p}: kon registry bestand niet downloaden: {err}\n"
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: kon registry bestand niet uploaden: {err}\n"
 
+#~ msgid "error constructing libvirt XML at \"%s\""
+#~ msgstr "fout bij het construeren van libvirt XML op \"%s\""
+
 #~ msgid ""
 #~ "filename cannot contain ':' (colon) character. This is a limitation of "
 #~ "qemu."
diff --git a/po/or.po b/po/or.po
index f2d61749b..305eeff89 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: ନିୟନ୍ତ୍ରଣ ପ୍ରସ୍ତୁତ କ
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2407,12 +2419,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2663,7 +2675,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2687,12 +2699,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5100,7 +5112,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ଗୋଟିଏ ଫାଇଲକୁ ସମ୍ପାଦନ କରିବା ପାଇଁ '%s filename' କୁ ବ୍ୟବହାର କରନ୍ତୁ\n"
@@ -6121,212 +6133,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6416,43 +6432,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6563,17 +6579,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6582,33 +6598,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6618,21 +6639,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6647,82 +6668,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6830,71 +6846,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/pa.po b/po/pa.po
index 4476cf602..6337f8067 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: ਹੈਂਡਲ ਬਣਾਉਣ ਵਿੱਚ ਫੇਲ\n
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2424,12 +2436,12 @@ msgstr ""
 "  -x                   Trace libguestfs API calls\n"
 "For more information, see the manpage %s(1)।\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2714,7 +2726,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2738,12 +2750,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5152,7 +5164,7 @@ msgstr "copy-out: '%s' ਇੱਕ ਫਾਇਲ ਜਾਂ ਡਾਇਰੈਕਟਰ
 msgid "display filename\n"
 msgstr "ਫਾਇਲ-ਨਾਂ ਵੇਖਾਓ\n"
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ਇੱਕ ਫਾਇਲ ਸੋਧ ਕਰਨ ਲਈ '%s filename' ਵਰਤੋ\n"
@@ -6203,212 +6215,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "%s ਪੈਰਾਮੀਟਰ ਖਾਲੀ ਹੈ ਜਾਂ ਇਸ ਵਿੱਚ ਨਾ-ਮਨਜੂਰ ਅੱਖਰ ਹਨ"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6498,43 +6514,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6647,17 +6663,17 @@ msgstr ""
 "%s: ਰੂਟ (root) ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ: ਇਸ ਫੰਕਸ਼ਨ ਨੂੰ ਸਿਰਫ ਰੂਟ ਜੰਤਰ ਨਾਲ ਕਾਲ ਕਰੋ ਜੋ ਪਹਿਲਾਂ "
 "guestfs_inspect_os ਦੁਆਰਾ ਦਿੱਤਾ ਗਿਆ ਸੀ"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6666,33 +6682,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6702,21 +6723,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "ਨਵਾਂ XPath ਪ੍ਰਸੰਗ ਬਣਾਉਣ ਵਿੱਚ ਅਸਫਲ"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6731,82 +6752,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6920,56 +6936,56 @@ msgstr ""
 "specify live access।  In most libguestfs tools these options are --ro or\n"
 "--live respectively।  Consult the documentation for further information।"
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "XPath ਐਕਸਪ੍ਰੈਸ਼ਨ ਦਾ ਮੁੱਲ ਪਤਾ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "libvirt ਡੋਮੇਨ ਵਿੱਚ ਕੋਈ ਡਿਸਕ ਨਹੀਂ ਹੈ"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -6977,16 +6993,16 @@ msgstr ""
 "ਇਸ ਗਿਸਟ ਉੱਪਰ guestfsd ਲਈ ਕੋਈ libvirt <channel> ਪਰਿਭਾਸ਼ਾ ਨਹੀਂ ਹੈ\n"
 "ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ ATTACHING TO RUNNING DAEMONS ਨੂੰ guestfs(3) ਵਿੱਚ ਵੇਖੋ।"
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "libvirt XML ਜਾਣਕਾਰੀ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr "libvirt ਦੁਆਰਾ ਦਿੱਤੀ XML ਜਾਣਕਾਰੀ ਨੂੰ ਪਾਰਸ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/pl.po b/po/pl.po
index 59244ef64..a3bbe6b4e 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -76,11 +76,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -184,7 +184,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:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -300,11 +300,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -421,7 +425,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -459,39 +463,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -577,11 +581,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Dodaje obraz dysku"
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -597,7 +601,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr "Wyrównaj pierwszą partycję (domyślnie: automatycznie)"
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -626,7 +630,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -666,7 +670,7 @@ msgstr ""
 "Kopiowanie %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -676,7 +680,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -733,7 +737,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -757,7 +761,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -765,29 +769,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -799,7 +803,7 @@ msgstr "Bez kopiowania programu startowego"
 msgid "Don't create extra partition"
 msgstr "Bez tworzenia dodatkowej partycji"
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -819,11 +823,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr "Bez wyświetlania podsumowania"
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -839,7 +843,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -847,13 +851,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Włącza komunikaty debugowania"
@@ -938,11 +942,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -995,7 +999,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -1003,7 +1007,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1041,11 +1045,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1062,7 +1066,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1082,7 +1086,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1096,7 +1100,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1127,7 +1131,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1151,7 +1155,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1360,19 +1364,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1400,11 +1404,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1416,7 +1420,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1492,11 +1496,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1512,7 +1516,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1520,15 +1524,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1536,7 +1540,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1563,23 +1567,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1636,11 +1644,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr "Zmniejsza partycję"
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1807,7 +1819,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1815,7 +1827,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1823,7 +1835,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2298,7 +2310,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2327,7 +2339,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2336,7 +2348,7 @@ msgstr "guestfs_create: utworzenie programu obsługi się nie powiodło\n"
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2440,13 +2452,13 @@ msgstr ""
 "  -x                   Śledzi wywołania API biblioteki libguestfs\n"
 "Aby dowiedzieć się więcej, należy zobaczyć stronę podręcznika %s(1).\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 "%s: musi być gościem systemu Windows, aby użyć liter dysków systemu Windows\n"
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr "%s: nie odnaleziono napędu \"%c:\".\n"
@@ -2768,7 +2780,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2792,12 +2804,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr "%s: opcję -b podano wiele razy\n"
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr "%s: opcję -e podano wiele razy\n"
@@ -5232,7 +5244,7 @@ msgstr "copy-out: \"%s\" nie jest plikiem lub katalogiem\n"
 msgid "display filename\n"
 msgstr "wyświetla nazwę pliku\n"
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "należy użyć \"%s nazwa_pliku\", aby zmodyfikować plik\n"
@@ -6398,212 +6410,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr "nieoczekiwane nieszesnastkowe cyfry w wyjściu polecenia db_dump "
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "parametr %s jest pusty lub zawiera niedozwolone znaki"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6697,43 +6713,43 @@ msgstr ""
 "API architektury plików jest niedostępne, ponieważ ta wersja biblioteki "
 "libguestfs została skompilowana bez biblioteki libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "system plików jest już zamontowany w innym wątku"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "należy najpierw wywołać guestfs_mount_local"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "żaden system plików nie jest zamontowany"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "nie można zainicjować tablic sum mieszania katalogu pamięci podręcznej"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6848,17 +6864,17 @@ msgstr ""
 "%s: nie odnaleziono urządzenia root: należy wywoływać tę funkcję tylko z "
 "urządzeniem root poprzednio zwróconym przez guestfs_inspect_os"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6867,34 +6883,39 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 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:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6904,21 +6925,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "nie można utworzyć nowego kontekstu XPath"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6933,82 +6954,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7124,7 +7140,7 @@ msgstr ""
 "większości narzędzi biblioteki libguestfs te opcje to odpowiednio --ro lub\n"
 "--live. Proszę skonsultować się z dokumentacją, aby dowiedzieć się więcej."
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
@@ -7133,49 +7149,49 @@ msgstr ""
 "%s: dysk jest oznaczony jako <readonly/> w pliku XML biblioteki libvirt, a "
 "parametr readonlydisk został ustawiony na \"error\""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "nie można sprawdzić wyrażenia XPath"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "domena biblioteki libvirt nie posiada dysków"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -7185,17 +7201,17 @@ msgstr ""
 "Proszę zobaczyć \"ATTACHING TO RUNNING DAEMONS\" w guestfs(3), aby "
 "dowiedzieć się więcej."
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "błąd podczas odczytywania informacji XML biblioteki libvirt: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 "nie można przetworzyć informacji XML zwróconej przez bibliotekę libvirt"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/ta.po b/po/ta.po
index d32631cb2..320c826b2 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -72,11 +72,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -112,7 +112,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -295,11 +295,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -416,7 +420,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -454,39 +458,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -572,11 +576,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -592,7 +596,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -621,7 +625,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -659,7 +663,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -669,7 +673,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -726,7 +730,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -750,7 +754,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -758,29 +762,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -792,7 +796,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -812,11 +816,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -832,7 +836,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -840,13 +844,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -925,11 +929,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -982,7 +986,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -990,7 +994,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1028,11 +1032,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1049,7 +1053,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1069,7 +1073,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1083,7 +1087,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1114,7 +1118,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1138,7 +1142,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1345,19 +1349,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1385,11 +1389,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1401,7 +1405,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1477,11 +1481,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1497,7 +1501,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1505,15 +1509,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1521,7 +1525,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1548,23 +1552,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1621,11 +1629,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1792,7 +1804,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1800,7 +1812,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1808,7 +1820,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2281,7 +2293,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2310,7 +2322,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2319,7 +2331,7 @@ msgstr "guestfs_create: ஹாண்டிலை உருவாக்க மு
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2406,12 +2418,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2662,7 +2674,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2686,12 +2698,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5099,7 +5111,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ஒரு கோப்பினை திருத்துவதற்கு '%s கோப்புபெயரை' பயன்படுத்து\n"
@@ -6121,212 +6133,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6416,43 +6432,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6563,17 +6579,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6582,33 +6598,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6618,21 +6639,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6647,82 +6668,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6830,71 +6846,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/te.po b/po/te.po
index ca94916be..d6cde0706 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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/"
@@ -73,11 +73,11 @@ msgstr ""
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -180,7 +180,7 @@ msgstr ""
 msgid "%s: This partition will be resized from %s to %s."
 msgstr ""
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -296,11 +296,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -417,7 +421,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -455,39 +459,39 @@ msgid ""
 "virt-resize only supports MBR (DOS) and GPT partition tables."
 msgstr ""
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -573,11 +577,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr ""
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -593,7 +597,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr ""
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -622,7 +626,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -660,7 +664,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -670,7 +674,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -727,7 +731,7 @@ msgstr ""
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -751,7 +755,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -759,29 +763,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr ""
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -793,7 +797,7 @@ msgstr ""
 msgid "Don't create extra partition"
 msgstr ""
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -813,11 +817,11 @@ msgstr ""
 msgid "Don't print the summary"
 msgstr ""
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -833,7 +837,7 @@ msgstr ""
 msgid "Dump POD for options (internal)"
 msgstr ""
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -841,13 +845,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr ""
@@ -926,11 +930,11 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -983,7 +987,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -991,7 +995,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1029,11 +1033,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr ""
@@ -1050,7 +1054,7 @@ msgstr ""
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1070,7 +1074,7 @@ msgstr ""
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1084,7 +1088,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1115,7 +1119,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1139,7 +1143,7 @@ msgstr ""
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1346,19 +1350,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1386,11 +1390,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr ""
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1402,7 +1406,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1478,11 +1482,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1498,7 +1502,7 @@ msgstr ""
 msgid "Set libvirt guest name"
 msgstr ""
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1506,15 +1510,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1522,7 +1526,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr ""
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1549,23 +1553,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1622,11 +1630,15 @@ msgid ""
 "%!"
 msgstr ""
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr ""
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1793,7 +1805,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1801,7 +1813,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1809,7 +1821,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2282,7 +2294,7 @@ msgid "you cannot use the same disk image for input and output"
 msgstr ""
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2311,7 +2323,7 @@ msgid ""
 msgstr ""
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2320,7 +2332,7 @@ msgstr "guestfs_create: సంభాలికను సృష్టించు
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2407,12 +2419,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr ""
@@ -2663,7 +2675,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -2687,12 +2699,12 @@ msgid ""
 "For more information, see the manpage %s(1).\n"
 msgstr ""
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr ""
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr ""
@@ -5099,7 +5111,7 @@ msgstr ""
 msgid "display filename\n"
 msgstr ""
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "ఫైలును సరికూర్చుటకు '%s filename' వుపయోగించుము\n"
@@ -6119,212 +6131,216 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr ""
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr ""
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr ""
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr ""
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr ""
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr ""
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr ""
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr ""
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr ""
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr ""
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr ""
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr ""
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr ""
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr ""
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr ""
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr ""
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr ""
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr ""
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr ""
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr ""
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr ""
@@ -6414,43 +6430,43 @@ msgid ""
 "compiled without the libmagic library"
 msgstr ""
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr ""
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr ""
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr ""
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr ""
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr ""
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr ""
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr ""
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr ""
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -6561,17 +6577,17 @@ msgid ""
 "previously returned by guestfs_inspect_os"
 msgstr ""
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr ""
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr ""
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -6580,33 +6596,38 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ఆరంభించబడింది మరియు డెమోన్‌ను సంప్రదించింది, అయితే state != READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr ""
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6616,21 +6637,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr ""
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6645,82 +6666,77 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 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:1283
+#: src/launch-libvirt.c:1347
 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:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr ""
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -6828,71 +6844,71 @@ msgid ""
 "--live respectively.  Consult the documentation for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
 "\"error\""
 msgstr ""
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr ""
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr ""
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr ""
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr ""
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr ""
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr ""
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
 msgstr ""
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr ""
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr ""
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
diff --git a/po/uk.po b/po/uk.po
index 476d76121..f002674e3 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-01-13 21:53+0000\n"
+"POT-Creation-Date: 2014-01-17 15:45+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"
@@ -78,11 +78,11 @@ msgstr "%s (проігноровано)\n"
 msgid "%s: %s (ignored)\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:161 ../builder/cmdline.ml:97
+#: ../builder/cmdline.ml:170 ../builder/cmdline.ml:97
 msgid "%s: %s: %s: file not found\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:163 ../builder/cmdline.ml:99
+#: ../builder/cmdline.ml:172 ../builder/cmdline.ml:99
 msgid "%s: %s: %s: file not found [did you mean %s?]\n"
 msgstr ""
 
@@ -118,7 +118,7 @@ msgstr ""
 msgid "%s: --update is not supported for this guest operating system\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:201
+#: ../builder/cmdline.ml:210
 msgid "%s: --upload: %s: file not found\n"
 msgstr ""
 
@@ -198,7 +198,7 @@ msgstr "%s: цей розділ не буде змінено."
 msgid "%s: This partition will be resized from %s to %s."
 msgstr "%s: розмір цього розділу буде змінено з %s на %s."
 
-#: ../builder/cmdline.ml:297
+#: ../builder/cmdline.ml:308
 msgid ""
 "%s: build virtual machine images quickly\n"
 "\n"
@@ -314,11 +314,15 @@ msgstr ""
 msgid "%s: invalid --link format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:196
+#: ../builder/cmdline.ml:141
+msgid "%s: invalid --list-format type '%s', see the man page.\n"
+msgstr ""
+
+#: ../builder/cmdline.ml:205
 msgid "%s: invalid --upload format, see the man page.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:213
+#: ../builder/cmdline.ml:222
 msgid "%s: invalid --write format, see the man page.\n"
 msgstr ""
 
@@ -459,7 +463,7 @@ msgid ""
 "%s: sorry, don't know how to use --update with the '%s' package manager\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:434
+#: ../builder/cmdline.ml:445
 msgid "%s: source and fingerprint lists are not the same length\n"
 msgstr ""
 
@@ -505,39 +509,39 @@ msgstr ""
 "%s: невідомий тип таблиці розділів\n"
 "У virt-resize передбачено підтримку лише таблиць MBR (DOS) та GPT."
 
-#: ../builder/cmdline.ml:388
+#: ../builder/cmdline.ml:399
 msgid ""
 "%s: virt-builder --cache-all-templates/--print-cache/--delete-cache does not "
 "need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:395
+#: ../builder/cmdline.ml:406
 msgid ""
 "%s: virt-builder --get-kernel image\n"
 "Missing 'image' (disk image file) argument.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:398
+#: ../builder/cmdline.ml:409
 msgid "%s: virt-builder --get-kernel: too many parameters\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:369
+#: ../builder/cmdline.ml:380
 msgid "%s: virt-builder --list does not need any extra arguments.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:376
+#: ../builder/cmdline.ml:387
 msgid ""
 "%s: virt-builder --notes os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:359
+#: ../builder/cmdline.ml:370
 msgid ""
 "%s: virt-builder os-version\n"
 "Missing 'os-version'. Use '--list' to list available template names.\n"
 msgstr ""
 
-#: ../builder/cmdline.ml:379 ../builder/cmdline.ml:362
+#: ../builder/cmdline.ml:390 ../builder/cmdline.ml:373
 msgid "%s: virt-builder: too many parameters, expecting 'os-version'\n"
 msgstr ""
 
@@ -625,11 +629,11 @@ msgstr ""
 msgid "Add disk image file"
 msgstr "Додати файл образу диска"
 
-#: ../builder/cmdline.ml:254
+#: ../builder/cmdline.ml:263
 msgid "Add package(s) to install"
 msgstr ""
 
-#: ../builder/cmdline.ml:248
+#: ../builder/cmdline.ml:257
 msgid "Add package(s) to install at firstboot"
 msgstr ""
 
@@ -646,7 +650,7 @@ msgstr ""
 msgid "Align first partition (default: auto)"
 msgstr "Вирівняти перший розділ (типове значення: auto)"
 
-#: ../builder/cmdline.ml:223
+#: ../builder/cmdline.ml:232
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
@@ -677,7 +681,7 @@ msgstr ""
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
-#: ../builder/cmdline.ml:231
+#: ../builder/cmdline.ml:240
 msgid "Check digital signatures"
 msgstr ""
 
@@ -721,7 +725,7 @@ msgstr ""
 "Копіювання %s ...\n"
 "%!"
 
-#: ../builder/cmdline.ml:263
+#: ../builder/cmdline.ml:274
 msgid "Create directory"
 msgstr ""
 
@@ -731,7 +735,7 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../builder/cmdline.ml:255
+#: ../builder/cmdline.ml:264
 msgid "Create symbolic links"
 msgstr ""
 
@@ -788,7 +792,7 @@ msgstr "Діагностика GC та розподілу пам’яті (вн
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
-#: ../builder/cmdline.ml:237
+#: ../builder/cmdline.ml:246
 msgid "Delete a file or dir"
 msgstr ""
 
@@ -812,7 +816,7 @@ msgid ""
 " virt-sysprep --delete '/var/log/*.log'."
 msgstr ""
 
-#: ../builder/cmdline.ml:239
+#: ../builder/cmdline.ml:248
 msgid "Delete the template cache"
 msgstr ""
 
@@ -820,29 +824,29 @@ msgstr ""
 msgid "Deleting: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:265
+#: ../builder/cmdline.ml:276
 msgid "Disable appliance network"
 msgstr ""
 
-#: ../builder/cmdline.ml:234
+#: ../builder/cmdline.ml:243
 msgid "Disable digital signatures"
 msgstr ""
 
-#: ../builder/cmdline.ml:227
+#: ../builder/cmdline.ml:236
 msgid "Disable template cache"
 msgstr ""
 
-#: ../builder/cmdline.ml:266
+#: ../builder/cmdline.ml:277
 msgid "Display installation notes"
 msgstr ""
 
 #. ../resize/resize.ml:113
-#. ../builder/cmdline.ml:288
+#. ../builder/cmdline.ml:299
 #: ../sysprep/main.ml:160 ../sysprep/main.ml:159 ../sparsify/sparsify.ml:86
 msgid "Display version and exit"
 msgstr "Показати номер версії і вийти"
 
-#: ../builder/cmdline.ml:282
+#: ../builder/cmdline.ml:293
 msgid "Do not fsync output file on exit"
 msgstr ""
 
@@ -854,7 +858,7 @@ msgstr "Не копіювати завантажувач"
 msgid "Don't create extra partition"
 msgstr "Не створювати додаткового розділу"
 
-#: ../builder/cmdline.ml:241
+#: ../builder/cmdline.ml:250
 msgid "Don't delete output file on failure"
 msgstr ""
 
@@ -874,11 +878,11 @@ msgstr "Не виводити повідомлень до журналу"
 msgid "Don't print the summary"
 msgstr "Не виводити даних резюме"
 
-#: ../builder/cmdline.ml:229
+#: ../builder/cmdline.ml:238
 msgid "Download all templates to the cache"
 msgstr ""
 
-#: ../builder/list_entries.ml:59
+#: ../builder/list_entries.ml:71
 msgid "Download size:"
 msgstr ""
 
@@ -894,7 +898,7 @@ msgstr "Створити дамп POD (вбудоване)"
 msgid "Dump POD for options (internal)"
 msgstr "Створити дамп POD для параметрів (вбудоване)"
 
-#: ../builder/cmdline.ml:242
+#: ../builder/cmdline.ml:251
 msgid "Edit file with Perl expr"
 msgstr ""
 
@@ -902,13 +906,13 @@ msgstr ""
 msgid "Editing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:264
+#: ../builder/cmdline.ml:275
 msgid "Enable appliance network (default)"
 msgstr ""
 
 #. ../resize/resize.ml:111
 #. ../resize/resize.ml:85
-#. ../builder/cmdline.ml:286
+#. ../builder/cmdline.ml:297
 #: ../sysprep/main.ml:158 ../sysprep/main.ml:157 ../sparsify/sparsify.ml:84
 msgid "Enable debugging messages"
 msgstr "Увімкнути показ діагностичних повідомлень"
@@ -1006,11 +1010,11 @@ msgstr ""
 "Заповнити вільне місце у групі томів %s нулями…\n"
 "%!"
 
-#: ../builder/cmdline.ml:244
+#: ../builder/cmdline.ml:253
 msgid "Fingerprint of valid signing key"
 msgstr ""
 
-#: ../builder/list_entries.ml:29
+#: ../builder/list_entries.ml:51
 msgid "Fingerprint: %s\n"
 msgstr ""
 
@@ -1069,7 +1073,7 @@ msgstr ""
 msgid "Free space: %s (%Ld%%)"
 msgstr ""
 
-#: ../builder/list_entries.ml:53
+#: ../builder/list_entries.ml:65
 msgid "Full name:"
 msgstr ""
 
@@ -1077,7 +1081,7 @@ msgstr ""
 msgid "Generate random seed for guest"
 msgstr "Створити породжувач випадкових чисел для гостьової системи"
 
-#: ../builder/cmdline.ml:251
+#: ../builder/cmdline.ml:260
 msgid "Get kernel from image"
 msgstr ""
 
@@ -1115,11 +1119,11 @@ msgstr ""
 msgid "Linking: %s -> %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:256
+#: ../builder/cmdline.ml:265
 msgid "List available templates"
 msgstr ""
 
-#. ../builder/cmdline.ml:260
+#. ../builder/cmdline.ml:271
 #: ../sysprep/main.ml:149 ../sparsify/sparsify.ml:79 ../resize/resize.ml:94
 msgid "List long options"
 msgstr "Показати список повних версій параметрів"
@@ -1136,7 +1140,7 @@ msgstr "Зробити машину виведення даних придатн
 msgid "Making directory: %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:55
+#: ../builder/list_entries.ml:67
 msgid "Minimum/default size:"
 msgstr ""
 
@@ -1156,7 +1160,7 @@ msgstr "Нова назва вузла"
 msgid "New timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:273
+#: ../builder/cmdline.ml:284
 msgid "No progress messages"
 msgstr ""
 
@@ -1172,7 +1176,7 @@ msgstr ""
 msgid "Notes on %s"
 msgstr ""
 
-#: ../builder/list_entries.ml:65
+#: ../builder/list_entries.ml:77
 msgid ""
 "Notes:\n"
 "\n"
@@ -1209,7 +1213,7 @@ msgstr ""
 msgid "Opening the new disk"
 msgstr ""
 
-#: ../builder/cmdline.ml:249
+#: ../builder/cmdline.ml:258
 msgid "Output format (default: raw)"
 msgstr ""
 
@@ -1233,7 +1237,7 @@ msgstr "Виконати тестовий запуск"
 msgid "Planning how to build this image"
 msgstr ""
 
-#: ../builder/cmdline.ml:272
+#: ../builder/cmdline.ml:283
 msgid "Print info about template cache"
 msgstr ""
 
@@ -1463,19 +1467,19 @@ msgstr ""
 msgid "Run arbitrary scripts against the guest"
 msgstr "Запустити довільні скрипти дій над гостьовою системою"
 
-#: ../builder/cmdline.ml:246
+#: ../builder/cmdline.ml:255
 msgid "Run command at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:277
+#: ../builder/cmdline.ml:288
 msgid "Run command in disk image"
 msgstr ""
 
-#: ../builder/cmdline.ml:245
+#: ../builder/cmdline.ml:254
 msgid "Run script at first guest boot"
 msgstr ""
 
-#: ../builder/cmdline.ml:276
+#: ../builder/cmdline.ml:287
 msgid "Run script in disk image"
 msgstr ""
 
@@ -1505,11 +1509,11 @@ msgstr ""
 msgid "Script or program to run on guest"
 msgstr "Скрипт або програма, яку слід запустити у гостьовій системі"
 
-#: ../builder/cmdline.ml:278
+#: ../builder/cmdline.ml:289
 msgid "Scrub a file"
 msgstr ""
 
-#: ../builder/cmdline.ml:259
+#: ../builder/cmdline.ml:270
 msgid "Scrub build log file"
 msgstr ""
 
@@ -1521,7 +1525,7 @@ msgstr ""
 msgid "Scrubbing: %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:252
+#: ../builder/cmdline.ml:261
 msgid "Set GPG binary/command"
 msgstr ""
 
@@ -1597,11 +1601,11 @@ msgid ""
 "=back"
 msgstr ""
 
-#: ../builder/cmdline.ml:225
+#: ../builder/cmdline.ml:234
 msgid "Set attach disk format"
 msgstr ""
 
-#: ../builder/cmdline.ml:236
+#: ../builder/cmdline.ml:245
 msgid "Set curl binary/command"
 msgstr ""
 
@@ -1617,7 +1621,7 @@ msgstr "Встановити адресу libvirt"
 msgid "Set libvirt guest name"
 msgstr "Встановити назву гостьової системи libvirt"
 
-#: ../builder/cmdline.ml:261
+#: ../builder/cmdline.ml:272
 msgid "Set memory size"
 msgstr ""
 
@@ -1625,15 +1629,15 @@ msgstr ""
 msgid "Set mount options (eg /:noatime;/var:rw,noatime)"
 msgstr ""
 
-#: ../builder/cmdline.ml:280
+#: ../builder/cmdline.ml:291
 msgid "Set number of vCPUs"
 msgstr ""
 
-#: ../builder/cmdline.ml:279
+#: ../builder/cmdline.ml:290
 msgid "Set output disk size"
 msgstr ""
 
-#: ../builder/cmdline.ml:267
+#: ../builder/cmdline.ml:278
 msgid "Set output filename"
 msgstr ""
 
@@ -1641,7 +1645,7 @@ msgstr ""
 msgid "Set partition alignment (default: 128 sectors)"
 msgstr "Встановити вирівнювання розділів (типове значення: 128 секторів)"
 
-#: ../builder/cmdline.ml:270
+#: ../builder/cmdline.ml:281
 msgid "Set password crypto"
 msgstr ""
 
@@ -1668,23 +1672,27 @@ msgstr ""
 msgid "Set root or user password"
 msgstr ""
 
-#: ../builder/cmdline.ml:275
+#: ../builder/cmdline.ml:286
 msgid "Set root password"
 msgstr ""
 
-#: ../builder/cmdline.ml:281
+#: ../builder/cmdline.ml:292
 msgid "Set source URL"
 msgstr ""
 
-#: ../builder/cmdline.ml:226
+#: ../builder/cmdline.ml:235
 msgid "Set template cache dir"
 msgstr ""
 
-#: ../builder/cmdline.ml:283
+#: ../builder/cmdline.ml:294
 msgid "Set the default timezone"
 msgstr ""
 
-#: ../builder/cmdline.ml:253
+#: ../builder/cmdline.ml:269
+msgid "Set the format for --list (default: short)"
+msgstr ""
+
+#: ../builder/cmdline.ml:262
 msgid "Set the hostname"
 msgstr ""
 
@@ -1743,11 +1751,15 @@ msgstr ""
 "Встановлення початкової таблиці розділів на %s…\n"
 "%!"
 
+#: ../builder/cmdline.ml:267
+msgid "Shortcut for --list-format short"
+msgstr ""
+
 #: ../resize/resize.ml:109
 msgid "Shrink partition"
 msgstr "Зменшити розмір розділу"
 
-#: ../builder/list_entries.ml:28
+#: ../builder/list_entries.ml:50
 msgid "Source URI: %s\n"
 msgstr ""
 
@@ -1970,7 +1982,7 @@ msgstr ""
 msgid "Uncompressing"
 msgstr ""
 
-#: ../builder/cmdline.ml:284
+#: ../builder/cmdline.ml:295
 msgid "Update core packages"
 msgstr ""
 
@@ -1978,7 +1990,7 @@ msgstr ""
 msgid "Updating core packages"
 msgstr ""
 
-#: ../builder/cmdline.ml:285
+#: ../builder/cmdline.ml:296
 msgid "Upload file to dest"
 msgstr ""
 
@@ -1986,7 +1998,7 @@ msgstr ""
 msgid "Uploading: %s to %s"
 msgstr ""
 
-#: ../builder/cmdline.ml:290
+#: ../builder/cmdline.ml:301
 msgid "Write file"
 msgstr ""
 
@@ -2495,7 +2507,7 @@ msgstr ""
 "результату"
 
 #: align/scan.c:73 cat/cat.c:56 cat/filesystems.c:87 cat/ls.c:83 df/main.c:66
-#: diff/diff.c:91 edit/edit.c:69 fish/fish.c:104 fuse/guestmount.c:99
+#: diff/diff.c:91 edit/edit.c:68 fish/fish.c:104 fuse/guestmount.c:99
 #: fuse/guestunmount.c:52 inspector/inspector.c:67 rescue/rescue.c:56
 #, c-format
 msgid "Try `%s --help' for more information.\n"
@@ -2542,7 +2554,7 @@ msgstr ""
 "З докладнішими даними можна ознайомитися на сторінці довідника (man) %s(1).\n"
 
 #: align/scan.c:133 cat/cat.c:115 cat/filesystems.c:187 cat/ls.c:174
-#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:135
+#: df/main.c:133 diff/diff.c:191 diff/diff.c:197 edit/edit.c:134
 #: fish/fish.c:234 format/format.c:129 fuse/guestmount.c:206
 #: inspector/inspector.c:127 rescue/rescue.c:135
 #, c-format
@@ -2551,7 +2563,7 @@ msgstr "guestfs_create: не вдалося створити елемент ке
 
 #: align/scan.c:153 builder/index-validate.c:75 cat/cat.c:137
 #: cat/filesystems.c:241 cat/ls.c:224 df/main.c:157 diff/diff.c:262
-#: edit/edit.c:157 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
+#: edit/edit.c:156 fish/fish.c:292 format/format.c:183 fuse/guestmount.c:241
 #: fuse/guestunmount.c:124 inspector/inspector.c:151 rescue/rescue.c:192
 #, c-format
 msgid "%s: unknown long option: %s (%d)\n"
@@ -2655,14 +2667,14 @@ msgstr ""
 "  -x                   Трасувати виклики програмного інтерфейсу libguestfs\n"
 "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#: cat/cat.c:357 edit/edit.c:627 fish/fish.c:1724
+#: cat/cat.c:357 edit/edit.c:582 fish/fish.c:1724
 #, c-format
 msgid "%s: to use Windows drive letters, this must be a Windows guest\n"
 msgstr ""
 "%s: для використання літерних позначень дисків Windows ваша система має бути "
 "гостьовою системою Windows\n"
 
-#: cat/cat.c:371 edit/edit.c:641
+#: cat/cat.c:371 edit/edit.c:596
 #, c-format
 msgid "%s: drive '%c:' not found.\n"
 msgstr "%s: диск '%c:' не знайдено.\n"
@@ -3010,7 +3022,7 @@ msgstr ""
 msgid "End of diff"
 msgstr ""
 
-#: edit/edit.c:73
+#: edit/edit.c:72
 #, c-format
 msgid ""
 "%s: Edit a file in a virtual machine\n"
@@ -3055,12 +3067,12 @@ msgstr ""
 "  -x                   Трасувати виклики API libguestfs\n"
 "Щоб дізнатися більше, скористайтеся сторінкою довідника (man) %s(1).\n"
 
-#: edit/edit.c:169
+#: edit/edit.c:168
 #, c-format
 msgid "%s: -b option given multiple times\n"
 msgstr "%s: параметр -b вказано декілька разів\n"
 
-#: edit/edit.c:186
+#: edit/edit.c:185
 #, c-format
 msgid "%s: -e option given multiple times\n"
 msgstr "%s: параметр -e вказано декілька разів\n"
@@ -5526,7 +5538,7 @@ msgstr "copy-out: «%s» не є файлом або каталогом\n"
 msgid "display filename\n"
 msgstr "показати назву файла\n"
 
-#: fish/edit.c:51
+#: fish/edit.c:50
 #, c-format
 msgid "use '%s filename' to edit a file\n"
 msgstr "скористайтеся командою «%s назва_файла» для редагування файла\n"
@@ -6795,225 +6807,229 @@ msgstr ""
 msgid "unexpected non-hex digits in output of db_dump command"
 msgstr "неочікувані не шістнадцяткові цифри у виводі команди db_dump"
 
-#: src/drives.c:150
+#: src/drives.c:98
+msgid "this backend does not support adding read-only drives"
+msgstr ""
+
+#: src/drives.c:198
 msgid "curl: you cannot specify a secret with this protocol"
 msgstr "curl: неможливо вказати ключ за допомогою цього протоколу"
 
-#: src/drives.c:155
+#: src/drives.c:203
 msgid "curl: you must specify exactly one server"
 msgstr "curl: слід вказати точно один сервер"
 
-#: src/drives.c:161
+#: src/drives.c:209
 msgid "curl: only tcp transport is supported"
 msgstr "curl: передбачено передавання даних лише за допомогою tcp"
 
-#: src/drives.c:166
+#: src/drives.c:214
 msgid "curl: pathname should not be an empty string"
 msgstr "curl: шлях не повинен бути порожнім рядком"
 
-#: src/drives.c:171
+#: src/drives.c:219
 msgid "curl: pathname must begin with a '/'"
 msgstr "curl: шлях має починатися з «/»"
 
-#: src/drives.c:192
+#: src/drives.c:240
 msgid "gluster: you cannot specify a username with this protocol"
 msgstr ""
 "gluster: не можна вказувати ім’я користувача, якщо використовується цей "
 "протокол"
 
-#: src/drives.c:196
+#: src/drives.c:244
 msgid "gluster: you cannot specify a secret with this protocol"
 msgstr ""
 "gluster: не можна вказувати пароль, якщо використовується цей протокол "
 "protocol"
 
-#: src/drives.c:201
+#: src/drives.c:249
 msgid "gluster: you must specify exactly one server"
 msgstr "gluster: слід вказати точно один сервер"
 
-#: src/drives.c:206
+#: src/drives.c:254
 msgid "gluster: volume name parameter should not be an empty string"
 msgstr "gluster: параметр назви тому не може бути порожнім рядком"
 
-#: src/drives.c:211
+#: src/drives.c:259
 msgid "gluster: pathname must begin with a '/'"
 msgstr ""
 
-#: src/drives.c:244
+#: src/drives.c:292
 msgid "nbd: you cannot specify a username with this protocol"
 msgstr ""
 "nbd: не можна вказувати ім’я користувача, якщо використовується цей протокол"
 
-#: src/drives.c:248
+#: src/drives.c:296
 msgid "nbd: you cannot specify a secret with this protocol"
 msgstr "nbd: не можна вказувати пароль, якщо використовується цей протокол"
 
-#: src/drives.c:253
+#: src/drives.c:301
 msgid "nbd: you must specify exactly one server"
 msgstr "nbd: слід вказати точно один сервер"
 
-#: src/drives.c:279
+#: src/drives.c:327
 msgid "rbd: you must specify one or more servers"
 msgstr "rbd: слід вказати один або декілька серверів"
 
-#: src/drives.c:286
+#: src/drives.c:334
 msgid "rbd: only tcp transport is supported"
 msgstr "rbd: передбачено передавання даних лише за допомогою tcp"
 
-#: src/drives.c:290
+#: src/drives.c:338
 msgid "rbd: port number must be specified"
 msgstr "rbd: слід вказати номер порту"
 
-#: src/drives.c:296
+#: src/drives.c:344
 msgid "rbd: image name parameter should not be an empty string"
 msgstr "rbd: параметр назви образу не повинен бути порожнім рядком"
 
-#: src/drives.c:301
+#: src/drives.c:349
 msgid "rbd: image name must begin with a '/'"
 msgstr "rbd: назва образу має починатися з «/»"
 
-#: src/drives.c:324
+#: src/drives.c:372
 msgid "sheepdog: you cannot specify a username with this protocol"
 msgstr ""
 "sheepdog: не можна вказувати ім’я користувача, якщо використовується цей "
 "протокол"
 
-#: src/drives.c:328
+#: src/drives.c:376
 msgid "sheepdog: you cannot specify a secret with this protocol"
 msgstr ""
 "sheepdog: не можна вказувати пароль, якщо використовується цей протокол"
 
-#: src/drives.c:335
+#: src/drives.c:383
 msgid "sheepdog: only tcp transport is supported"
 msgstr "sheepdog: передбачено передавання даних лише за допомогою tcp"
 
-#: src/drives.c:339
+#: src/drives.c:387
 msgid "sheepdog: port number must be specified"
 msgstr "sheepdog: слід вказати номер порту"
 
-#: src/drives.c:345
+#: src/drives.c:393
 msgid "sheepdog: volume parameter should not be an empty string"
 msgstr "sheepdog: параметр тому не може бути порожнім рядком"
 
-#: src/drives.c:350
+#: src/drives.c:398
 msgid "sheepdog: volume parameter must begin with a '/'"
 msgstr "sheepdog: параметр тому має починатися з «/»"
 
-#: src/drives.c:371
+#: src/drives.c:419
 msgid "ssh: you cannot specify a secret with this protocol"
 msgstr "ssh: не можна вказувати пароль, якщо використовується цей протокол"
 
-#: src/drives.c:376
+#: src/drives.c:424
 msgid "ssh: you must specify exactly one server"
 msgstr "ssh: слід вказати точно один сервер"
 
-#: src/drives.c:382
+#: src/drives.c:430
 msgid "ssh: only tcp transport is supported"
 msgstr "ssh: передбачено передавання даних лише за допомогою tcp"
 
-#: src/drives.c:387
+#: src/drives.c:435
 msgid "ssh: pathname should not be an empty string"
 msgstr "ssh: шлях не може бути порожнім рядком"
 
-#: src/drives.c:392
+#: src/drives.c:440
 msgid "ssh: pathname must begin with a '/'"
 msgstr "ssh: шлях має починатися з «/»"
 
-#: src/drives.c:397
+#: src/drives.c:445
 msgid "ssh: username should not be an empty string"
 msgstr "ssh: ім’я користувача не може бути порожнім рядком"
 
-#: src/drives.c:418
+#: src/drives.c:466
 msgid "iscsi: you cannot specify a username with this protocol"
 msgstr ""
 "iscsi: не можна вказувати ім’я користувача, якщо використовується цей "
 "протокол"
 
-#: src/drives.c:423
+#: src/drives.c:471
 msgid "iscsi: you cannot specify a secret with this protocol"
 msgstr "iscsi: не можна вказувати пароль, якщо використовується цей протокол"
 
-#: src/drives.c:428
+#: src/drives.c:476
 msgid "iscsi: you must specify exactly one server"
 msgstr "iscsi: слід вказати точно один сервер"
 
-#: src/drives.c:434
+#: src/drives.c:482
 msgid "iscsi: only tcp transport is supported"
 msgstr "iscsi: передбачено передавання даних лише за допомогою tcp"
 
-#: src/drives.c:439
+#: src/drives.c:487
 msgid "iscsi: target name should not be an empty string"
 msgstr "iscsi: назва призначення не може бути порожнім рядком"
 
-#: src/drives.c:444
+#: src/drives.c:492
 msgid "iscsi: target string must begin with a '/'"
 msgstr "iscsi: рядок призначення має починатися з «/»"
 
-#: src/drives.c:472
+#: src/drives.c:520
 msgid "for device '/dev/null', format must be 'raw'"
 msgstr "для пристрою /dev/null слід вказувати формат raw"
 
-#: src/drives.c:702
+#: src/drives.c:764
 msgid "missing Unix domain socket path"
 msgstr "не вказано шляху до сокета домену Unix"
 
-#: src/drives.c:714
+#: src/drives.c:776
 #, c-format
 msgid "invalid port number '%s'"
 msgstr "некоректний номер порту, «%s»"
 
-#: src/drives.c:721
+#: src/drives.c:783
 #, c-format
 msgid "invalid hostname '%s'"
 msgstr "некоректна назва вузла, «%s»"
 
-#: src/drives.c:732
+#: src/drives.c:794
 #, c-format
 msgid "invalid hostname or server string '%s'"
 msgstr "некоректний рядок назви вузла або сервера, «%s»"
 
-#: src/drives.c:812 src/drives.c:818
+#: src/drives.c:874 src/drives.c:880
 #, c-format
 msgid "%s parameter is empty or contains disallowed characters"
 msgstr "параметр %s є порожнім або містить заборонені до використання символи"
 
-#: src/drives.c:824
+#: src/drives.c:886
 msgid "label parameter is empty, too long, or contains disallowed characters"
 msgstr ""
 "параметр мітки є порожнім, занадто довгим або містить заборонені символи"
 
-#: src/drives.c:830
+#: src/drives.c:892
 msgid "cachemode parameter must be 'writeback' (default) or 'unsafe'"
 msgstr ""
 
-#: src/drives.c:837
+#: src/drives.c:899
 msgid "you cannot specify a server with file-backed disks"
 msgstr "не можна вказувати сервер з резервними копіями дисків у файлах"
 
-#: src/drives.c:842
+#: src/drives.c:904
 msgid "you cannot specify a username with file-backed disks"
 msgstr ""
 "не можна вказувати ім’я користувача для резервних копій дисків у файлах"
 
-#: src/drives.c:846
+#: src/drives.c:908
 msgid "you cannot specify a secret with file-backed disks"
 msgstr "не можна вказувати пароль з резервними копіями дисків у файлах"
 
-#: src/drives.c:938
+#: src/drives.c:1000
 #, c-format
 msgid "unknown protocol '%s'"
 msgstr "невідомий протокол «%s»"
 
-#: src/drives.c:956 src/drives.c:1119
+#: src/drives.c:1018 src/drives.c:1181
 msgid "the current backend does not support hotplugging drives"
 msgstr ""
 "у поточному модулі не передбачено підтримки інтерактивного з’єднання дисків"
 
-#: src/drives.c:962
+#: src/drives.c:1024
 msgid "'label' is required when hotplugging drives"
 msgstr "для інтерактивного з’єднання дисків слід вказати «label»"
 
-#: src/drives.c:1104
+#: src/drives.c:1166
 #, c-format
 msgid "disk with label '%s' not found"
 msgstr "диска з міткою «%s» не знайдено"
@@ -7129,43 +7145,43 @@ msgstr ""
 "файлово-архітектурний програмний інтерфейс недоступний, оскільки цю версію "
 "libguestfs було зібрано без підтримки бібліотеки libmagic"
 
-#: src/fuse.c:936
+#: src/fuse.c:938
 msgid "filesystem is already mounted in another thread"
 msgstr "файлову систему вже змонтовано у іншому потоці виконання команд"
 
-#: src/fuse.c:961
+#: src/fuse.c:963
 #, c-format
 msgid "fuse_opt_add_arg: %s"
 msgstr "fuse_opt_add_arg: %s"
 
-#: src/fuse.c:978
+#: src/fuse.c:980
 #, c-format
 msgid "fuse_mount: %s"
 msgstr "fuse_mount: %s"
 
-#: src/fuse.c:996
+#: src/fuse.c:998
 #, c-format
 msgid "fuse_new: %s"
 msgstr "fuse_new: %s"
 
-#: src/fuse.c:1025
+#: src/fuse.c:1027
 msgid "you must call guestfs_mount_local first"
 msgstr "вам слід спочатку викликати guestfs_mount_local"
 
-#: src/fuse.c:1034
+#: src/fuse.c:1036
 #, c-format
 msgid "fuse_loop: %s"
 msgstr "fuse_loop: %s"
 
-#: src/fuse.c:1084
+#: src/fuse.c:1086
 msgid "no filesystem is mounted"
 msgstr "не змонтовано жодної файлової системи"
 
-#: src/fuse.c:1202
+#: src/fuse.c:1204
 msgid "could not initialize dir cache hashtables"
 msgstr "не вдалося ініціалізувати таблиці хешів каталогів кешу"
 
-#: src/fuse.c:1454
+#: src/fuse.c:1456
 msgid ""
 "FUSE is not supported in this build of libguestfs because libfuse was not "
 "found when libguestfs was compiled"
@@ -7288,17 +7304,17 @@ msgstr ""
 "кореневого пристрою, дані якого раніше було повернуто функцією "
 "guestfs_inspect_os"
 
-#: src/launch-direct.c:128
+#: src/launch-direct.c:178
 #, c-format
 msgid "unclosed quote character (%c) in command line near: %s"
 msgstr "неврівноважений символ лапки (%c) у командному рядку поблизу від %s"
 
-#: src/launch-direct.c:147
+#: src/launch-direct.c:197
 #, c-format
 msgid "cannot parse quoted string near: %s"
 msgstr "не вдалося обробити рядок у лапках поблизу від %s"
 
-#: src/launch-direct.c:214
+#: src/launch-direct.c:264
 #, c-format
 msgid ""
 "current user is not a member of the KVM group (group ID %d). This user "
@@ -7307,37 +7323,42 @@ msgid ""
 "might need to log out and log in again)."
 msgstr ""
 
-#: src/launch-direct.c:248 src/launch-uml.c:120
+#: src/launch-direct.c:298 src/launch-uml.c:155
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
 
-#: src/launch-direct.c:799 src/launch-libvirt.c:491
+#: src/launch-direct.c:861 src/launch-libvirt.c:539
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
 "дорівнює READY"
 
-#: src/launch-libvirt.c:188
+#: src/launch-direct.c:1242 src/launch-libvirt.c:1238
+#, c-format
+msgid "realpath: could not convert '%s' to absolute path"
+msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
+
+#: src/launch-libvirt.c:244
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "у модулі libvirt ще не передбачено підтримки прапорця безпосереднього режиму"
 
-#: src/launch-libvirt.c:197
+#: src/launch-libvirt.c:253
 #, 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:232
+#: src/launch-libvirt.c:288
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "не вдалося встановити з’єднання з libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:248
+#: src/launch-libvirt.c:304
 msgid "could not get libvirt capabilities"
 msgstr "не вдалося визначити можливості libvirt"
 
-#: src/launch-libvirt.c:419
+#: src/launch-libvirt.c:467
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7347,22 +7368,22 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:555
+#: src/launch-libvirt.c:603
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 "не вдалося обробити запис можливостей у форматі XML, повернутий libvirt"
 
-#: src/launch-libvirt.c:561 src/libvirt-domain.c:352 src/libvirt-domain.c:435
-#: src/libvirt-domain.c:642
+#: src/launch-libvirt.c:609 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/libvirt-domain.c:645
 msgid "unable to create new XPath context"
 msgstr "не вдалося створити контекст XPath"
 
-#: src/launch-libvirt.c:571
+#: src/launch-libvirt.c:619
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "не вдалося обробити вираз XPath: %s"
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:652
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7390,16 +7411,16 @@ msgstr ""
 "guestfs(3) та списком поширених питань щодо libguestfs та відповідей\n"
 "на ці питання."
 
-#: src/launch-libvirt.c:759
+#: src/launch-libvirt.c:867
 #, c-format
-msgid "error constructing libvirt XML at \"%s\""
-msgstr "помилка під час спроби побудувати XML для libvirt у «%s»"
+msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
+msgstr ""
 
-#: src/launch-libvirt.c:1123
+#: src/launch-libvirt.c:1194
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
 
-#: src/launch-libvirt.c:1234
+#: src/launch-libvirt.c:1315
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -7407,7 +7428,7 @@ msgstr ""
 "у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
 "тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
 
-#: src/launch-libvirt.c:1272
+#: src/launch-libvirt.c:1340
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -7419,7 +7440,7 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1283
+#: src/launch-libvirt.c:1347
 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"
@@ -7432,53 +7453,48 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1638
-#, c-format
-msgid "realpath: could not convert '%s' to absolute path"
-msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
-
-#: src/launch-libvirt.c:1720
+#: src/launch-libvirt.c:1604
 msgid "could not destroy libvirt domain"
 msgstr "не вдалося знищити домен libvirt"
 
-#: src/launch-libvirt.c:1757
+#: src/launch-libvirt.c:1641
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
 
-#: src/launch-libvirt.c:1819
+#: src/launch-libvirt.c:1700
 msgid "could not attach disk to libvirt domain"
 msgstr "не вдалося долучити диск до домену libvirt"
 
-#: src/launch-libvirt.c:1850
+#: src/launch-libvirt.c:1731
 msgid "could not detach disk from libvirt domain"
 msgstr "не вдалося від’єднати диск від домену libvirt"
 
-#: src/launch-uml.c:65
+#: src/launch-uml.c:100
 msgid "uml backend does not support networking"
 msgstr ""
 
-#: src/launch-uml.c:69
+#: src/launch-uml.c:104
 msgid "uml backend does not support SMP"
 msgstr ""
 
-#: src/launch-uml.c:75
+#: src/launch-uml.c:110
 msgid "uml backend does not support remote drives"
 msgstr ""
 
-#: src/launch-uml.c:79
+#: src/launch-uml.c:114
 msgid "uml backend does not support non-raw-format drives"
 msgstr ""
 
-#: src/launch-uml.c:84
+#: src/launch-uml.c:119
 msgid "uml backend does not support drives with 'iface' parameter"
 msgstr ""
 
-#: src/launch-uml.c:89
+#: src/launch-uml.c:124
 msgid "uml backend does not support drives with 'label' parameter"
 msgstr ""
 
-#: src/launch-uml.c:447
+#: src/launch-uml.c:472
 msgid "vmlinux launched and contacted daemon, but state != READY"
 msgstr ""
 
@@ -7599,7 +7615,7 @@ msgstr ""
 "інструментів libguestfs є --ro і --live. Докладніші дані можна знайти у "
 "документації."
 
-#: src/libvirt-domain.c:302
+#: src/libvirt-domain.c:305
 #, c-format
 msgid ""
 "%s: disk is marked <readonly/> in libvirt XML, and readonlydisk was set to "
@@ -7608,49 +7624,49 @@ msgstr ""
 "%s: диск позначено теґом <readonly/> у XML libvirt, readonlydisk було "
 "встановлено у значення «error»"
 
-#: src/libvirt-domain.c:370 src/libvirt-domain.c:442 src/libvirt-domain.c:657
+#: src/libvirt-domain.c:373 src/libvirt-domain.c:445 src/libvirt-domain.c:660
 msgid "unable to evaluate XPath expression"
 msgstr "не вдалося сформувати вираз XPath"
 
-#: src/libvirt-domain.c:383
+#: src/libvirt-domain.c:386
 #, c-format
 msgid "ignoring %zu nodes matching '%s'"
 msgstr "ігноруємо %zu вузлів, що відповідають «%s»"
 
-#: src/libvirt-domain.c:389
+#: src/libvirt-domain.c:392
 msgid "expected <seclabel/> to be an XML element"
 msgstr "очікувалося, що <seclabel/> має бути елементом XML"
 
-#: src/libvirt-domain.c:504
+#: src/libvirt-domain.c:507
 #, c-format
 msgid "disk[%zu]: network device"
 msgstr "диск[%zu]: мережевий пристрій"
 
-#: src/libvirt-domain.c:524
+#: src/libvirt-domain.c:527
 #, c-format
 msgid "disk[%zu]: protocol: %s"
 msgstr "диск[%zu]: протокол: %s"
 
-#: src/libvirt-domain.c:535
+#: src/libvirt-domain.c:538
 #, c-format
 msgid "disk[%zu]: username: %s"
 msgstr "диск[%zu]: користувач: %s"
 
-#: src/libvirt-domain.c:561
+#: src/libvirt-domain.c:564
 #, c-format
 msgid "disk[%zu]: host: %s:%s"
 msgstr "диск[%zu]: вузол: %s:%s"
 
-#: src/libvirt-domain.c:582
+#: src/libvirt-domain.c:585
 #, c-format
 msgid "disk[%zu]: filename: %s"
 msgstr "диск[%zu]: назва файла: %s"
 
-#: src/libvirt-domain.c:618
+#: src/libvirt-domain.c:621
 msgid "libvirt domain has no disks"
 msgstr "у домені libvirt немає дисків"
 
-#: src/libvirt-domain.c:687
+#: src/libvirt-domain.c:690
 msgid ""
 "this guest has no libvirt <channel> definition for guestfsd\n"
 "See ATTACHING TO RUNNING DAEMONS in guestfs(3) for further information."
@@ -7660,16 +7676,16 @@ msgstr ""
 "Докладнішу довідкову інформацію можна знайти у розділі ATTACHING TO RUNNING "
 "DAEMONS сторінки довідника (man) guestfs(3)."
 
-#: src/libvirt-domain.c:706
+#: src/libvirt-domain.c:709
 #, c-format
 msgid "error reading libvirt XML information: %s"
 msgstr "помилка під час читання XML-даних libvirt: %s"
 
-#: src/libvirt-domain.c:713
+#: src/libvirt-domain.c:716
 msgid "unable to parse XML information returned by libvirt"
 msgstr "не вдалося обробити дані XML, повернуті libvirt"
 
-#: src/libvirt-domain.c:723
+#: src/libvirt-domain.c:726
 msgid ""
 "add-domain API not available since this version of libguestfs was compiled "
 "without libvirt"
@@ -8068,6 +8084,9 @@ msgstr "virt-win-reg: {p}: не вдалося отримати файл рег
 msgid "virt-win-reg: {p}: could not upload registry file: {err}\n"
 msgstr "virt-win-reg: {p}: не вдалося вивантажити файл регістра: {err}\n"
 
+#~ msgid "error constructing libvirt XML at \"%s\""
+#~ msgstr "помилка під час спроби побудувати XML для libvirt у «%s»"
+
 #~ msgid ""
 #~ "filename cannot contain ':' (colon) character. This is a limitation of "
 #~ "qemu."