[Pkg-libvirt-commits] [libguestfs] 96/233: Version 1.25.25.

Hilko Bengen bengen at moszumanska.debian.org
Wed Feb 19 21:11:22 UTC 2014


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit ebb04b64a2c630089f7d6e8261f4cb2b93e12724
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Jan 21 18:37:26 2014 +0000

    Version 1.25.25.
---
 BUGS                        |   8 +-
 configure.ac                |   2 +-
 po-docs/ja.po               | 164 ++++++++++++++++--------
 po-docs/libguestfs-docs.pot | 157 +++++++++++++++--------
 po-docs/uk.po               | 165 +++++++++++++++++--------
 po/en_GB.po                 | 292 ++++++++++++++++++++++---------------------
 po/es.po                    | 292 ++++++++++++++++++++++---------------------
 po/gu.po                    | 292 ++++++++++++++++++++++---------------------
 po/hi.po                    | 292 ++++++++++++++++++++++---------------------
 po/kn.po                    | 292 ++++++++++++++++++++++---------------------
 po/libguestfs.pot           | 294 ++++++++++++++++++++++----------------------
 po/ml.po                    | 292 ++++++++++++++++++++++---------------------
 po/mr.po                    | 292 ++++++++++++++++++++++---------------------
 po/nl.po                    | 292 ++++++++++++++++++++++---------------------
 po/or.po                    | 292 ++++++++++++++++++++++---------------------
 po/pa.po                    | 292 ++++++++++++++++++++++---------------------
 po/pl.po                    | 292 ++++++++++++++++++++++---------------------
 po/ta.po                    | 292 ++++++++++++++++++++++---------------------
 po/te.po                    | 292 ++++++++++++++++++++++---------------------
 po/uk.po                    | 292 ++++++++++++++++++++++---------------------
 20 files changed, 2583 insertions(+), 2295 deletions(-)

diff --git a/BUGS b/BUGS
index 56a2b68..f4d3e64 100644
--- a/BUGS
+++ b/BUGS
@@ -1,5 +1,5 @@
 NOTE: This file is automatically generated from "update-bugs.sh".
-Last updated: 2014-01-18
+Last updated: 2014-01-21
 
 This contains a local list of the bugs that are open against
 libguestfs.  Bugs are tracked in the Red Hat Bugzilla database
@@ -284,12 +284,12 @@ 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
 
+1045033 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1045033
+  LIBVIRT_DEFAULT_URI=qemu:///system breaks libguestfs
+
 1053847 MODIFIED https://bugzilla.redhat.com/show_bug.cgi?id=1053847
   Recommended default clock/timer settings
 
diff --git a/configure.ac b/configure.ac
index 5da7dd2..38440f6 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], [24])
+m4_define([libguestfs_release], [25])
 
 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 231491f..144db4f 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 at redhat.com\n"
-"POT-Creation-Date: 2014-01-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/fedora/language/"
@@ -1212,7 +1212,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1742 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1777 ../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
@@ -1248,8 +1248,8 @@ msgstr "このプログラムは以下を返します:"
 #: ../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-builder.pod:1677 ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1685 ../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:1747 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1782 ../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:1764
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1799
 #: ../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:1766
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1801
 #: ../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:1768 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1803 ../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:1706 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1741 ../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:4606 ../test-tool/libguestfs-test-tool.pod:178
@@ -5415,11 +5415,50 @@ msgstr ""
 
 #. type: =head2
 #: ../builder/virt-builder.pod:1632
+#, fuzzy
+#| msgid "VIRT-CLONE"
+msgid "CLONES"
+msgstr "virt-clone"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1634
+msgid ""
+"If you wish to create many new guests of the same type, it is tempting to "
+"run virt-builder once and then copy the output file.  You should B<not> do "
+"this.  You should run virt-builder once for each new guest you need."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1639
+msgid ""
+"The reason is that each clone needs to have (at least) a separate random "
+"seed, and possibly other unique features (such as filesystem UUIDs) in "
+"future versions of virt-builder."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1643
+msgid ""
+"Another thing you should I<not> do is to boot the guest, then clone the "
+"booted disk image.  The reason is that some guests create unique machine "
+"IDs, SSH host keys and so on at first boot, and you would not want clones to "
+"have duplicate identities."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1648
+#, fuzzy
+#| msgid "See also L<virt-win-reg(1)>."
+msgid "See also: L<virt-sysprep(1)>."
+msgstr "L<virt-win-reg(1)> 参照。"
+
+#. type: =head2
+#: ../builder/virt-builder.pod:1650
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1634
+#: ../builder/virt-builder.pod:1652
 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 "
@@ -5428,7 +5467,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1639
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5439,53 +5478,53 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1647
+#: ../builder/virt-builder.pod:1665
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1649
+#: ../builder/virt-builder.pod:1667
 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:1652
+#: ../builder/virt-builder.pod:1670
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1654
+#: ../builder/virt-builder.pod:1672
 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:1661
+#: ../builder/virt-builder.pod:1679
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1665
+#: ../builder/virt-builder.pod:1683
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1669
+#: ../builder/virt-builder.pod:1687
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1673
+#: ../builder/virt-builder.pod:1691
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1675
+#: ../builder/virt-builder.pod:1693
 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, "
@@ -5493,14 +5532,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1679
+#: ../builder/virt-builder.pod:1697
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1699
 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 "
@@ -5508,123 +5547,152 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1685
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1706
 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:1691
+#: ../builder/virt-builder.pod:1709
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1712 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1714
 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:1699
+#: ../builder/virt-builder.pod:1717
 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 "
-"itself at first boot."
+"Since virt-builder does not know how to give new files a correct label, the "
+"guest templates have an empty file C</.autorelabel> and this causes the "
+"guest to relabel itself at first boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1703
+#: ../builder/virt-builder.pod:1721
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
-"time you use them.  This is normal, and harmless."
+"time you use them.  B<This is normal, and harmless.> However if you want to "
+"perform the relabelling at build time instead of delaying it to the first "
+"boot, you can boot the guest with the qemu I<-no-reboot> option (which means "
+"it will shut down after the relabel is complete without booting \"for real"
+"\").  Only do this if you are sure it is an SELinux guest:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1729
+#, no-wrap
+msgid ""
+" qemu-system-x86_64 \\\n"
+"   -no-reboot \\\n"
+"   -nographic \\\n"
+"   -machine accel=kvm:tcg \\\n"
+"   -cpu host \\\n"
+"   -m 2048 \\\n"
+"   -drive file=disk.img,format=raw,if=virtio \\\n"
+"   -serial stdio\n"
+"\n"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1708
+#: ../builder/virt-builder.pod:1738
+#, fuzzy
+#| msgid ""
+#| "L<https://www.redhat.com/archives/libguestfs/2009-July/msg00023.html>"
+msgid ""
+"(For further information on the topic of SELinux labelling, see: L<https://"
+"www.redhat.com/archives/libguestfs/2014-January/msg00183.html>)"
+msgstr "L<https://www.redhat.com/archives/libguestfs/2009-July/msg00023.html>"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1743
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1713
+#: ../builder/virt-builder.pod:1748
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1715
+#: ../builder/virt-builder.pod:1750
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1717
+#: ../builder/virt-builder.pod:1752
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1719
+#: ../builder/virt-builder.pod:1754
 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:1722
+#: ../builder/virt-builder.pod:1757
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
+#: ../builder/virt-builder.pod:1759 ../builder/virt-builder.pod:1773
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1726
+#: ../builder/virt-builder.pod:1761
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1728
+#: ../builder/virt-builder.pod:1763
 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:1731
+#: ../builder/virt-builder.pod:1766
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1733
+#: ../builder/virt-builder.pod:1768
 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:1736
+#: ../builder/virt-builder.pod:1771
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1744 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1779 ../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
@@ -5635,7 +5703,7 @@ msgid ""
 msgstr "このプログラムは、成功すると 0 を、エラーがあると 0 以外を返します。"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1749
+#: ../builder/virt-builder.pod:1784
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5653,7 +5721,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1770 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1805 ../builder/virt-index-validate.pod:92
 #: ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "Copyright (C) 2013 Red Hat Inc."
diff --git a/po-docs/libguestfs-docs.pot b/po-docs/libguestfs-docs.pot
index ac000a1..7ede091 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.24\n"
+"Project-Id-Version: libguestfs 1.25.25\n"
 "Report-Msgid-Bugs-To: libguestfs at redhat.com\n"
-"POT-Creation-Date: 2014-01-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -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: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  [...]
+#: ../align/virt-alignment-scan.pod:359 ../appliance/libguestfs-make-fixed-appliance.pod:156 ../builder/virt-builder.pod:1777 ../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  [...]
 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:586 ../builder/virt-builder.pod:590 ../builder/virt-b [...]
+#: ../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-b [...]
 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: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:56 [...]
+#: ../align/virt-alignment-scan.pod:393 ../appliance/libguestfs-make-fixed-appliance.pod:166 ../builder/virt-builder.pod:1782 ../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:56 [...]
 msgid "SEE ALSO"
 msgstr ""
 
@@ -849,17 +849,17 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../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 [...]
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1799 ../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 [...]
 msgid "AUTHOR"
 msgstr ""
 
 #. type: textblock
-#: ../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/ [...]
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1801 ../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/ [...]
 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: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:5 [...]
+#: ../align/virt-alignment-scan.pod:406 ../appliance/libguestfs-make-fixed-appliance.pod:179 ../builder/virt-builder.pod:1803 ../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:5 [...]
 msgid "COPYRIGHT"
 msgstr ""
 
@@ -1143,7 +1143,7 @@ msgid ""
 msgstr ""
 
 #. type: =head1
-#: ../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:4606 ../test-tool/libguestfs-test-tool.pod:178
+#: ../appliance/libguestfs-make-fixed-appliance.pod:161 ../builder/virt-builder.pod:1741 ../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:4606 ../test-tool/libguestfs-test-tool.pod:178
 msgid "ENVIRONMENT VARIABLES"
 msgstr ""
 
@@ -4599,12 +4599,47 @@ msgstr ""
 
 #. type: =head2
 #: ../builder/virt-builder.pod:1632
-msgid "PERFORMANCE"
+msgid "CLONES"
 msgstr ""
 
 #. type: textblock
 #: ../builder/virt-builder.pod:1634
 msgid ""
+"If you wish to create many new guests of the same type, it is tempting to "
+"run virt-builder once and then copy the output file.  You should B<not> do "
+"this.  You should run virt-builder once for each new guest you need."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1639
+msgid ""
+"The reason is that each clone needs to have (at least) a separate random "
+"seed, and possibly other unique features (such as filesystem UUIDs) in "
+"future versions of virt-builder."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1643
+msgid ""
+"Another thing you should I<not> do is to boot the guest, then clone the "
+"booted disk image.  The reason is that some guests create unique machine "
+"IDs, SSH host keys and so on at first boot, and you would not want clones to "
+"have duplicate identities."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1648
+msgid "See also: L<virt-sysprep(1)>."
+msgstr ""
+
+#. type: =head2
+#: ../builder/virt-builder.pod:1650
+msgid "PERFORMANCE"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1652
+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 "
 "the I<--cache-all-templates> option.  See L</CACHING> above for further "
@@ -4612,7 +4647,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1639
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -4623,51 +4658,51 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1647
+#: ../builder/virt-builder.pod:1665
 msgid "Using I<--no-sync>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1649
+#: ../builder/virt-builder.pod:1667
 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:1652
+#: ../builder/virt-builder.pod:1670
 msgid "Skipping virt-resize"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1654
+#: ../builder/virt-builder.pod:1672
 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:1661
+#: ../builder/virt-builder.pod:1679
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1665
+#: ../builder/virt-builder.pod:1683
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1669
+#: ../builder/virt-builder.pod:1687
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1673
+#: ../builder/virt-builder.pod:1691
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1675
+#: ../builder/virt-builder.pod:1693
 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, "
@@ -4675,12 +4710,12 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1679
+#: ../builder/virt-builder.pod:1697
 msgid "User-Mode Linux"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1699
 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 "
@@ -4688,128 +4723,154 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1685
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1706
 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:1691
+#: ../builder/virt-builder.pod:1709
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create "
 "raw-format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1712 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1714
 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:1699
+#: ../builder/virt-builder.pod:1717
 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 "
-"itself at first boot."
+"Since virt-builder does not know how to give new files a correct label, the "
+"guest templates have an empty file C</.autorelabel> and this causes the "
+"guest to relabel itself at first boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1703
+#: ../builder/virt-builder.pod:1721
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
-"time you use them.  This is normal, and harmless."
+"time you use them.  B<This is normal, and harmless.> However if you want to "
+"perform the relabelling at build time instead of delaying it to the first "
+"boot, you can boot the guest with the qemu I<-no-reboot> option (which means "
+"it will shut down after the relabel is complete without booting \"for "
+"real\").  Only do this if you are sure it is an SELinux guest:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1729
+#, no-wrap
+msgid ""
+" qemu-system-x86_64 \\\n"
+"   -no-reboot \\\n"
+"   -nographic \\\n"
+"   -machine accel=kvm:tcg \\\n"
+"   -cpu host \\\n"
+"   -m 2048 \\\n"
+"   -drive file=disk.img,format=raw,if=virtio \\\n"
+"   -serial stdio\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1738
+msgid ""
+"(For further information on the topic of SELinux labelling, see: "
+"L<https://www.redhat.com/archives/libguestfs/2014-January/msg00183.html>)"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1708
+#: ../builder/virt-builder.pod:1743
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1713
+#: ../builder/virt-builder.pod:1748
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1715
+#: ../builder/virt-builder.pod:1750
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1717
+#: ../builder/virt-builder.pod:1752
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1719
+#: ../builder/virt-builder.pod:1754
 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:1722
+#: ../builder/virt-builder.pod:1757
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
+#: ../builder/virt-builder.pod:1759 ../builder/virt-builder.pod:1773
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1726
+#: ../builder/virt-builder.pod:1761
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1728
+#: ../builder/virt-builder.pod:1763
 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:1731
+#: ../builder/virt-builder.pod:1766
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1733
+#: ../builder/virt-builder.pod:1768
 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:1736
+#: ../builder/virt-builder.pod:1771
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../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
+#: ../builder/virt-builder.pod:1779 ../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:1749
+#: ../builder/virt-builder.pod:1784
 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)>, "
@@ -4818,7 +4879,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1770 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
+#: ../builder/virt-builder.pod:1805 ../builder/virt-index-validate.pod:92 ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr ""
 
diff --git a/po-docs/uk.po b/po-docs/uk.po
index 8dbfe66..28fbdbe 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 at redhat.com\n"
-"POT-Creation-Date: 2014-01-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-10-17 14:46+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/fedora/"
@@ -1186,7 +1186,7 @@ msgstr ""
 #. type: =head1
 #: ../align/virt-alignment-scan.pod:359
 #: ../appliance/libguestfs-make-fixed-appliance.pod:156
-#: ../builder/virt-builder.pod:1742 ../builder/virt-index-validate.pod:76
+#: ../builder/virt-builder.pod:1777 ../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
@@ -1222,8 +1222,8 @@ msgstr "Ця програма повертає:"
 #: ../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-builder.pod:1677 ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1685 ../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:1747 ../builder/virt-index-validate.pod:81
+#: ../builder/virt-builder.pod:1782 ../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:1764
+#: ../align/virt-alignment-scan.pod:402 ../builder/virt-builder.pod:1799
 #: ../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:1766
+#: ../align/virt-alignment-scan.pod:404 ../builder/virt-builder.pod:1801
 #: ../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:1768 ../builder/virt-index-validate.pod:90
+#: ../builder/virt-builder.pod:1803 ../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:1706 ../edit/virt-edit.pod:337
+#: ../builder/virt-builder.pod:1741 ../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:4606 ../test-tool/libguestfs-test-tool.pod:178
@@ -5381,11 +5381,50 @@ msgstr ""
 
 #. type: =head2
 #: ../builder/virt-builder.pod:1632
+#, fuzzy
+#| msgid "VIRT-CLONE"
+msgid "CLONES"
+msgstr "VIRT-CLONE"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1634
+msgid ""
+"If you wish to create many new guests of the same type, it is tempting to "
+"run virt-builder once and then copy the output file.  You should B<not> do "
+"this.  You should run virt-builder once for each new guest you need."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1639
+msgid ""
+"The reason is that each clone needs to have (at least) a separate random "
+"seed, and possibly other unique features (such as filesystem UUIDs) in "
+"future versions of virt-builder."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1643
+msgid ""
+"Another thing you should I<not> do is to boot the guest, then clone the "
+"booted disk image.  The reason is that some guests create unique machine "
+"IDs, SSH host keys and so on at first boot, and you would not want clones to "
+"have duplicate identities."
+msgstr ""
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1648
+#, fuzzy
+#| msgid "See also L<virt-win-reg(1)>."
+msgid "See also: L<virt-sysprep(1)>."
+msgstr "Див. також L<virt-win-reg(1)>."
+
+#. type: =head2
+#: ../builder/virt-builder.pod:1650
 msgid "PERFORMANCE"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1634
+#: ../builder/virt-builder.pod:1652
 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 "
@@ -5394,7 +5433,7 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1639
+#: ../builder/virt-builder.pod:1657
 msgid ""
 "Packages required for the I<--install> and I<--update> options are "
 "downloaded using the host network connection.  Setting the C<http_proxy>, "
@@ -5405,55 +5444,55 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1647
+#: ../builder/virt-builder.pod:1665
 #, fuzzy
 #| msgid "B<--no-sync>"
 msgid "Using I<--no-sync>"
 msgstr "B<--no-sync>"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1649
+#: ../builder/virt-builder.pod:1667
 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:1652
+#: ../builder/virt-builder.pod:1670
 #, fuzzy
 #| msgid "virt-resize"
 msgid "Skipping virt-resize"
 msgstr "virt-resize"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1654
+#: ../builder/virt-builder.pod:1672
 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:1661
+#: ../builder/virt-builder.pod:1679
 msgid "the output must be a regular file (not a block device), B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1665
+#: ../builder/virt-builder.pod:1683
 msgid "the user did B<not> use the I<--size> option, B<and>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1669
+#: ../builder/virt-builder.pod:1687
 msgid "the output format is the same as the template format (usually raw)."
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1673
+#: ../builder/virt-builder.pod:1691
 msgid "pxzcat"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1675
+#: ../builder/virt-builder.pod:1693
 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, "
@@ -5461,14 +5500,14 @@ msgid ""
 msgstr ""
 
 #. type: =head3
-#: ../builder/virt-builder.pod:1679
+#: ../builder/virt-builder.pod:1697
 #, fuzzy
 #| msgid "set-selinux"
 msgid "User-Mode Linux"
 msgstr "set-selinux"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1681
+#: ../builder/virt-builder.pod:1699
 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 "
@@ -5476,123 +5515,153 @@ msgid ""
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1685
+#: ../builder/virt-builder.pod:1703
 msgid ""
 "To enable the UML backend, read the instructions in L<guestfs(3)/USER-MODE "
 "LINUX BACKEND>."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1688
+#: ../builder/virt-builder.pod:1706
 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:1691
+#: ../builder/virt-builder.pod:1709
 msgid ""
 "The qcow2 output format is not supported by UML.  You can only create raw-"
 "format guests."
 msgstr ""
 
 #. type: =head2
-#: ../builder/virt-builder.pod:1694 ../src/guestfs.pod:479
+#: ../builder/virt-builder.pod:1712 ../src/guestfs.pod:479
 msgid "SELINUX"
 msgstr "SELINUX"
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1696
+#: ../builder/virt-builder.pod:1714
 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:1699
+#: ../builder/virt-builder.pod:1717
 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 "
-"itself at first boot."
+"Since virt-builder does not know how to give new files a correct label, the "
+"guest templates have an empty file C</.autorelabel> and this causes the "
+"guest to relabel itself at first boot."
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1703
+#: ../builder/virt-builder.pod:1721
 msgid ""
 "This usually means that these guests will reboot themselves once the first "
-"time you use them.  This is normal, and harmless."
+"time you use them.  B<This is normal, and harmless.> However if you want to "
+"perform the relabelling at build time instead of delaying it to the first "
+"boot, you can boot the guest with the qemu I<-no-reboot> option (which means "
+"it will shut down after the relabel is complete without booting \"for real"
+"\").  Only do this if you are sure it is an SELinux guest:"
+msgstr ""
+
+#. type: verbatim
+#: ../builder/virt-builder.pod:1729
+#, no-wrap
+msgid ""
+" qemu-system-x86_64 \\\n"
+"   -no-reboot \\\n"
+"   -nographic \\\n"
+"   -machine accel=kvm:tcg \\\n"
+"   -cpu host \\\n"
+"   -m 2048 \\\n"
+"   -drive file=disk.img,format=raw,if=virtio \\\n"
+"   -serial stdio\n"
+"\n"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1708
+#: ../builder/virt-builder.pod:1738
+#, fuzzy
+#| msgid ""
+#| "L<https://www.redhat.com/archives/libguestfs/2012-January/msg00023.html>"
+msgid ""
+"(For further information on the topic of SELinux labelling, see: L<https://"
+"www.redhat.com/archives/libguestfs/2014-January/msg00183.html>)"
+msgstr ""
+"L<https://www.redhat.com/archives/libguestfs/2012-January/msg00023.html>"
+
+#. type: textblock
+#: ../builder/virt-builder.pod:1743
 msgid ""
 "For other environment variables which affect all libguestfs programs, see "
 "L<guestfs(3)/ENVIRONMENT VARIABLES>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1713
+#: ../builder/virt-builder.pod:1748
 msgid "C<http_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1715
+#: ../builder/virt-builder.pod:1750
 msgid "C<https_proxy>"
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1717
+#: ../builder/virt-builder.pod:1752
 msgid "C<no_proxy>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1719
+#: ../builder/virt-builder.pod:1754
 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:1722
+#: ../builder/virt-builder.pod:1757
 msgid "C<HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1724 ../builder/virt-builder.pod:1738
+#: ../builder/virt-builder.pod:1759 ../builder/virt-builder.pod:1773
 msgid "Used to determine the location of the template cache.  See L</CACHING>."
 msgstr ""
 
 #. type: =item
-#: ../builder/virt-builder.pod:1726
+#: ../builder/virt-builder.pod:1761
 msgid "C<VIRT_BUILDER_FINGERPRINT>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1728
+#: ../builder/virt-builder.pod:1763
 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:1731
+#: ../builder/virt-builder.pod:1766
 msgid "C<VIRT_BUILDER_SOURCE>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1733
+#: ../builder/virt-builder.pod:1768
 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:1736
+#: ../builder/virt-builder.pod:1771
 msgid "C<XDG_CACHE_HOME>"
 msgstr ""
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1744 ../cat/virt-cat.pod:246
+#: ../builder/virt-builder.pod:1779 ../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
@@ -5605,7 +5674,7 @@ msgstr ""
 "значення, якщо сталася помилка."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1749
+#: ../builder/virt-builder.pod:1784
 #, fuzzy
 #| msgid ""
 #| "L<guestfs(3)>, L<guestfish(1)>, L<virt-clone(1)>, L<virt-rescue(1)>, "
@@ -5623,7 +5692,7 @@ msgstr ""
 "img(1)>, L<scrub(1)>, L<http://libguestfs.org/>, L<http://libvirt.org/>."
 
 #. type: textblock
-#: ../builder/virt-builder.pod:1770 ../builder/virt-index-validate.pod:92
+#: ../builder/virt-builder.pod:1805 ../builder/virt-index-validate.pod:92
 #: ../fuse/guestunmount.pod:164 ../golang/examples/guestfs-golang.pod:99
 msgid "Copyright (C) 2013 Red Hat Inc."
 msgstr "© Red Hat Inc., 2013"
diff --git a/po/en_GB.po b/po/en_GB.po
index 62f412d..c5bfdd6 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6653,34 +6659,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6690,21 +6696,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6719,49 +6725,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index f6b5218..e7d13bf 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Spanish <trans-es at lists.fedoraproject.org>\n"
@@ -569,8 +569,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -602,28 +602,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -679,15 +679,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -700,21 +700,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -740,11 +740,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -915,7 +915,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -949,12 +949,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -992,7 +992,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1067,11 +1067,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1079,13 +1079,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1096,21 +1096,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1156,63 +1156,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1220,101 +1220,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1325,7 +1325,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1347,7 +1347,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1373,7 +1373,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1387,7 +1387,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1411,7 +1411,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1531,7 +1531,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1550,7 +1550,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1578,7 +1578,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1593,7 +1593,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1662,7 +1662,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1688,7 +1688,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1702,7 +1702,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1713,7 +1713,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1721,7 +1721,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1733,7 +1733,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1753,14 +1753,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1772,7 +1772,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1781,7 +1781,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1790,7 +1790,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1826,7 +1826,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1850,7 +1850,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1886,7 +1886,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1941,7 +1941,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1956,7 +1956,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1999,7 +1999,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2024,7 +2024,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2036,38 +2036,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2075,7 +2075,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2091,23 +2091,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2174,21 +2174,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2196,12 +2202,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2209,11 +2215,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2221,31 +2227,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6779,35 +6785,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "antes de guestfs_launch, debe llamar guestfs_add_drive"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu ha sido iniciado y contactado el demonio, pero es estado es != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6817,21 +6823,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6846,49 +6852,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 2377dc7..5a25edc 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Gujarati <trans-gu at lists.fedoraproject.org>\n"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6612,34 +6618,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "તમારે guestfs_launch પહેલાં guestfs_add_drive ને કોલ કરવુ જ જોઇએ"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu શરૂ થયેલ છે, ડિમનનો સંપર્ક થયેલ છે, પરંતુ state != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6649,21 +6655,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6678,49 +6684,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/hi.po b/po/hi.po
index c433481..bf07cea 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Hindi <indlinux-hindi at lists.sourceforge.net>\n"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6610,34 +6616,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6647,21 +6653,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6676,49 +6682,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/kn.po b/po/kn.po
index 8be7513..1e1db6e 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/fedora/language/"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6615,34 +6621,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ನೀವು guestfs_launch ನ ಮೊದಲು guestfs_add_drive ಅನ್ನು ಕರೆಯಬೇಕು"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ಆರಂಭಗೊಂಡಿದೆ ಹಾಗು ಡೀಮನ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿದೆ, ಆದರೆ != READY ಸ್ಥಿತಿಯಲ್ಲಿದೆ"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6652,21 +6658,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6681,49 +6687,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/libguestfs.pot b/po/libguestfs.pot
index 4876645..2464afe 100644
--- a/po/libguestfs.pot
+++ b/po/libguestfs.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: libguestfs 1.25.24\n"
+"Project-Id-Version: libguestfs 1.25.25\n"
 "Report-Msgid-Bugs-To: https://bugzilla.redhat.com/enter_bug.cgi?"
 "component=libguestfs&product=Virtualization+Tools\n"
-"POT-Creation-Date: 2014-01-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -567,8 +567,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -600,28 +600,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -677,15 +677,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -698,21 +698,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -738,11 +738,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -913,7 +913,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -947,12 +947,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1065,11 +1065,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1077,13 +1077,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1094,21 +1094,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1154,63 +1154,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1218,101 +1218,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1323,7 +1323,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1371,7 +1371,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1385,7 +1385,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1409,7 +1409,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1529,7 +1529,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1548,7 +1548,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1591,7 +1591,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1660,7 +1660,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1686,7 +1686,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1700,7 +1700,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1711,7 +1711,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1719,7 +1719,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1731,7 +1731,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1751,14 +1751,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1770,7 +1770,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1779,7 +1779,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1788,7 +1788,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1824,7 +1824,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1848,7 +1848,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1884,7 +1884,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1939,7 +1939,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1954,7 +1954,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1997,7 +1997,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2022,7 +2022,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2034,38 +2034,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2089,23 +2089,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2172,21 +2172,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2194,12 +2200,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2207,11 +2213,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2219,31 +2225,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6601,34 +6607,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr ""
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6638,21 +6644,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6667,49 +6673,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/ml.po b/po/ml.po
index 0d25d2c..a344bd2 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Malayalam <discuss at lists.smc.org.in>\n"
@@ -567,8 +567,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -600,28 +600,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -677,15 +677,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -698,21 +698,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -738,11 +738,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -913,7 +913,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -947,12 +947,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1065,11 +1065,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1077,13 +1077,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1094,21 +1094,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1154,63 +1154,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1218,101 +1218,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1323,7 +1323,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1371,7 +1371,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1385,7 +1385,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1409,7 +1409,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1529,7 +1529,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1548,7 +1548,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1591,7 +1591,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1660,7 +1660,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1686,7 +1686,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1700,7 +1700,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1711,7 +1711,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1719,7 +1719,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1731,7 +1731,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1751,14 +1751,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1770,7 +1770,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1779,7 +1779,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1788,7 +1788,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1824,7 +1824,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1848,7 +1848,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1884,7 +1884,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1939,7 +1939,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1954,7 +1954,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1997,7 +1997,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2022,7 +2022,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2034,38 +2034,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2089,23 +2089,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2172,21 +2172,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2194,12 +2200,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2207,11 +2213,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2219,31 +2225,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6612,34 +6618,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launch-നു് മുമ്പു് guestfs_add_drive വിളിക്കേണ്ടതു്"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu വിന്യസിച്ചു് ഡെമണുമായി ബന്ധപ്പെട്ടു, പക്ഷേ state != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6649,21 +6655,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6678,49 +6684,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/mr.po b/po/mr.po
index 4cf055c..0ade0f9 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Marathi (http://www.transifex.com/projects/p/fedora/language/"
@@ -569,8 +569,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -602,28 +602,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -679,15 +679,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -700,21 +700,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -728,7 +728,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -740,11 +740,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -915,7 +915,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -949,12 +949,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -992,7 +992,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1059,7 +1059,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1067,11 +1067,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1079,13 +1079,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1096,21 +1096,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1156,63 +1156,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1220,101 +1220,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1325,7 +1325,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1347,7 +1347,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1373,7 +1373,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1387,7 +1387,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1411,7 +1411,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1531,7 +1531,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1550,7 +1550,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1578,7 +1578,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1593,7 +1593,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1662,7 +1662,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1688,7 +1688,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1702,7 +1702,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1713,7 +1713,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1721,7 +1721,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1733,7 +1733,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1753,14 +1753,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1772,7 +1772,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1781,7 +1781,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1790,7 +1790,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1826,7 +1826,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1850,7 +1850,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1886,7 +1886,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1941,7 +1941,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1956,7 +1956,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1999,7 +1999,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2024,7 +2024,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2036,38 +2036,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2075,7 +2075,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2091,23 +2091,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2174,21 +2174,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2196,12 +2202,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2209,11 +2215,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2221,31 +2227,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6699,34 +6705,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_add_drive यांस guestfs_launch च्या अगोदर कॉल करा"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu सुरू झाले व डिमन सुरू केले, परंतु state != READY आढळले"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6736,21 +6742,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6765,49 +6771,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 4c5b459..325f23a 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/fedora/language/"
@@ -619,8 +619,8 @@ msgstr "--expand optie wordt tweemaal opgegeven"
 msgid "--shrink option given twice"
 msgstr "--shrink optie wordt tweemaal opgegeven"
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -652,30 +652,30 @@ msgstr "Richt eerste partitie uit (standaard: auto)"
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr "Verander LVM2 PV en VG UUID's"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr "Verander de hostnaam van een gast"
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 "Verander de hostnaam.  Als deze niet opgegeven wordt, wordt het C<localhost."
 "localdomain>."
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -737,15 +737,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -758,21 +758,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -786,7 +786,7 @@ msgstr "Debug GC en geheugen toewijzingen"
 msgid "Debug GC and memory allocations (internal)"
 msgstr "Debug GC en geheugen toewijzingen (intern)"
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -798,11 +798,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Verwijder partitie"
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -988,7 +988,7 @@ msgstr ""
 "\n"
 "De onderliggende fout was: %s"
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -1028,12 +1028,12 @@ msgstr ""
 "Eerste NTFS partitie boot record wordt gerepareerd...\n"
 "%!"
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr "Markeer het systeem voor opnieuw configureren"
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -1073,7 +1073,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr "Genereer random seed voor gast"
 
@@ -1140,7 +1140,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr "Aankoppel punt op host"
 
@@ -1148,11 +1148,11 @@ msgstr "Aankoppel punt op host"
 msgid "Never do SELinux relabel"
 msgstr "Voer nooit een SELinux relabel uit"
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr "Nieuwe hostnaam"
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1160,7 +1160,7 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
@@ -1168,7 +1168,7 @@ msgstr ""
 "Merk op dat dit gebruikersinterventie kan vereisen als de\n"
 "gast opgestart is."
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1179,7 +1179,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
@@ -1190,7 +1190,7 @@ msgstr ""
 "worden nieuwe willekeurige UUID's aangemaakt en toegekend aan die PV's en "
 "VG's."
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1200,7 +1200,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1246,39 +1246,39 @@ msgstr "Stille output"
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr "Lees virt-sysprep(1) man pagina voor verdere informatie.\n"
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr "Verwijder \".ssh\" mappen op de gast"
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr "Verwijder CA certificaten in de gast"
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr "Verwijder DHCP cliënt leases"
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr "Verwijder DHCP server leases"
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr "Verwijder Dovecot (mail server) data"
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr "Verwijder HOSTNAME in netwerkinterface configuratie"
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr "Verwijder HWADDR (hard-coded MAC adres) configuratie"
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr "Verwijder Kerberos data in de gast"
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
@@ -1286,25 +1286,25 @@ msgstr ""
 "Verwijder alle gebruikersaccounts en hun persoonlijke mappen.\n"
 "Het \"root\" account wordt niet verwijderd."
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr "Verwijder blkid tab in de gast"
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr "Verwijder email uit de lokale mail spool map"
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr "Verwijder veel log bestanden van de gast"
 
@@ -1312,11 +1312,11 @@ msgstr "Verwijder veel log bestanden van de gast"
 msgid "Remove package manager cache"
 msgstr "Verwijder pakketmanager cache"
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
@@ -1324,23 +1324,23 @@ msgstr ""
 "Verwijder de C<.ssh> map van gebruiker \"root\" en alle andere\n"
 "gebruikers die een C<.ssh> map in hun persoonlijke map hebben."
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr "Verwijder de PAM data in de gast"
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr "Verwijder de RHN systeem ID"
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr "Verwijder de SSH host sleutels op de gast"
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr "Verwijder de Smolt hardware UUID"
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
@@ -1348,15 +1348,15 @@ msgstr ""
 "Verwijder de automatisch gegenereerde ABRT crash data in\n"
 "C</var/spool/abrt/>."
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr "Verwijder de automatisch aangemaakte kdump kernel crash data."
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr "Verwijder de bash geschiedenis op de gast"
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
@@ -1365,55 +1365,55 @@ msgstr ""
 "gebruikers\n"
 "die een C<.bash_history> bestand in hun persoonlijke map hebben."
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr "Verwijder de crash data aangemaakt door ABRT"
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr "Verwijder de crash data aangemaakt door kexec-tools"
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr "Verwijder de data en log bestanden van puppet"
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr "Verwijder de database en log bestanden van Samba"
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr "Verwijder de database en log bestanden van sssd"
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr "Verwijder de lokale machine ID"
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr "Verwijder de procesaccount logbestanden"
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr "Verwijder de gebruikersaccounts op de gast"
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr "Verwijder het utmp bestand"
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr "Verwijder de yum UUID"
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr "Verwijder udev persistente net regels"
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1434,7 +1434,7 @@ msgstr ""
 "meestal\n"
 "ongewenst.  Het verwijderen van de udev persistente net regels voorkomt dit."
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr "Verwijder at-jobs en cron-jobs van gebruiker"
 
@@ -1459,7 +1459,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr "Voer willekeurige scrips voor de gast uit"
 
@@ -1487,7 +1487,7 @@ msgstr ""
 "Voer script(s) zodra de gast de volgende keer opstart uit.  Je kunt de\n"
 "I<--firstboot> optie zo vaak opgegeven als nodig is."
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1501,7 +1501,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr "Script of programma welke op de gast uitgevoerd moet worden"
 
@@ -1525,7 +1525,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1645,7 +1645,7 @@ msgstr "Stel partitie uitlijning in (standaard: 128 sectors)"
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1664,7 +1664,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1692,7 +1692,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1707,7 +1707,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1781,7 +1781,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1832,7 +1832,7 @@ msgstr ""
 "van de gast draaien als het voor de eerste keer opstart).\n"
 "I<--script> scripts draaien op de host, niet op dee gast."
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1856,7 +1856,7 @@ msgstr ""
 " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1867,7 +1867,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1881,7 +1881,7 @@ msgstr ""
 "zonder toestand wordt het optioneel gegenereerd bij het opstarten als deze\n"
 "niet aanwezig is."
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1893,7 +1893,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1918,7 +1918,7 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr "Er is een overschot van %s."
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
@@ -1931,7 +1931,7 @@ msgstr ""
 "van de schijf van de virtuele machine, maar in oudere distributies werd het "
 "opgeslagen op de schijf."
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1943,7 +1943,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1958,7 +1958,7 @@ msgstr ""
 "veranderd\n"
 "naar C<localhost.localdomain>."
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1967,7 +1967,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -2003,7 +2003,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -2035,7 +2035,7 @@ msgstr ""
 "Je kunt --shrink niet gebruiken als er geen tekort is (zie 'deficit' in de "
 "virt-resize(1) man pagina)."
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -2076,7 +2076,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr "kan input schijfformaat niet detecteren; gebruik de --format parameter"
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr "dir"
 
@@ -2131,7 +2131,7 @@ msgstr "formaat"
 msgid "fs"
 msgstr "bs"
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr "hostnaam"
 
@@ -2148,7 +2148,7 @@ msgstr ""
 msgid "lv"
 msgstr "lv"
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -2193,7 +2193,7 @@ msgstr "part"
 msgid "part=size"
 msgstr "part=grootte"
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2218,7 +2218,7 @@ msgid "run script once next time guest boots"
 msgstr "voer script uit zodra gasten de volgende keer opstarten"
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr "script"
 
@@ -2230,33 +2230,33 @@ msgstr "script mislukte"
 msgid "sectors"
 msgstr "sectoren"
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr "sysprep bewerking faalde: %s\n"
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr "sysprep bewerking faalde: uitzondering: %s\n"
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 "sysprep bewerking faalde: interne fout: Not_found uitzondering trad op\n"
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
@@ -2264,7 +2264,7 @@ msgstr ""
 "sysprep bewerking faalde: interne fout: stelling faalde op %s, regel %d, "
 "karakter %d\n"
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr "sysprep bewerking faalde: interne fout: ongeldig argument: %s\n"
 
@@ -2272,7 +2272,7 @@ msgstr "sysprep bewerking faalde: interne fout: ongeldig argument: %s\n"
 msgid "the source disk has no partitions"
 msgstr "de bron schijf heeft geen partities"
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2288,23 +2288,23 @@ msgstr "uri"
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr "gebruik is: %s [--opties] indisk outdisk"
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2371,21 +2371,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2393,12 +2399,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2406,11 +2412,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr "virt-sysprep: --scriptdir kan slechts een keer gebruikt worden\n"
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr "virt-sysprep: POD voor %s mag niet op een nieuwe regel eindigen\n"
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2418,33 +2424,33 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr "virt-sysprep: niet toegestaan karakter (%c) in bewerkingsnaam\n"
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr "virt-sysprep: bewerkingsnaam (%s) dubbel gebruikt\n"
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 "virt-sysprep: koptekst voor %s mag niet eindigen op een nieuwe regel of "
 "punt\n"
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr "virt-sysprep: bewerking %s heeft geen POD\n"
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr "virt-sysprep: bewerking %s heeft geen koptekst\n"
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr "virt-sysprep: bewerkingsnaam is een lege string\n"
 
@@ -7060,35 +7066,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "je moet guestfs_add_drive aanroepen voor guestfs_launch"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu gelanceerd en contact opgenomen met daemon, maar toestand != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, 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
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "kon niet verbinden met libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr "kon libvirt mogelijkheden niet verkrijgen"
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7098,21 +7104,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7127,49 +7133,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr "kon libvirt domein niet vernietigen"
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: interne fout bij formuleren van foutboodschap"
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr "kon schijf niet koppelen aan libvirt domein"
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr "kon schijf niet loskoppelen van libvirt domein"
 
diff --git a/po/or.po b/po/or.po
index 4687b2e..2b7d3a1 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Oriya (http://www.transifex.com/projects/p/fedora/language/"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6611,34 +6617,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "ଆପଣ ନିଶ୍ଚିତ ଭାବରେ guestfs_add_drive କୁ guestfs_launch ପୂର୍ବରୁ ଡାକିବା ଉଚିତ"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ଆରମ୍ଭ ହୋଇଛି ଏବଂ ଡେମନ ସହିତ ଯୋଗାଯୋଗ ଆରମ୍ଭ କରିଛି, କିନ୍ତୁ ଅବସ୍ଥା != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6648,21 +6654,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6677,49 +6683,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/pa.po b/po/pa.po
index 8202d51..6ffe930 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Panjabi (Punjabi) <punjabi-users at lists.sf.net>\n"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6695,34 +6701,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "you must call guestfs_add_drive before guestfs_launch"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu launched and contacted daemon, but state != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6732,21 +6738,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6761,49 +6767,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index b26415c..3bc9bdb 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Polish <trans-pl at lists.fedoraproject.org>\n"
@@ -572,8 +572,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -605,28 +605,28 @@ msgstr "Wyrównaj pierwszą partycję (domyślnie: automatycznie)"
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -684,15 +684,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -705,21 +705,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -733,7 +733,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -745,11 +745,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Usuwa partycję"
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -924,7 +924,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -960,12 +960,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -1003,7 +1003,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1070,7 +1070,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1078,11 +1078,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1090,13 +1090,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1107,21 +1107,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1169,63 +1169,63 @@ msgstr ""
 "Proszę przeczytać stronę podręcznika virt-sysprep(1), aby uzyskać więcej "
 "informacji.\n"
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr "Usuwa katalogi \".ssh\" gościa"
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr "Usuwa dzierżawy klienta DHCP"
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr "Usuwa dzierżawy serwera DHCP"
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr "Usuwa dane (serwera pocztowego) Dovecot"
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1233,101 +1233,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr "Usuwa historię powłoki bash gościa"
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr "Usuwa plik utmp"
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1338,7 +1338,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1360,7 +1360,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1386,7 +1386,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1400,7 +1400,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1424,7 +1424,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1544,7 +1544,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1563,7 +1563,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1591,7 +1591,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1606,7 +1606,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1675,7 +1675,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1715,7 +1715,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1726,7 +1726,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1734,7 +1734,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1746,7 +1746,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1766,14 +1766,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1785,7 +1785,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1794,7 +1794,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1803,7 +1803,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1839,7 +1839,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1863,7 +1863,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1901,7 +1901,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1956,7 +1956,7 @@ msgstr "format"
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1971,7 +1971,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -2014,7 +2014,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2039,7 +2039,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr "skrypt"
 
@@ -2051,38 +2051,38 @@ msgstr ""
 msgid "sectors"
 msgstr "sektory"
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2090,7 +2090,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2106,23 +2106,23 @@ msgstr "uri"
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2189,21 +2189,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2211,12 +2217,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2224,11 +2230,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2236,31 +2242,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6896,35 +6902,35 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "należy wywołać guestfs_add_drive przed guestfs_launch"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "QEMU zostało uruchomione i skontaktowano się z demonem, ale stan != GOTOWY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6934,21 +6940,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6963,49 +6969,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr "niemożna dołączyć dysku do domeny biblioteki libvirt"
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr "nie można odłączyć dysku od domeny biblioteki libvirt"
 
diff --git a/po/ta.po b/po/ta.po
index ebdd7bc..2483403 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Tamil <tamil-users at lists.fedoraproject.org>\n"
@@ -567,8 +567,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -600,28 +600,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -677,15 +677,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -698,21 +698,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -726,7 +726,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -738,11 +738,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -913,7 +913,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -947,12 +947,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -990,7 +990,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1057,7 +1057,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1065,11 +1065,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1077,13 +1077,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1094,21 +1094,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1154,63 +1154,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1218,101 +1218,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1323,7 +1323,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1345,7 +1345,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1371,7 +1371,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1385,7 +1385,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1409,7 +1409,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1529,7 +1529,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1548,7 +1548,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1576,7 +1576,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1591,7 +1591,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1660,7 +1660,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1686,7 +1686,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1700,7 +1700,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1711,7 +1711,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1719,7 +1719,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1731,7 +1731,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1751,14 +1751,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1770,7 +1770,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1779,7 +1779,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1788,7 +1788,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1824,7 +1824,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1848,7 +1848,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1884,7 +1884,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1939,7 +1939,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1954,7 +1954,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1997,7 +1997,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2022,7 +2022,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2034,38 +2034,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2089,23 +2089,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2172,21 +2172,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2194,12 +2200,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2207,11 +2213,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2219,31 +2225,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6611,34 +6617,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "நீங்கள் guestfs_add_drive ஐ guestfs_launchக்கு முன் அழைக்க வேண்டும்"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu டொமைனுடன் துவக்கப்பட்டு தொடர்பு கொண்டது, ஆனால் நிலையானது != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6648,21 +6654,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6677,49 +6683,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/te.po b/po/te.po
index cb0b4f6..2e08460 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Telugu (http://www.transifex.com/projects/p/fedora/language/"
@@ -568,8 +568,8 @@ msgstr ""
 msgid "--shrink option given twice"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -601,28 +601,28 @@ msgstr ""
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -678,15 +678,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -699,21 +699,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -727,7 +727,7 @@ msgstr ""
 msgid "Debug GC and memory allocations (internal)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -739,11 +739,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -914,7 +914,7 @@ msgid ""
 "The underlying error was: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -948,12 +948,12 @@ msgid ""
 "%!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr ""
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -991,7 +991,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr ""
 
@@ -1058,7 +1058,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr ""
 
@@ -1066,11 +1066,11 @@ msgstr ""
 msgid "Never do SELinux relabel"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1078,13 +1078,13 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1095,21 +1095,21 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
 "new random UUIDs are generated and assigned to those PVs and VGs."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
 "%s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1155,63 +1155,63 @@ msgstr ""
 msgid "Read virt-sysprep(1) man page for further information.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr ""
 
@@ -1219,101 +1219,101 @@ msgstr ""
 msgid "Remove package manager cache"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1324,7 +1324,7 @@ msgid ""
 "undesirable.  Erasing the udev persistent net rules avoids this."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr ""
 
@@ -1346,7 +1346,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr ""
 
@@ -1372,7 +1372,7 @@ msgid ""
 "the I<--firstboot> option as many times as needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1386,7 +1386,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr ""
 
@@ -1410,7 +1410,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1530,7 +1530,7 @@ msgstr ""
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1549,7 +1549,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1577,7 +1577,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1592,7 +1592,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1661,7 +1661,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1687,7 +1687,7 @@ msgid ""
 "I<--script> scripts run on the host, not in the guest."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1701,7 +1701,7 @@ msgid ""
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1712,7 +1712,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1720,7 +1720,7 @@ msgid ""
 "found to be empty."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1732,7 +1732,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1752,14 +1752,14 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
 "virtual machine's disk, but it was stored on disk in older distros."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1771,7 +1771,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1780,7 +1780,7 @@ msgid ""
 "to C<localhost.localdomain>."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1789,7 +1789,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -1825,7 +1825,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -1849,7 +1849,7 @@ msgid ""
 "resize(1) man page)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -1885,7 +1885,7 @@ msgstr ""
 msgid "cannot detect input disk format; use the --format parameter"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "fs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr ""
 
@@ -1955,7 +1955,7 @@ msgstr ""
 msgid "lv"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -1998,7 +1998,7 @@ msgstr ""
 msgid "part=size"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2023,7 +2023,7 @@ msgid "run script once next time guest boots"
 msgstr ""
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr ""
 
@@ -2035,38 +2035,38 @@ msgstr ""
 msgid "sectors"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr ""
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
 msgstr ""
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 
@@ -2074,7 +2074,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2090,23 +2090,23 @@ msgstr ""
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr ""
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2173,21 +2173,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2195,12 +2201,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2208,11 +2214,11 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2220,31 +2226,31 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr ""
 
@@ -6609,34 +6615,34 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "guestfs_launchకు ముందుగా మీరు guestfs_add_driveను పిలువవలెను"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr "qemu ఆరంభించబడింది మరియు డెమోన్‌ను సంప్రదించింది, అయితే state != READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr ""
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, c-format
 msgid "you must have libvirt >= %d.%d.%d to use the 'libvirt' backend"
 msgstr ""
 
-#: src/launch-libvirt.c:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr ""
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr ""
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -6646,21 +6652,21 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr ""
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -6675,49 +6681,49 @@ msgid ""
 "For further help, read the guestfs(3) man page and libguestfs FAQ."
 msgstr ""
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr ""
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
 msgstr ""
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 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:1373
+#: src/launch-libvirt.c:1374
 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:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr ""
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr ""
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 1296093..cbdb067 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-18 21:37+0000\n"
+"POT-Creation-Date: 2014-01-21 18:36+0000\n"
 "PO-Revision-Date: 2013-08-06 13:32+0000\n"
 "Last-Translator: rjones <rjones at redhat.com>\n"
 "Language-Team: Ukrainian <trans-uk at lists.fedoraproject.org>\n"
@@ -620,8 +620,8 @@ msgstr "параметр --expand вказано двічі"
 msgid "--shrink option given twice"
 msgstr "параметр --shrink вказано двічі"
 
-#. ../sysprep/sysprep_operation_password.ml:102
-#: ../sysprep/sysprep_operation_password.ml:109
+#. ../sysprep/sysprep_operation_password.ml:101
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "..."
 msgstr ""
 
@@ -654,30 +654,30 @@ msgstr "Вирівняти перший розділ (типове значен
 msgid "Attach data disk/ISO during install"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:44
 msgid "Change LVM2 PV and VG UUIDs"
 msgstr "Змінити UUID ФТ і ГТ LVM2"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:47
+#: ../sysprep/sysprep_operation_fs_uuids.ml:46
 msgid "Change filesystem UUIDs"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:39
+#: ../sysprep/sysprep_operation_timezone.ml:40
 msgid "Change the default timezone of the guest"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:36
+#: ../sysprep/sysprep_operation_hostname.ml:37
 msgid "Change the hostname of the guest"
 msgstr "Змінити назву вузла гостьової системи"
 
-#: ../sysprep/sysprep_operation_hostname.ml:51
+#: ../sysprep/sysprep_operation_hostname.ml:52
 msgid ""
 "Change the hostname.  If not given, defaults to C<localhost.localdomain>."
 msgstr ""
 "Зміни назву вузла. Якщо не вказано, використовувати типове C<localhost."
 "localdomain>."
 
-#: ../sysprep/sysprep_operation_timezone.ml:58
+#: ../sysprep/sysprep_operation_timezone.ml:59
 msgid "Change the timezone.  Use a location string such as C<Europe/London>"
 msgstr ""
 
@@ -739,15 +739,15 @@ msgstr ""
 msgid "Create symbolic links"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:45
+#: ../sysprep/sysprep_operation_hostname.ml:46
 msgid "Currently this can only set the hostname on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_timezone.ml:51
+#: ../sysprep/sysprep_operation_timezone.ml:52
 msgid "Currently this can only set the timezone on Linux guests."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_user_account.ml:69
+#: ../sysprep/sysprep_operation_user_account.ml:67
 msgid ""
 "Currently this does not remove the user accounts from\n"
 "C</etc/shadow>.  This is because there is no lens for\n"
@@ -760,21 +760,21 @@ msgid ""
 "either SysVinit-style scripts, Upstart or systemd."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_bash_history.ml:44
+#: ../sysprep/sysprep_operation_bash_history.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the bash history removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:44
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:42
 msgid ""
 "Currently this only looks in C</root> and C</home/*> for\n"
 "home directories, so users with home directories in other\n"
 "locations won't have the ssh files removed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:97
+#: ../sysprep/sysprep_operation_password.ml:96
 msgid ""
 "Currently this only works for glibc-based Linux guests that\n"
 "use shadow passwords."
@@ -788,7 +788,7 @@ msgstr "Діагностика GC та розподілу пам’яті"
 msgid "Debug GC and memory allocations (internal)"
 msgstr "Діагностика GC та розподілу пам’яті (внутрішня)"
 
-#: ../sysprep/sysprep_operation_delete.ml:52
+#: ../sysprep/sysprep_operation_delete.ml:51
 msgid "Delete (recursively) the specified C<PATHNAME> in the guest."
 msgstr ""
 
@@ -800,11 +800,11 @@ msgstr ""
 msgid "Delete partition"
 msgstr "Вилучити розділ"
 
-#: ../sysprep/sysprep_operation_delete.ml:39
+#: ../sysprep/sysprep_operation_delete.ml:38
 msgid "Delete specified files or directories"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_delete.ml:40
+#: ../sysprep/sysprep_operation_delete.ml:39
 msgid ""
 "Delete specified files or directories.\n"
 "\n"
@@ -990,7 +990,7 @@ msgstr ""
 "\n"
 "Повідомлення про помилку: %s"
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "File or directory to be removed on guest"
 msgstr ""
 
@@ -1030,12 +1030,12 @@ msgstr ""
 "Виправлення завантажувального запису першого розділу NTFS…\n"
 "%!"
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:35
 msgid "Flag the system for reconfiguration"
 msgstr "Позначити систему для зміни налаштувань"
 
-#. ../sysprep/sysprep_operation_net_hostname.ml:51
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:51
+#. ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
 msgid ""
 "For Fedora and Red Hat Enterprise Linux,\n"
 "this is removed from C<ifcfg-*> files."
@@ -1077,7 +1077,7 @@ msgstr ""
 msgid "Full name:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:33
+#: ../sysprep/sysprep_operation_random_seed.ml:34
 msgid "Generate random seed for guest"
 msgstr "Створити породжувач випадкових чисел для гостьової системи"
 
@@ -1144,7 +1144,7 @@ msgstr ""
 msgid "Minimum/default size:"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "Mount point on host"
 msgstr "Точка монтування у основній системі"
 
@@ -1152,11 +1152,11 @@ msgstr "Точка монтування у основній системі"
 msgid "Never do SELinux relabel"
 msgstr "Ніколи не виконувати зміни міток SELinux"
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "New hostname"
 msgstr "Нова назва вузла"
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "New timezone"
 msgstr ""
 
@@ -1164,7 +1164,7 @@ msgstr ""
 msgid "No progress messages"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:37
+#: ../sysprep/sysprep_operation_flag_reconfiguration.ml:36
 msgid ""
 "Note that this may require user intervention when the\n"
 "guest is booted."
@@ -1172,7 +1172,7 @@ msgstr ""
 "Зауважте, що це може потребувати втручання користувача під\n"
 "час завантаження гостьової системи."
 
-#: ../sysprep/sysprep_operation.ml:203
+#: ../sysprep/sysprep_operation.ml:210
 msgid "Notes on %s"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_lvm_uuids.ml:46
+#: ../sysprep/sysprep_operation_lvm_uuids.ml:45
 msgid ""
 "On Linux guests that have LVM2 physical volumes (PVs) or volume groups "
 "(VGs),\n"
@@ -1193,7 +1193,7 @@ msgstr ""
 "(ГТ) LVM2\n"
 "для ФТ і ГТ буде створено і призначено випадкові UUID."
 
-#: ../sysprep/sysprep_operation_logfiles.ml:117
+#: ../sysprep/sysprep_operation_logfiles.ml:116
 msgid ""
 "On Linux the following files are removed:\n"
 "\n"
@@ -1203,7 +1203,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:48
+#: ../sysprep/sysprep_operation_fs_uuids.ml:47
 msgid ""
 "On guests and filesystem types where this is supported,\n"
 "new random UUIDs are generated and assigned to filesystems."
@@ -1251,39 +1251,39 @@ msgstr ""
 "Ознайомтеся зі сторінкою підручника (man) virt-sysprep(1), щоб дізнатися "
 "більше.\n"
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:40
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:38
 msgid "Remove \".ssh\" directories in the guest"
 msgstr "Вилучити каталоги «.ssh» у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_ca_certificates.ml:54
+#: ../sysprep/sysprep_operation_ca_certificates.ml:51
 msgid "Remove CA certificates in the guest"
 msgstr "Вилучити сертифікати CA у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_dhcp_client_state.ml:37
+#: ../sysprep/sysprep_operation_dhcp_client_state.ml:36
 msgid "Remove DHCP client leases"
 msgstr "Вилучити надані клієнтські адреси DHCP"
 
-#: ../sysprep/sysprep_operation_dhcp_server_state.ml:32
+#: ../sysprep/sysprep_operation_dhcp_server_state.ml:31
 msgid "Remove DHCP server leases"
 msgstr "Вилучити надані серверні адреси DHCP"
 
-#: ../sysprep/sysprep_operation_dovecot_data.ml:39
+#: ../sysprep/sysprep_operation_dovecot_data.ml:37
 msgid "Remove Dovecot (mail server) data"
 msgstr "Вилучити дані Dovecot (поштового сервера)"
 
-#: ../sysprep/sysprep_operation_net_hostname.ml:50
+#: ../sysprep/sysprep_operation_net_hostname.ml:49
 msgid "Remove HOSTNAME in network interface configuration"
 msgstr "Вилучити HOSTNAME у налаштуваннях інтерфейсу мережі"
 
-#: ../sysprep/sysprep_operation_net_hwaddr.ml:50
+#: ../sysprep/sysprep_operation_net_hwaddr.ml:49
 msgid "Remove HWADDR (hard-coded MAC address) configuration"
 msgstr "Вилучити налаштування HWADDR (апаратної адреси MAC)"
 
-#: ../sysprep/sysprep_operation_kerberos_data.ml:47
+#: ../sysprep/sysprep_operation_kerberos_data.ml:44
 msgid "Remove Kerberos data in the guest"
 msgstr "Вилучити дані Kerberos у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_user_account.ml:66
+#: ../sysprep/sysprep_operation_user_account.ml:64
 msgid ""
 "Remove all the user accounts and their home directories.\n"
 "The \"root\" account is not removed."
@@ -1291,25 +1291,25 @@ msgstr ""
 "Вилучити всі облікові записи користувачів та відповідні домашні каталоги.\n"
 "Обліковий запис «root» вилучено не буде."
 
-#: ../sysprep/sysprep_operation_blkid_tab.ml:50
+#: ../sysprep/sysprep_operation_blkid_tab.ml:47
 msgid "Remove blkid tab in the guest"
 msgstr "Вилучити вкладку ідентифікаторів блоків у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_mail_spool.ml:37
+#: ../sysprep/sysprep_operation_mail_spool.ml:36
 msgid "Remove email from the local mail spool directory"
 msgstr "Вилучити поштове повідомлення з локального каталогу поштового буфера"
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:41
+#: ../sysprep/sysprep_operation_rpm_db.ml:39
 msgid "Remove host-specific RPM database files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_rpm_db.ml:42
+#: ../sysprep/sysprep_operation_rpm_db.ml:40
 msgid ""
 "Remove host-specific RPM database files and locks.  RPM will\n"
 "recreate these files automatically if needed."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_logfiles.ml:115
+#: ../sysprep/sysprep_operation_logfiles.ml:114
 msgid "Remove many log files from the guest"
 msgstr "Вилучити з гостьової системи багато файлів журналів"
 
@@ -1317,11 +1317,11 @@ msgstr "Вилучити з гостьової системи багато фа
 msgid "Remove package manager cache"
 msgstr "Вилучити кеш керування пакунками"
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:46
+#: ../sysprep/sysprep_operation_tmp_files.ml:43
 msgid "Remove temporary files"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_ssh_userdir.ml:41
+#: ../sysprep/sysprep_operation_ssh_userdir.ml:39
 msgid ""
 "Remove the C<.ssh> directory of user \"root\" and any other\n"
 "users who have a C<.ssh> directory in their home directory."
@@ -1329,23 +1329,23 @@ msgstr ""
 "Вилучити каталог C<.ssh> користувача «root» та всіх інших користувачів,\n"
 "домашні каталоги яких містять каталог C<.ssh>."
 
-#: ../sysprep/sysprep_operation_pam_data.ml:47
+#: ../sysprep/sysprep_operation_pam_data.ml:44
 msgid "Remove the PAM data in the guest"
 msgstr "Вилучити дані PAM у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_rhn_systemid.ml:39
+#: ../sysprep/sysprep_operation_rhn_systemid.ml:38
 msgid "Remove the RHN system ID"
 msgstr "Вилучити ідентифікатор системи у RHN"
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:37
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:35
 msgid "Remove the SSH host keys in the guest"
 msgstr "Вилучити ключі вузла SSH у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_smolt_uuid.ml:42
+#: ../sysprep/sysprep_operation_smolt_uuid.ml:39
 msgid "Remove the Smolt hardware UUID"
 msgstr "Вилучити UUID обладнання Smolt"
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:40
+#: ../sysprep/sysprep_operation_abrt_data.ml:38
 msgid ""
 "Remove the automatically generated ABRT crash data in\n"
 "C</var/spool/abrt/>."
@@ -1353,15 +1353,15 @@ msgstr ""
 "Вилучити автоматично створені ABRT дані щодо аварії у\n"
 "C</var/spool/abrt/>."
 
-#: ../sysprep/sysprep_operation_crash_data.ml:41
+#: ../sysprep/sysprep_operation_crash_data.ml:40
 msgid "Remove the automatically generated kdump kernel crash data."
 msgstr "Вилучити автоматично створені kdump дані аварії ядра."
 
-#: ../sysprep/sysprep_operation_bash_history.ml:40
+#: ../sysprep/sysprep_operation_bash_history.ml:38
 msgid "Remove the bash history in the guest"
 msgstr "Вилучити журнал команд bash у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_bash_history.ml:41
+#: ../sysprep/sysprep_operation_bash_history.ml:39
 msgid ""
 "Remove the bash history of user \"root\" and any other users\n"
 "who have a C<.bash_history> file in their home directory."
@@ -1369,55 +1369,55 @@ msgstr ""
 "Вилучити журнал команд bash користувача «root» та всіх інших користувачів,\n"
 "у домашніх каталогах яких містяться файли C<.bash_history>."
 
-#: ../sysprep/sysprep_operation_abrt_data.ml:39
+#: ../sysprep/sysprep_operation_abrt_data.ml:37
 msgid "Remove the crash data generated by ABRT"
 msgstr "Вилучити дані щодо аварії, створені ABRT"
 
-#: ../sysprep/sysprep_operation_crash_data.ml:40
+#: ../sysprep/sysprep_operation_crash_data.ml:39
 msgid "Remove the crash data generated by kexec-tools"
 msgstr "Вилучити дані щодо аварії, створені kexec-tools"
 
-#: ../sysprep/sysprep_operation_puppet_data_log.ml:47
+#: ../sysprep/sysprep_operation_puppet_data_log.ml:44
 msgid "Remove the data and log files of puppet"
 msgstr "Вилучити дані та файли журналів puppet"
 
-#: ../sysprep/sysprep_operation_samba_db_log.ml:48
+#: ../sysprep/sysprep_operation_samba_db_log.ml:45
 msgid "Remove the database and log files of Samba"
 msgstr "Вилучити бази даних та файли журналів Samba"
 
-#: ../sysprep/sysprep_operation_sssd_db_log.ml:46
+#: ../sysprep/sysprep_operation_sssd_db_log.ml:43
 msgid "Remove the database and log files of sssd"
 msgstr "Вилучити бази даних і файли журналів sssd"
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:47
+#: ../sysprep/sysprep_operation_firewall_rules.ml:44
 msgid "Remove the firewall rules"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:38
+#: ../sysprep/sysprep_operation_machine_id.ml:39
 msgid "Remove the local machine ID"
 msgstr "Вилучити ідентифікатор локального комп’ютера"
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:52
+#: ../sysprep/sysprep_operation_pacct_log.ml:56
 msgid "Remove the process accounting log files"
 msgstr "Вилучити файли журналу обліку процесів"
 
-#: ../sysprep/sysprep_operation_user_account.ml:65
+#: ../sysprep/sysprep_operation_user_account.ml:63
 msgid "Remove the user accounts in the guest"
 msgstr "Вилучити облікові записи користувачів у гостьовій системі"
 
-#: ../sysprep/sysprep_operation_utmp.ml:36
+#: ../sysprep/sysprep_operation_utmp.ml:35
 msgid "Remove the utmp file"
 msgstr "Вилучити файл utmp"
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:36
+#: ../sysprep/sysprep_operation_yum_uuid.ml:34
 msgid "Remove the yum UUID"
 msgstr "Вилучити UUID yum"
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:37
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:35
 msgid "Remove udev persistent net rules"
 msgstr "Вилучити постійні правила мережі udev"
 
-#: ../sysprep/sysprep_operation_udev_persistent_net.ml:38
+#: ../sysprep/sysprep_operation_udev_persistent_net.ml:36
 msgid ""
 "Remove udev persistent net rules which map the guest's existing MAC\n"
 "address to a fixed ethernet device (eg. eth0).\n"
@@ -1438,7 +1438,7 @@ msgstr ""
 "зазвичай є небажаним. За допомогою вилучення постійних правил мережі udev\n"
 "цьому можна запобігти."
 
-#: ../sysprep/sysprep_operation_cron_spool.ml:40
+#: ../sysprep/sysprep_operation_cron_spool.ml:39
 msgid "Remove user at-jobs and cron-jobs"
 msgstr "Вилучити завдання at та cron користувачів"
 
@@ -1463,7 +1463,7 @@ msgstr ""
 msgid "Resizing container (but not filesystems) to expand the disk to %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:111
+#: ../sysprep/sysprep_operation_script.ml:110
 msgid "Run arbitrary scripts against the guest"
 msgstr "Запустити довільні скрипти дій над гостьовою системою"
 
@@ -1491,7 +1491,7 @@ msgstr ""
 "Запустити скрипти одноразово під час наступного завантаження гостьової\n"
 "системи. Кількість параметрів I<--firstboot> у рядку команди не обмежено."
 
-#: ../sysprep/sysprep_operation_script.ml:151
+#: ../sysprep/sysprep_operation_script.ml:150
 msgid ""
 "Run the named C<SCRIPT> (a shell script or program) against the\n"
 "guest.  The script can be any program on the host.  The script's\n"
@@ -1505,7 +1505,7 @@ msgstr ""
 msgid "Running: %s"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "Script or program to run on guest"
 msgstr "Скрипт або програма, яку слід запустити у гостьовій системі"
 
@@ -1529,7 +1529,7 @@ msgstr ""
 msgid "Set GPG binary/command"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:111
+#: ../sysprep/sysprep_operation_password.ml:110
 msgid ""
 "Set a user password.  The user must exist already (this option\n"
 "does I<not> create users).\n"
@@ -1649,7 +1649,7 @@ msgstr "Встановити вирівнювання розділів (типо
 msgid "Set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:80
+#: ../sysprep/sysprep_operation_password.ml:79
 msgid ""
 "Set root or another user's password.\n"
 "\n"
@@ -1668,7 +1668,7 @@ msgid ""
 "argument given."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:79
+#: ../sysprep/sysprep_operation_password.ml:78
 msgid "Set root or user password"
 msgstr ""
 
@@ -1696,7 +1696,7 @@ msgstr ""
 msgid "Set the hostname"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:184
+#: ../sysprep/sysprep_operation_password.ml:183
 msgid ""
 "Set the password encryption to C<md5>, C<sha256> or C<sha512>.\n"
 "\n"
@@ -1711,7 +1711,7 @@ msgid ""
 "You can override libguestfs by specifying this option."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:104
+#: ../sysprep/sysprep_operation_password.ml:103
 msgid ""
 "Set the root password.  See I<--password> above for the format\n"
 "of C<SELECTOR>."
@@ -1785,7 +1785,7 @@ msgid ""
 "C<~root/virt-sysprep-firstboot.log> (in the guest)."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_script.ml:112
+#: ../sysprep/sysprep_operation_script.ml:111
 msgid ""
 "The C<script> module lets you run arbitrary shell scripts or programs\n"
 "against the guest.\n"
@@ -1836,7 +1836,7 @@ msgstr ""
 "її першого завантаження). Скрипти I<--script> виконуються у\n"
 "основній, а не у гостьовій системі."
 
-#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:38
+#: ../sysprep/sysprep_operation_ssh_hostkeys.ml:36
 msgid ""
 "The SSH host keys are regenerated (differently) next time the guest is\n"
 "booted.\n"
@@ -1860,7 +1860,7 @@ msgstr ""
 " @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"
 " IT IS POSSIBLE THAT SOMEONE IS DOING SOMETHING NASTY!"
 
-#: ../sysprep/sysprep_operation_fs_uuids.ml:51
+#: ../sysprep/sysprep_operation_fs_uuids.ml:50
 msgid ""
 "The fs-uuids operation is disabled by default because it does\n"
 "not yet find and update all the places in the guest that use\n"
@@ -1871,7 +1871,7 @@ msgid ""
 "See: L<https://bugzilla.redhat.com/show_bug.cgi?id=991641>"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_machine_id.ml:39
+#: ../sysprep/sysprep_operation_machine_id.ml:40
 msgid ""
 "The machine ID is usually generated from a random source during system\n"
 "installation and stays constant for all subsequent boots.  Optionally,\n"
@@ -1884,7 +1884,7 @@ msgstr ""
 "стану цей ідентифікатор створюється під час роботи завантажувача,\n"
 "якщо буде виявлено порожнє значення."
 
-#: ../sysprep/sysprep_operation_script.ml:138
+#: ../sysprep/sysprep_operation_script.ml:137
 msgid ""
 "The mount point (an empty directory on the host) used when\n"
 "the C<script> operation is enabled and one or more scripts\n"
@@ -1896,7 +1896,7 @@ msgid ""
 "will be created."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_pacct_log.ml:53
+#: ../sysprep/sysprep_operation_pacct_log.ml:57
 msgid ""
 "The system wide process accounting will store to the pacct\n"
 "log files if the process accounting is on."
@@ -1920,7 +1920,7 @@ msgstr ""
 msgid "There is a surplus of %s."
 msgstr "Маємо надлишок у %s."
 
-#: ../sysprep/sysprep_operation_utmp.ml:37
+#: ../sysprep/sysprep_operation_utmp.ml:36
 msgid ""
 "This file records who is currently logged in on a machine.  In modern\n"
 "Linux distros it is stored in a ramdisk and hence not part of the\n"
@@ -1931,7 +1931,7 @@ msgstr ""
 "тому не є частиною віртуальної машини на диску, але ці дані зберігаються\n"
 "на диску у старіших версіях дистрибутивів."
 
-#: ../sysprep/sysprep_operation_timezone.ml:41
+#: ../sysprep/sysprep_operation_timezone.ml:42
 msgid ""
 "This operation changes the default timezone of the guest to the value\n"
 "given in the I<--timezone> parameter.\n"
@@ -1943,7 +1943,7 @@ msgid ""
 "in, but they can still change their timezone per-user account."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_hostname.ml:38
+#: ../sysprep/sysprep_operation_hostname.ml:39
 msgid ""
 "This operation changes the hostname of the guest to the value\n"
 "given in the I<--hostname> parameter.\n"
@@ -1957,7 +1957,7 @@ msgstr ""
 "Якщо параметр I<--hostname> не буде вказано, назву вузла буде змінено\n"
 "на C<localhost.localdomain>."
 
-#: ../sysprep/sysprep_operation_firewall_rules.ml:48
+#: ../sysprep/sysprep_operation_firewall_rules.ml:45
 msgid ""
 "This removes custom firewall rules by removing C</etc/sysconfig/iptables>\n"
 "or custom firewalld configuration in C</etc/firewalld/*/*>.\n"
@@ -1966,7 +1966,7 @@ msgid ""
 "exploits.  Use with care."
 msgstr ""
 
-#: ../sysprep/sysprep_operation_tmp_files.ml:47
+#: ../sysprep/sysprep_operation_tmp_files.ml:44
 msgid "This removes temporary files under C</tmp> and C</var/tmp>."
 msgstr ""
 
@@ -2002,7 +2002,7 @@ msgstr ""
 msgid "Write file"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_random_seed.ml:34
+#: ../sysprep/sysprep_operation_random_seed.ml:35
 msgid ""
 "Write some random bytes from the host into the random seed file of the\n"
 "guest.\n"
@@ -2035,7 +2035,7 @@ msgstr ""
 "Не можна використовувати --shrink, якщо немає запасу (див. «deficit» на "
 "сторінці підручника (man) virt-resize(1))."
 
-#: ../sysprep/sysprep_operation_yum_uuid.ml:37
+#: ../sysprep/sysprep_operation_yum_uuid.ml:35
 msgid ""
 "Yum creates a fresh UUID the next time it runs when it notices that the\n"
 "original UUID has been erased."
@@ -2077,7 +2077,7 @@ msgstr ""
 "не вдалося визначити формат диска з вхідними даними; скористайтеся "
 "параметром --format"
 
-#: ../sysprep/sysprep_operation_script.ml:136
+#: ../sysprep/sysprep_operation_script.ml:135
 msgid "dir"
 msgstr "каталог"
 
@@ -2132,7 +2132,7 @@ msgstr "формат"
 msgid "fs"
 msgstr "файлова система"
 
-#: ../sysprep/sysprep_operation_hostname.ml:49
+#: ../sysprep/sysprep_operation_hostname.ml:50
 msgid "hostname"
 msgstr "назва_вузла"
 
@@ -2149,7 +2149,7 @@ msgstr ""
 msgid "lv"
 msgstr "логічний том"
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "md5|sha256|sha512"
 msgstr ""
 
@@ -2194,7 +2194,7 @@ msgstr "частина"
 msgid "part=size"
 msgstr "частина=розмір"
 
-#: ../sysprep/sysprep_operation_delete.ml:50
+#: ../sysprep/sysprep_operation_delete.ml:49
 msgid "path"
 msgstr ""
 
@@ -2223,7 +2223,7 @@ msgstr ""
 "системи"
 
 #. ../sysprep/sysprep_operation_firstboot.ml:68
-#: ../sysprep/sysprep_operation_script.ml:149
+#: ../sysprep/sysprep_operation_script.ml:148
 msgid "script"
 msgstr "скрипт"
 
@@ -2235,34 +2235,34 @@ msgstr "помилка скрипту"
 msgid "sectors"
 msgstr "сектори"
 
-#: ../sysprep/sysprep_operation_password.ml:182
+#: ../sysprep/sysprep_operation_password.ml:181
 msgid "set password crypto"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:102
+#: ../sysprep/sysprep_operation_password.ml:101
 msgid "set root password (see man page)"
 msgstr ""
 
-#: ../sysprep/sysprep_operation_password.ml:109
+#: ../sysprep/sysprep_operation_password.ml:108
 msgid "set user password (see man page)"
 msgstr ""
 
-#: ../sysprep/main.ml:310
+#: ../sysprep/main.ml:306
 msgid "sysprep operation failed: %s\n"
 msgstr "помилка під час дії sysprep: %s\n"
 
-#: ../sysprep/main.ml:322
+#: ../sysprep/main.ml:318
 msgid "sysprep operation failed: exception: %s\n"
 msgstr "помилка під час дії sysprep: виключення: %s\n"
 
-#: ../sysprep/main.ml:319
+#: ../sysprep/main.ml:315
 msgid ""
 "sysprep operation failed: internal error: Not_found exception was thrown\n"
 msgstr ""
 "помилка під час дії sysprep: внутрішня помилка: сталося виключення "
 "Not_found\n"
 
-#: ../sysprep/main.ml:316
+#: ../sysprep/main.ml:312
 msgid ""
 "sysprep operation failed: internal error: assertion failed at %s, line %d, "
 "char %d\n"
@@ -2270,7 +2270,7 @@ msgstr ""
 "помилка під час дії sysprep: внутрішня помилка: помилка твердження у %s, "
 "рядок %d, символ %d\n"
 
-#: ../sysprep/main.ml:313
+#: ../sysprep/main.ml:309
 msgid "sysprep operation failed: internal error: invalid argument: %s\n"
 msgstr ""
 "помилка під час дії sysprep: внутрішня помилка: некоректний аргумент: %s\n"
@@ -2279,7 +2279,7 @@ msgstr ""
 msgid "the source disk has no partitions"
 msgstr "на початковому диску немає розділів"
 
-#: ../sysprep/sysprep_operation_timezone.ml:56
+#: ../sysprep/sysprep_operation_timezone.ml:57
 msgid "timezone"
 msgstr ""
 
@@ -2295,23 +2295,23 @@ msgstr "адреса"
 msgid "usage is: %s [--options] indisk outdisk"
 msgstr "спосіб використання: %s [--параметри] початковий_диск диск_результату"
 
-#: ../builder/index_parser.ml:208
+#: ../builder/index_parser.ml:214
 msgid "virt-builder: cannot parse 'compressed_size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:222
+#: ../builder/index_parser.ml:228
 msgid "virt-builder: cannot parse 'hidden' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:187
+#: ../builder/index_parser.ml:193
 msgid "virt-builder: cannot parse 'revision' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:199
+#: ../builder/index_parser.ml:205
 msgid "virt-builder: cannot parse 'size' field for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:257
+#: ../builder/index_parser.ml:263
 msgid "virt-builder: cannot use a URI ('%s') in the index file\n"
 msgstr ""
 
@@ -2378,21 +2378,27 @@ msgstr ""
 msgid "virt-builder: get-kernel: no operating system found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:154
+#: ../builder/index_parser.ml:159
 msgid ""
 "virt-builder: index is corrupt: %s: field '%s' appears two or more times\n"
 msgstr ""
 
+#: ../builder/index_parser.ml:157
+msgid ""
+"virt-builder: index is corrupt: %s: field '%s[%s]' appears two or more "
+"times\n"
+msgstr ""
+
 #: ../builder/index_parser.ml:141
 msgid ""
 "virt-builder: index is corrupt: os-version '%s' appears two or more times\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:172
+#: ../builder/index_parser.ml:178
 msgid "virt-builder: no 'file' (URI) entry for '%s'\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:196
+#: ../builder/index_parser.ml:202
 msgid "virt-builder: no 'size' field for '%s'\n"
 msgstr ""
 
@@ -2400,12 +2406,12 @@ msgstr ""
 msgid "virt-builder: no kernel found\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:262
+#: ../builder/index_parser.ml:268
 msgid ""
 "virt-builder: you must use relative paths (not '%s') in the index file\n"
 msgstr ""
 
-#: ../builder/index_parser.ml:253
+#: ../builder/index_parser.ml:259
 msgid "virt-builder: zero length path in the index file\n"
 msgstr ""
 
@@ -2413,12 +2419,12 @@ msgstr ""
 msgid "virt-sysprep: --scriptdir cannot be used more than once\n"
 msgstr "virt-sysprep: --scriptdir не можна використовувати декілька разів\n"
 
-#: ../sysprep/sysprep_operation.ml:156
+#: ../sysprep/sysprep_operation.ml:163
 msgid "virt-sysprep: POD for %s must not end with newline\n"
 msgstr ""
 "virt-sysprep: POD для %s не повинен завершуватися символом нового рядка\n"
 
-#: ../sysprep/sysprep_operation.ml:170
+#: ../sysprep/sysprep_operation.ml:177
 msgid "virt-sysprep: POD notes for %s must not end with newline\n"
 msgstr ""
 
@@ -2426,33 +2432,33 @@ msgstr ""
 msgid "virt-sysprep: cannot set passwords for %s guests.\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:133
+#: ../sysprep/sysprep_operation.ml:140
 msgid "virt-sysprep: disallowed character (%c) in operation name\n"
 msgstr "virt-sysprep: заборонений символ (%c) у назві дії\n"
 
-#: ../sysprep/sysprep_operation.ml:117
+#: ../sysprep/sysprep_operation.ml:124
 msgid "virt-sysprep: duplicate operation name (%s)\n"
 msgstr "virt-sysprep: дубльована назва дії (%s)\n"
 
-#: ../sysprep/sysprep_operation.ml:143
+#: ../sysprep/sysprep_operation.ml:150
 msgid "virt-sysprep: heading for %s must not end with newline or period\n"
 msgstr ""
 "virt-sysprep: заголовок %s не повинен завершуватися символом нового рядка "
 "або крапкою\n"
 
-#: ../sysprep/sysprep_operation.ml:152
+#: ../sysprep/sysprep_operation.ml:159
 msgid "virt-sysprep: operation %s has no POD\n"
 msgstr "virt-sysprep: для дії %s немає POD\n"
 
-#: ../sysprep/sysprep_operation.ml:166
+#: ../sysprep/sysprep_operation.ml:173
 msgid "virt-sysprep: operation %s has no POD notes\n"
 msgstr ""
 
-#: ../sysprep/sysprep_operation.ml:139
+#: ../sysprep/sysprep_operation.ml:146
 msgid "virt-sysprep: operation %s has no heading\n"
 msgstr "virt-sysprep: для дії %s немає заголовка\n"
 
-#: ../sysprep/sysprep_operation.ml:126
+#: ../sysprep/sysprep_operation.ml:133
 msgid "virt-sysprep: operation name is an empty string\n"
 msgstr "virt-sysprep: назвою дії є порожній рядок\n"
 
@@ -7336,38 +7342,38 @@ msgstr ""
 msgid "you must call guestfs_add_drive before guestfs_launch"
 msgstr "вам слід викликати guestfs_add_drive перед викликом guestfs_launch"
 
-#: src/launch-direct.c:859 src/launch-libvirt.c:539
+#: src/launch-direct.c:859 src/launch-libvirt.c:540
 msgid "qemu launched and contacted daemon, but state != READY"
 msgstr ""
 "qemu запущено, встановлено зв’язок з фоновою службою, але стан процесу не "
 "дорівнює READY"
 
-#: src/launch-direct.c:1240 src/launch-libvirt.c:1264
+#: src/launch-direct.c:1240 src/launch-libvirt.c:1265
 #, c-format
 msgid "realpath: could not convert '%s' to absolute path"
 msgstr "realpath: не вдалося перетворити «%s» на абсолютний шлях"
 
-#: src/launch-libvirt.c:244
+#: src/launch-libvirt.c:245
 msgid "direct mode flag is not supported yet for libvirt backend"
 msgstr ""
 "у модулі libvirt ще не передбачено підтримки прапорця безпосереднього режиму"
 
-#: src/launch-libvirt.c:253
+#: src/launch-libvirt.c:254
 #, 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:288
+#: src/launch-libvirt.c:289
 #, c-format
 msgid "could not connect to libvirt (URI = %s)"
 msgstr "не вдалося встановити з’єднання з libvirt (URI = %s)"
 
-#: src/launch-libvirt.c:304
+#: src/launch-libvirt.c:305
 msgid "could not get libvirt capabilities"
 msgstr "не вдалося визначити можливості libvirt"
 
-#: src/launch-libvirt.c:467
+#: src/launch-libvirt.c:468
 msgid ""
 "could not create appliance through libvirt.\n"
 "\n"
@@ -7377,22 +7383,22 @@ msgid ""
 "Original error from libvirt"
 msgstr ""
 
-#: src/launch-libvirt.c:604
+#: src/launch-libvirt.c:605
 msgid "unable to parse capabilities XML returned by libvirt"
 msgstr ""
 "не вдалося обробити запис можливостей у форматі XML, повернутий libvirt"
 
-#: src/launch-libvirt.c:610 src/libvirt-domain.c:355 src/libvirt-domain.c:438
+#: src/launch-libvirt.c:611 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:620
+#: src/launch-libvirt.c:621
 #, c-format
 msgid "unable to evaluate XPath expression: %s"
 msgstr "не вдалося обробити вираз XPath: %s"
 
-#: src/launch-libvirt.c:653
+#: src/launch-libvirt.c:654
 #, c-format
 msgid ""
 "libvirt hypervisor doesn't support qemu or KVM,\n"
@@ -7420,16 +7426,16 @@ msgstr ""
 "guestfs(3) та списком поширених питань щодо libguestfs та відповідей\n"
 "на ці питання."
 
-#: src/launch-libvirt.c:884
+#: src/launch-libvirt.c:885
 #, c-format
 msgid "%s:%d: error constructing libvirt XML near call to \"%s\""
 msgstr ""
 
-#: src/launch-libvirt.c:1220
+#: src/launch-libvirt.c:1221
 msgid "'iface' parameter is not supported by the libvirt backend"
 msgstr "підтримки параметра «iface» у модулі libvirt не передбачено"
 
-#: src/launch-libvirt.c:1341
+#: src/launch-libvirt.c:1342
 msgid ""
 "libvirt does not support the qemu curl driver protocols (ftp, http, etc.); "
 "try setting LIBGUESTFS_BACKEND=direct"
@@ -7437,7 +7443,7 @@ msgstr ""
 "у libvirt не передбачено підтримки драйверів протоколів curl qemu (ftp, http "
 "тощо); спробуйте встановити LIBGUESTFS_BACKEND=direct"
 
-#: src/launch-libvirt.c:1366
+#: src/launch-libvirt.c:1367
 msgid ""
 "could not auto-detect the format.\n"
 "If the format is known, pass the format to libguestfs, eg. using the\n"
@@ -7449,7 +7455,7 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1373
+#: src/launch-libvirt.c:1374
 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"
@@ -7462,20 +7468,20 @@ msgstr ""
 "параметра «--format» або за допомогою додаткового параметра аргументу "
 "формату до «add-drive»."
 
-#: src/launch-libvirt.c:1616
+#: src/launch-libvirt.c:1617
 msgid "could not destroy libvirt domain"
 msgstr "не вдалося знищити домен libvirt"
 
-#: src/launch-libvirt.c:1653
+#: src/launch-libvirt.c:1654
 #, c-format
 msgid "%s: internal error forming error message"
 msgstr "%s: внутрішня помилка формування повідомлення щодо помилки"
 
-#: src/launch-libvirt.c:1712
+#: src/launch-libvirt.c:1713
 msgid "could not attach disk to libvirt domain"
 msgstr "не вдалося долучити диск до домену libvirt"
 
-#: src/launch-libvirt.c:1743
+#: src/launch-libvirt.c:1744
 msgid "could not detach disk from libvirt domain"
 msgstr "не вдалося від’єднати диск від домену libvirt"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git



More information about the Pkg-libvirt-commits mailing list